From 18662f9ecbebf3a32dddc65a3e7954dacbe528a0 Mon Sep 17 00:00:00 2001
From: Stefan Profanter <git@s.profanter.me>
Date: Thu, 21 Apr 2016 17:32:57 +0200
Subject: [PATCH 001/222] Fix: The shared folder/folder id can also be a task
 list

---
 chrome/content/exchangeSettingsOverlay.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/exchangeSettingsOverlay.js b/chrome/content/exchangeSettingsOverlay.js
index 92e2f1ba..4af78732 100644
--- a/chrome/content/exchangeSettingsOverlay.js
+++ b/chrome/content/exchangeSettingsOverlay.js
@@ -408,7 +408,7 @@ exchSettingsOverlay.prototype = {
 	{
 		this.globalFunctions.LOG("exchWebServicesGetFolderOK: aFolderID:"+aFolderID+", aChangeKey:"+aChangeKey+", aFolderClass:"+aFolderClass);
 
-		if (aFolderClass == "IPF.Appointment") {
+		if (aFolderClass == "IPF.Appointment" || aFolderClass == "IPF.Task") {
 			this.exchWebServicesgFolderID = aFolderID;
 			this.exchWebServicesgChangeKey = aChangeKey;
 			this.gexchWebServicesDetailsChecked = true;

From e9d219b0e09374d37ee597fae643ff6ab1ca4d9c Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Tue, 26 Jul 2016 18:17:06 +0530
Subject: [PATCH 002/222] propose-new-time

---
 chrome/content/invitationResponse.js          | 57 ++++++++++-
 chrome/content/invitationResponse.xul         | 94 ++++++++++---------
 components/erSendMeetingRespons.js            | 29 ++++--
 .../exchangeCalendar/mivExchangeCalendar.js   | 23 ++++-
 .../de/invitationResponse.dtd                 |  3 +
 .../en-US/invitationResponse.dtd              |  5 +-
 .../fr-FR/invitationResponse.dtd              |  3 +
 .../ja-JP/invitationResponse.dtd              |  3 +
 .../nl/invitationResponse.dtd                 |  3 +
 .../ru/invitationResponse.dtd                 |  3 +
 .../sv/invitationResponse.dtd                 |  3 +
 .../tr/invitationResponse.dtd                 |  3 +
 12 files changed, 171 insertions(+), 58 deletions(-)

diff --git a/chrome/content/invitationResponse.js b/chrome/content/invitationResponse.js
index 6c409181..d1c7f2df 100644
--- a/chrome/content/invitationResponse.js
+++ b/chrome/content/invitationResponse.js
@@ -42,6 +42,9 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 if (! exchWebService) var exchWebService = {};
 
+var exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+		.getService(Ci.mivExchangeStatistics); 
+		
 exchWebService.invitationResponse = {
 
 	onAccept: function _onAccept()
@@ -49,9 +52,35 @@ exchWebService.invitationResponse = {
 		window.arguments[0].answer = "send";
 		window.arguments[0].bodyText = document.getElementById("exchWebService_messageReponseBody").value;
 		window.arguments[0].response = document.getElementById("exchWebService_itemResponse").value;
+
+		var pStart = this.formatDate(document.getElementById("exchWebService_propose_start").value);
+		var pEnd = this.formatDate(document.getElementById("exchWebService_propose_end").value);
+		
+		
+		window.arguments[0].proposeStart = pStart;	
+		window.arguments[0].proposeEnd = pEnd;
+
 		return true;
 	},
+	
+	formatDate: function _formatDate(date) {
+		var year = date.getFullYear(),
+			month = date.getMonth() + 1, // months are zero indexed
+			day = date.getDate(),
+			hour = date.getHours(),
+			minute = date.getMinutes(),
+			second = date.getSeconds(),
+			dayFormatted = day < 10 ? "0" + day : day,
+			monthFormatted = month < 10 ? "0" + month : month,  
+			hourFormatted = hour < 10 ? "0" + hour : hour,  
+			minuteFormatted = minute < 10 ? "0" + minute : minute,
+			secondFormatted = second < 10 ? "0" + second : second,
+			morning = hour < 12 ? "am" : "pm";
 
+		return year + "-" + monthFormatted + "-" + dayFormatted + "T" + hourFormatted + ":" +
+				minuteFormatted + ":"+ secondFormatted+ "Z"  ;
+	},
+	
 	onLoad: function _onLoad()
 	{
 		var item = window.arguments[0].item;
@@ -78,12 +107,36 @@ exchWebService.invitationResponse = {
 			document.getElementById("exchWebService_meetingOrganiser").value = "(unknown)";
 		}
 
-		document.getElementById("exchWebService_messageReponseBody").placeholder = window.arguments[0].response;
-
+		document.getElementById("exchWebService_messageReponseBody").placeholder = window.arguments[0].response; 
+		
+		var serverUrl = window.arguments[0].serverUrl;  
+		if ( exchangeStatistics.getServerVersion(serverUrl).indexOf("Exchange2013") > -1) {
+			document.getElementById("exchWebService_propose_time_checkbox").setAttribute("disabled","false");
+		}
+		else{
+			document.getElementById("exchWebService_propose_time_checkbox").setAttribute("disabled","true");
+		}
 	},
 
 	doResponseChanged: function _doResponseChanged(aMenuList)
 	{
 		document.getElementById("exchWebService_messageReponseBody").placeholder = aMenuList.value;
 	},
+	
+	onCheckChanged: function _onCheckChanged(aCheckbox)
+	{   
+		if( aCheckbox.checked == true ){
+			document.getElementById("exchWebService_propose_end_label").setAttribute("disabled","false");
+			document.getElementById("exchWebService_propose_start_label").setAttribute("disabled","false");
+			document.getElementById("exchWebService_propose_start").setAttribute("disabled","false");
+			document.getElementById("exchWebService_propose_end").setAttribute("disabled","false"); 
+		} 
+		else{
+			document.getElementById("exchWebService_propose_end_label").setAttribute("disabled","true");
+			document.getElementById("exchWebService_propose_start_label").setAttribute("disabled","true");
+			document.getElementById("exchWebService_propose_start").setAttribute("disabled","true");
+			document.getElementById("exchWebService_propose_end").setAttribute("disabled","true");
+		}
+	},
+	 
 }
diff --git a/chrome/content/invitationResponse.xul b/chrome/content/invitationResponse.xul
index bebe250f..3c15e656 100644
--- a/chrome/content/invitationResponse.xul
+++ b/chrome/content/invitationResponse.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,60 +36,67 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
+<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
+    <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css" ?>
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/invitationResponse.dtd" > %dtd1;
-]>
+        <!DOCTYPE dialog [
+    
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/invitationResponse.dtd" > %dtd1; ]>
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="exchWebService_invitationResponse_dialog" title="&description.invitationResponse;" buttons="accept,cancel" buttonlabelaccept="&label.acceptbutton;" buttonlabelcancel="&label.cancelbutton;" ondialogaccept="return exchWebService.invitationResponse.onAccept();" onload="exchWebService.invitationResponse.onLoad();">
 
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_invitationResponse_dialog" 
-  title="Select" 
-  buttons="accept,cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return exchWebService.invitationResponse.onAccept();"
-  onload="exchWebService.invitationResponse.onLoad();">
+	<script type="application/javascript" src="chrome://exchangecalendar/content/invitationResponse.js" />
 
-	<script type="application/javascript" src="chrome://exchangecalendar/content/invitationResponse.js"/>
+	<script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js" />
+	<script type="application/javascript" src="chrome://calendar/content/calUtils.js" />
+	<script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js" />
 
 	<vbox>
-		<description value="&description.invitationResponse;"/>
-
-		<seperator/>
-
 		<grid>
 			<columns>
 				<column />
-				<column flex="1"/>
+				<column flex="1" />
 			</columns>
 			<rows>
-			
-		<row>	<label value="&label.calendarName;"/> <label id="exchWebService_calendarName"/>	</row>
-		<row>	<label value="&label.itemTitle;"/> <label id="exchWebService_itemTitle"/>	</row>
-		<row>	<label value="&label.itemStart;"/> <label id="exchWebService_itemStart"/>	</row>
-		<row>	<label value="&label.itemResponse;"/> 						
-			<menulist label="(Make a choice)" id="exchWebService_itemResponse" value="1" oncommand="exchWebService.invitationResponse.doResponseChanged(this);">
-				<menupopup>
-					<menuitem label="&menuitem.label.ec-autorespond-answer.tentative;" value="TENTATIVE"/>
-					<menuitem label="&menuitem.label.ec-autorespond-answer.accepted;" value ="ACCEPTED"/>
-					<menuitem label="&menuitem.label.ec-autorespond-answer.declined;" value ="DECLINED"/>
-				</menupopup>
-			</menulist>
-		</row>
-		<row>	<label value="&label.meetingOrganiser;"/> <label id="exchWebService_meetingOrganiser"/>	</row>
-
+				<row>
+					<label value="&label.calendarName;" />
+					<label id="exchWebService_calendarName" />
+				</row>
+				<row>
+					<label value="&label.itemTitle;" />
+					<label id="exchWebService_itemTitle" />
+				</row>
+				<row>
+					<label value="&label.itemStart;" />
+					<label id="exchWebService_itemStart" />
+				</row>
+				<row>
+					<label value="&label.itemResponse;" />
+					<menulist label="(Make a choice)" id="exchWebService_itemResponse" value="1" oncommand="exchWebService.invitationResponse.doResponseChanged(this);">
+						<menupopup>
+							<menuitem label="&menuitem.label.ec-autorespond-answer.tentative;" value="TENTATIVE" />
+							<menuitem label="&menuitem.label.ec-autorespond-answer.accepted;" value="ACCEPTED" />
+							<menuitem label="&menuitem.label.ec-autorespond-answer.declined;" value="DECLINED" />
+						</menupopup>
+					</menulist>
+				</row>
+				<row>
+					<label value="&label.meetingOrganiser;" />
+					<label id="exchWebService_meetingOrganiser" />
+				</row>
 			</rows>
 		</grid>
-
 		<seperator/>
+		<checkbox id="exchWebService_propose_time_checkbox" label="&label.proposenewtime.title;" oncommand="exchWebService.invitationResponse.onCheckChanged(this);" checked="false" pack="start" />
+		<groupbox id="exchWebService_propose_groupbox">
+			<label value="&label.proposenewtime.start;" id="exchWebService_propose_start_label" control="exchWebService_propose_start" class="event-only" disable-on-readonly="true" />
 
-		<label value="&label.messageReponseBody;"/>
-		<textbox id="exchWebService_messageReponseBody" multiline="true" label="messageResponseBody" rows="5"/>
-
+			<datetimepicker id="exchWebService_propose_start" disable-on-readonly="true" class="event-only" disabled="true" />
+			<seperator/>
+			<label value="&label.proposenewtime.end;" id="exchWebService_propose_end_label" control="exchWebService_propose_end" class="event-only" disable-on-readonly="true" />
+			<datetimepicker id="exchWebService_propose_end" class="event-only" disable-on-readonly="true" disabled="true" />
+		</groupbox>
+		<seperator/>
+		<label value="&label.messageReponseBody;" />
+		<textbox id="exchWebService_messageReponseBody" multiline="true" label="messageResponseBody" rows="5" />
 	</vbox>
-
-
-</dialog>
+</dialog>
\ No newline at end of file
diff --git a/components/erSendMeetingRespons.js b/components/erSendMeetingRespons.js
index a36f4fad..8a211b0e 100644
--- a/components/erSendMeetingRespons.js
+++ b/components/erSendMeetingRespons.js
@@ -35,6 +35,8 @@
  * ***** BEGIN LICENSE BLOCK *****/
 
 var Cu = Components.utils;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -70,7 +72,9 @@ function erSendMeetingResponsRequest(aArgument, aCbOk, aCbError, aListener)
 	this.response = aArgument.response;
 	this.item = aArgument.item;
 	this.messageDisposition = aArgument.messageDisposition;
-
+	this.pstart = aArgument.proposeStart;
+	this.pend = aArgument.proposeEnd;
+	this.proposeNewTime = aArgument.proposeNewTime;
 	this.isRunning = true;
 	this.execute();
 }
@@ -115,25 +119,36 @@ erSendMeetingResponsRequest.prototype = {
 
 		if (this.senderMailbox) {
 			r.addChildTag("Sender", "nsTypes", null).addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", this.senderMailbox);
-		}
-
+		} 
+		
 		var referenceItemId = r.addChildTag("ReferenceItemId", "nsTypes", null);
 		referenceItemId.setAttribute("Id", this.item.id);
 		referenceItemId.setAttribute("ChangeKey", this.item.changeKey);
-
+		
+		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+				.getService(Ci.mivExchangeStatistics);
+				
+
+		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1) {  
+				if( this.proposeNewTime == true ){
+					r.addChildTag("ProposedStart", "nsTypes", this.pstart);   
+					r.addChildTag("ProposedEnd", "nsTypes", this.pend);
+				}
+		}
+		
 		req.addChildTag("Items", "nsMessages", null).addChildTagObject(r);
 		r = null;
 
 		this.parent.xml2jxon = true;
 
-		//exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.execute>"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+	//	exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.execute>"+String(req));
+		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
 		req = null;
 	},
 
 	onSendOk: function _onSendOk(aExchangeRequest, aResp)
 	{
-		//exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.onSendOk: "+String(aResp)+"\n");
+	//	exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.onSendOkxxxxxxxxxx : "+String(aResp)+"\n");
 
 		var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage[@ResponseClass='Success']");
 		if (rm.length == 0) {
diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 38d97d76..6f0c8d4c 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -5531,6 +5531,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		var input= { item: aItem, 
 			     response: tmpResponse,
 			     answer: "",
+				 proposeStart: "",
+				 proposeEnd: "",
+				 serverUrl: this.serverUrl,
 			     bodyText: ""};
 
 		if (preInput.response == "edit") {
@@ -5547,7 +5550,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 					"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
 					input); 
 			}
-
+						
 			if (input.answer != "send") {
 				if (this.debug) this.logInfo("User canceled invitationDialog.");
 				return false;
@@ -5561,8 +5564,19 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				messageDisposition = "SaveOnly";
 			}
 		}
-		if (this.debug) this.logInfo("  -------------- messageDisposition="+messageDisposition);
-
+		if (this.debug) this.logInfo("  -------------- messageDisposition="+messageDisposition); 
+	
+		var proposeStart = this.tryToSetDateValue(input.proposeStart,"");
+		var proposeEnd   = this.tryToSetDateValue(input.proposeEnd,""); 
+	 	var proposeNewTime = false;
+		
+		input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
+		input.proposeEnd   = cal.toRFC3339(proposeEnd.getInTimezone(  this.globalFunctions.ecUTC())); 
+		
+		if( input.proposeStart && input.proposeEnd ){
+			proposeNewTime = true;
+		}
+	 
 		var self = this;
 		this.addToQueue( erSendMeetingResponsRequest,
 			{user: this.user, 
@@ -5574,6 +5588,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			 changeKey: this.changeKey,
 			 response: input.response,
 			 bodyText: input.bodyText,
+			 proposeStart: input.proposeStart,
+			 proposeEnd: input.proposeEnd,
+			 proposeNewTime: proposeNewTime,
 			 senderMailbox: this.mailbox,
 	 		 actionStart: Date.now(),
 			 itemType: aItemType,
diff --git a/locale/exchangecalendar/de/invitationResponse.dtd b/locale/exchangecalendar/de/invitationResponse.dtd
index b2970763..7ac6949a 100644
--- a/locale/exchangecalendar/de/invitationResponse.dtd
+++ b/locale/exchangecalendar/de/invitationResponse.dtd
@@ -17,3 +17,6 @@
 
 
 
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/en-US/invitationResponse.dtd b/locale/exchangecalendar/en-US/invitationResponse.dtd
index 29ce1593..660d0a33 100644
--- a/locale/exchangecalendar/en-US/invitationResponse.dtd
+++ b/locale/exchangecalendar/en-US/invitationResponse.dtd
@@ -15,5 +15,6 @@
 <!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
 <!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
 
-
-
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/fr-FR/invitationResponse.dtd b/locale/exchangecalendar/fr-FR/invitationResponse.dtd
index 83d0f69c..0ece5197 100644
--- a/locale/exchangecalendar/fr-FR/invitationResponse.dtd
+++ b/locale/exchangecalendar/fr-FR/invitationResponse.dtd
@@ -17,3 +17,6 @@
 
 
 
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/ja-JP/invitationResponse.dtd b/locale/exchangecalendar/ja-JP/invitationResponse.dtd
index 29ce1593..fa22513d 100644
--- a/locale/exchangecalendar/ja-JP/invitationResponse.dtd
+++ b/locale/exchangecalendar/ja-JP/invitationResponse.dtd
@@ -17,3 +17,6 @@
 
 
 
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/nl/invitationResponse.dtd b/locale/exchangecalendar/nl/invitationResponse.dtd
index 9af52a09..f4836f0c 100644
--- a/locale/exchangecalendar/nl/invitationResponse.dtd
+++ b/locale/exchangecalendar/nl/invitationResponse.dtd
@@ -22,3 +22,6 @@
 
 
 
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/ru/invitationResponse.dtd b/locale/exchangecalendar/ru/invitationResponse.dtd
index 6fe0639f..25d68825 100644
--- a/locale/exchangecalendar/ru/invitationResponse.dtd
+++ b/locale/exchangecalendar/ru/invitationResponse.dtd
@@ -17,3 +17,6 @@
 
 
 
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/sv/invitationResponse.dtd b/locale/exchangecalendar/sv/invitationResponse.dtd
index 51c7a188..00822ff8 100644
--- a/locale/exchangecalendar/sv/invitationResponse.dtd
+++ b/locale/exchangecalendar/sv/invitationResponse.dtd
@@ -14,3 +14,6 @@
 <!ENTITY menuitem.label.ec-autorespond-answer.tentative "Jag kommer kanske att närvara">
 <!ENTITY menuitem.label.ec-autorespond-answer.accepted "Jag kommer att närvara">
 <!ENTITY menuitem.label.ec-autorespond-answer.declined "Jag kommer inte att närvara">
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/tr/invitationResponse.dtd b/locale/exchangecalendar/tr/invitationResponse.dtd
index 93ac0183..81f0d4d5 100644
--- a/locale/exchangecalendar/tr/invitationResponse.dtd
+++ b/locale/exchangecalendar/tr/invitationResponse.dtd
@@ -17,3 +17,6 @@
 
 
 
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">

From 3bad91492449c4d9efe73adee9b593df8308a05a Mon Sep 17 00:00:00 2001
From: enozkan <enozkan@yahoo.com>
Date: Wed, 3 Aug 2016 00:23:39 -0500
Subject: [PATCH 003/222] Update invitationResponse.dtd for tr locale

---
 locale/exchangecalendar/tr/invitationResponse.dtd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/exchangecalendar/tr/invitationResponse.dtd b/locale/exchangecalendar/tr/invitationResponse.dtd
index 81f0d4d5..8d4c24e3 100644
--- a/locale/exchangecalendar/tr/invitationResponse.dtd
+++ b/locale/exchangecalendar/tr/invitationResponse.dtd
@@ -5,7 +5,7 @@
 
 <!ENTITY label.calendarName “Takvim:”>
 <!ENTITY label.itemTitle “Konu:”>
-<!ENTITY label.itemStart “Başlangıç zamanı:”>
+<!ENTITY label.itemStart “Başlama zamanı:”>
 <!ENTITY label.itemResponse "Yanıtın:”>
 <!ENTITY label.meetingOrganiser "Düzenleyen:”>
 
@@ -17,6 +17,6 @@
 
 
 
-<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
-<!ENTITY label.proposenewtime.start "Start time">
-<!ENTITY label.proposenewtime.end "End time">
+<!ENTITY label.proposenewtime.title "Yeni bir zaman öner (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Başlama zamanı">
+<!ENTITY label.proposenewtime.end "Sona erme zamanı">

From c0de9f89572f8d02b1643f59365d79393e459c3b Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Fri, 14 Oct 2016 14:58:39 +0530
Subject: [PATCH 004/222] Password not being accepted when trying to add a
 Calendar #531

---
 interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index d862e6b3..feed03a5 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -214,8 +214,7 @@ mivExchangeAuthPrompt2.prototype = {
 						};*/
 
 			this.logInfo("getPassword: Going to ask user to provide a new password.");
-
-			this.details[aURL].ntlmCount = 0;
+ 
 			var answer = this.getCredentials(username, aURL);
 
 			if (answer.result) {

From 2b84a66e82c8bf48bf9b06df16a7151ea0006ec1 Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Fri, 14 Oct 2016 15:03:52 +0530
Subject: [PATCH 005/222] bump-version

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index 36fbf7c8..c06ac95f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>3.8.0</em:version>
+    <em:version>3.9.0-beta1</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->

From fc8ea0c5ff3eba93fe8240fed8fe47553b94704f Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Fri, 11 Nov 2016 21:34:58 -0800
Subject: [PATCH 006/222] Revert "Password not being accepted when trying to
 add a Calendar #531"

This reverts commit c0de9f89572f8d02b1643f59365d79393e459c3b.
---
 interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index feed03a5..d862e6b3 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -214,7 +214,8 @@ mivExchangeAuthPrompt2.prototype = {
 						};*/
 
 			this.logInfo("getPassword: Going to ask user to provide a new password.");
- 
+
+			this.details[aURL].ntlmCount = 0;
 			var answer = this.getCredentials(username, aURL);
 
 			if (answer.result) {

From 5d1c267cd54a8a3abf8ab84dbbc2750769aae9dd Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Wed, 21 Dec 2016 12:13:19 +0530
Subject: [PATCH 007/222] bump-version

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index c06ac95f..42e62911 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>3.9.0-beta1</em:version>
+    <em:version>3.9.0-beta2</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->

From c7e6162dc7266c698a30022b7fcc8bb94d661fc2 Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Thu, 12 Jan 2017 12:15:54 +0530
Subject: [PATCH 008/222] bump-version

---
 install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.rdf b/install.rdf
index 42e62911..79874a60 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,13 +5,13 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>3.9.0-beta2</em:version>
+    <em:version>3.9.0</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>12.0</em:minVersion>
-        <em:maxVersion>45.*</em:maxVersion>
+        <em:maxVersion>50.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From eca97cc5273570d7d9f050792115124a0927bc8d Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Sat, 14 Jan 2017 02:25:11 -0800
Subject: [PATCH 009/222] bump version

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index 79874a60..df6c9433 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>3.9.0</em:version>
+    <em:version>4.0.0-beta1</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->

From f7454c677ccf9153e57d108915d1835c941f3b22 Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Sat, 14 Jan 2017 02:31:48 -0800
Subject: [PATCH 010/222] enabler-sm-2.46

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index df6c9433..b71247fd 100644
--- a/install.rdf
+++ b/install.rdf
@@ -20,7 +20,7 @@
           <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.6</em:minVersion>
-        <em:maxVersion>2.26.*</em:maxVersion>
+        <em:maxVersion>2.46.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From bd7de51f95fd5e945467093dabd6ccbaec9ff660 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 3 May 2017 22:32:54 +0200
Subject: [PATCH 011/222] components/EcExchangeRequest.js: coding style and try
 to comment code

---
 components/ecExchangeRequest.js | 1103 ++++++++++++++++++-------------
 1 file changed, 657 insertions(+), 446 deletions(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index f0dd9a61..984421b4 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -66,7 +66,9 @@ const nsErrors = "http://schemas.microsoft.com/exchange/services/2006/errors";
 
 var gExchangeRequestVersion = "0.1";
 
-if (! exchWebService) var exchWebService = {};
+if (! exchWebService) {
+	var exchWebService = {};
+}
 
 exchWebService.prePasswords = {};
 
@@ -90,7 +92,7 @@ function ExchangeRequest(aArgument, aCbOk, aCbError, aListener)
 	this._notificationCallbacks = null;
 
 	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+		.getService(Ci.mivFunctions);
 
 	this.uuid = this.globalFunctions.getUUID();
 
@@ -99,22 +101,21 @@ function ExchangeRequest(aArgument, aCbOk, aCbError, aListener)
 	this.kerberos = true;
 
 	this.prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
+		.getService(Ci.nsIPrefBranch);
 
 	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-			.getService(Ci.mivExchangeStatistics);
+		.getService(Ci.mivExchangeStatistics);
 
 	this.exchangeBadCertListener2 = Cc["@1st-setup.nl/exchange/badcertlistener2;1"]
-			.getService(Ci.mivExchangeBadCertListener2);
+		.getService(Ci.mivExchangeBadCertListener2);
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService); 
+	this.observerService = Cc["@mozilla.org/observer-service;1"]
+		.getService(Ci.nsIObserverService);
 
 	this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-				.getService(Ci.mivExchangeTimeZones);
-				
-	this.xml2json = false;
+		.getService(Ci.mivExchangeTimeZones);
 
+	this.xml2json = false;
 }
 
 ExchangeRequest.prototype = {
@@ -158,7 +159,7 @@ ExchangeRequest.prototype = {
 
 	get debug()
 	{
-		if ((this.debuglevel == 0) || (!this.globalFunctions.shouldLog())) {
+		if ((this.debuglevel === 0) || (!this.globalFunctions.shouldLog())) {
 			return false;
 		}
 
@@ -172,7 +173,9 @@ ExchangeRequest.prototype = {
 
 	logInfo: function _logInfo(aMsg, aLevel)
 	{
-		if (!aLevel)  aLevel = 1;
+		if (!aLevel) {
+			aLevel = 1;
+		}
 
 		if ((this.debug) && (aLevel <= this.debuglevel)) {
 			this.globalFunctions.LOG(this.uuid+": "+aMsg);
@@ -201,78 +204,114 @@ ExchangeRequest.prototype = {
 
 	sendRequest: function(aData, aUrl)
 	{
+		// Stop process while exchangecalendar is shutted down
 		if (this.shutdown) {
 			return;
 		}
 
-//		this.logInfo(": sendRequest\n");
-		this.mData = aData;
-		this.currentUrl = "";
+		//////////////////////////////////
+		// Looking for URL to send data //
+		//////////////////////////////////
+		this.currentUrl = null;
 
-		while ((!aUrl) && (this.urllist.length > 0 )) {
+		// If no URL is given, try cached next known URL
+		// This handle the process of AutoDiscovery while list of URLs to try is not empty
+		if ((!aUrl) && (this.urllist.length > 0 )) {
 			aUrl = this.urllist[0];
 			this.urllist.shift();
 		}
 
-		if ((!aUrl) || (aUrl == "") || (aUrl == undefined)) {
-			this.fail(this.ER_ERROR_INVALID_URL, "No url to send request to (sendRequest).");
+		// If no URL is given and we have tried every known URL, stop process
+		if ((!aUrl) || (aUrl === "") || (aUrl === undefined)) {
+			this.fail(this.ER_ERROR_INVALID_URL,
+				"No url to send request to (sendRequest).");
 			return;
 		}
 
-		this.currentUrl = aUrl;
-
-		if (this.exchangeBadCertListener2.userCanceledCertProblem(this.currentUrl)) {
-			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION, "User canceled adding server certificate for url="+this.currentUrl+". Aborting this request.");
+		// If previously user canceled request on the "Certification issue dialog" for this URL,
+		// we have to not go further with this one
+		if (this.exchangeBadCertListener2.userCanceledCertProblem(aUrl)) {
+			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+				"User previously canceled adding server certificate for url=" + aUrl + ". Aborting this request.");
 			return;
 		}
 
-		// remove domain part in xmlhttprequest.open call
+		// We found an URL to send data, save it to current process
+		this.currentUrl = aUrl;
+
+		/////////////////////////////
+		// Processing data to send //
+		/////////////////////////////
+		this.mData = aData;
+
+		//////////////////////////////////////
+		// Looking for user authentications //
+		////////////////////////////////////
 		var openUser = this.mArgument.user;
-/*		if (openUser.indexOf("\\") > -1) {
-			openUser = openUser.substr(openUser.indexOf("\\")+1);
-		}*/
+		var password = null;
+
+		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(
+			Ci.mivExchangeAuthPrompt2);
 
-		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
 		if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
-			
-			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION, "User canceled providing a valid password for url="+this.currentUrl+". Aborting this request.");
+			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+				"User canceled providing a valid password for url="
+				+ this.currentUrl + ". Aborting this request.");
 			return;
 		}
 
 		try {
-			var password = myAuthPrompt2.getPassword(null, openUser, this.currentUrl);
-//			var password = myAuthPrompt2.getPassword(null, this.mArgument.user, this.currentUrl);
+			password = myAuthPrompt2.getPassword(null, openUser, this.currentUrl);
 		}
 		catch(err) {
 			this.logInfo(err);
-			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION, "User canceled providing a valid password for url="+this.currentUrl+". Aborting this request.");
+			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+				"User canceled providing a valid password for url="
+				+ this.currentUrl + ". Aborting this request.");
 			myAuthPrompt2 = null;
 			return;
 		}
 		myAuthPrompt2 = null;
 
-		this.xmlReq = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
-
-		this.mXmlReq = this.xmlReq;
-
-		var tmp = this;
-
+		////////////////////////////////////////////////////
+		// Sending data through standard XML HTTP Request //
+		////////////////////////////////////////////////////
 		// http://dvcs.w3.org/hg/progress/raw-file/tip/Overview.html
 		// https://developer.mozilla.org/en/XPCOM_Interface_Reference/nsIXMLHttpRequestEventTarget
-		this.xmlReq.addEventListener("loadstart", function(evt) { tmp.loadstart(evt); }, false);
-		this.xmlReq.addEventListener("progress", function(evt) { tmp.progress(evt); }, false);
-		this.xmlReq.addEventListener("error", function(evt) { tmp.error(evt); }, false);
-		this.xmlReq.addEventListener("abort", function(evt) { tmp.abort(evt); }, false);
-		this.xmlReq.addEventListener("load", function(evt) { tmp.onLoad(evt); }, false);
-		this.xmlReq.addEventListener("loadend", function(evt) { tmp.loadend(evt); }, false);
 
-		if (this.debug) this.logInfo(": 1 ExchangeRequest.sendRequest : user="+this.mArgument.user+", url="+this.currentUrl);
+		this.xmlReq = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
+		this.mXmlReq = this.xmlReq;
+
+		var currentEcRequest = this;
+
+		// Add listeners to the request so we have more details on the current state
+		this.xmlReq.addEventListener("loadstart",
+			function(evt) { currentEcRequest.loadstart(evt); },
+			false);
+		this.xmlReq.addEventListener("progress",
+			function(evt) { currentEcRequest.progress(evt); },
+			false);
+		this.xmlReq.addEventListener("error",
+			function(evt) { currentEcRequest.error(evt); },
+			false);
+		this.xmlReq.addEventListener("abort",
+			function(evt) { currentEcRequest.abort(evt); },
+			false);
+		this.xmlReq.addEventListener("load",
+			function(evt) { currentEcRequest.onLoad(evt); },
+			false);
+		this.xmlReq.addEventListener("loadend",
+			function(evt) { currentEcRequest.loadend(evt); },
+			false);
 
-		this._notificationCallbacks = new ecnsIAuthPrompt2(this);
+		if (this.debug) {
+			this.logInfo(": 1 ExchangeRequest.sendRequest : user="
+				+ this.mArgument.user +", url=" + this.currentUrl);
+		}
 
+		// Open XML HTTP Request channel we'll use to coummunicate with the server
 		try {
-
-//				this.xmlReq.open("POST", this.currentUrl, true);
+			// If a password is already known, we can try basic authentication diretcly.
 			if (password) {
 				if (this.debug) this.logInfo("We have a prePassword: *******");
 				this.xmlReq.open("POST", this.currentUrl, true, openUser, password);
@@ -281,57 +320,65 @@ ExchangeRequest.prototype = {
 				var tok = openUser + ':' + password;
 				var basicAuthHash = btoa(tok);
 				this.xmlReq.setRequestHeader('Authorization', "Basic " + basicAuthHash);
-				
-				//this.xmlReq.open("POST", this.currentUrl, true, this.mArgument.user, password);
 			}
 			else {
+				// If we don't have a password, we need to reach one time the URL
+				// to get a NTML challenge
+				// TODO: check if this comment is correct
 				this.xmlReq.open("POST", this.currentUrl, true, openUser);
-				//this.xmlReq.open("POST", this.currentUrl, true, this.mArgument.user);
 			}
-
 		}
 		catch(err) {
-			dump("\n ERROR sendrequest:"+err+"\n");
-			if (this.debug) this.logInfo(": ERROR on ExchangeRequest.sendRequest to URL:"+this.currentUrl+". err:"+err); 
+			if (this.debug) {
+				this.logInfo(": ERROR on ExchangeRequest.sendRequest to URL:"
+					+ this.currentUrl + ". err:" + err);
+			}
 
+			// Try another URL if possible
 			if (this.tryNextURL()) {
 				return;
 			}
 
-			this.fail(this.ER_ERROR_OPEN_FAILED,"Could not connect to specified host:"+err);
+			this.fail(this.ER_ERROR_OPEN_FAILED, "Could not connect to specified host:" + err);
 			return;
 		}
 
+		// Update HTTP Headers
 		this.xmlReq.overrideMimeType('text/xml');
 		this.xmlReq.setRequestHeader("Content-Type", "text/xml");
-//		this.xmlReq.setRequestHeader("User-Agent", "extensions.1st-setup.nl/" + gExchangeRequestVersion+"/username="+this.mArgument.user);
 		this.xmlReq.setRequestHeader("User-Agent", this.globalFunctions.safeGetCharPref(this.prefB, "extensions.1st-setup.others.userAgent", "exchangecalendar@extensions.1st-setup.nl", true));
 
 		// This is required for NTLM authenticated sessions. Which is default for a default EWS install.
 		this.xmlReq.setRequestHeader("Connection", "keep-alive");
 
 		/* set channel notifications for password processing */
+		this._notificationCallbacks = new ecnsIAuthPrompt2(this);
 		this.xmlReq.channel.notificationCallbacks = this._notificationCallbacks;
 		this.xmlReq.channel.loadGroup = null;
 
 		var httpChannel = this.xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
 
-		// XXX we want to preserve POST across 302 redirects TODO: This might go away because header params are copyied right now.
+		// XXX we want to preserve POST across 302 redirects
+		// TODO: This might go away because header params are copyied right now.
 		httpChannel.redirectionLimit = 0;
-try{
-		httpChannel.allowPipelining = false;
-}
-catch(err) {
-		this.logInfo("sendRequest: ERROR on httpChannel.allowPipelining to err:"+err); 
-}
-
-		if (this.debug) this.logInfo(": sendRequest Sending: " + this.mData+"\n", 2);
+		try{
+			httpChannel.allowPipelining = false;
+		}
+		catch(err) {
+			this.logInfo("sendRequest: ERROR on httpChannel.allowPipelining to err:"+err);
+		}
 
-		//this.exchangeStatistics.addDataSend(this.currentUrl, this.mData.length);
+		if (this.debug) {
+			this.logInfo(": sendRequest Sending: " + this.mData+"\n", 2);
+		}
 
+		// Finally, send data through the channel
 		this.xmlReq.send(this.mData);
 	},
 
+	/*
+	 * loadstart: XML HTTP Request callback
+	 */
 	loadstart: function _loadtstart(evt)
 	{
 		if (this.debug) this.logInfo(": ExchangeRequest.loadstart");
@@ -339,38 +386,62 @@ catch(err) {
 		this.badCert = false;
 	},
 
+	/*
+	 * loadend: XML HTTP Request callback
+	 */
 	loadend: function _loadend(evt)
 	{
-		if (this.debug) this.logInfo(": ExchangeRequest.loadend");
-
-		let xmlReq = this.mXmlReq;
-
-		if (this.debug) this.logInfo(": ExchangeRequest.loadend :"+evt.type+", readyState:"+xmlReq.readyState+", status:"+xmlReq.status);
-		if (this.debug) this.logInfo(": ExchangeRequest.loadend :"+xmlReq.responseText,2);
-
+		if (this.debug) {
+			this.logInfo(": ExchangeRequest.loadend :"
+				+ evt.type + ", readyState:" + this.mXmlReq.readyState
+				+ ", status:" + this.mXmlReq.status);
+			this.logInfo(": ExchangeRequest.loadend :"
+				+ this.mXmlReq.responseText,2);
+		}
 	},
 
+	/*
+	 * progress: XML HTTP Request callback
+	 */
 	progress: function _progress(evt)
 	{
-		if (this.debug) this.logInfo(": ExchangeRequest.progress. loaded:"+evt.loaded+", total:"+evt.total);
+		if (this.debug) {
+			this.logInfo(": ExchangeRequest.progress. loaded:"
+				+ evt.loaded + ", total:" + evt.total);
+		}
 	},
 
+	/*
+	 * error: XML HTTP Request callback
+	 * Depending on error received we try to recover if possible
+	 */
 	error: function _error(evt)
 	{
 		let xmlReq = this.mXmlReq;
 
-		if (this.debug) this.logInfo(": ExchangeRequest.error :"+evt.type+", readyState:"+xmlReq.readyState+", status:"+xmlReq.status+", lastStatus:"+this._notificationCallbacks.lastStatus);
-		if (this.debug) this.logInfo(": ExchangeRequest.error :"+xmlReq.responseText,2);
-		if (this.debug) this.logInfo(': xmlReq.getResponseHeader("Location") :'+xmlReq.getResponseHeader("Location"),2);
+		if (this.debug) {
+			this.logInfo(": ExchangeRequest.error :" + evt.type
+				+ ", readyState:" + xmlReq.readyState + ", status:" + xmlReq.status
+				+ ", lastStatus:" + this._notificationCallbacks.lastStatus);
+			this.logInfo(": ExchangeRequest.error :" + xmlReq.responseText, 2);
+			this.logInfo(': xmlReq.getResponseHeader("Location") :'
+				+ xmlReq.getResponseHeader("Location"), 2);
+		}
 
-		if ((!this.shutdown) && (xmlReq.readyState == 4) && (xmlReq.status == 0)) {
+		//////////////////////////////////////////////////////////
+		// Check if error is related to TLS certification issue //
+		//////////////////////////////////////////////////////////
+		if ((!this.shutdown) && (xmlReq.readyState === 4) && (xmlReq.status === 0)) {
 			this.logInfo(": ExchangeRequest.error : badCert going to check if it is a cert problem.");
-try {
-			var result = this.exchangeBadCertListener2.checkAndSolveCertProblem(this.currentUrl);
-}
-catch(err){
-			this.logInfo(": ExchangeRequest.error : this.exchangeBadCertListener2.checkAndSolveCertProblem Error:"+err);
-}
+			var result = null;
+
+			try {
+				result = this.exchangeBadCertListener2.checkAndSolveCertProblem(this.currentUrl);
+			}
+			catch(err) {
+				this.logInfo(": ExchangeRequest.error : this.exchangeBadCertListener2.checkAndSolveCertProblem Error:" + err);
+			}
+
 			if (result.hadProblem) {
 				if (result.solved) {
 					this.logInfo(": ExchangeRequest.error : badCert problem but solved. going to retry url.");
@@ -386,126 +457,187 @@ catch(err){
 			}
 		}
 
-		if (this.isHTTPRedirect(evt)) return;
-
-		if (this.tryNextURL()) return;
+		// Stop if we are able to resolve the error following redirection or trying next URL
+		if (this.isHTTPRedirect(evt) || this.tryNextURL()) {
+			return;
+		}
 
-		this.observerService.notifyObservers(this._notificationCallbacks, "onExchangeConnectionError", this.currentUrl+"|"+this._notificationCallbacks.lastStatus+"|"+this._notificationCallbacks.lastStatusArg);
+		this.observerService.notifyObservers(this._notificationCallbacks,
+			"onExchangeConnectionError",
+			this.currentUrl + "|" + this._notificationCallbacks.lastStatus
+			+ "|" + this._notificationCallbacks.lastStatusArg);
 
 		switch (this._notificationCallbacks.lastStatus) {
-		case 0x804b0003: 
-			this.fail(this.ER_ERROR_RESOLVING_HOST, "Error resolving hostname '"+this._notificationCallbacks.lastStatusArg+"'. Did you type the right hostname. (STATUS_RESOLVING)");
-			xmlReq.abort();
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			return;
-		case 0x804b000b: 
-			this.fail(this.ER_ERROR_RESOLVING_HOST, "Error resolving hostname '"+this._notificationCallbacks.lastStatusArg+"'. Did you type the right hostname. (STATUS_RESOLVED)");
-			xmlReq.abort();
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			return;
-		case 0x804b0007:
-			this.fail(this.ER_ERROR_CONNECTING_TO, "Error during connecting to hostname '"+this._notificationCallbacks.lastStatusArg+"'. Is the host down?. (STATUS_CONNECTING_TO)");
-			xmlReq.abort();
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			return;
-		case 0x804b0004:
-			this.fail(this.ER_ERROR_CONNECED_TO, "Error during connection to hostname '"+this._notificationCallbacks.lastStatusArg+"'. (STATUS_CONNECTED_TO)");
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			break;
-		case 0x804b0005:
-			this.fail(this.ER_ERROR_SENDING_TO, "Error during sending data to hostname '"+this._notificationCallbacks.lastStatusArg+"'. (STATUS_SENDING_TO)");
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			break;
-		case 0x804b000a:
-			this.fail(this.ER_ERROR_WAITING_FOR, "Error during waiting for data of hostname '"+this._notificationCallbacks.lastStatusArg+"'. (STATUS_WAITING_FOR)");
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			break;
-		case 0x804b0006: 
-			this.fail(this.ER_ERROR_RECEIVING_FROM, "Error during receiving of data from hostname '"+this._notificationCallbacks.lastStatusArg+"'. (STATUS_RECEIVING_FROM)");
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			break;
-		default:
-			this.fail(this.ER_ERROR_UNKNOWN_CONNECTION, "Unknown error during communication with hostname '"+this._notificationCallbacks.lastStatusArg+"'. ("+this._notificationCallbacks.lastStatus+")");
+			// On these status, we abort current connection, reset try counter and return
+			case 0x804b0003:
+			case 0x804b000b:
+				this.fail(this.ER_ERROR_RESOLVING_HOST,
+					"Error resolving hostname '"
+					+ this._notificationCallbacks.lastStatusArg
+					+ "'. Did you type the right hostname. (STATUS_RESOLVED)");
+				xmlReq.abort();
+				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
+					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
+				}
+				return;
+			case 0x804b0007:
+				this.fail(this.ER_ERROR_CONNECTING_TO, "Error during connecting to hostname '"
+					+ this._notificationCallbacks.lastStatusArg
+					+ "'. Is the host down?. (STATUS_CONNECTING_TO)");
+				xmlReq.abort();
+				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
+					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
+				}
+				return;
+			// On these status we just reset try counter and continue
+			case 0x804b0004:
+				this.fail(this.ER_ERROR_CONNECED_TO, "Error during connection to hostname '"
+					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_CONNECTED_TO)");
+				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
+					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
+				}
+				break;
+			case 0x804b0005:
+				this.fail(this.ER_ERROR_SENDING_TO, "Error during sending data to hostname '"
+					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_SENDING_TO)");
+				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
+					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
+				}
+				break;
+			case 0x804b000a:
+				this.fail(this.ER_ERROR_WAITING_FOR, "Error during waiting for data of hostname '"
+					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_WAITING_FOR)");
+				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
+					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
+				}
+				break;
+			case 0x804b0006:
+				this.fail(this.ER_ERROR_RECEIVING_FROM, "Error during receiving of data from hostname '"
+					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_RECEIVING_FROM)");
+				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
+					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
+				}
+				break;
+			// Unknown status
+			default:
+				this.fail(this.ER_ERROR_UNKNOWN_CONNECTION, "Unknown error during communication with hostname '"
+					+ this._notificationCallbacks.lastStatusArg
+					+ "'. (" + this._notificationCallbacks.lastStatus + ")");
 		}
 
 	},
 
+	/*
+	 * abort: XML HTTP Request callback
+	 */
 	abort: function _abort(evt)
 	{
-		if (this.debug) this.logInfo("ExchangeRequest.abort: type:"+evt.type);
-		if (evt.type != "abort") {
-			if (this.debug) this.logInfo("ecExchangeRequest.abort: "+evt.type);
+		if (this.debug) {
+			this.logInfo("ExchangeRequest.abort: type:" + evt.type);
 		}
-		dump("Abort!\n");
-//		this.fail(-3, "User aborted data transfer.");
 	},
 
 	onUserStop: function _onUserStop(aCode, aMsg)
 	{
-		if (this.debug) this.logInfo("ecExchangeRequest.onUserStop: aCode:"+aCode+", aMsg:"+aMsg);
+		if (this.debug) {
+			this.logInfo("ecExchangeRequest.onUserStop: aCode:"+aCode+", aMsg:"+aMsg);
+		}
+
 		this.mXmlReq.abort();
 		this.fail(aCode, aMsg);
 	},
 
+	/*
+	 * isHTTPRedirect: check if URL has bee redirected and try to go through redirection
+	 */
 	isHTTPRedirect: function(evt)
 	{
 		let xmlReq = this.mXmlReq;
-		if (this.debug) this.logInfo("exchangeRequest.isHTTPRedirect.xmlReq. xmlReq.readyState:"+xmlReq.readyState+", xmlReq.status:"+xmlReq.status);
 
-		if (xmlReq.readyState != 4)
+		if (this.debug) {
+			this.logInfo("exchangeRequest.isHTTPRedirect.xmlReq. xmlReq.readyState:"
+				+ xmlReq.readyState + ", xmlReq.status:" + xmlReq.status);
+		}
+
+		// This is not a redirection
+		// TODO Documentation
+		if (xmlReq.readyState != 4) {
 			return false;
+		}
 
+		// Read status to find redirection
 		switch (xmlReq.status) {
-		case 301:  // Moved Permanently
-		case 302:  // Found
-		case 307:  // Temporary redirect (since HTTP/1.1)
-			if (this.debug) this.logInfo(": ExchangeRequest.redirect :"+evt.type+", readyState:"+xmlReq.readyState+", status:"+xmlReq.status);
-
-			let httpChannel = xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
-			let loc = httpChannel.getResponseHeader("Location");
-
-			// The location could be a relative path
-			if (loc.indexOf("http") == -1) {
-				if (this.debug) this.logInfo("new location looks to be relative.");
-				if (loc.indexOf("/") == 0) {
-					if (this.debug) this.logInfo("Relative to the root of the server.");
+			case 301:  // Moved Permanently
+			case 302:  // Found
+			case 307:  // Temporary redirect (since HTTP/1.1)
+				if (this.debug) {
+					this.logInfo(": ExchangeRequest.redirect :"
+						+ evt.type + ", readyState:" + xmlReq.readyState
+						+ ", status:" + xmlReq.status);
+				}
+
+				// Read new location from HTTP headers
+				let httpChannel = xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
+				let loc = httpChannel.getResponseHeader("Location");
+
+				// The location could be a relative path
+				if (loc.indexOf("http") === -1) {
+					if (this.debug) {
+						this.logInfo("new location looks to be relative.");
+					}
+
 					// Relative to the root of the server
-					//Find position of third slash https://xxx/
-					var slashCounter = 0;
-					var counter = 0;
-					while ((slashCounter < 3) && (counter < this.currentUrl.length)) {
-						if (this.currentUrl.substr(counter, 1) == "/") {
-							slashCounter++;
-
-							if (slashCounter == 3) {
-								var tmpUrl = this.currentUrl.substr(0, counter);
-								break;
+					if (loc.indexOf("/") === 0) {
+						if (this.debug) {
+							this.logInfo("Relative to the root of the server.");
+						}
+
+						// Retrieve current root path by looking for the third slash
+						// for the currenty requested URL (like https://xxx.yyy/)
+						// If there's not 3 slash, so the URL is already the root path
+						var rootUrlPath = null
+						var slashCounter = 0;
+						var pos = 0;
+						while ((slashCounter < 3) && (pos < this.currentUrl.length)) {
+							if (this.currentUrl.substr(pos, 1) === "/") {
+								slashCounter++;
+
+								if (slashCounter === 3) {
+									rootUrlPath = this.currentUrl.substr(0, pos);
+									break;
+								}
 							}
+							pos++;
+						}
+
+						if (rootUrlPath) {
+							loc = rootUrlPath + loc;
+						}
+						else {
+							loc = this.currentUrl + loc;
 						}
-						counter++;
-					}
-					if (tmpUrl) {
-						loc = tmpUrl + loc;
 					}
 					else {
-						loc = this.currentUrl + loc;
+						// Relative to last dir.
+						if (this.debug){
+							this.logInfo("it is relative to the last dir. Currently not able to handle this.");
+						}
 					}
 				}
-				else {
-					// Relative to last dir.
-					if (this.debug) this.logInfo("it is relative to the last dir. Currently not able to handle this. Will be available in future version.");
-				}
-			}
 
-			if (this.debug) this.logInfo(": Redirect: " + loc + "\n");
+				if (this.debug){
+					this.logInfo(": Redirect: " + loc + "\n");
+				}
 
-                        // XXX pheer loops.
-                        xmlReq.abort();
-                        this.sendRequest(this.mData, loc);
+				// XXX pheer loops.
+				xmlReq.abort();
+				this.sendRequest(this.mData, loc);
 
-			return true;
+				// This is a redirection and we are alreday trying a new URL
+				return true;
 		}
 
+		// That wasn't a redirection
 		return false;
 	},
 
@@ -515,11 +647,18 @@ catch(err){
 		if ((pos > -1) && (pos < 5)) {
 			var chunkCounter = 1;
 			var chunkLength = parseInt(aStr.substr(0,pos), 16);
+
 			if (isNaN(chunkLength)) {
-				if (this.debug) this.logInfo("unchunk: 1st chunk is not a number:"+aStr.substr(0,pos));
+				if (this.debug){
+					this.logInfo("unchunk: 1st chunk is not a number:" + aStr.substr(0,pos));
+				}
 				return "";
 			}
-			if (this.debug) this.logInfo("unchunk: 1st chunk has length:"+chunkLength);
+
+			if (this.debug) {
+				this.logInfo("unchunk: 1st chunk has length:" + chunkLength);
+			}
+
 			var newStr = "";
 			while (chunkLength > 0) {
 				var bytesToCopy = chunkLength;
@@ -533,13 +672,17 @@ catch(err){
 					}
 					else {
 						if (charCode <= 0xFFFF) {
-							if (this.debug) this.logInfo("unchunk: TWO bytes copied '"+aStr.substr(pos, 1)+"'="+charCode);
+							if (this.debug) {
+								this.logInfo("unchunk: TWO bytes copied '" + aStr.substr(pos, 1) + "'="+charCode);
+							}
 							bytesToCopy = bytesToCopy - 2;
 
 						}
 						else {
 							if (charCode <= 0xFFFFFF) {
-								if (this.debug) this.logInfo("unchunk: THREE bytes copied '"+aStr.substr(pos, 1)+"'="+charCode);
+								if (this.debug) {
+									this.logInfo("unchunk: THREE bytes copied '" + aStr.substr(pos, 1) + "'="+charCode);
+								}
 								bytesToCopy = bytesToCopy - 3;
 							}
 						}
@@ -547,13 +690,17 @@ catch(err){
 					pos++;
 				}
 
-				//newStr = newStr + aStr.substr(pos+2, chunkLength);
-					if (this.debug) this.logInfo("unchunk: pos:"+pos+", CunkStr:"+newStr+"|");
-				//pos = pos + chunkLength + 2;
+				if (this.debug) {
+					this.logInfo("unchunk: pos:" + pos + ", CunkStr:" + newStr + "|");
+				}
+
 				// Next two bytes should be \r\n
 				var check = aStr.substr(pos, 2);
 				if (check != "\r\n") {
-					if (this.debug) this.logInfo("unchunk: Strange. Expected 0D0A (Cr+Lf) but found:"+check+". Stopping processing of this chunked message.");
+					if (this.debug) {
+						this.logInfo("unchunk: Strange. Expected 0D0A (Cr+Lf) but found:"
+							+ check + ". Stopping processing of this chunked message.");
+					}
 					return "";
 				}
 				pos = pos + 2;
@@ -561,24 +708,35 @@ catch(err){
 				var pos2 = tmpStr.indexOf("\r\n");
 				chunkCounter++;
 				if (pos2 > -1) {
-					if (this.debug) this.logInfo("unchunk: Found next chunk. Number:"+chunkCounter+", LengthStr:"+tmpStr.substr(0,pos2));
+					if (this.debug) {
+						this.logInfo("unchunk: Found next chunk. Number:"+chunkCounter+", LengthStr:"+tmpStr.substr(0,pos2));
+					}
+
 					chunkLength = parseInt(tmpStr.substr(0,pos2), 16);
 					if (isNaN(chunkLength)) {
-						if (this.debug) this.logInfo("unchunk: Chunk '"+chunkCounter+"' is not a number:"+tmpStr);
+						if (this.debug) {
+							this.logInfo("unchunk: Chunk '"+chunkCounter+"' is not a number:"+tmpStr);
+						}
 						return "";
 					}
-					if (this.debug) this.logInfo("unchunk: Chunk '"+chunkCounter+"' has length:"+chunkLength);
+					if (this.debug) {
+						this.logInfo("unchunk: Chunk '"+chunkCounter+"' has length:"+chunkLength);
+					}
 					pos = pos + pos2;
 				}
 				else {
-					if (this.debug) this.logInfo("unchunk: Trying to determine chunk '"+chunkCounter+"' length but it is more than 4 bytes big!! size:"+tmpStr);
+					if (this.debug) {
+						this.logInfo("unchunk: Trying to determine chunk '"+chunkCounter+"' length but it is more than 4 bytes big!! size:"+tmpStr);
+					}
 					return "";
 				}
 			}
 			return newStr;
 		}
 		else {
-			if (this.debug) this.logInfo("unchunk: Trying to determine first chunk length but it is very big...!! size:"+pos);
+			if (this.debug) {
+				this.logInfo("unchunk: Trying to determine first chunk length but it is very big...!! size:" + pos);
+			}
 			return aStr;
 		}
 	},
@@ -586,16 +744,17 @@ catch(err){
 	saveToFile: function _saveToFile(aFilename, aContent)
 	{
 		var file = Cc["@mozilla.org/file/directory_service;1"]
-				.getService(Components.interfaces.nsIProperties)
-				.get("ProfD", Components.interfaces.nsIFile);
+			.getService(Components.interfaces.nsIProperties)
+			.get("ProfD", Components.interfaces.nsIFile);
+
 		file.append("exchange-data");
 		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));  
+			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
 		}
 
 		file.append("responses");
 		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));  
+			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
 		}
 
 		if (!this.fileCount) {
@@ -606,73 +765,65 @@ catch(err){
 		}
 
 		if (this.fileCount < 10) {
-			file.append(this.uuid+"-00"+this.fileCount+"."+aFilename);
+			file.append(this.uuid+"-00" + this.fileCount + "."+aFilename);
+		}
+		else if (this.fileCount < 100) {
+			file.append(this.uuid+"-0" + this.fileCount + "." + aFilename);
 		}
 		else {
-			if (this.fileCount < 100) {
-				file.append(this.uuid+"-0"+this.fileCount+"."+aFilename);
-			}
-			else {
-				file.append(this.uuid+"-"+this.fileCount+"."+aFilename);
-			}
+			file.append(this.uuid+"-" + this.fileCount + "."+aFilename);
 		}
 
 		if (file.exists()) {
 			file.remove(false);
 		}
 
-//		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0777);  
-
-		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].  
-				 createInstance(Components.interfaces.nsIFileOutputStream);  
-		foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);  
+		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
+			createInstance(Components.interfaces.nsIFileOutputStream);
+		foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);
 
 		var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
-				createInstance(Components.interfaces.nsIConverterOutputStream);
+			createInstance(Components.interfaces.nsIConverterOutputStream);
 		converter.init(foStream, "UTF-8", 0, 0);
 		converter.writeString(aContent);
 		converter.close(); // this closes foStream
-		  
+
 		return 0;
 	},
 
 
-	onLoad:function _onLoad(evt) 
+	onLoad:function _onLoad(evt)
 	{
 		let xmlReq = this.mXmlReq;
 
-		if (this.debug) this.logInfo(": ExchangeRequest.onLoad :"+evt.type+", readyState:"+xmlReq.readyState+", status:"+xmlReq.status);
-
-		if (this.debug) this.logInfo(": ExchangeRequest.onLoad :"+xmlReq.getAllResponseHeaders(),2);
-
-		if (this.debug) this.logInfo(": ExchangeRequest.onLoad :"+xmlReq.responseText,2);
-
-		//this.exchangeStatistics.addDataRead(this.currentUrl, xmlReq.responseText.length);
-
-		if (xmlReq.readyState != 4) {
-
-			//if (this.tryNextURL()) return;
-
-			if (this.debug) this.logInfo("readyState < 4. THIS SHOULD NEVER HAPPEN. PLEASE REPORT.");
-			this.fail(this.ER_ERROR_OPEN_FAILED,"Ready state != 4, readyState:"+xmlReq.readyState);
-			return;
+		if (this.debug) {
+			this.logInfo(": ExchangeRequest.onLoad :" + evt.type
+				+ ", readyState:" + xmlReq.readyState
+				+ ", status:" + xmlReq.status);
+			this.logInfo(": ExchangeRequest.onLoad :"
+				+ xmlReq.getAllResponseHeaders(), 2);
+			this.logInfo(": ExchangeRequest.onLoad :" + xmlReq.responseText, 2);
 		}
 
-		if (this.isHTTPRedirect(evt)) {
+		if (xmlReq.readyState != 4) {
+			if (this.debug) {
+				this.logInfo("readyState != 4. THIS SHOULD NEVER HAPPEN. PLEASE REPORT.");
+			}
+			this.fail(this.ER_ERROR_OPEN_FAILED,
+				"Ready state != 4, readyState:" + xmlReq.readyState);
 			return;
 		}
 
-		if (this.isHTTPError()) {
+		// Check redirection and follow it if possible
+		// Check if this is an HTTP Error
+		if (this.isHTTPRedirect(evt) || this.isHTTPError()) {
 			return;
 		}
 
 		var xml = xmlReq.responseText; // bug 270553
-		//this.saveToFile("onload.xml", xml);
-
-// Removed following as this is no longer a problem as we are not using E4X anymore.
-//		xml = xml.replace(/&#x10;/g, ""); // BUG 61 remove hexadecimal code 0x10. It will fail in xml conversion.
-
 		var newXML;
+
+		// Initiate XML parser
 		try {
 			if (this.xml2json === true) {
 				newXML = xml2json.newJSON();
@@ -681,8 +832,13 @@ catch(err){
 				newXML = new mivIxml2jxon('', 0, null);
 			}
 		}
-		catch(exc) { if (this.debug) this.logInfo("createInstance error:"+exc);}
+		catch(exc) {
+			if (this.debug) {
+				this.logInfo("createInstance error:"+exc);
+			}
+		}
 
+		// Parse XML data
 		try {
 			if (this.xml2json === true) {
 				xml2json.parseXML(newXML, xml);
@@ -696,7 +852,12 @@ catch(err){
 				newXML.processXMLString(xml, 0, null);
 			}
 		}
-		catch(exc) { if (this.debug) this.logInfo("processXMLString error:"+exc.name+", "+exc.message+"\n"+xml);} 
+		catch(exc) {
+			if (this.debug) {
+				this.logInfo("processXMLString error:" + exc.name + ","
+					+ exc.message + "\n" + xml);
+			}
+		}
 
 		this.mAuthFail = 0;
 		this.mRunning  = false;
@@ -706,37 +867,51 @@ catch(err){
 			try {
 				if (this.xml2json === true) {
 					let serverVersion = xml2json.XPath(newXML,"/Envelope/Header/ServerVersionInfo");
-					if ((serverVersion.length > 0) && (xml2json.getAttribute(serverVersion[0], "Version") !== null)) {
-						this.exchangeStatistics.setServerVersion(this.currentUrl, xml2json.getAttribute(serverVersion[0], "Version"), xml2json.getAttribute(serverVersion[0], "MajorVersion"), xml2json.getAttribute(serverVersion[0], "MinorVersion"));
+					if (serverVersion.length > 0
+						&& xml2json.getAttribute(serverVersion[0], "Version") !== null) {
+						this.exchangeStatistics.setServerVersion(this.currentUrl,
+							xml2json.getAttribute(serverVersion[0], "Version"),
+							xml2json.getAttribute(serverVersion[0], "MajorVersion"),
+							xml2json.getAttribute(serverVersion[0], "MinorVersion"));
 					}
 					serverVersion = null;
 				}
 				else {
 					let serverVersion = newXML.XPath("/s:Header/ServerVersionInfo");
-					if ((serverVersion.length > 0) && (serverVersion[0].getAttribute("Version") != "")) {
-						this.exchangeStatistics.setServerVersion(this.currentUrl, serverVersion[0].getAttribute("Version"), serverVersion[0].getAttribute("MajorVersion"), serverVersion[0].getAttribute("MinorVersion"));
+					if (serverVersion.length > 0
+						&& serverVersion[0].getAttribute("Version") != "") {
+						this.exchangeStatistics.setServerVersion(this.currentUrl,
+							serverVersion[0].getAttribute("Version"),
+							serverVersion[0].getAttribute("MajorVersion"),
+							serverVersion[0].getAttribute("MinorVersion"));
 					}
 					serverVersion[0] = null;
 					serverVersion = null;
 				}
 			}
-			catch(err) { }
+			catch(err) {
+			}
 
 			this.retryCount = 0;
-
 			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 				exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
 			}
 
-try {
-			this.mCbOk(this, newXML);
-}catch(err) { dump("onload: err:"+err+"\n"+this.globalFunctions.STACK()+"\n"+xml+"\n");}
+			try {
+				this.mCbOk(this, newXML);
+			}
+			catch(err)
+			{
+				if (this.debug) {
+					this.logInfo("onLoad: err:" + err);
+					this.logInfo("onLoad: stack:" + this.globalFunctions.STACK());
+					this.logInfo("onLoad: xml:" + xml);
+				}
+			}
 			this.originalReq = null;
 		}
 
-//dump(" stat: time1:"+(time2-time1)+", time2:"+(time4-time3)+"\n");
 		newXML = null;
-
 		this.observerService.notifyObservers(this._notificationCallbacks, "onExchangeConnectionOk", this.currentUrl);
 	},
 
@@ -747,14 +922,18 @@ try {
 
 	tryNextURL: function _tryNextURL()
 	{
-		if (this.debug) this.logInfo("exchangeRequest.tryNextURL");
-                let xmlReq = this.mXmlReq;
+		if (this.debug) {
+			this.logInfo("exchangeRequest.tryNextURL");
+		}
+
+		let xmlReq = this.mXmlReq;
+
 		if (xmlReq.readyState != 4) {
 			xmlReq.abort();
 		}
 
 		if (this.urllist.length > 0) {
-			if (this.debug) this.logInfo("exchangeRequest.tryNextURL: We have another URLto try the request on.");
+			if (this.debug) this.logInfo("exchangeRequest.tryNextURL: We have another URL to try the request on.");
 			this.sendRequest(this.mData);
 			return true;
 		}
@@ -769,161 +948,179 @@ try {
 			// https://webmail.example.com/ews/exchange.asmx
 
 			var tmpColon = tmpURL.indexOf("://");
-			tmpURL = tmpURL.substr(0, tmpColon+3) + aUser + "@" + tmpURL.substr(tmpColon+3);
+			tmpURL = tmpURL.substr(0, tmpColon + 3) + aUser + "@" + tmpURL.substr(tmpColon+3);
 		}
 		return this._notificationCallbacks.getPrePassword(aUser, tmpURL);
 	},
 
-        isHTTPError: function()
-        {
-                let xmlReq = this.mXmlReq;
+	isHTTPError: function()
+	{
+		let xmlReq = this.mXmlReq;
 
-                if (xmlReq.status != 200) {
+		if (xmlReq.status != 200) {
 			if (xmlReq.status ==  303) {  // See Other (since HTTP/1.1) new request should be a GET instead of a POST.
- 				this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Redirection "+xmlReq.status+": See Other\n"+xmlReq.responseText.substr(0,300)+"\n\n");
-                        	return true;
+				this.fail(this.ER_ERROR_HTTP_ERROR4XX,
+					"HTTP Redirection " + xmlReq.status + ": See Other\n"
+					+ xmlReq.responseText.substr(0,300) + "\n\n");
+				return true;
 			}
 
-                        if ((xmlReq.status > 399) && (xmlReq.status < 500)) {
-
+			if ((xmlReq.status > 399) && (xmlReq.status < 500)) {
 				var errMsg = "";
 				switch (xmlReq.status) {
-				case 400: errMsg = "Bad request"; break;
-				case 401: errMsg = "Unauthorized"; break;
-				case 402: errMsg = "Payment required"; break;
-				case 403: errMsg = "Forbidden"; break;
-				case 404: errMsg = "Not found"; break;
-				case 405: errMsg = "Method not allowed"; break;
-				case 406: errMsg = "Not acceptable"; break;
-				case 407: errMsg = "Proxy athentication required"; break;
-				case 408: errMsg = "Request timeout"; break;
-				case 409: errMsg = "Conflict"; break;
-				case 410: errMsg = "Gone"; break;
-				case 411: errMsg = "Length required"; break;
-				case 412: errMsg = "Precondition failed"; break;
-				case 413: errMsg = "Request entity too large"; break;
-				case 414: errMsg = "Request-URI too long"; break;
-				case 415: errMsg = "Unsupported media type"; break;
-				case 416: errMsg = "Request range not satisfiable"; break;
-				case 417: errMsg = "Expectation failed"; break;
-				case 418: errMsg = "I'm a teapot(RFC 2324)"; break;
-				case 420: errMsg = "Enhance your calm (Twitter)"; break;
-				case 422: errMsg = "Unprocessable entity (WebDAV)(RFC 4918)"; break;
-				case 423: errMsg = "Locked (WebDAV)(RFC 4918)"; break;
-				case 424: errMsg = "Failed dependency (WebDAV)(RFC 4918)"; break;
-				case 425: errMsg = "Unordered collection (RFC 3648)"; break;
-				case 426: errMsg = "Upgrade required (RFC2817)"; break;
-				case 428: errMsg = "Precondition required"; break;
-				case 429: errMsg = "Too many requests"; break;
-				case 431: errMsg = "Request header fields too large"; break;
-				case 444: errMsg = "No response"; break;
-				case 449: errMsg = "Retry with"; break;
-				case 450: errMsg = "Blocked by Windows Parental Controls"; break;
-				case 499: errMsg = "Client closed request"; break;
+					case 400: errMsg = "Bad request"; break;
+					case 401: errMsg = "Unauthorized"; break;
+					case 402: errMsg = "Payment required"; break;
+					case 403: errMsg = "Forbidden"; break;
+					case 404: errMsg = "Not found"; break;
+					case 405: errMsg = "Method not allowed"; break;
+					case 406: errMsg = "Not acceptable"; break;
+					case 407: errMsg = "Proxy athentication required"; break;
+					case 408: errMsg = "Request timeout"; break;
+					case 409: errMsg = "Conflict"; break;
+					case 410: errMsg = "Gone"; break;
+					case 411: errMsg = "Length required"; break;
+					case 412: errMsg = "Precondition failed"; break;
+					case 413: errMsg = "Request entity too large"; break;
+					case 414: errMsg = "Request-URI too long"; break;
+					case 415: errMsg = "Unsupported media type"; break;
+					case 416: errMsg = "Request range not satisfiable"; break;
+					case 417: errMsg = "Expectation failed"; break;
+					case 418: errMsg = "I'm a teapot(RFC 2324)"; break;
+					case 420: errMsg = "Enhance your calm (Twitter)"; break;
+					case 422: errMsg = "Unprocessable entity (WebDAV)(RFC 4918)"; break;
+					case 423: errMsg = "Locked (WebDAV)(RFC 4918)"; break;
+					case 424: errMsg = "Failed dependency (WebDAV)(RFC 4918)"; break;
+					case 425: errMsg = "Unordered collection (RFC 3648)"; break;
+					case 426: errMsg = "Upgrade required (RFC2817)"; break;
+					case 428: errMsg = "Precondition required"; break;
+					case 429: errMsg = "Too many requests"; break;
+					case 431: errMsg = "Request header fields too large"; break;
+					case 444: errMsg = "No response"; break;
+					case 449: errMsg = "Retry with"; break;
+					case 450: errMsg = "Blocked by Windows Parental Controls"; break;
+					case 499: errMsg = "Client closed request"; break;
 				}
 
-                                if (this.debug) this.logInfo(": isConnError req.status="+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText, 2);
+				if (this.debug) {
+					this.logInfo(": isConnError req.status=" + xmlReq.status
+						+ ": " +errMsg + "\nURL:" + this.currentUrl + "\n"
+						+ xmlReq.responseText, 2);
+				}
 
 				var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-				if ((this.urllist.length > 0) && (!myAuthPrompt2.getUserCanceled(this.currentUrl))) {
-					if (this.tryNextURL()) { 
+				if (this.urllist.length > 0 && !myAuthPrompt2.getUserCanceled(this.currentUrl)) {
+					if (this.tryNextURL()) {
 						return true;
 					}
-	 				this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Client error "+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText.substr(0,300)+"\n\n");
+					this.fail(this.ER_ERROR_HTTP_ERROR4XX,
+						"HTTP Client error " + xmlReq.status + ": "
+						+ errMsg + "\nURL:" + this.currentUrl + "\n"
+						+ xmlReq.responseText.substr(0,300)+"\n\n");
+				}
+				else if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
+					this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+						"User canceled providing a valid password for url="
+						+ this.currentUrl + ". Aborting this request.");
 				}
 				else {
-					if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
-		 				this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,  "User canceled providing a valid password for url="+this.currentUrl+". Aborting this request.");
-					}
-					else {
-		 				this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Client error "+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText.substr(0,300)+"\n\n");
-					}
+					this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Client error "
+						+ xmlReq.status + ": " +errMsg +"\nURL:" + this.currentUrl
+						+ "\n" + xmlReq.responseText.substr(0,300)+"\n\n");
 				}
 
-                        	return true;
-
-                        }
-
-                        if ((xmlReq.status > 499) && (xmlReq.status < 600)) {
+				return true;
+			}
 
+			if ((xmlReq.status > 499) && (xmlReq.status < 600)) {
 				var errMsg = "";
 				switch (xmlReq.status) {
-				case 500: errMsg = "Internal server error"; 
-
+					case 500: errMsg = "Internal server error";
 						// First check if we have a version mismatch and we need a lower version. This sometimes happens.
 						if (xmlReq.responseText.indexOf("ErrorInvalidServerVersion") > -1) {
-							if (this.debug) this.logInfo(" ErrorInvalidServerVersion -> RequestServerVersion wrong:"+this.version+".", 2);
-							// We are going to retry with a different serverversion.
+							if (this.debug) {
+								this.logInfo(" ErrorInvalidServerVersion -> RequestServerVersion wrong:"+this.version+".", 2);
+							}
+
+							// We are going to retry with a different server version.
 							var tryAgain = false;
 							switch(this.version) {
-							case "Exchange2010":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2007_SP1", null, null);
-								tryAgain = true;
-								break;
-							case "Exchange2010_SP1":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
-								tryAgain = true;
-								break;
-							case "Exchange2010_SP2":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
-								tryAgain = true;
-								break;
-							case "Exchange2013":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
-								tryAgain = true;
-								break;
-							default:
-								tryAgain = false;
+								case "Exchange2010":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2007_SP1", null, null);
+									tryAgain = true;
+									break;
+								case "Exchange2010_SP1":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
+									tryAgain = true;
+									break;
+								case "Exchange2010_SP2":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
+									tryAgain = true;
+									break;
+								case "Exchange2013":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
+									tryAgain = true;
+									break;
+								default:
+									tryAgain = false;
 							}
 							if (tryAgain) {
-								if (this.debug) this.logInfo("Going to retry with lower server version", 2);
+								if (this.debug) {
+									this.logInfo("Going to retry with lower server version", 2);
+								}
 								this.sendRequest(this.makeSoapMessage(this.originalReq), this.currentUrl);
 								return true;
 							}
 						}
-
-						// First check if we have a version mismatch and we need a higher version. This sometimes happens.
-						if ((xmlReq.responseText.indexOf("ErrorIncorrectSchemaVersion") > -1) &&
-							(xmlReq.responseText.indexOf("RequestServerVersion") > -1) ) {
-							if (this.debug) this.logInfo(" ErrorIncorrectSchemaVersion -> RequestServerVersion wrong:"+this.version+".", 2);
+						// Next check if we have a version mismatch and we need a higher version. This sometimes happens.
+						if (xmlReq.responseText.indexOf("ErrorIncorrectSchemaVersion") > -1
+							&& xmlReq.responseText.indexOf("RequestServerVersion") > -1) {
+							if (this.debug){
+								this.logInfo(" ErrorIncorrectSchemaVersion -> RequestServerVersion wrong:"+this.version+".", 2);
+							}
 							// We are going to retry with a different serverversion.
 							var tryAgain = false;
 							switch(this.version) {
-							case "Exchange2007_SP1":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
-								tryAgain = true;
-								break;
-							case "Exchange2010":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
-								tryAgain = true;
-								break;
-							case "Exchange2010_SP1":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
-								tryAgain = true;
-								break;
-							case "Exchange2010_SP2":
-								this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2013", null, null);
-								tryAgain = true;
-								break;
-							default:
-								tryAgain = false;
+								case "Exchange2007_SP1":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
+									tryAgain = true;
+									break;
+								case "Exchange2010":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
+									tryAgain = true;
+									break;
+								case "Exchange2010_SP1":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
+									tryAgain = true;
+									break;
+								case "Exchange2010_SP2":
+									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2013", null, null);
+									tryAgain = true;
+									break;
+								default:
+									tryAgain = false;
 							}
 							if (tryAgain) {
-								if (this.debug) this.logInfo("Going to retry with higher server version", 2);
+								if (this.debug) {
+									this.logInfo("Going to retry with higher server version", 2);
+								}
 								this.sendRequest(this.makeSoapMessage(this.originalReq), this.currentUrl);
 								return true;
 							}
 						}
 
 						// This might be generated because of a password not yet supplied in open function during a request so we try again
-						//if ((this.prePassword == "") && 
-						if	((!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) || (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount < 3)) {
-							if (this.debug) this.logInfo("isHTTPError: We are going to ask the user or password store for a password and try again.");
+						if	((!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl])
+							 || (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount < 3)) {
+							if (this.debug) {
+								this.logInfo("isHTTPError: We are going to ask the user or password store for a password and try again.");
+							}
 							this.prePassword = this.getPrePassword(this.currentUrl, this.mArgument.user);
 
 							if (this.prePassword) {
-
-								if (this.debug) this.logInfo("isHTTPError: We received a prePassword. Going to retry current URL");
+								if (this.debug) {
+									this.logInfo("isHTTPError: We received a prePassword. Going to retry current URL");
+								}
 
 								if (!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 									exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl] = {};
@@ -933,17 +1130,24 @@ try {
 								exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount++;
 
 								xmlReq.abort();
-
 								this.retryCurrentUrl();
 
 								return true;
 							}
-							if (this.debug) this.logInfo("isHTTPError: User canceled request for prePassword.");
+							if (this.debug) {
+								this.logInfo("isHTTPError: User canceled request for prePassword.");
+							}
 						}
 
-						if	((exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) && (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount > 2)) {
+						// Password were given and that's the third try we have an error
+						if	((exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl])
+							 && (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount > 2)) {
 							// Failed three times. Remove password also from password store.
-							if (this.debug) this.logInfo("isHTTPError: Failed password "+exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount+" times. Stopping communication.");
+							if (this.debug) {
+								this.logInfo("isHTTPError: Failed password "
+									+ exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount
+									+ " times. Stopping communication.");
+							}
 							var title = "Microsoft Exchange EWS";
 							var tmpURL = this.currentUrl;
 							if (this.mArgument.user != "") {
@@ -956,60 +1160,76 @@ try {
 							this._notificationCallbacks.passwordManagerRemove(this.mArgument.user, tmpURL, title);
 						}
 
+						// Finally reset password cache
 						if (!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 							exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl] = {};
 						}
-						
+
 						exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
 
 						this.prePassword = null;
-
 						break;
-				case 501: errMsg = "Not implemented"; break;
-				case 502: errMsg = "Bad gateway"; break;
-				case 503: errMsg = "Service unavailable"; break;
-				case 504: errMsg = "Gateway timeout"; break;
-				case 505: errMsg = "HTTP version not supported"; break;
-				case 506: errMsg = "Variant also negotiates (RFC 2295)"; break;
-				case 507: errMsg = "Insufficient Storage (WebDAV)(RFC 4918)"; break;
-				case 508: errMsg = "Loop detected (WebDAV)(RFC 4918)"; break;
-				case 509: errMsg = "Bandwith limit exceeded (Apache bw/limited extension)"; break;
-				case 510: errMsg = "Not extended (RFC 2774)"; break;
-				case 511: errMsg = "Network authentication required"; break;
-				case 598: errMsg = "Network read timeout error"; break;
-				case 599: errMsg = "Network connect timeout error"; break;
+					case 501: errMsg = "Not implemented"; break;
+					case 502: errMsg = "Bad gateway"; break;
+					case 503: errMsg = "Service unavailable"; break;
+					case 504: errMsg = "Gateway timeout"; break;
+					case 505: errMsg = "HTTP version not supported"; break;
+					case 506: errMsg = "Variant also negotiates (RFC 2295)"; break;
+					case 507: errMsg = "Insufficient Storage (WebDAV)(RFC 4918)"; break;
+					case 508: errMsg = "Loop detected (WebDAV)(RFC 4918)"; break;
+					case 509: errMsg = "Bandwith limit exceeded (Apache bw/limited extension)"; break;
+					case 510: errMsg = "Not extended (RFC 2774)"; break;
+					case 511: errMsg = "Network authentication required"; break;
+					case 598: errMsg = "Network read timeout error"; break;
+					case 599: errMsg = "Network connect timeout error"; break;
 				}
 
-                                if (this.debug) this.logInfo(": isConnError req.status="+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText, 2);
+				if (this.debug) {
+					this.logInfo(": isConnError req.status="
+						+ xmlReq.status + ": " + errMsg
+						+ "\nURL:" + this.currentUrl + "\n"
+						+ xmlReq.responseText, 2);
+				}
 
 				if (this.tryNextURL()) {
 					return true;
 				}
 
- 				this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Server error "+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText.substr(0,300)+"\n\n");
-                        	return true;
-                        }
+				this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Server error "+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText.substr(0,300)+"\n\n");
+				return true;
+			} // End of error status 5xx
 
 			if (this.tryNextURL()) {
 				return true;
 			}
-                        // XXX parse it
- 			this.fail(this.ER_ERROR_FROM_SERVER, "Unknown error from server"+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText.substr(0,300)+"\n\n");
-                        return true;
-                }
 
-                return false;
-        },
+			// XXX parse it
+ 			this.fail(this.ER_ERROR_FROM_SERVER, "Unknown error from server"
+ 				+ xmlReq.status + ": " + errMsg + "\nURL:"+this.currentUrl
+ 				+ "\n" + xmlReq.responseText.substr(0,300) + "\n\n");
+			return true;
+		} // Received HTTP 200 OK
+
+		// That wasn't an HTTP error
+		return false;
+	},
 
 	fail: function(aCode, aMsg)
 	{
-		if (this.debug) this.logInfo("ecExchangeRequest.fail: aCode:"+aCode+", aMsg:"+aMsg);
+		if (this.debug) {
+			this.logInfo("ecExchangeRequest.fail: aCode:"+aCode+", aMsg:"+aMsg);
+		}
+
 		if (this.mCbError) {
 			this.mCbError(this, aCode, aMsg);
 		}
+
 		this.originalReq = null;
 	},
 
+	/*
+	 * Generate SOAP message by xml2json
+	 */
 	makeSoapMessage2: function erMakeSoapMessage2(aReq)
 	{
 		this.originalReq = aReq;
@@ -1021,23 +1241,23 @@ try {
 		xml2json.setAttribute(msg, "xmlns:nsTypes", nsTypesStr);
 
 		this.version = this.exchangeStatistics.getServerVersion(this.mArgument.serverUrl);
-		
+
 		var header = xml2json.addTag(msg,"Header", "nsSoap", null);
 
 		var requestServerVersion = xml2json.addTag(header, "RequestServerVersion", "nsTypes", null);
 		xml2json.setAttribute(requestServerVersion, "Version", this.version);
-		
+
 		var exchTimeZone = this.timeZones.getExchangeTimeZoneByCalTimeZone(this.globalFunctions.ecDefaultTimeZone(), this.mArgument.serverUrl, cal.now());
 
 		if (exchTimeZone) {
-				let timeZoneContext = xml2json.addTag(header, "TimeZoneContext", "nsTypes", null);
-				let tmpTimeZone = xml2json.addTag(timeZoneContext, "TimeZoneDefinition", "nsTypes");
-				if (this.version.indexOf("2007") < 0) {
-					xml2json.setAttribute(tmpTimeZone, "Name",exchTimeZone.name);
-				}
-				xml2json.setAttribute(tmpTimeZone, "Id",exchTimeZone.id);
-				tmpTimeZone = null;
-				timeZoneContext = null;
+			let timeZoneContext = xml2json.addTag(header, "TimeZoneContext", "nsTypes", null);
+			let tmpTimeZone = xml2json.addTag(timeZoneContext, "TimeZoneDefinition", "nsTypes");
+			if (this.version.indexOf("2007") < 0) {
+				xml2json.setAttribute(tmpTimeZone, "Name",exchTimeZone.name);
+			}
+			xml2json.setAttribute(tmpTimeZone, "Id",exchTimeZone.id);
+			tmpTimeZone = null;
+			timeZoneContext = null;
 		}
 		header = null;
 
@@ -1051,6 +1271,9 @@ try {
 		return tmpStr;
 	},
 
+	/*
+	 * Generate SOAP message by mivIxml2jxon
+	 */
 	makeSoapMessage: function erMakeSoapMessage(aReq)
 	{
 		this.originalReq = aReq;
@@ -1058,41 +1281,29 @@ try {
 		var msg = new mivIxml2jxon('<nsSoap:Envelope xmlns:nsSoap="'+nsSoapStr+'" xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>', 0, null);
 
 		this.version = this.exchangeStatistics.getServerVersion(this.mArgument.serverUrl);
-		
+
 		var header = msg.addChildTag("Header", "nsSoap", null);
+		header.addChildTag("RequestServerVersion", "nsTypes", null).setAttribute("Version", this.version);
 
-/*		if (this.mArgument.ServerVersion) {
-			header.addChildTag("RequestServerVersion", "nsTypes", null).setAttribute("Version", this.mArgument.ServerVersion);
-		}
-		else {*/
-			header.addChildTag("RequestServerVersion", "nsTypes", null).setAttribute("Version", this.version);
-//		}
-		
 		var exchTimeZone = this.timeZones.getExchangeTimeZoneByCalTimeZone(this.globalFunctions.ecDefaultTimeZone(), this.mArgument.serverUrl, cal.now());
 
 		if (exchTimeZone) {
-				//exchTimeZone.timeZone.tagName = "TimeZoneDefinition";
-				//header.addChildTag("TimeZoneContext", "nsTypes", null).addChildTagObject(exchTimeZone.timeZone);
-
-				if (this.version.indexOf("2007") > -1) {
-					var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>',0,null);
-					tmpTimeZone.setAttribute("Id",exchTimeZone.id); 
-				}
-				else {
-					var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>',0,null);
-					tmpTimeZone.setAttribute("Name",exchTimeZone.name); 
-					tmpTimeZone.setAttribute("Id",exchTimeZone.id); 
-				}
-				header.addChildTag("TimeZoneContext", "nsTypes", null).addChildTagObject(tmpTimeZone);
-				tmpTimeZone = null;
+			if (this.version.indexOf("2007") > -1) {
+				var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>',0,null);
+				tmpTimeZone.setAttribute("Id",exchTimeZone.id);
+			}
+			else {
+				var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>',0,null);
+				tmpTimeZone.setAttribute("Name",exchTimeZone.name);
+				tmpTimeZone.setAttribute("Id",exchTimeZone.id);
+			}
+			header.addChildTag("TimeZoneContext", "nsTypes", null).addChildTagObject(tmpTimeZone);
+			tmpTimeZone = null;
 		}
 		header = null;
 
 		msg.addChildTag("Body", "nsSoap", null).addChildTagObject(aReq);
 
-//dump("Going to send1:"+msg.toString().length+", xml:"+msg.getSize()+"\n");
-//dump("Going to send2:"+msg.toString()+"\n");
-
 		var tmpStr = xml_tag + msg.toString();
 		msg = null;
 		return tmpStr;
@@ -1129,9 +1340,7 @@ try {
 	{
 		this.fail(this.ERR_PASSWORD_ERROR, aMsg);
 	},
-
-
-};
+}; // End of ExchangeRequest prototype
 
 var ecPasswordErrorList = {};
 
@@ -1140,7 +1349,7 @@ function ecnsIAuthPrompt2(aExchangeRequest)
 	this.exchangeRequest = aExchangeRequest;
 
 	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+		.getService(Ci.mivFunctions);
 	this.uuid = this.globalFunctions.getUUID();
 
 	this.callback = null;
@@ -1154,13 +1363,12 @@ function ecnsIAuthPrompt2(aExchangeRequest)
 	this.password = null;
 	this.URL = null;
 	this.lastStatus = 0;  // set by nsIProgressEventSink onStatus.
-	
+
 	this.timer = Cc["@mozilla.org/timer;1"]
-					.createInstance(Ci.nsITimer);
+		.createInstance(Ci.nsITimer);
 }
 
 ecnsIAuthPrompt2.prototype = {
-
 	QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2, Ci.nsIBadCertListener2, Ci.nsIProgressEventSink, 
 						Ci.nsISecureBrowserUI, Ci.nsIDocShellTreeItem, Ci.nsIAuthPromptProvider,
 						Ci.nsIChannelEventSink, Ci.nsIRedirectResultListener]),
@@ -1174,22 +1382,22 @@ ecnsIAuthPrompt2.prototype = {
 
 		if ((Ci.nsIBadCertListener2) && (iid.equals(Ci.nsIBadCertListener2))) {
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIBadCertListener2");
-        		return Cc["@1st-setup.nl/exchange/badcertlistener2;1"].getService(Ci.mivExchangeBadCertListener2);
+			return Cc["@1st-setup.nl/exchange/badcertlistener2;1"].getService(Ci.mivExchangeBadCertListener2);
 		} 
 
 		if ((Ci.nsIProgressEventSink) && (iid.equals(Ci.nsIProgressEventSink))) {   // iid == d974c99e-4148-4df9-8d98-de834a2f6462
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIProgressEventSink");
-        		return this;
+			return this;
 		} 
 
 		if ((Ci.nsISecureBrowserUI) && (iid.equals(Ci.nsISecureBrowserUI))) {   // iid == 081e31e0-a144-11d3-8c7c-00609792278c
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsISecureBrowserUI");
-        		return this;
+			return this;
 		} 
 
 		if ((Ci.nsIDocShellTreeItem) && (iid.equals(Ci.nsIDocShellTreeItem))) {   // iid == 09b54ec1-d98a-49a9-bc95-3219e8b55089
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIDocShellTreeItem");
-        		return Cr.NS_NOINTERFACE;
+			return Cr.NS_NOINTERFACE;
 		} 
 
 		if ((Ci.nsIAuthPromptProvider) && (iid.equals(Ci.nsIAuthPromptProvider))) {   // iid == bd9dc0fa-68ce-47d0-8859-6418c2ae8576
@@ -1199,12 +1407,12 @@ ecnsIAuthPrompt2.prototype = {
 
 		if ((Ci.nsIChannelEventSink) && (iid.equals(Ci.nsIChannelEventSink))) {   // iid == a430d870-df77-4502-9570-d46a8de33154
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIChannelEventSink");
-        		return this;
+			return this;
 		} 
 
 		if ((Ci.nsIRedirectResultListener) && (iid.equals(Ci.nsIRedirectResultListener))) {   // iid == 85cd2640-e91e-41ac-bdca-1dbf10dc131e
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIRedirectResultListener");
-        		return this;
+			return this;
 		} 
 
 		// The next iid is available sine TB 13.
@@ -1238,15 +1446,15 @@ ecnsIAuthPrompt2.prototype = {
 		this.lastStatus = aStatus;
 		this.lastStatusArg = aStatusArg;
 		switch (aStatus) {
-		case 0x804b0003: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVING of "+aStatusArg); break;
-		case 0x804b000b: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVED of "+aStatusArg); break;
-		case 0x804b0007: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTING_TO of "+aStatusArg); break;
-		case 0x804b0004: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTED_TO of "+aStatusArg); break;
-		case 0x804b0005: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_SENDING_TO of "+aStatusArg); break;
-		case 0x804b000a: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_WAITING_FOR of "+aStatusArg); break;
-		case 0x804b0006: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RECEIVING_FROM of "+aStatusArg); break;
-		default:
-			this.logInfo("  --- ecnsIAuthPrompt2.onStatus:"+aStatus+" of "+aStatusArg);
+			case 0x804b0003: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVING of "+aStatusArg); break;
+			case 0x804b000b: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVED of "+aStatusArg); break;
+			case 0x804b0007: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTING_TO of "+aStatusArg); break;
+			case 0x804b0004: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTED_TO of "+aStatusArg); break;
+			case 0x804b0005: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_SENDING_TO of "+aStatusArg); break;
+			case 0x804b000a: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_WAITING_FOR of "+aStatusArg); break;
+			case 0x804b0006: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RECEIVING_FROM of "+aStatusArg); break;
+			default:
+				this.logInfo("  --- ecnsIAuthPrompt2.onStatus:"+aStatus+" of "+aStatusArg);
 		}
 	},
 
@@ -1272,22 +1480,27 @@ ecnsIAuthPrompt2.prototype = {
 		this.logInfo("  --- ecnsIAuthPrompt2.tooltipText (nsISecureBrowserUI):");
 		return "ecnsIAuthPrompt2.tooltipText";
 	},
-	
+
 	// nsIChannelEventSink
 	//void asyncOnChannelRedirect(in nsIChannel oldChannel, 
-        //                        in nsIChannel newChannel,
-        //                        in unsigned long flags,
-        //                        in nsIAsyncVerifyRedirectCallback callback);
+	//	in nsIChannel newChannel,
+	//	in unsigned long flags,
+	//	in nsIAsyncVerifyRedirectCallback callback);
 	asyncOnChannelRedirect: function _nsIChannelEventSink_asyncOnChannelRedirect(oldChannel, newChannel, flags, callback)
 	{
 		var tmpStr = "";
-		if (flags & 1) tmpStr += "REDIRECT_TEMPORARY";
-		if (flags & 2) tmpStr += " REDIRECT_PERMANENT";
-		if (flags & 4) tmpStr += " REDIRECT_INTERNAL";
+		if (flags & 1) {
+			tmpStr += "REDIRECT_TEMPORARY";
+		}
+		if (flags & 2) {
+			tmpStr += " REDIRECT_PERMANENT";
+		}
+		if (flags & 4) {
+			tmpStr += " REDIRECT_INTERNAL";
+		}
 
 		this.logInfo("  --- nsIChannelEventSink.asyncOnChannelRedirect :flags:"+flags+"="+tmpStr);
 
-		
 		var url1 = "";
 		var url2 = "";
 
@@ -1296,8 +1509,8 @@ ecnsIAuthPrompt2.prototype = {
 
 		this.logInfo("We are going to allow the redirect from '"+url1+"' to '"+url2+"'.");
 
-	        newChannel.notificationCallbacks = this;
-	        callback.onRedirectVerifyCallback(Cr.NS_OK);
+		newChannel.notificationCallbacks = this;
+		callback.onRedirectVerifyCallback(Cr.NS_OK);
 	},
 
 	// nsIRedirectResultListener
@@ -1312,7 +1525,7 @@ ecnsIAuthPrompt2.prototype = {
 		this.logInfo("getPrePassword for user:"+aUsername+", server url:"+aURL);
 		this.username = aUsername;
 		this.URL = aURL;
- 		
+
 		var password;
 		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
 		if (myAuthPrompt2.getUserCanceled(aURL)) {
@@ -1339,6 +1552,4 @@ ecnsIAuthPrompt2.prototype = {
 			this.globalFunctions.LOG(this.uuid+": "+aMsg);
 		}
 	},
-
-
-}
+} // End of ecnsIAuthPrompt2 prototype

From 19adcdd5e534d9a9e29f68da97812c2a3365debb Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 5 May 2017 21:51:22 +0200
Subject: [PATCH 012/222] ecExchangeRequest.js: avoid use of magic 4 number and
 prefer use of constants

---
 components/ecExchangeRequest.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index 984421b4..240609e1 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -430,8 +430,11 @@ ExchangeRequest.prototype = {
 
 		//////////////////////////////////////////////////////////
 		// Check if error is related to TLS certification issue //
+		// Connection is terminated and HTTP status is 0 (none) //
 		//////////////////////////////////////////////////////////
-		if ((!this.shutdown) && (xmlReq.readyState === 4) && (xmlReq.status === 0)) {
+		if ((!this.shutdown)
+			&& (xmlReq.readyState === xmlReq.DONE)
+			&& (xmlReq.status === 0)) {
 			this.logInfo(": ExchangeRequest.error : badCert going to check if it is a cert problem.");
 			var result = null;
 
@@ -559,9 +562,7 @@ ExchangeRequest.prototype = {
 				+ xmlReq.readyState + ", xmlReq.status:" + xmlReq.status);
 		}
 
-		// This is not a redirection
-		// TODO Documentation
-		if (xmlReq.readyState != 4) {
+		if (xmlReq.readyState != xmlReq.DONE) {
 			return false;
 		}
 
@@ -805,9 +806,9 @@ ExchangeRequest.prototype = {
 			this.logInfo(": ExchangeRequest.onLoad :" + xmlReq.responseText, 2);
 		}
 
-		if (xmlReq.readyState != 4) {
+		if (xmlReq.readyState != xmlReq.DONE) {
 			if (this.debug) {
-				this.logInfo("readyState != 4. THIS SHOULD NEVER HAPPEN. PLEASE REPORT.");
+				this.logInfo("readyState is not DONE inside the onLoad internal function. THIS SHOULD NEVER HAPPEN. PLEASE REPORT.");
 			}
 			this.fail(this.ER_ERROR_OPEN_FAILED,
 				"Ready state != 4, readyState:" + xmlReq.readyState);
@@ -928,7 +929,7 @@ ExchangeRequest.prototype = {
 
 		let xmlReq = this.mXmlReq;
 
-		if (xmlReq.readyState != 4) {
+		if (xmlReq.readyState != xmlReq.DONE) {
 			xmlReq.abort();
 		}
 

From 96d5367013bc0176f81e1301379842295308c750 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 5 May 2017 23:36:12 +0200
Subject: [PATCH 013/222] mivExchangeAuthPrompt2: code style and some English
 typo

---
 .../mivExchangeAuthPrompt2.js                 | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index d862e6b3..22a449e2 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -109,8 +109,6 @@ mivExchangeAuthPrompt2.prototype = {
 //		var realm = aRealm;
 		var realm = "Exchange Web Service";
 
-		//this.logInfo("getPassword: useCached:"+useCached);
-
 		if (!realm) {
 			this.logInfo("getPassword: No realm specified. Trying to get it from the URL.");
 			var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
@@ -129,7 +127,7 @@ mivExchangeAuthPrompt2.prototype = {
 	if we have password from cache or manager, and we have a password in the channel. We are going to match them.
 	Because when they are equal then the cached and stored password were wrong. Otherwise we did not get here.
 
-	When no password at al always ask. */
+	When no password at all always ask. */
 
 		var password;
 		if (this.passwordCache[username+"|"+aURL+"|"+realm]) {
@@ -166,17 +164,18 @@ mivExchangeAuthPrompt2.prototype = {
 			this.logInfo("getPassword: password(2)=********");
 		}
 
-		if ((password) && (aChannel) && (aChannel.URI.password) && (decodeURIComponent(aChannel.URI.password) != "")) {
+		if ((password) && (aChannel) && (aChannel.URI.password)
+			&& (decodeURIComponent(aChannel.URI.password) != "")) {
 			this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. Going to see if they are the same.");
-			if ((password == decodeURIComponent(aChannel.URI.password)) && (!useCached)) {
+			if ((password === decodeURIComponent(aChannel.URI.password)) && (!useCached)) {
 				this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. Going to ask user to provide a new password.");
-				if ((this.details[aURL]) && (this.details[aURL].ntlmCount == 1)) {
+				if ((this.details[aURL]) && (this.details[aURL].ntlmCount === 1)) {
 					this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. But it is a first pass on an NTLM authentication. Using stored password and going to see if it can be used.");
 				}
 				else { 
 					this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. Going to ask user to provide a new password.");
 					var channel = aChannel.QueryInterface(Ci.nsIHttpChannel); 
-					 if( channel.responseStatus == 401 ){
+					 if( channel.responseStatus === 401 ){
 						 password=null;
 						 this.logInfo("getPassword: Login Failed, Going to ask user to provide a new password.");
 					 } 
@@ -261,17 +260,20 @@ mivExchangeAuthPrompt2.prototype = {
 	asyncPromptAuthNotifyCallback: function _asyncPromptAuthNotifyCallback(aURL)
 	{
 		if (!this.details[aURL]) {
-			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have this URL '"+aURL+"' in queue");
+			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have this URL '"
+				+ aURL + "' in queue");
 			return;
 		}
 
 		if (this.details[aURL].showing) {
-			this.logInfo("asyncPromptAuthNotifyCallback: Allready showing a prompt or trying to get the password for URL '"+aURL+"'. Not going to try again until the active one has finished.");
+			this.logInfo("asyncPromptAuthNotifyCallback: Already showing a prompt or trying to get the password for URL '"
+				+ aURL + "'. Not going to try again until the active one has finished.");
 			return;
 		}
 
-		if (this.details[aURL].queue.length == 0) {
-			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have a request in queue for URL '"+aURL+"'.");
+		if (this.details[aURL].queue.length === 0) {
+			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have a request in queue for URL '"
+				+ aURL +"'.");
 			return;
 		}
 
@@ -279,7 +281,9 @@ mivExchangeAuthPrompt2.prototype = {
 
 			// We grab the first one from the queue.
 			var request = this.details[aURL].queue.shift();
-			this.logInfo("asyncPromptAuthNotifyCallback: Removed request from queue["+aURL+"]. There are now '"+this.details[aURL].queue.length+"' requests in queue left.");
+			this.logInfo("asyncPromptAuthNotifyCallback: Removed request from queue["
+				+ aURL + "]. There are now '"
+				+ this.details[aURL].queue.length + "' requests in queue left.");
 			var aChannel = request.channel;
 			var aCallback = request.callback;
 			var aContext = request.context;
@@ -288,7 +292,9 @@ mivExchangeAuthPrompt2.prototype = {
 			var canUseBasicAuth = false;
 
 			if (this.details[aURL].previousFailedCount > 4) { // Maybe make this a user preference
-				this.logInfo("asyncPromptAuthNotifyCallback: We have more than '"+this.details[aURL].previousFailedCount+"' previous failed for '"+aURL+"'.");
+				this.logInfo("asyncPromptAuthNotifyCallback: We have more than '"
+					+ this.details[aURL].previousFailedCount + "' previous failed for '"
+					+ aURL +"'.");
 				aCallback.onAuthCancelled(aContext, false);
 				return;
 			}
@@ -309,7 +315,7 @@ mivExchangeAuthPrompt2.prototype = {
 					username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
 				}
 
-				if (username == "") {
+				if (username === "") {
 					// We do not have a username. We need to prompt for one.
 					// This should always be filled in. So for now we error.
 					this.logInfo("asyncPromptAuthNotifyCallback: username is empty. This is not allowed.");
@@ -319,7 +325,8 @@ mivExchangeAuthPrompt2.prototype = {
 				this.logInfo("asyncPromptAuthNotifyCallback: username="+username);
 
 				if (!error) {
-					// Trying to get realm from response header. This is used when basic authentication is available.
+					// Trying to get realm from response header.
+					// This is used when basic authentication is available.
 					var realm = "exchange.server";
 					try {
 						var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
@@ -337,7 +344,7 @@ mivExchangeAuthPrompt2.prototype = {
 						}
 					}
 					catch(err) {
-							this.logInfo("asyncPromptAuthNotifyCallback: NO WWW-Authenticate in response header!?");
+							this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate HTTP response header not found !");
 					}
 
 					// try to get password.
@@ -350,7 +357,7 @@ mivExchangeAuthPrompt2.prototype = {
 						error = true;
 					}
 
-					if ((!password) || (password == null)) {
+					if ((!password)) {
 						error = true;
 					}
 					else {
@@ -359,8 +366,8 @@ mivExchangeAuthPrompt2.prototype = {
 				}
 			}
 
+			// Return credentials we have obtained
 			if (!error) {
-				// Return credentials we have obtained
 				if (!(authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD)) {
 					this.logInfo("asyncPromptAuthNotifyCallback: authInfo wants username and password and possibly domainname.");
 					if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) {
@@ -379,7 +386,7 @@ mivExchangeAuthPrompt2.prototype = {
 						else {
 								this.logInfo("asyncPromptAuthNotifyCallback: We do not have a domainname part in the username. Specifying empty one.");
 								authInfo.username = username;
-						}						
+						}
 					}
 					else {
 						authInfo.username = username;
@@ -416,9 +423,6 @@ mivExchangeAuthPrompt2.prototype = {
 				}
 			}
 		}
-
-		//this.details[aURL].showing = false;
-
 	},
 
 	asyncPromptAuthCancelCallback: function _asyncPromptAuthCallBack(aReason, aURL, aUUID)

From de7b7dd75c50841fb573e8cbc5efd5e87972c5b2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 5 May 2017 23:37:09 +0200
Subject: [PATCH 014/222] mivExchangeAuthPrompt2: remove use of for-each and
 use regexp to simplify code

---
 .../mivExchangeAuthPrompt2.js                    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index 22a449e2..3c3dc874 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -331,14 +331,14 @@ mivExchangeAuthPrompt2.prototype = {
 					try {
 						var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
 						acceptedAuthentications = acceptedAuthentications.split("\n");
-						for each (var index in acceptedAuthentications) {
-							this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate:"+index);
-							if (index.indexOf("realm=") > -1) {
-								realm = index.substr(index.indexOf("realm=")+6);
-								while (realm.indexOf('"') > -1) {
-									realm = realm.replace('"', "");
-								}
-								this.logInfo("asyncPromptAuthNotifyCallback: Found a realm going to use it. realm="+realm);
+
+						for (var i = 0; i < acceptedAuthentications.length ; i++) {
+							var acceptAuth = acceptedAuthentications[i];
+							this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate:" + acceptAuth);
+							if (acceptAuth.indexOf("realm=") > -1) {
+								realm = acceptAuth.substr(index.indexOf("realm=") + 6);
+								realm = realm.replace(/"/g, "");
+								this.logInfo("asyncPromptAuthNotifyCallback: Found a realm going to use it. realm=" + realm);
 								canUseBasicAuth = true;
 							}
 						}

From 1038975c5998677f10e24304c137c8940aac9d88 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 5 May 2017 23:38:03 +0200
Subject: [PATCH 015/222] mivExchangeAuthPrompt2: try to fix the multiple
 password prompt shown

I activate the flag "showing" previously commented.
---
 interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index 3c3dc874..46f07f4f 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -270,6 +270,9 @@ mivExchangeAuthPrompt2.prototype = {
 				+ aURL + "'. Not going to try again until the active one has finished.");
 			return;
 		}
+		else {
+			this.details[aURL].showing = true;
+		}
 
 		if (this.details[aURL].queue.length === 0) {
 			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have a request in queue for URL '"
@@ -423,6 +426,7 @@ mivExchangeAuthPrompt2.prototype = {
 				}
 			}
 		}
+		this.details[aURL].showing = false;
 	},
 
 	asyncPromptAuthCancelCallback: function _asyncPromptAuthCallBack(aReason, aURL, aUUID)

From ed8baa4a054a258711b844358b4ab35d309be6e1 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 6 May 2017 15:56:11 +0200
Subject: [PATCH 016/222] components/ecExchangeRequest: document unchunk
 function

---
 components/ecExchangeRequest.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index 240609e1..fdef2810 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -642,16 +642,21 @@ ExchangeRequest.prototype = {
 		return false;
 	},
 
-	unchunk: function _unchunk(aStr)
+	/*
+	 * Revert chunk process on data:
+	 * this function take string splitted in big pieces of data
+	 * and gather them in one big string.
+	 */
+	unchunk: function _unchunk(aChunkedString)
 	{
-		var pos = aStr.indexOf("\r\n");
+		var pos = aChunkedString.indexOf("\r\n");
 		if ((pos > -1) && (pos < 5)) {
 			var chunkCounter = 1;
-			var chunkLength = parseInt(aStr.substr(0,pos), 16);
+			var chunkLength = parseInt(aChunkedString.substr(0,pos), 16);
 
 			if (isNaN(chunkLength)) {
 				if (this.debug){
-					this.logInfo("unchunk: 1st chunk is not a number:" + aStr.substr(0,pos));
+					this.logInfo("unchunk: 1st chunk is not a number:" + aChunkedString.substr(0,pos));
 				}
 				return "";
 			}
@@ -660,21 +665,21 @@ ExchangeRequest.prototype = {
 				this.logInfo("unchunk: 1st chunk has length:" + chunkLength);
 			}
 
-			var newStr = "";
+			var gatheredString = "";
 			while (chunkLength > 0) {
 				var bytesToCopy = chunkLength;
 				pos = pos + 2;
 				var charCode;
 				while (bytesToCopy > 0) {
-					newStr = newStr + aStr.substr(pos, 1);
-					charCode = aStr.charCodeAt(pos);
+					gatheredString = gatheredString + aChunkedString.substr(pos, 1);
+					charCode = aChunkedString.charCodeAt(pos);
 					if (charCode <= 0xFF) {
 						bytesToCopy--;
 					}
 					else {
 						if (charCode <= 0xFFFF) {
 							if (this.debug) {
-								this.logInfo("unchunk: TWO bytes copied '" + aStr.substr(pos, 1) + "'="+charCode);
+								this.logInfo("unchunk: TWO bytes copied '" + aChunkedString.substr(pos, 1) + "'="+charCode);
 							}
 							bytesToCopy = bytesToCopy - 2;
 
@@ -682,7 +687,7 @@ ExchangeRequest.prototype = {
 						else {
 							if (charCode <= 0xFFFFFF) {
 								if (this.debug) {
-									this.logInfo("unchunk: THREE bytes copied '" + aStr.substr(pos, 1) + "'="+charCode);
+									this.logInfo("unchunk: THREE bytes copied '" + aChunkedString.substr(pos, 1) + "'="+charCode);
 								}
 								bytesToCopy = bytesToCopy - 3;
 							}
@@ -692,11 +697,11 @@ ExchangeRequest.prototype = {
 				}
 
 				if (this.debug) {
-					this.logInfo("unchunk: pos:" + pos + ", CunkStr:" + newStr + "|");
+					this.logInfo("unchunk: pos:" + pos + ", CunkStr:" + gatheredString + "|");
 				}
 
 				// Next two bytes should be \r\n
-				var check = aStr.substr(pos, 2);
+				var check = aChunkedString.substr(pos, 2);
 				if (check != "\r\n") {
 					if (this.debug) {
 						this.logInfo("unchunk: Strange. Expected 0D0A (Cr+Lf) but found:"
@@ -705,7 +710,7 @@ ExchangeRequest.prototype = {
 					return "";
 				}
 				pos = pos + 2;
-				var tmpStr = aStr.substr(pos, 6);
+				var tmpStr = aChunkedString.substr(pos, 6);
 				var pos2 = tmpStr.indexOf("\r\n");
 				chunkCounter++;
 				if (pos2 > -1) {
@@ -732,13 +737,13 @@ ExchangeRequest.prototype = {
 					return "";
 				}
 			}
-			return newStr;
+			return gatheredString;
 		}
 		else {
 			if (this.debug) {
 				this.logInfo("unchunk: Trying to determine first chunk length but it is very big...!! size:" + pos);
 			}
-			return aStr;
+			return aChunkedString;
 		}
 	},
 

From ba73847942db2947c5965871f1694e9dce0cdf28 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 6 May 2017 15:58:18 +0200
Subject: [PATCH 017/222] components/ecExchangeRequest.js: rename notifcation
 callback to clarify its use

---
 components/ecExchangeRequest.js | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index fdef2810..cf532f9a 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -89,7 +89,7 @@ function ExchangeRequest(aArgument, aCbOk, aCbError, aListener)
 	this.shutdown = false;
 	this.badCert = false;
 	this.badCertCount = 0;
-	this._notificationCallbacks = null;
+	this.channelCallbackEcAuthPrompt2 = null;
 
 	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
 		.getService(Ci.mivFunctions);
@@ -352,8 +352,8 @@ ExchangeRequest.prototype = {
 		this.xmlReq.setRequestHeader("Connection", "keep-alive");
 
 		/* set channel notifications for password processing */
-		this._notificationCallbacks = new ecnsIAuthPrompt2(this);
-		this.xmlReq.channel.notificationCallbacks = this._notificationCallbacks;
+		this.channelCallbackEcAuthPrompt2 = new ecnsIAuthPrompt2(this);
+		this.xmlReq.channel.notificationCallbacks = this.channelCallbackEcAuthPrompt2;
 		this.xmlReq.channel.loadGroup = null;
 
 		var httpChannel = this.xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
@@ -422,7 +422,7 @@ ExchangeRequest.prototype = {
 		if (this.debug) {
 			this.logInfo(": ExchangeRequest.error :" + evt.type
 				+ ", readyState:" + xmlReq.readyState + ", status:" + xmlReq.status
-				+ ", lastStatus:" + this._notificationCallbacks.lastStatus);
+				+ ", lastStatus:" + this.channelCallbackEcAuthPrompt2.lastStatus);
 			this.logInfo(": ExchangeRequest.error :" + xmlReq.responseText, 2);
 			this.logInfo(': xmlReq.getResponseHeader("Location") :'
 				+ xmlReq.getResponseHeader("Location"), 2);
@@ -465,18 +465,18 @@ ExchangeRequest.prototype = {
 			return;
 		}
 
-		this.observerService.notifyObservers(this._notificationCallbacks,
+		this.observerService.notifyObservers(this.channelCallbackEcAuthPrompt2,
 			"onExchangeConnectionError",
-			this.currentUrl + "|" + this._notificationCallbacks.lastStatus
-			+ "|" + this._notificationCallbacks.lastStatusArg);
+			this.currentUrl + "|" + this.channelCallbackEcAuthPrompt2.lastStatus
+			+ "|" + this.channelCallbackEcAuthPrompt2.lastStatusArg);
 
-		switch (this._notificationCallbacks.lastStatus) {
+		switch (this.channelCallbackEcAuthPrompt2.lastStatus) {
 			// On these status, we abort current connection, reset try counter and return
 			case 0x804b0003:
 			case 0x804b000b:
 				this.fail(this.ER_ERROR_RESOLVING_HOST,
 					"Error resolving hostname '"
-					+ this._notificationCallbacks.lastStatusArg
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg
 					+ "'. Did you type the right hostname. (STATUS_RESOLVED)");
 				xmlReq.abort();
 				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
@@ -485,7 +485,7 @@ ExchangeRequest.prototype = {
 				return;
 			case 0x804b0007:
 				this.fail(this.ER_ERROR_CONNECTING_TO, "Error during connecting to hostname '"
-					+ this._notificationCallbacks.lastStatusArg
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg
 					+ "'. Is the host down?. (STATUS_CONNECTING_TO)");
 				xmlReq.abort();
 				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
@@ -495,28 +495,28 @@ ExchangeRequest.prototype = {
 			// On these status we just reset try counter and continue
 			case 0x804b0004:
 				this.fail(this.ER_ERROR_CONNECED_TO, "Error during connection to hostname '"
-					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_CONNECTED_TO)");
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_CONNECTED_TO)");
 				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
 				}
 				break;
 			case 0x804b0005:
 				this.fail(this.ER_ERROR_SENDING_TO, "Error during sending data to hostname '"
-					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_SENDING_TO)");
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_SENDING_TO)");
 				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
 				}
 				break;
 			case 0x804b000a:
 				this.fail(this.ER_ERROR_WAITING_FOR, "Error during waiting for data of hostname '"
-					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_WAITING_FOR)");
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_WAITING_FOR)");
 				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
 				}
 				break;
 			case 0x804b0006:
 				this.fail(this.ER_ERROR_RECEIVING_FROM, "Error during receiving of data from hostname '"
-					+ this._notificationCallbacks.lastStatusArg + "'. (STATUS_RECEIVING_FROM)");
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_RECEIVING_FROM)");
 				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
 					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
 				}
@@ -524,8 +524,8 @@ ExchangeRequest.prototype = {
 			// Unknown status
 			default:
 				this.fail(this.ER_ERROR_UNKNOWN_CONNECTION, "Unknown error during communication with hostname '"
-					+ this._notificationCallbacks.lastStatusArg
-					+ "'. (" + this._notificationCallbacks.lastStatus + ")");
+					+ this.channelCallbackEcAuthPrompt2.lastStatusArg
+					+ "'. (" + this.channelCallbackEcAuthPrompt2.lastStatus + ")");
 		}
 
 	},
@@ -918,7 +918,7 @@ ExchangeRequest.prototype = {
 		}
 
 		newXML = null;
-		this.observerService.notifyObservers(this._notificationCallbacks, "onExchangeConnectionOk", this.currentUrl);
+		this.observerService.notifyObservers(this.channelCallbackEcAuthPrompt2, "onExchangeConnectionOk", this.currentUrl);
 	},
 
 	retryCurrentUrl: function()
@@ -956,7 +956,7 @@ ExchangeRequest.prototype = {
 			var tmpColon = tmpURL.indexOf("://");
 			tmpURL = tmpURL.substr(0, tmpColon + 3) + aUser + "@" + tmpURL.substr(tmpColon+3);
 		}
-		return this._notificationCallbacks.getPrePassword(aUser, tmpURL);
+		return this.channelCallbackEcAuthPrompt2.getPrePassword(aUser, tmpURL);
 	},
 
 	isHTTPError: function()
@@ -1163,7 +1163,7 @@ ExchangeRequest.prototype = {
 								var tmpColon = tmpURL.indexOf("://");
 								tmpURL = tmpURL.substr(0, tmpColon+3) + this.mArgument.user + "@" + tmpURL.substr(tmpColon+3);
 							}
-							this._notificationCallbacks.passwordManagerRemove(this.mArgument.user, tmpURL, title);
+							this.channelCallbackEcAuthPrompt2.passwordManagerRemove(this.mArgument.user, tmpURL, title);
 						}
 
 						// Finally reset password cache

From e8fdad26c9e3a06df736c01e558c7ea09f19909a Mon Sep 17 00:00:00 2001
From: Jarek Polok <Jaroslaw.Polok@cern.ch>
Date: Fri, 12 May 2017 11:07:32 +0200
Subject: [PATCH 018/222] set default to proposeStart/End to avoid getTimeZone
 call on a non-object

---
 interfaces/exchangeCalendar/mivExchangeCalendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 6f0c8d4c..4dca13b3 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -5566,8 +5566,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 		if (this.debug) this.logInfo("  -------------- messageDisposition="+messageDisposition); 
 	
-		var proposeStart = this.tryToSetDateValue(input.proposeStart,"");
-		var proposeEnd   = this.tryToSetDateValue(input.proposeEnd,""); 
+		var proposeStart = this.tryToSetDateValue(input.proposeStart,cal.now());
+		var proposeEnd   = this.tryToSetDateValue(input.proposeEnd,cal.now()); 
 	 	var proposeNewTime = false;
 		
 		input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));

From 7ff38490c460dfe70a64ff1ffc34e57e707dea5b Mon Sep 17 00:00:00 2001
From: "R. Kent James" <rkent@caspia.com>
Date: Fri, 12 May 2017 15:58:52 -0700
Subject: [PATCH 019/222] Thunderbird 52 issues: obsolete for loops, version
 52.*, force authentication callbacks

Conflicts:
  components/ecExchangeRequest.js: simply due to my code style modifications
---
 chrome/content/msgHdrUtils.js   | 10 +++-----
 components/ecExchangeRequest.js | 44 +++++++++++++++++++++++++++------
 install.rdf                     |  2 +-
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/chrome/content/msgHdrUtils.js b/chrome/content/msgHdrUtils.js
index 6a1cfca2..f6e0556c 100644
--- a/chrome/content/msgHdrUtils.js
+++ b/chrome/content/msgHdrUtils.js
@@ -208,18 +208,16 @@ function msgHdrGetTags (aMsgHdr) {
 function msgHdrSetTags (aMsgHdr, aTags) {
   let oldTagList = msgHdrGetTags(aMsgHdr);
   let oldTags = {}; // hashmap
-  for each (let [, tag] in Iterator(oldTagList))
+  for (let tag of oldTagList)
     oldTags[tag.key] = null;
 
   let newTags = {};
   let newTagList = aTags;
-  for each (let [, tag] in Iterator(newTagList))
+  for (let tag of newTagList)
     newTags[tag.key] = null;
 
-  let toAdd = [x.key for each ([, x] in Iterator(newTagList))
-    if (!(x.key in oldTags))];
-  let toRemove = [x.key for each ([, x] in Iterator(oldTagList))
-    if (!(x.key in newTags))];
+  let toAdd = newTagList.filter( tag => !(tag.key in oldTags));
+  let toRemove = oldTagList.filter( tag => !(tag.key in newTags));
 
   let folder = aMsgHdr.folder;
   let msgHdr = toXPCOMArray([aMsgHdr], Ci.nsIMutableArray);
diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index cf532f9a..b4bf7b55 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -111,6 +111,7 @@ function ExchangeRequest(aArgument, aCbOk, aCbError, aListener)
 
 	this.observerService = Cc["@mozilla.org/observer-service;1"]
 		.getService(Ci.nsIObserverService);
+	this.observerService.addObserver(this, "http-on-modify-request", true);
 
 	this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
 		.getService(Ci.mivExchangeTimeZones);
@@ -157,6 +158,39 @@ ExchangeRequest.prototype = {
 
 	ERR_PASSWORD_ERROR: -300, // To many password errors.
 
+	QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver]),
+
+	/*
+	In Mozilla bug 1221320, changes were done to XMLHttpRequest so that the authPrompt dialog only appears
+	if neither username nor password is set in the request URL. So you only asyncPromptAuth called when both
+	are blank. But Exchange calendar sets a username on the first authentication attempt (supporting Basic
+	and Kerberos), expecting a callback to asyncPromptAuth if that fails, which it does for NTLM.
+
+	Further changes to authentication are all controlled through these asyncPromptAuth calls which never occur, hence failure. What we
+	do with the observer is reverse the effect of that bug, adding back the calls to asyncPromptAuth
+	*/
+	observe(aSubject, aTopic, aData) {
+		let channel = aSubject.QueryInterface(Components.interfaces.nsIHttpChannel);
+		this.logInfo("ecExchangeRequest observing http-on-modify-request for URI " + channel.URI.spec +
+		             " originalURI " + (channel.originalURI ? channel.originalURI.spec : "none"));
+
+		// Only respond to our host
+		let myHost = this.xmlReq && this.xmlReq.channel && this.xmlReq.channel.URI.host;
+		let theirHost = channel.URI.host;
+		if (myHost && (myHost != theirHost)) {
+			this.logInfo("Host does not match, theirs: " + theirHost + " mine: " + myHost);
+			return;
+		}
+
+		let internalChannel = channel.QueryInterface(Ci.nsIHttpChannelInternal);
+		if (internalChannel.blockAuthPrompt) {
+			this.logInfo("unblocking request");
+			internalChannel.blockAuthPrompt = false;
+		}
+		else
+			this.logInfo("Already unblocked");
+	},
+
 	get debug()
 	{
 		if ((this.debuglevel === 0) || (!this.globalFunctions.shouldLog())) {
@@ -315,11 +349,6 @@ ExchangeRequest.prototype = {
 			if (password) {
 				if (this.debug) this.logInfo("We have a prePassword: *******");
 				this.xmlReq.open("POST", this.currentUrl, true, openUser, password);
-
-				// If we have full credentials we are going to add a Basic auth header just for the case we support Basic.
-				var tok = openUser + ':' + password;
-				var basicAuthHash = btoa(tok);
-				this.xmlReq.setRequestHeader('Authorization', "Basic " + basicAuthHash);
 			}
 			else {
 				// If we don't have a password, we need to reach one time the URL
@@ -1394,7 +1423,7 @@ ecnsIAuthPrompt2.prototype = {
 		if ((Ci.nsIProgressEventSink) && (iid.equals(Ci.nsIProgressEventSink))) {   // iid == d974c99e-4148-4df9-8d98-de834a2f6462
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIProgressEventSink");
 			return this;
-		} 
+		}
 
 		if ((Ci.nsISecureBrowserUI) && (iid.equals(Ci.nsISecureBrowserUI))) {   // iid == 081e31e0-a144-11d3-8c7c-00609792278c
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsISecureBrowserUI");
@@ -1404,7 +1433,7 @@ ecnsIAuthPrompt2.prototype = {
 		if ((Ci.nsIDocShellTreeItem) && (iid.equals(Ci.nsIDocShellTreeItem))) {   // iid == 09b54ec1-d98a-49a9-bc95-3219e8b55089
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIDocShellTreeItem");
 			return Cr.NS_NOINTERFACE;
-		} 
+		}
 
 		if ((Ci.nsIAuthPromptProvider) && (iid.equals(Ci.nsIAuthPromptProvider))) {   // iid == bd9dc0fa-68ce-47d0-8859-6418c2ae8576
 			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIAuthPromptProvider");
@@ -1433,7 +1462,6 @@ ecnsIAuthPrompt2.prototype = {
 			return Cr.NS_NOINTERFACE;  // We do not support this.
 		}
 
-		this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/Ericsson/exchangecalendar/issues: ecnsIAuthPrompt2.getInterface("+iid+")");
 		throw Cr.NS_NOINTERFACE;
 	},
 
diff --git a/install.rdf b/install.rdf
index b71247fd..8a0f7176 100644
--- a/install.rdf
+++ b/install.rdf
@@ -11,7 +11,7 @@
       	<!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>12.0</em:minVersion>
-        <em:maxVersion>50.*</em:maxVersion>
+        <em:maxVersion>52.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From 8affd49ea33748cef58cd2b78a72f1f46111934c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 13 May 2017 21:56:44 +0200
Subject: [PATCH 020/222] interfaces/exchangeAuthPrompt2: update foreach loop

---
 .../mivExchangeAuthPrompt2.js                 | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index 46f07f4f..3cfc9656 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -335,8 +335,7 @@ mivExchangeAuthPrompt2.prototype = {
 						var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
 						acceptedAuthentications = acceptedAuthentications.split("\n");
 
-						for (var i = 0; i < acceptedAuthentications.length ; i++) {
-							var acceptAuth = acceptedAuthentications[i];
+						for (let acceptAuth of acceptedAuthentications) {
 							this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate:" + acceptAuth);
 							if (acceptAuth.indexOf("realm=") > -1) {
 								realm = acceptAuth.substr(index.indexOf("realm=") + 6);
@@ -572,11 +571,11 @@ mivExchangeAuthPrompt2.prototype = {
 			try {
 				var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
 				acceptedAuthentications = acceptedAuthentications.split("\n");
-				for each (var index in acceptedAuthentications) {
-					this.logInfo("promptAuth: WWW-Authenticate:"+index);
-					if (index.indexOf("realm=") > -1) {
-						realm = index.substr(index.indexOf("realm=")+6);
-						this.logInfo("promptAuth: Found a realm going to use it. realm="+realm);
+				for (let authenticateHeader of acceptedAuthentications) {
+					this.logInfo("promptAuth: WWW-Authenticate:" + authenticateHeader);
+					if (authenticateHeader.indexOf("realm=") > -1) {
+						realm = index.substr(authenticateHeader.indexOf("realm=")+6);
+						this.logInfo("promptAuth: Found a realm going to use it. realm=" + realm);
 					}
 				}
 			}
@@ -633,7 +632,7 @@ mivExchangeAuthPrompt2.prototype = {
 						.getService(Ci.nsILoginManager);
 
 			var logins = loginManager.findLogins({}, aURL, null, aRealm);
-			for each (var loginInfo in logins) {
+			for (let loginInfo of logins) {
 				if (loginInfo.username == aUsername) {
 					this.logInfo("passwordManagerGet found password for: username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
 					return { result: true, password: loginInfo.password};
@@ -662,12 +661,12 @@ mivExchangeAuthPrompt2.prototype = {
 
 			if (logins.length > 0) {
 				var modified = false;
-				for each (let loginInfo in logins) {
-					if (loginInfo.username == aUsername) {
+				for (let loginInfo of logins) {
+					if (loginInfo.username === aUsername) {
 						this.logInfo("Login credentials updated:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
 						loginManager.removeLogin(loginInfo);
 						modified = true;
-				    		break;
+				    break;
 					}
 				}
 				if (!modified) {
@@ -707,7 +706,7 @@ mivExchangeAuthPrompt2.prototype = {
 
 			if (logins.length > 0) {
 				var modified = false;
-				for each (let loginInfo in logins) {
+				for (let loginInfo of logins) {
 					if (loginInfo.username == aUsername) {
 						this.logInfo("Login credentials updated:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
 						loginManager.modifyLogin(loginInfo, newLoginInfo);

From 765dd48e63a778de65f46aedd44dc75236f917a1 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 14 May 2017 19:02:33 +0200
Subject: [PATCH 021/222] component/accountFunctions: this code is not used any
 more

---
 components/accountFunctions.js | 173 ---------------------------------
 1 file changed, 173 deletions(-)
 delete mode 100644 components/accountFunctions.js

diff --git a/components/accountFunctions.js b/components/accountFunctions.js
deleted file mode 100644
index aec741c4..00000000
--- a/components/accountFunctions.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * -- Global Functions for Exchange Calendar and Exchange Contacts.
- * -- For Thunderbird.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/wordpress/?page_id=133
- * email: info@1st-setup.nl
- *
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-var components = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/Services.jsm");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-
-var EXPORTED_SYMBOLS = [];
-
-if (! exchWebService) var exchWebService = {};
-
-exchWebService.accountFunctions = {
-
-		prefs: Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService)
-				    .getBranch("extensions.exchangeWebServices.accounts."),
-
-		logInfo: function _logInfo(message)
-		{
-			exchWebService.commonFunctions.LOG("[exchWebService.accountFunctions] "+message + " ("+exchWebService.commonFunctions.STACKshort()+")");
-		},
-
-		getAccountIds: function _getAccountIds()
-		{
-			var ids = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "ids", "");
-			this.logInfo("ids:"+ids);
-			return ids.split(",");
-		},
-
-		getAccounts: function _getAccounts()
-		{
-			var result = {};
-			var ids = this.getAccountIds()
-			for (var index in ids) {
-
-				if (ids[index] != "") {
-					this.logInfo("id:"+ids[index]);
-					result[ids[index]] = {};
-					this.getAccountById(ids[index], result[ids[index]]);
-				}
-			}
-
-			return result;
-		},
-
-		getAccountById: function _getAccountById(aId, aAccount)
-		{
-			var result = false;
-
-			this.logInfo("id:"+aId);
-			var children = this.prefs.getChildList(aId+".",{});
-			if (children.length > 0) {
-				result = true;
-				aAccount["id"] = aId;
-				for (var index in children) {
-					var attribute = children[index].substr(children[index].indexOf(".")+1);
-					switch (this.prefs.getPrefType(children[index])) {
-					case this.prefs.PREF_STRING:
-						aAccount[attribute] = this.prefs.getCharPref(children[index]);
-						break;
-					case this.prefs.PREF_INT:
-						aAccount[attribute] = this.prefs.getIntPref(children[index]);
-						break;
-					case this.prefs.PREF_BOOL:
-						aAccount[attribute] = this.prefs.getBoolPref(children[index]);
-						break;
-					}
-				}
-			}
-
-			return result;
-		},
-
-		getAccountByServer: function _getAccountByServer(aServer)
-		{
-			var accounts = this.getAccounts();
-			var account = null;
-			for (var index in accounts) {
-				if ((accounts[index].server) && (accounts[index].server.toLowerCase() == aServer.toLowerCase())) {
-					return accounts[index];
-				}
-			}
-		},
-
-		saveAccount: function _saveAccount(aAccount)
-		{
-			for (var index in aAccount) {
-				switch (typeof(aAccount[index])) {
-				case "string": 
-					this.prefs.setCharPref(aAccount.id+"."+index, aAccount[index]);
-					break;
-				case "number":
-					this.prefs.setIntPref(aAccount.id+"."+index, aAccount[index]);
-					break;
-				default:
-					this.logInfo("Unknown object index:"+index);
-				}
-			}
-
-			// Check if the ids all ready exists. If not add it.
-			var ids = this.getAccountIds();
-			var idExists = false;
-			for (var index in ids) {
-				if (ids[index] == aAccount.id) {
-					idExists = true;
-					break;
-				}
-			}
-			if (!idExists) {
-				ids.push(aAccount.id);
-				ids = ids.join(",");
-				this.prefs.setCharPref("ids", ids);
-			}
-		},
-
-		removeAccount: function _removeAccount(aAccount)
-		{
-			if (aAccount.id) {
-				this.removeAccountById(aAccount.id);
-			}
-		},
-
-		removeAccountById: function _removeAccountById(aAccountId)
-		{
-			this.prefs.deleteBranch(aAccountId);
-			// Remove from ids list.
-			var oldIds = this.getAccountIds();
-			var newIds = [];
-			for (var index in oldIds) {
-				if (oldIds[index] != aAccountId) {
-					newIds.push(oldIds[index]);
-				}
-			}
-
-			if (newIds.length > 0) {
-				newIds = newIds.join(",");
-			}
-			else {
-				newIds = "";
-			}
-			this.prefs.setCharPref("ids", newIds);
-		},
-
-
-}
-
-

From 019330feb36a75f0f980378ac8823a1daebf58e9 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 14 May 2017 20:52:48 +0200
Subject: [PATCH 022/222] calendar-event-dialog: avoid warning when
 exchWebService-body-editor element doesn't exists

---
 chrome/content/calendar-event-dialog.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 7515f48f..48a6ad06 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -94,12 +94,15 @@ try{
 
 	onLoad: function _onLoad()
 	{
-		//onLoad();
-		 this._document.getElementById("exchWebService-body-editor").setAttribute("scrollbars","yes");
+		if (this._document.getElementById("exchWebService-body-editor"))
+			this._document.getElementById("exchWebService-body-editor").setAttribute("scrollbars","yes");
+		)
+
  		if (this._window.arguments[0].calendarEvent.calendar.type != "exchangecalendar") {
 			if (this._document.getElementById("item-description")) {
 				this._document.getElementById("item-description").hidden = false;
 			}
+
 			if (this._document.getElementById("exchWebService-body-editor")) {
 				this._document.getElementById("exchWebService-body-editor").hidden = true;
 			}

From cd4500ce480355f1856a9f011859bdcfc37fbd3f Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 14 May 2017 20:53:52 +0200
Subject: [PATCH 023/222] exchService-followup-event-dialog.xml: fix id for
 attendees menu item

---
 chrome/content/exchService-followup-event-dialog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/exchService-followup-event-dialog.xml b/chrome/content/exchService-followup-event-dialog.xml
index ad47f246..fd440e0d 100755
--- a/chrome/content/exchService-followup-event-dialog.xml
+++ b/chrome/content/exchService-followup-event-dialog.xml
@@ -445,7 +445,7 @@
                   accesskey="&event.menu.options.accesskey;">
                 <menupopup id="options-menupopup"
                            onpopupshowing="onPopupShowing(this)">
-                  <menuitem id="options-attendess-menuitem"
+                  <menuitem id="options-attendees-menuitem"
                             label="&event.menu.options.attendees.label;"
                             accesskey="&event.menu.options.attendees.accesskey;"
                             command="cmd_attendees"

From f87e5a4d9b8c4ae8ff237ea75bdbec380748eb2e Mon Sep 17 00:00:00 2001
From: Jarek Polok <Jaroslaw.Polok@cern.ch>
Date: Thu, 18 May 2017 11:26:34 +0200
Subject: [PATCH 024/222] set default to proposeStart/End to avoid Error:Typ
 eError: proposeStart.getInTimezone is not a function (try2)

---
 interfaces/exchangeCalendar/mivExchangeCalendar.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 4dca13b3..28781bed 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -5566,12 +5566,14 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 		if (this.debug) this.logInfo("  -------------- messageDisposition="+messageDisposition); 
 	
-		var proposeStart = this.tryToSetDateValue(input.proposeStart,cal.now());
-		var proposeEnd   = this.tryToSetDateValue(input.proposeEnd,cal.now()); 
+		var proposeStart = this.tryToSetDateValue(input.proposeStart,"");
+		var proposeEnd   = this.tryToSetDateValue(input.proposeEnd,""); 
 	 	var proposeNewTime = false;
 		
-		input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
-		input.proposeEnd   = cal.toRFC3339(proposeEnd.getInTimezone(  this.globalFunctions.ecUTC())); 
+		if (proposeStart) 
+                        input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
+		if (proposeEnd)
+                        input.proposeEnd   = cal.toRFC3339(proposeEnd.getInTimezone(  this.globalFunctions.ecUTC())); 
 		
 		if( input.proposeStart && input.proposeEnd ){
 			proposeNewTime = true;

From d5e52b9cfddf4018686599f4d7e045b63f4dff13 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 15 May 2017 22:52:12 +0200
Subject: [PATCH 025/222] calendar-event-dialog: review code and try to
 simplify it

---
 chrome/content/calendar-event-dialog.js | 343 +++++++++++++-----------
 1 file changed, 184 insertions(+), 159 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 48a6ad06..2242dd94 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -44,48 +44,48 @@ function exchEventDialog(aDocument, aWindow)
 }
 
 exchEventDialog.prototype = {
-
 	_initialized: false,
 	_oldCallback: null,
 
 	onAcceptCallback: function _onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing)
 	{
-		if ((cal.isEvent(aItem)) && (aCalendar.type == "exchangecalendar")) {
-			if (!aItem.className) {
-				var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+		if (aCalendar.type === "exchangecalendar") {
+			if (cal.isEvent(aItem)) {
+				if (!aItem.className) {
+					var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
 						.createInstance(Ci.mivExchangeEvent);
-				newItem.cloneToCalEvent(aItem);
-				aItem = newItem;
+					newItem.cloneToCalEvent(aItem);
+					aItem = newItem;
+				}
 			}
-		}
-
-		if ((!cal.isEvent(aItem)) && (aCalendar.type == "exchangecalendar")) {
-			// Save extra exchange fields to item.
-			if (!aItem.className) {
-				var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
+			else if (!cal.isEvent(aItem)) {
+				// Save extra exchange fields to item.
+				if (!aItem.className) {
+					var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
 						.createInstance(Ci.mivExchangeTodo);
-				newItem.cloneToCalEvent(aItem);
-				aItem = newItem;
-			}
+					newItem.cloneToCalEvent(aItem);
+					aItem = newItem;
+				}
 
-			aItem.totalWork = this._document.getElementById("exchWebService-totalWork-count").value;
-			aItem.actualWork = this._document.getElementById("exchWebService-actualWork-count").value;
-			aItem.mileage = this._document.getElementById("exchWebService-mileage-count").value;
-			aItem.billingInformation = this._document.getElementById("exchWebService-billingInformation-count").value;
-			aItem.companies = this._document.getElementById("exchWebService-companies-count").value;
+				aItem.totalWork = this._document.getElementById("exchWebService-totalWork-count").value;
+				aItem.actualWork = this._document.getElementById("exchWebService-actualWork-count").value;
+				aItem.mileage = this._document.getElementById("exchWebService-mileage-count").value;
+				aItem.billingInformation = this._document.getElementById("exchWebService-billingInformation-count").value;
+				aItem.companies = this._document.getElementById("exchWebService-companies-count").value;
+			}
 		}
 
-try{
-		if (this.newItem) {
-			aItem.bodyType = "HTML";
-			aItem.body = this._document.getElementById("exchWebService-body-editor").content;
-		}
-		else {
-			if (aItem.bodyType == "HTML") {
+		try{
+			if (this.newItem) {
+				aItem.bodyType = "HTML";
+				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+			}
+			else if (aItem.bodyType == "HTML") {
 				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
 			}
+		} catch(err) {
+			dump("Error saving content\n");
 		}
-}catch(err){dump("Error saving content\n");}
 
 		if (this._oldCallback) {
 			this._oldCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
@@ -94,9 +94,9 @@ try{
 
 	onLoad: function _onLoad()
 	{
-		if (this._document.getElementById("exchWebService-body-editor"))
+		if (this._document.getElementById("exchWebService-body-editor")) {
 			this._document.getElementById("exchWebService-body-editor").setAttribute("scrollbars","yes");
-		)
+		}
 
  		if (this._window.arguments[0].calendarEvent.calendar.type != "exchangecalendar") {
 			if (this._document.getElementById("item-description")) {
@@ -106,57 +106,77 @@ try{
 			if (this._document.getElementById("exchWebService-body-editor")) {
 				this._document.getElementById("exchWebService-body-editor").hidden = true;
 			}
+
+			return;
+		}
+
+		if (this._initialized) {
 			return;
 		}
 
-		if (this._initialized) return;
+		// Save current acceptCallback function in temporary place to be excuted later by ourself
 		this._oldCallback = this._window.onAcceptCallback;
 		var self = this;
-		this._window.onAcceptCallback = function(aItem, aCalendar, aOriginalItem, aIsClosing) { self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing); };
+		// Ovverride acceptCallback with our own function
+		this._window.onAcceptCallback = function(aItem, aCalendar, aOriginalItem, aIsClosing) {
+			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
+		};
 
+		// If DOM contain a "todo-entrydate", we check if we need to display our HTML body editor
 		if (this._document.getElementById("todo-entrydate")) {
 			this._initialized = true;
 
 			var args = this._window.arguments[0];
 			var item = args.calendarEvent;
 			this.updateScreen(item, item.calendar);
-			//Cc["@mozilla.org/consoleservice;1"]
-	                //     .getService(Ci.nsIConsoleService).logStringMessage(item.exchangeXML);
 
-//dump("event.dialog: item.exchangeXML:"+item.exchangeXML+"\n");
+			// Display (or not) our body HTML editor
 
-			if ((item.bodyType === undefined) || (item.bodyType == "HTML")) {
+			if (item.bodyType === undefined // item is not already defined
+					|| item.bodyType.toLowerCase() === "html" // current item contains HTML
+				) {
+				// Hidde original item description
 				if (this._document.getElementById("item-description")) {
 					this._document.getElementById("item-description").hidden = true;
 				}
+
+				// Display our own body editor
 				if (this._document.getElementById("exchWebService-body-editor")) {
 					this._document.getElementById("exchWebService-body-editor").hidden = false;
-					if (item.bodyType !== undefined) {
-						this._document.getElementById("exchWebService-body-editor").content = item.body;
-					}
-					else {
-						this.newItem = true;
-						if (item.body) {
-							if ((item.body.indexOf("<BODY>") > -1) || (item.body.indexOf("<body>") > -1)) {
-								this._document.getElementById("exchWebService-body-editor").content = item.body;
-							}
-							else {
-								this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
-							}
-						}
-						else {
-							this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
-						}
-					}
 				}
 			}
+
+			// Set content to our body HTML editor
+
+			// If item contains already HTML content, just use it
+			if (item.bodyType.toLowerCase() === "html") {
+				this._document.getElementById("exchWebService-body-editor").content = item.body;
+			}
 			else {
-				if (this._document.getElementById("item-description")) {
-					this._document.getElementById("item-description").hidden = false;
-				}
-				if (this._document.getElementById("exchWebService-body-editor")) {
-					this._document.getElementById("exchWebService-body-editor").hidden = true;
-				}
+				this.newItem = true;
+			}
+
+			// If the body is already filled and it contains HTML, save it to our body editor
+			if (item.body
+				&& item.body.toLowerCase().indexOf("<body>") > -1) {
+				this._document.getElementById("exchWebService-body-editor").content = item.body;
+			}
+			else {
+				// Otherwise, translate the DESCRIPTION property to HTML and give it to editor
+				this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+			}
+		}
+		else {
+			// DOM doesn't containt "todo-entrydate"
+
+			// Display original editor and hidde our own HTML body editor
+
+			if (this._document.getElementById("item-description")) {
+				this._document.getElementById("item-description").hidden = false;
+			}
+
+			if (this._document.getElementById("exchWebService-body-editor")) {
+				this._document.getElementById("exchWebService-body-editor").hidden = true;
 			}
 		}
 	},
@@ -165,7 +185,9 @@ try{
 	{
 		var item = aItem;
 
-		if ((!cal.isEvent(item)) && (aCalendar.type == "exchangecalendar")) {
+		// If not an event and calendar type is exchangeCalendar, update Attendees dialog
+		if (!cal.isEvent(item)
+			&& aCalendar.type === "exchangecalendar") {
 
 			var ownerLabel = this._document.getElementById("exchWebService-owner-label");
 			if (ownerLabel) {
@@ -177,7 +199,8 @@ try{
 				this._document.getElementById("exchWebService-details-row2").removeAttribute("collapsed");
 				this._document.getElementById("exchWebService-details-row3").removeAttribute("collapsed");
 			}
-			catch (ex) {}
+			catch (ex) {
+			}
 
 			this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "false");
 			this._document.getElementById("exchWebService-details-separator").hidden = false;
@@ -206,16 +229,17 @@ try{
 			this._document.getElementById("reminder-1day-menuitem").hidden = true;
 			this._document.getElementById("reminder-2days-menuitem").hidden = true;
 			this._document.getElementById("reminder-1week-menuitem").hidden = true;
-			
+
+			// Clear timezone start/end time
 			this._document.getElementById("timezone-starttime").hidden = true;
 			this._document.getElementById("timezone-endtime").hidden = true;
 
 			if (this._document.getElementById("item-repeat")) {
 				this._document.getElementById("item-repeat").addEventListener("command", function() { self.updateRepeat(); }, false);
 			}
-			//this.updateTime();
 			this.updateRepeat();
 		}
+		// For other item type and other calendar type, reset Atttendees dialog
 		else {
 			try {
 				this._document.getElementById("exchWebService-details-row1").setAttribute("collapsed", "true");
@@ -230,7 +254,7 @@ try{
 			this._document.getElementById("event-grid-location-row").hidden = false;
 			this._document.getElementById("event-grid-recurrence-row").hidden=false;
 
-			// Clear reminder select list for todo
+			// Reset reminder select list for todo
 			this._document.getElementById("reminder-none-separator").hidden = false;
 			this._document.getElementById("reminder-0minutes-menuitem").hidden = false;
 			this._document.getElementById("reminder-5minutes-menuitem").hidden = false;
@@ -245,9 +269,9 @@ try{
 			this._document.getElementById("reminder-2days-menuitem").hidden = false;
 			this._document.getElementById("reminder-1week-menuitem").hidden = false;
 
+			// Reset timezone start/end time
 			this._document.getElementById("timezone-starttime").hidden = false;
 			this._document.getElementById("timezone-endtime").hidden = false;
-
 		}
 	},
 
@@ -255,7 +279,7 @@ try{
 	updateRepeat: function _updateRepeat()
 	{
 		var repeatDetails = this._document.getElementById("repeat-details").childNodes;
-		if (repeatDetails.length == 3) {
+		if (repeatDetails.length === 3) {
 			this._document.getElementById("repeat-details").removeChild(repeatDetails[2]);
 			var toolTip = repeatDetails[0].getAttribute("tooltiptext");
 			var tmpArray = toolTip.split("\n");
@@ -277,103 +301,104 @@ try{
 if (!exchWebService) var exchWebService = {};
 
 exchWebService.eventDialog = {
+	_initialized: false,
 
-    _initialized: false,
-    onLoad: function _onLoad() {
-        if (this._initialized) return;
-
-      //  exchWebService.eventDialog.updateAttendees();
-	}, 
-
-    editAttendees: function _editAttendees() {
-        let savedWindow = window;
-        let calendar = getCurrentCalendar();
-
-        var callback = function (attendees, organizer, startTime, endTime) {
-            savedWindow.attendees = attendees;
-            if (organizer) {
-                // In case we didn't have an organizer object before we
-                // added attendees to our event we take the one created
-                // by the 'invite attendee'-dialog.
-                if (savedWindow.organizer) {
-                    // The other case is that we already had an organizer object
-                    // before we went throught the 'invite attendee'-dialog. In that
-                    // case make sure we don't carry over attributes that have been
-                    // set to their default values by the dialog but don't actually
-                    // exist in the original organizer object.
-                    if (!savedWindow.organizer.id) {
-                        organizer.id = null;
-                    }
-                    if (!savedWindow.organizer.role) {
-                        organizer.role = null;
-                    }
-                    if (!savedWindow.organizer.participationStatus) {
-                        organizer.participationStatus = null;
-                    }
-                    if (!savedWindow.organizer.commonName) {
-                        organizer.commonName = null;
-                    }
-                }
-                savedWindow.organizer = organizer;
-            }
-            var duration = endTime.subtractDate(startTime);
-            startTime = startTime.clone();
-            endTime = endTime.clone();
-            var kDefaultTimezone = calendarDefaultTimezone();
-            gStartTimezone = startTime.timezone;
-            gEndTimezone = endTime.timezone;
-            gStartTime = startTime.getInTimezone(kDefaultTimezone);
-            gEndTime = endTime.getInTimezone(kDefaultTimezone);
-            gItemDuration = duration;
-          //  exchWebService.eventDialog.updateAttendees();
-            updateDateTime();
-            updateAllDay();
-            if (isAllDay != gStartTime.isDate) {
-                setShowTimeAs(gStartTime.isDate)
-            }
-        };
-
-        var startTime = gStartTime.getInTimezone(gStartTimezone);
-        var endTime = gEndTime.getInTimezone(gEndTimezone);
-
-        var isAllDay = getElementValue("event-all-day", "checked");
-        if (isAllDay) {
-            startTime.isDate = true;
-            endTime.isDate = true;
-            endTime.day += 1;
-        } else {
-            startTime.isDate = false;
-            endTime.isDate = false;
-        }
-
-        var menuItem = document.getElementById('options-timezone-menuitem');
-        var displayTimezone = true;
-        if( menuItem != null)
-            displayTimezone = menuItem.getAttribute('checked') == 'true';
-
-        var args = new Object();
-        args.startTime = startTime;
-        args.endTime = endTime;
-        args.displayTimezone = displayTimezone;
-        args.attendees = window.attendees;
-        args.organizer = window.organizer && window.organizer.clone();
-        args.calendar = calendar;
-        args.item = window.calendarItem;
-        args.onOk = callback;
-        args.fbWrapper = window.fbWrapper;
-
-        // open the dialog modally
-        openDialog(
-            "chrome://calendar/content/calendar-event-dialog-attendees.xul",
-            "_blank",
-            "chrome,titlebar,modal,resizable",
-            args);
-    }
-}
+  onLoad: function _onLoad() {
+  	if (this._initialized) {
+  		return ;
+		}
+	},
 
-window.addEventListener("load", exchWebService.eventDialog.onLoad, false);
+  editAttendees: function _editAttendees() {
+		var eventDialog = window;
+		var calendar = getCurrentCalendar();
+
+		var callback = function (attendees, organizer, startTime, endTime) {
+			eventDialog.attendees = attendees;
+
+	    if (organizer) {
+				// In case we didn't have an organizer object before we
+				// added attendees to our event we take the one created
+				// by the 'invite attendee'-dialog.
+				if (eventDialog.organizer) {
+					// The other case is that we already had an organizer object
+					// before we went throught the 'invite attendee'-dialog. In that
+					// case make sure we don't carry over attributes that have been
+					// set to their default values by the dialog but don't actually
+					// exist in the original organizer object.
+					if (!eventDialog.organizer.id) {
+						organizer.id = null;
+					}
+					if (!eventDialog.organizer.role) {
+						organizer.role = null;
+					}
+					if (!eventDialog.organizer.participationStatus) {
+						organizer.participationStatus = null;
+					}
+					if (!eventDialog.organizer.commonName) {
+						organizer.commonName = null;
+					}
+				}
+				eventDialog.organizer = organizer;
+  		}
+
+			var duration = endTime.subtractDate(startTime);
+			startTime = startTime.clone();
+			endTime = endTime.clone();
+
+			var kDefaultTimezone = calendarDefaultTimezone();
+			gStartTimezone = startTime.timezone;
+			gEndTimezone = endTime.timezone;
+			gStartTime = startTime.getInTimezone(kDefaultTimezone);
+			gEndTime = endTime.getInTimezone(kDefaultTimezone);
+			gItemDuration = duration;
+
+			updateDateTime();
+			updateAllDay();
+			if (isAllDay != gStartTime.isDate) {
+				setShowTimeAs(gStartTime.isDate)
+			}
+		};
+
+		var startTime = gStartTime.getInTimezone(gStartTimezone);
+		var endTime = gEndTime.getInTimezone(gEndTimezone);
+
+		var isAllDay = getElementValue("event-all-day", "checked");
+		if (isAllDay) {
+		    startTime.isDate = true;
+		    endTime.isDate = true;
+		    endTime.day += 1;
+		} else {
+		    startTime.isDate = false;
+		    endTime.isDate = false;
+		}
 
+		var menuItem = document.getElementById('options-timezone-menuitem');
+		var displayTimezone = true;
+		if( menuItem != null)
+		    displayTimezone = menuItem.getAttribute('checked') == 'true';
+
+    var ewsDialogAttendees = {};
+    ewsDialogAttendees.endTime = endTime;
+    ewsDialogAttendees.startTime = startTime;
+    ewsDialogAttendees.displayTimezone = displayTimezone;
+    ewsDialogAttendees.attendees = window.attendees;
+    ewsDialogAttendees.organizer = window.organizer && window.organizer.clone();
+    ewsDialogAttendees.calendar = calendar;
+    ewsDialogAttendees.item = window.calendarItem;
+    ewsDialogAttendees.onOk = callback;
+    ewsDialogAttendees.fbWrapper = window.fbWrapper;
+
+		// open the dialog modally
+		openDialog(
+				"chrome://calendar/content/calendar-event-dialog-attendees.xul",
+				"_blank",
+				"chrome,titlebar,modal,resizable",
+				ewsDialogAttendees);
+	}
+}
 
+window.addEventListener("load", exchWebService.eventDialog.onLoad, false);
 var tmpEventDialog = new exchEventDialog(document, window);
 window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpEventDialog.onLoad(); }, true);
 

From 237b2b965dfc9296be8dd42b24075e7296b1433b Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 21 May 2017 17:49:23 +0200
Subject: [PATCH 026/222] calendar-event-dialog.js: use new way to init dialog
 javascript

---
 chrome/content/calendar-event-dialog.js  | 26 +++++++++++++++---------
 chrome/content/calendar-event-dialog.xul |  9 +++++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 2242dd94..69987841 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -298,9 +298,16 @@ exchEventDialog.prototype = {
 
 }
 
-if (!exchWebService) var exchWebService = {};
+function exchToolsEventDialog(aDocument, aWindow)
+{
+	this._document = aDocument;
+	this._window = aWindow;
+
+	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+				.getService(Ci.mivFunctions);
+}
 
-exchWebService.eventDialog = {
+exchToolsEventDialog.prototype = {
 	_initialized: false,
 
   onLoad: function _onLoad() {
@@ -373,7 +380,7 @@ exchWebService.eventDialog = {
 		    endTime.isDate = false;
 		}
 
-		var menuItem = document.getElementById('options-timezone-menuitem');
+		var menuItem = this._document.getElementById('options-timezone-menuitem');
 		var displayTimezone = true;
 		if( menuItem != null)
 		    displayTimezone = menuItem.getAttribute('checked') == 'true';
@@ -382,12 +389,12 @@ exchWebService.eventDialog = {
     ewsDialogAttendees.endTime = endTime;
     ewsDialogAttendees.startTime = startTime;
     ewsDialogAttendees.displayTimezone = displayTimezone;
-    ewsDialogAttendees.attendees = window.attendees;
-    ewsDialogAttendees.organizer = window.organizer && window.organizer.clone();
+    ewsDialogAttendees.attendees = this._window.attendees;
+    ewsDialogAttendees.organizer = this._window.organizer && this._window.organizer.clone();
     ewsDialogAttendees.calendar = calendar;
-    ewsDialogAttendees.item = window.calendarItem;
+    ewsDialogAttendees.item = this._window.calendarItem;
     ewsDialogAttendees.onOk = callback;
-    ewsDialogAttendees.fbWrapper = window.fbWrapper;
+    ewsDialogAttendees.fbWrapper = this._window.fbWrapper;
 
 		// open the dialog modally
 		openDialog(
@@ -398,7 +405,6 @@ exchWebService.eventDialog = {
 	}
 }
 
-window.addEventListener("load", exchWebService.eventDialog.onLoad, false);
-var tmpEventDialog = new exchEventDialog(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpEventDialog.onLoad(); }, true);
+var exchToolsEventDialog = new exchToolsEventDialog(document, window);
+window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); exchToolsEventDialog.onLoad(); }, true);
 
diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
index e1d19c5e..ba0dee33 100644
--- a/chrome/content/calendar-event-dialog.xul
+++ b/chrome/content/calendar-event-dialog.xul
@@ -48,8 +48,11 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
     <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
     <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog.js"/>
+
+    <!-- Override default attendees command for Options menu -->
     <command id="cmd_attendees"
-			 oncommand="exchWebService.eventDialog.editAttendees();"/>
+             oncommand="exchToolsEventDialog.editAttendees();"/>
+
     <rows id="event-grid-rows" insertbefore = "event-grid-alarmrow">
         <row id="exchWebService-owner-row" collapsed="true" insertafter="event-grid-title-row">
             <label value="&exchWebService.owner.label;"/>
@@ -57,7 +60,7 @@
         </row>
         <row id="event-grid-category-color-row">
             <hbox id="event-grid-category-box">
-                <menulist id="item-calendar" oncommand="tmpEventDialog.selectedCalendarChanged(this);"/>
+                <menulist id="item-calendar" oncommand="exchToolsEventDialog.selectedCalendarChanged(this);"/>
             </hbox>
         </row>
         <separator id="exchWebService-details-separator" hidden="true" class="groove" insertafter="event-grid-todo-status-row"/>
@@ -99,7 +102,7 @@
         </row>
         <row id="event-grid-category-color-row">
             <hbox id="event-grid-category-box">
-                <menulist id="item-calendar" oncommand="tmpEventDialog.selectedCalendarChanged(this);"/>
+                <menulist id="item-calendar" oncommand="exchToolsEventDialog.selectedCalendarChanged(this);"/>
             </hbox>
         </row>
         <separator id="exchWebService-details-separator" hidden="true" class="groove" insertafter="event-grid-todo-status-row"/>

From 87634f11d75196e6995f8738d024f6b3816eb3b7 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 21 May 2017 17:51:54 +0200
Subject: [PATCH 027/222] calendar-event-dialog-attendees.xml: javascript style

---
 chrome/content/calendar-event-dialog-attendees.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/calendar-event-dialog-attendees.xml b/chrome/content/calendar-event-dialog-attendees.xml
index da4b5b9b..6effef94 100644
--- a/chrome/content/calendar-event-dialog-attendees.xml
+++ b/chrome/content/calendar-event-dialog-attendees.xml
@@ -66,7 +66,7 @@
                          completedefaultindex="true"
                          forcecomplete="true"
                          minresultsforpopup="1"
-                         onblur="if (this.localName == 'textbox') document.getBindingParent(this).onBlurInput(event);"
+                         onblur="if (this.localName === 'textbox') document.getBindingParent(this).onBlurInput(event);"
                          ignoreblurwhilesearching="true"
                          oninput="this.setAttribute('dirty', 'true');">
             </xul:textbox>
@@ -138,7 +138,7 @@
 						  numRowsAdded++;
 					      }
 					  }
-					  if (numRowsAdded == 0) {
+					  if (numRowsAdded === 0) {
 					      this.appendAttendee(null, listbox, template, false);
 					  }
 

From edd50c1c6046b201f9ebd04bc98cb1b0fb4f9ca3 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 21 May 2017 21:20:44 +0200
Subject: [PATCH 028/222] calendar-event-dialog.js: use only one prototype for
 everything

---
 chrome/content/calendar-event-dialog.js | 260 ++++++++++++------------
 1 file changed, 127 insertions(+), 133 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 69987841..ab129ed7 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -34,7 +34,7 @@ var Cc = Components.classes;
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-function exchEventDialog(aDocument, aWindow)
+function exchangeEventDialog(aDocument, aWindow)
 {
 	this._document = aDocument;
 	this._window = aWindow;
@@ -43,10 +43,13 @@ function exchEventDialog(aDocument, aWindow)
 				.getService(Ci.mivFunctions);
 }
 
-exchEventDialog.prototype = {
+exchangeEventDialog.prototype = {
 	_initialized: false,
 	_oldCallback: null,
 
+	/*
+	 * onAcceptCallback: read caller content to save extra information if caller was exchangecalendar
+	 */
 	onAcceptCallback: function _onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing)
 	{
 		if (aCalendar.type === "exchangecalendar") {
@@ -80,7 +83,7 @@ exchEventDialog.prototype = {
 				aItem.bodyType = "HTML";
 				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
 			}
-			else if (aItem.bodyType == "HTML") {
+			else if (aItem.bodyType === "HTML") {
 				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
 			}
 		} catch(err) {
@@ -92,92 +95,17 @@ exchEventDialog.prototype = {
 		}
 	},
 
-	onLoad: function _onLoad()
+	// This will remove the time value from the repeat part and tooltip.
+	updateRepeat: function _updateRepeat()
 	{
-		if (this._document.getElementById("exchWebService-body-editor")) {
-			this._document.getElementById("exchWebService-body-editor").setAttribute("scrollbars","yes");
-		}
-
- 		if (this._window.arguments[0].calendarEvent.calendar.type != "exchangecalendar") {
-			if (this._document.getElementById("item-description")) {
-				this._document.getElementById("item-description").hidden = false;
-			}
-
-			if (this._document.getElementById("exchWebService-body-editor")) {
-				this._document.getElementById("exchWebService-body-editor").hidden = true;
-			}
-
-			return;
-		}
-
-		if (this._initialized) {
-			return;
-		}
-
-		// Save current acceptCallback function in temporary place to be excuted later by ourself
-		this._oldCallback = this._window.onAcceptCallback;
-		var self = this;
-		// Ovverride acceptCallback with our own function
-		this._window.onAcceptCallback = function(aItem, aCalendar, aOriginalItem, aIsClosing) {
-			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
-		};
-
-		// If DOM contain a "todo-entrydate", we check if we need to display our HTML body editor
-		if (this._document.getElementById("todo-entrydate")) {
-			this._initialized = true;
-
-			var args = this._window.arguments[0];
-			var item = args.calendarEvent;
-			this.updateScreen(item, item.calendar);
-
-			// Display (or not) our body HTML editor
-
-			if (item.bodyType === undefined // item is not already defined
-					|| item.bodyType.toLowerCase() === "html" // current item contains HTML
-				) {
-				// Hidde original item description
-				if (this._document.getElementById("item-description")) {
-					this._document.getElementById("item-description").hidden = true;
-				}
-
-				// Display our own body editor
-				if (this._document.getElementById("exchWebService-body-editor")) {
-					this._document.getElementById("exchWebService-body-editor").hidden = false;
-				}
-			}
-
-			// Set content to our body HTML editor
-
-			// If item contains already HTML content, just use it
-			if (item.bodyType.toLowerCase() === "html") {
-				this._document.getElementById("exchWebService-body-editor").content = item.body;
-			}
-			else {
-				this.newItem = true;
-			}
-
-			// If the body is already filled and it contains HTML, save it to our body editor
-			if (item.body
-				&& item.body.toLowerCase().indexOf("<body>") > -1) {
-				this._document.getElementById("exchWebService-body-editor").content = item.body;
-			}
-			else {
-				// Otherwise, translate the DESCRIPTION property to HTML and give it to editor
-				this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
-			}
-		}
-		else {
-			// DOM doesn't containt "todo-entrydate"
-
-			// Display original editor and hidde our own HTML body editor
-
-			if (this._document.getElementById("item-description")) {
-				this._document.getElementById("item-description").hidden = false;
-			}
-
-			if (this._document.getElementById("exchWebService-body-editor")) {
-				this._document.getElementById("exchWebService-body-editor").hidden = true;
-			}
+		var repeatDetails = this._document.getElementById("repeat-details").childNodes;
+		if (repeatDetails.length === 3) {
+			this._document.getElementById("repeat-details").removeChild(repeatDetails[2]);
+			var toolTip = repeatDetails[0].getAttribute("tooltiptext");
+			var tmpArray = toolTip.split("\n");
+			tmpArray.splice(2,1);
+			repeatDetails[0].setAttribute("tooltiptext", tmpArray.join("\n"));
+			repeatDetails[1].setAttribute("tooltiptext", tmpArray.join("\n"));
 		}
 	},
 
@@ -275,55 +203,119 @@ exchEventDialog.prototype = {
 		}
 	},
 
-	// This will remove the time value from the repeat part and tooltip.
-	updateRepeat: function _updateRepeat()
+	/*
+	 * onLoad: setup event dialog window
+	 * - Add callback
+	 **/
+	onLoad: function _onLoad()
 	{
-		var repeatDetails = this._document.getElementById("repeat-details").childNodes;
-		if (repeatDetails.length === 3) {
-			this._document.getElementById("repeat-details").removeChild(repeatDetails[2]);
-			var toolTip = repeatDetails[0].getAttribute("tooltiptext");
-			var tmpArray = toolTip.split("\n");
-			tmpArray.splice(2,1);
-			repeatDetails[0].setAttribute("tooltiptext", tmpArray.join("\n"));
-			repeatDetails[1].setAttribute("tooltiptext", tmpArray.join("\n"));
+		if (this._document.getElementById("exchWebService-body-editor")) {
+			this._document.getElementById("exchWebService-body-editor").setAttribute("scrollbars","yes");
 		}
-	},
 
-	selectedCalendarChanged: function _selectedCalendarChanged(aMenuList)
-	{
-		updateCalendar();
+ 		if (this._window.arguments[0].calendarEvent.calendar.type != "exchangecalendar") {
+			if (this._document.getElementById("item-description")) {
+				this._document.getElementById("item-description").hidden = false;
+			}
 
-		this.updateScreen(this._window.calendarItem, getCurrentCalendar());
-	},
+			if (this._document.getElementById("exchWebService-body-editor")) {
+				this._document.getElementById("exchWebService-body-editor").hidden = true;
+			}
 
-}
+			return;
+		}
 
-function exchToolsEventDialog(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+		if (this._initialized) {
+			return;
+		}
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
-}
+		// Override dialog callback to add extra exchangecalendar information processing
+		this._oldCallback = this._window.onAcceptCallback;
+		var self = this;
+		this._window.onAcceptCallback = function(aItem, aCalendar, aOriginalItem, aIsClosing) {
+			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
+		};
 
-exchToolsEventDialog.prototype = {
-	_initialized: false,
+		// If DOM contain a "todo-entrydate", we check if we need to display our HTML body editor
+		if (this._document.getElementById("todo-entrydate")) {
+			this._initialized = true;
+
+			var args = this._window.arguments[0];
+			var item = args.calendarEvent;
+			this.updateScreen(item, item.calendar);
+
+			// Display (or not) our body HTML editor
+
+			if (item.bodyType === undefined // item is not already defined
+					|| item.bodyType.toLowerCase() === "html" // current item contains HTML
+				) {
+				// Hidde original item description
+				if (this._document.getElementById("item-description")) {
+					this._document.getElementById("item-description").hidden = true;
+				}
+
+				// Display our own body editor
+				if (this._document.getElementById("exchWebService-body-editor")) {
+					this._document.getElementById("exchWebService-body-editor").hidden = false;
+				}
+			}
+
+			// Set content to our body HTML editor
+
+			// If item contains already HTML content, just use it
+			if (item.bodyType.toLowerCase() === "html") {
+				this._document.getElementById("exchWebService-body-editor").content = item.body;
+			}
+			else {
+				this.newItem = true;
+			}
+
+			// If the body is already filled and it contains HTML, save it to our body editor
+			if (item.body
+				&& item.body.toLowerCase().indexOf("<body>") > -1) {
+				this._document.getElementById("exchWebService-body-editor").content = item.body;
+			}
+			else {
+				// Otherwise, translate the DESCRIPTION property to HTML and give it to editor
+				this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+			}
+		}
+		else {
+			// DOM doesn't contain "todo-entrydate"
 
-  onLoad: function _onLoad() {
-  	if (this._initialized) {
-  		return ;
+			// Display original editor and hidde our own HTML body editor
+
+			if (this._document.getElementById("item-description")) {
+				this._document.getElementById("item-description").hidden = false;
+			}
+
+			if (this._document.getElementById("exchWebService-body-editor")) {
+				this._document.getElementById("exchWebService-body-editor").hidden = true;
+			}
 		}
 	},
 
-  editAttendees: function _editAttendees() {
+	/*
+	 * selectedCalendarChanged: modify event-dialog to add extra exchangecalendar info when an exchange calendar is selected
+	 */
+	selectedCalendarChanged: function _selectedCalendarChanged(aMenuList)
+	{
+		updateCalendar();
+
+		this.updateScreen(this._window.calendarItem, getCurrentCalendar());
+	},
+
+	/*
+	 * editAttendees: call editAttendees with some already known informations
+	 */
+	editAttendees: function _editAttendees() {
 		var eventDialog = window;
 		var calendar = getCurrentCalendar();
 
 		var callback = function (attendees, organizer, startTime, endTime) {
 			eventDialog.attendees = attendees;
 
-	    if (organizer) {
+			if (organizer) {
 				// In case we didn't have an organizer object before we
 				// added attendees to our event we take the one created
 				// by the 'invite attendee'-dialog.
@@ -382,19 +374,20 @@ exchToolsEventDialog.prototype = {
 
 		var menuItem = this._document.getElementById('options-timezone-menuitem');
 		var displayTimezone = true;
-		if( menuItem != null)
-		    displayTimezone = menuItem.getAttribute('checked') == 'true';
-
-    var ewsDialogAttendees = {};
-    ewsDialogAttendees.endTime = endTime;
-    ewsDialogAttendees.startTime = startTime;
-    ewsDialogAttendees.displayTimezone = displayTimezone;
-    ewsDialogAttendees.attendees = this._window.attendees;
-    ewsDialogAttendees.organizer = this._window.organizer && this._window.organizer.clone();
-    ewsDialogAttendees.calendar = calendar;
-    ewsDialogAttendees.item = this._window.calendarItem;
-    ewsDialogAttendees.onOk = callback;
-    ewsDialogAttendees.fbWrapper = this._window.fbWrapper;
+		if( menuItem != null){
+			displayTimezone = menuItem.getAttribute('checked') == 'true';
+		}
+
+		var ewsDialogAttendees = {};
+		ewsDialogAttendees.endTime = endTime;
+		ewsDialogAttendees.startTime = startTime;
+		ewsDialogAttendees.displayTimezone = displayTimezone;
+		ewsDialogAttendees.attendees = this._window.attendees;
+		ewsDialogAttendees.organizer = this._window.organizer && this._window.organizer.clone();
+		ewsDialogAttendees.calendar = calendar;
+		ewsDialogAttendees.item = this._window.calendarItem;
+		ewsDialogAttendees.onOk = callback;
+		ewsDialogAttendees.fbWrapper = this._window.fbWrapper;
 
 		// open the dialog modally
 		openDialog(
@@ -405,6 +398,7 @@ exchToolsEventDialog.prototype = {
 	}
 }
 
-var exchToolsEventDialog = new exchToolsEventDialog(document, window);
+
+var exchToolsEventDialog = new exchangeEventDialog(document, window);
 window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); exchToolsEventDialog.onLoad(); }, true);
 

From 189835e51cfaf25485acef86ff06ab252f93706f Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 23 May 2017 08:02:58 +0200
Subject: [PATCH 029/222] calendar-event-dialog.xul: remove duplicated code

---
 chrome/content/calendar-event-dialog.xul | 52 +++---------------------
 1 file changed, 5 insertions(+), 47 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
index ba0dee33..b3d1b60a 100644
--- a/chrome/content/calendar-event-dialog.xul
+++ b/chrome/content/calendar-event-dialog.xul
@@ -95,57 +95,15 @@
             <textbox id="exchWebService-companies-count" value="" disable-on-readonly="true"/>
         </row>
     </rows>
-    <rows flex="1" id="event-grid-rows" >
-        <row id="exchWebService-owner-row" collapsed="true" insertafter="event-grid-title-row">
-            <label value="&exchWebService.owner.label;"/>
-            <label id="exchWebService-owner-label" value=""/>
-        </row>
-        <row id="event-grid-category-color-row">
-            <hbox id="event-grid-category-box">
-                <menulist id="item-calendar" oncommand="exchToolsEventDialog.selectedCalendarChanged(this);"/>
-            </hbox>
-        </row>
-        <separator id="exchWebService-details-separator" hidden="true" class="groove" insertafter="event-grid-todo-status-row"/>
-        <row id="exchWebService-details-row1" align="center"
-			collapsed="true" insertafter="exchWebService-details-separator">
-            <label value="&exchWebService.totalWork.label;"
-				disable-on-readonly="true"/>
-            <hbox  align="center">
-                <textbox id="exchWebService-totalWork-count"
-					increment="10" min="0" type="number" size="3" value="0" disable-on-readonly="true"/>
-                <label value="&exchWebService.mileage.label;"
-					disable-on-readonly="true"/>
-                <textbox id="exchWebService-mileage-count" value="" disable-on-readonly="true"/>
-            </hbox>
-        </row>
-        <row id="exchWebService-details-row2" align="center"
-			collapsed="true" insertafter="exchWebService-details-row1">
-            <label value="&exchWebService.actualWork.label;"
-				disable-on-readonly="true"/>
-            <hbox  align="center">
-                <textbox id="exchWebService-actualWork-count"
-					increment="10" min="0" type="number" size="3" value="0" disable-on-readonly="true"/>
-                <label value="&exchWebService.billingInformation.label;"
-					disable-on-readonly="true"/>
-                <textbox id="exchWebService-billingInformation-count" value="" disable-on-readonly="true"/>
-            </hbox>
-        </row>
-        <row id="exchWebService-details-row3" align="center"
-			collapsed="true" insertafter="exchWebService-details-row2">
-            <label value="&exchWebService.companies.label;"
-				disable-on-readonly="true"/>
-            <textbox id="exchWebService-companies-count" value="" disable-on-readonly="true"/>
-        </row>
-    </rows>
     <tabbox
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="event-grid-tabbox" 		selectedIndex="2" flex="1">
         <tabpanels id="event-grid-tabpanels" flex="1" selectedIndex="2">
             <tabpanel id="event-grid-tabpanel-description">
-                <itemBodyEditor id="exchWebService-body-editor" 
-					flex="1" 
-					insertafter="item-description" 
+                <itemBodyEditor id="exchWebService-body-editor"
+					flex="1"
+					insertafter="item-description"
 					disable-on-readonly="true"/>
-            </tabpanel> 
+            </tabpanel>
         </tabpanels>
     </tabbox>
-</overlay>
\ No newline at end of file
+</overlay>

From a9f9432be70bdbcfdf1691d306f10f8ce2d1f052 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 23 May 2017 08:04:10 +0200
Subject: [PATCH 030/222] calendar-event-dialog.js: fix editAttendees execution

Now, our editAttendees dialog show up, but isn't full working
---
 chrome/content/calendar-event-dialog.js | 64 +++++++++++++++----------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index ab129ed7..b1b4900e 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -229,6 +229,11 @@ exchangeEventDialog.prototype = {
 			return;
 		}
 
+		// Set window.calendarItem to be able to call getCalendar()
+		var args = this._window.arguments[0];
+		var item = args.calendarEvent;
+		this._window.calendarItem = item.clone();
+
 		// Override dialog callback to add extra exchangecalendar information processing
 		this._oldCallback = this._window.onAcceptCallback;
 		var self = this;
@@ -240,8 +245,6 @@ exchangeEventDialog.prototype = {
 		if (this._document.getElementById("todo-entrydate")) {
 			this._initialized = true;
 
-			var args = this._window.arguments[0];
-			var item = args.calendarEvent;
 			this.updateScreen(item, item.calendar);
 
 			// Display (or not) our body HTML editor
@@ -309,8 +312,8 @@ exchangeEventDialog.prototype = {
 	 * editAttendees: call editAttendees with some already known informations
 	 */
 	editAttendees: function _editAttendees() {
-		var eventDialog = window;
-		var calendar = getCurrentCalendar();
+		var eventDialog = this._window;
+		var calendar = eventDialog.getCurrentCalendar();
 
 		var callback = function (attendees, organizer, startTime, endTime) {
 			eventDialog.attendees = attendees;
@@ -342,15 +345,15 @@ exchangeEventDialog.prototype = {
   		}
 
 			var duration = endTime.subtractDate(startTime);
-			startTime = startTime.clone();
-			endTime = endTime.clone();
+			var startTime = startTime.clone();
+			var endTime = endTime.clone();
 
 			var kDefaultTimezone = calendarDefaultTimezone();
-			gStartTimezone = startTime.timezone;
-			gEndTimezone = endTime.timezone;
-			gStartTime = startTime.getInTimezone(kDefaultTimezone);
-			gEndTime = endTime.getInTimezone(kDefaultTimezone);
-			gItemDuration = duration;
+			var gStartTimezone = startTime.timezone;
+			var gEndTimezone = endTime.timezone;
+			var gStartTime = startTime.getInTimezone(kDefaultTimezone);
+			var gEndTime = endTime.getInTimezone(kDefaultTimezone);
+			var gItemDuration = duration;
 
 			updateDateTime();
 			updateAllDay();
@@ -359,35 +362,46 @@ exchangeEventDialog.prototype = {
 			}
 		};
 
-		var startTime = gStartTime.getInTimezone(gStartTimezone);
-		var endTime = gEndTime.getInTimezone(gEndTimezone);
+		var startTime = {};
+		var endTime = {};
 
-		var isAllDay = getElementValue("event-all-day", "checked");
+		if (eventDialog.gStartTime) {
+			startTime = eventDialog.gStartTime.getInTimezone(eventDialog.gStartTimezone);
+		}
+		if (eventDialog.gEndTime) {
+			endTime = eventDialog.gEndTime.getInTimezone(eventDialog.gEndTimezone);
+		}
+
+		var isAllDay = null;
+		var isAllDayBox = this._document.getElementById("event-all-day");
+		if (isAllDayBox) {
+			isAllDay = isAllDayBox.getAttribute('checked');
+		}
 		if (isAllDay) {
-		    startTime.isDate = true;
-		    endTime.isDate = true;
-		    endTime.day += 1;
+			startTime.isDate = true;
+			endTime.isDate = true;
+			endTime.day += 1;
 		} else {
-		    startTime.isDate = false;
-		    endTime.isDate = false;
+			startTime.isDate = false;
+			endTime.isDate = false;
 		}
 
 		var menuItem = this._document.getElementById('options-timezone-menuitem');
 		var displayTimezone = true;
-		if( menuItem != null){
-			displayTimezone = menuItem.getAttribute('checked') == 'true';
+		if( menuItem ){
+			displayTimezone = menuItem.getAttribute('checked');
 		}
 
 		var ewsDialogAttendees = {};
 		ewsDialogAttendees.endTime = endTime;
 		ewsDialogAttendees.startTime = startTime;
 		ewsDialogAttendees.displayTimezone = displayTimezone;
-		ewsDialogAttendees.attendees = this._window.attendees;
-		ewsDialogAttendees.organizer = this._window.organizer && this._window.organizer.clone();
+		ewsDialogAttendees.attendees = eventDialog.attendees;
+		ewsDialogAttendees.organizer = eventDialog.organizer && eventDialog.organizer.clone();
 		ewsDialogAttendees.calendar = calendar;
-		ewsDialogAttendees.item = this._window.calendarItem;
+		ewsDialogAttendees.item = eventDialog.calendarItem;
 		ewsDialogAttendees.onOk = callback;
-		ewsDialogAttendees.fbWrapper = this._window.fbWrapper;
+		ewsDialogAttendees.fbWrapper = eventDialog.fbWrapper;
 
 		// open the dialog modally
 		openDialog(

From 0fb095f54965e9a75e8de77cedf1f03230927470 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 30 May 2017 15:07:49 +0200
Subject: [PATCH 031/222] calendar-event-dialog: fix overlay of event dialog

This commit fix the overlay, but the JavaScript needs now fixes
to hide/display exchangecalendar items with the good context.
---
 chrome.manifest                          |   4 +
 chrome/content/calendar-event-dialog.xul |  71 +----------
 chrome/content/lightning-item-iframe.xul | 147 +++++++++++++++++++++++
 3 files changed, 153 insertions(+), 69 deletions(-)
 create mode 100644 chrome/content/lightning-item-iframe.xul

diff --git a/chrome.manifest b/chrome.manifest
index ff53de49..18c63b4d 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -12,10 +12,14 @@ overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangec
 overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/progress_panel.xul
 overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
 overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecalendar/content/progress_panel.xul
+
 overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
+overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
+
 overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
 overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendar/content/calendar-summary-dialog.xul
 overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendar/content/calendar-properties-dialog.xul
+
 overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
 overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/check4lightning.xul
 overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/messenger-overlay-preferences.xul
diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
index b3d1b60a..bc02d8a6 100644
--- a/chrome/content/calendar-event-dialog.xul
+++ b/chrome/content/calendar-event-dialog.xul
@@ -30,80 +30,13 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messengercompose/messengercompose.css"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/itemBodyEditor.css"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
-<!DOCTYPE dialog [
-    
-<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-    %eventDialogDTD;
-    
-<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/calendar-event-dialog.dtd" > 
-    %dtd1;
-]>
+
 <?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
 <overlay id="exchWebService-calendar-event-dialog.xul"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
     <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
-    <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog.js"/>
 
-    <!-- Override default attendees command for Options menu -->
+    <!-- Override default attendees command for Options menu and tools in toolbar -->
     <command id="cmd_attendees"
              oncommand="exchToolsEventDialog.editAttendees();"/>
-
-    <rows id="event-grid-rows" insertbefore = "event-grid-alarmrow">
-        <row id="exchWebService-owner-row" collapsed="true" insertafter="event-grid-title-row">
-            <label value="&exchWebService.owner.label;"/>
-            <label id="exchWebService-owner-label" value=""/>
-        </row>
-        <row id="event-grid-category-color-row">
-            <hbox id="event-grid-category-box">
-                <menulist id="item-calendar" oncommand="exchToolsEventDialog.selectedCalendarChanged(this);"/>
-            </hbox>
-        </row>
-        <separator id="exchWebService-details-separator" hidden="true" class="groove" insertafter="event-grid-todo-status-row"/>
-        <row id="exchWebService-details-row1" align="center"
-			collapsed="true" insertafter="exchWebService-details-separator">
-            <label value="&exchWebService.totalWork.label;"
-				disable-on-readonly="true"/>
-            <hbox  align="center">
-                <textbox id="exchWebService-totalWork-count"
-					increment="10" min="0" type="number" size="3" value="0" disable-on-readonly="true"/>
-                <label value="&exchWebService.mileage.label;"
-					disable-on-readonly="true"/>
-                <textbox id="exchWebService-mileage-count" value="" disable-on-readonly="true"/>
-            </hbox>
-        </row>
-        <row id="exchWebService-details-row2" align="center"
-			collapsed="true" insertafter="exchWebService-details-row1">
-            <label value="&exchWebService.actualWork.label;"
-				disable-on-readonly="true"/>
-            <hbox  align="center">
-                <textbox id="exchWebService-actualWork-count"
-					increment="10" min="0" type="number" size="3" value="0" disable-on-readonly="true"/>
-                <label value="&exchWebService.billingInformation.label;"
-					disable-on-readonly="true"/>
-                <textbox id="exchWebService-billingInformation-count" value="" disable-on-readonly="true"/>
-            </hbox>
-        </row>
-        <row id="exchWebService-details-row3" align="center"
-			collapsed="true" insertafter="exchWebService-details-row2">
-            <label value="&exchWebService.companies.label;"
-				disable-on-readonly="true"/>
-            <textbox id="exchWebService-companies-count" value="" disable-on-readonly="true"/>
-        </row>
-    </rows>
-    <tabbox
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="event-grid-tabbox" 		selectedIndex="2" flex="1">
-        <tabpanels id="event-grid-tabpanels" flex="1" selectedIndex="2">
-            <tabpanel id="event-grid-tabpanel-description">
-                <itemBodyEditor id="exchWebService-body-editor"
-					flex="1"
-					insertafter="item-description"
-					disable-on-readonly="true"/>
-            </tabpanel>
-        </tabpanels>
-    </tabbox>
 </overlay>
diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
new file mode 100644
index 00000000..cfaa94a2
--- /dev/null
+++ b/chrome/content/lightning-item-iframe.xul
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: GPL 3.0
+ *
+ * The contents of this file are subject to the General Public License
+ * 3.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * ## Exchange 2007/2010 Calendar and Tasks Provider.
+ * ## For Thunderbird with the Lightning add-on.
+ *
+ * Author: Michel Verbraak (info@1st-setup.nl)
+ * Website: http://www.1st-setup.nl/wordpress/?page_id=133
+ * email: exchangecalendar@extensions.1st-setup.nl
+ *
+ *
+ * This code uses parts of the Microsoft Exchange Calendar Provider code on which the
+ * "Exchange Data Provider for Lightning" was based.
+ * The Initial Developer of the Microsoft Exchange Calendar Provider Code is
+ *   Andrea Bittau <a.bittau@cs.ucl.ac.uk>, University College London
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * ***** BEGIN LICENSE BLOCK *****/
+-->
+
+<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
+<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messengercompose/messengercompose.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/itemBodyEditor.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
+
+<!DOCTYPE dialog [
+
+<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
+    %eventDialogDTD;
+
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/calendar-event-dialog.dtd" >
+    %dtd1;
+]>
+
+<overlay id="exchangecalendar-lightning-item-iframe.xul"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- Manage special Exchange items and provide attendee speicific dialog -->
+    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
+
+    <!-- These rows correspond to the full form under the toolbar -->
+    <rows id="event-grid-rows">
+        <!-- If the current calendar is an Exchange one, add a label to show the current owner of the event. -->
+        <row id="exchWebService-owner-row"
+            insertafter="event-grid-title-row"
+            align="center">
+            <label value="&exchWebService.owner.label;" />
+            <label id="exchWebService-owner-label"
+                value="" />
+        </row>
+
+        <!-- When other calendar is selected, we have to clean the current dialog if the new calendar is not an Exchange one -->
+        <row id="event-grid-category-color-row">
+            <hbox id="event-grid-category-box">
+                <menulist id="item-calendar"
+                    oncommand="exchToolsEventDialog.selectedCalendarChanged(this);" />
+            </hbox>
+        </row>
+
+        <!-- Exchange calendar details -->
+        <separator id="exchWebService-details-separator"
+            insertafter="event-grid-todo-status-row"
+            class="groove" />
+
+        <row id="exchWebService-details-row1"
+            insertafter="exchWebService-details-separator"
+            align="center">
+            <label value="&exchWebService.totalWork.label;"
+                disable-on-readonly="true" />
+
+            <hbox align="center">
+                <textbox id="exchWebService-totalWork-count"
+                    type="number" increment="10" min="0" size="3"
+                    value="0"
+                    disable-on-readonly="true" />
+
+                <label value="&exchWebService.mileage.label;"
+                    disable-on-readonly="true" />
+                <textbox id="exchWebService-mileage-count" value=""
+                    disable-on-readonly="true"/>
+            </hbox>
+        </row>
+
+        <row id="exchWebService-details-row2"
+            insertafter="exchWebService-details-row1"
+            align="center" >
+            <label value="&exchWebService.actualWork.label;"
+                disable-on-readonly="true" />
+
+            <hbox align="center">
+                <textbox id="exchWebService-actualWork-count"
+                    type="number" increment="10" min="0" size="3"
+                    value="0"
+                    disable-on-readonly="true" />
+
+                <label value="&exchWebService.billingInformation.label;"
+                    disable-on-readonly="true"/>
+                <textbox id="exchWebService-billingInformation-count"
+                    value=""
+                    disable-on-readonly="true"/>
+            </hbox>
+        </row>
+
+        <row id="exchWebService-details-row3"
+            insertafter="exchWebService-details-row2"
+            align="center" >
+            <label value="&exchWebService.companies.label;"
+                disable-on-readonly="true"/>
+            <textbox id="exchWebService-companies-count"
+                value=""
+                disable-on-readonly="true"/>
+        </row>
+    </rows>
+
+    <tabbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="event-grid-tabbox"
+        selectedIndex="2"
+        flex="1">
+
+        <tabpanels id="event-grid-tabpanels"
+            flex="1"
+            selectedIndex="2">
+            <textbox id="item-description"
+                style="display: none;"/>
+            <tabpanel id="event-grid-tabpanel-description">
+                <itemBodyEditor id="exchWebService-body-editor"
+                    flex="1"
+                    insertafter="item-description"
+                    disable-on-readonly="true"/>
+            </tabpanel>
+        </tabpanels>
+    </tabbox>
+</overlay>

From 9f44d1abec1ebd7b96395814e5e077ef79286a4c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 31 May 2017 09:09:09 +0200
Subject: [PATCH 032/222] lightning-item-iframe: hidde by default Exchange task
 informations

---
 chrome/content/lightning-item-iframe.xul | 39 +++++++++++++-----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
index cfaa94a2..5ac1f6d7 100644
--- a/chrome/content/lightning-item-iframe.xul
+++ b/chrome/content/lightning-item-iframe.xul
@@ -52,12 +52,17 @@
     <!-- Manage special Exchange items and provide attendee speicific dialog -->
     <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
 
+    <!-- Override default attendees command for Options menu and tools in toolbar -->
+    <command id="cmd_attendees"
+             oncommand="exchToolsEventDialog.editAttendees();"/>
+
     <!-- These rows correspond to the full form under the toolbar -->
     <rows id="event-grid-rows">
-        <!-- If the current calendar is an Exchange one, add a label to show the current owner of the event. -->
+        <!-- If the current element is a Task and is an Exchange one, add a label to show the current owner of the task. -->
         <row id="exchWebService-owner-row"
             insertafter="event-grid-title-row"
-            align="center">
+            align="center"
+            collapsed="true" >
             <label value="&exchWebService.owner.label;" />
             <label id="exchWebService-owner-label"
                 value="" />
@@ -71,14 +76,16 @@
             </hbox>
         </row>
 
-        <!-- Exchange calendar details -->
+        <!-- Exchange task details (hidden by defaults, displayed only by javascript) -->
         <separator id="exchWebService-details-separator"
             insertafter="event-grid-todo-status-row"
-            class="groove" />
+            class="groove"
+            hidden="true" />
 
         <row id="exchWebService-details-row1"
             insertafter="exchWebService-details-separator"
-            align="center">
+            align="center"
+            collapsed="true" >
             <label value="&exchWebService.totalWork.label;"
                 disable-on-readonly="true" />
 
@@ -97,7 +104,8 @@
 
         <row id="exchWebService-details-row2"
             insertafter="exchWebService-details-row1"
-            align="center" >
+            align="center"
+            collapsed="true" >
             <label value="&exchWebService.actualWork.label;"
                 disable-on-readonly="true" />
 
@@ -117,7 +125,8 @@
 
         <row id="exchWebService-details-row3"
             insertafter="exchWebService-details-row2"
-            align="center" >
+            align="center"
+            collapsed="true" >
             <label value="&exchWebService.companies.label;"
                 disable-on-readonly="true"/>
             <textbox id="exchWebService-companies-count"
@@ -127,20 +136,16 @@
     </rows>
 
     <tabbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="event-grid-tabbox"
-        selectedIndex="2"
-        flex="1">
-
-        <tabpanels id="event-grid-tabpanels"
-            flex="1"
-            selectedIndex="2">
-            <textbox id="item-description"
-                style="display: none;"/>
+        id="event-grid-tabbox">
+
+        <tabpanels id="event-grid-tabpanels">
+            <!-- Add HTML text editor for Exchange tasks -->
             <tabpanel id="event-grid-tabpanel-description">
                 <itemBodyEditor id="exchWebService-body-editor"
                     flex="1"
                     insertafter="item-description"
-                    disable-on-readonly="true"/>
+                    disable-on-readonly="true"
+                    hidden="true"/>
             </tabpanel>
         </tabpanels>
     </tabbox>

From 1edf79c64e80f88834c9f33f51f3e0968add134d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 31 May 2017 09:11:07 +0200
Subject: [PATCH 033/222] calendar-event-dialog.js: update documentation and
 orgnanize code

---
 chrome/content/calendar-event-dialog.js | 143 ++++++++++++------------
 1 file changed, 70 insertions(+), 73 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index b1b4900e..9ce708ba 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -95,7 +95,9 @@ exchangeEventDialog.prototype = {
 		}
 	},
 
-	// This will remove the time value from the repeat part and tooltip.
+	/*
+	 * Update repeat informations on Exchange tasks
+	 */
 	updateRepeat: function _updateRepeat()
 	{
 		var repeatDetails = this._document.getElementById("repeat-details").childNodes;
@@ -109,29 +111,33 @@ exchangeEventDialog.prototype = {
 		}
 	},
 
+	/*
+	 * This function is used to add extra informations for Exchange tasks
+	 * As the same dialog is used for non-Exchange tasks and for events, this function
+	 * remove too these details when necessary.
+	 */
 	updateScreen: function _updateScreen(aItem, aCalendar)
 	{
 		var item = aItem;
 
-		// If not an event and calendar type is exchangeCalendar, update Attendees dialog
+		// If not an event and calendar type is exchangeCalendar, add Exchange task extra informations
 		if (!cal.isEvent(item)
 			&& aCalendar.type === "exchangecalendar") {
 
+			// Set and display task owner
+
+			this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "false");
 			var ownerLabel = this._document.getElementById("exchWebService-owner-label");
 			if (ownerLabel) {
 				ownerLabel.value = item.owner;
 			}
 
-			try {
-				this._document.getElementById("exchWebService-details-row1").removeAttribute("collapsed");
-				this._document.getElementById("exchWebService-details-row2").removeAttribute("collapsed");
-				this._document.getElementById("exchWebService-details-row3").removeAttribute("collapsed");
-			}
-			catch (ex) {
-			}
+			// Set and display Exchange task details
 
-			this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "false");
 			this._document.getElementById("exchWebService-details-separator").hidden = false;
+			this._document.getElementById("exchWebService-details-row1").collapsed = false;
+			this._document.getElementById("exchWebService-details-row2").collapsed = false;
+			this._document.getElementById("exchWebService-details-row3").collapsed = false;
 
 			if (item.className) {
 				this._document.getElementById("exchWebService-totalWork-count").value = item.totalWork;
@@ -141,9 +147,42 @@ exchangeEventDialog.prototype = {
 				this._document.getElementById("exchWebService-companies-count").value = item.companies;
 			}
 
+			// Set HTML content editor
+
+			// If item contains already HTML content, just use it
+			if (item.bodyType
+				&& item.bodyType.toLowerCase() === "html") {
+				this._document.getElementById("exchWebService-body-editor").content = item.body;
+			}
+			else {
+				this.newItem = true;
+			}
+
+			// If the body is already filled and it contains HTML, save it to our body editor
+			if (item.body
+				&& item.body.toLowerCase().indexOf("<body>") > -1) {
+				this._document.getElementById("exchWebService-body-editor").content = item.body;
+			}
+			else {
+				// Otherwise, translate the DESCRIPTION property to HTML and give it to editor
+				this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+			}
+
+			// Display HTML content editor
+			if (item.bodyType === undefined // item is not already defined
+					|| item.bodyType.toLowerCase() === "html" // current item contains HTML
+				) {
+				// Hidde original item description editor
+				this._document.getElementById("item-description").hidden = true;
+
+				// Display our own HTML content editor
+				this._document.getElementById("exchWebService-body-editor").hidden = false;
+			}
+
+			// Remove some standard inputs
+
 			this._document.getElementById("event-grid-location-row").hidden = true;
 
-			// Clear reminder select list for todo
 			this._document.getElementById("reminder-none-separator").hidden = true;
 			this._document.getElementById("reminder-0minutes-menuitem").hidden = true;
 			this._document.getElementById("reminder-5minutes-menuitem").hidden = true;
@@ -158,27 +197,36 @@ exchangeEventDialog.prototype = {
 			this._document.getElementById("reminder-2days-menuitem").hidden = true;
 			this._document.getElementById("reminder-1week-menuitem").hidden = true;
 
-			// Clear timezone start/end time
 			this._document.getElementById("timezone-starttime").hidden = true;
 			this._document.getElementById("timezone-endtime").hidden = true;
 
+			// Manage repeat for Exchange tasks
+
 			if (this._document.getElementById("item-repeat")) {
 				this._document.getElementById("item-repeat").addEventListener("command", function() { self.updateRepeat(); }, false);
 			}
+
 			this.updateRepeat();
 		}
-		// For other item type and other calendar type, reset Atttendees dialog
+		// For events and other calendar type, hidde back all Exchange task details, display back standard items
 		else {
-			try {
-				this._document.getElementById("exchWebService-details-row1").setAttribute("collapsed", "true");
-				this._document.getElementById("exchWebService-details-row2").setAttribute("collapsed", "true");
-				this._document.getElementById("exchWebService-details-row3").setAttribute("collapsed", "true");
-			}
-			catch (ex) {}
 
+			// Hide Exchange task details
+
+			// Task owner
 			this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "true");
+
+			// Task details
 			this._document.getElementById("exchWebService-details-separator").hidden = true;
+			this._document.getElementById("exchWebService-details-row1").collapsed = true;
+			this._document.getElementById("exchWebService-details-row2").collapsed = true;
+			this._document.getElementById("exchWebService-details-row3").collapsed = true;
+
+			// HTML Task content editor
+			this._document.getElementById("item-description").hidden = false;
+			this._document.getElementById("exchWebService-body-editor").hidden = true;
 
+			// Reset standard form
 			this._document.getElementById("event-grid-location-row").hidden = false;
 			this._document.getElementById("event-grid-recurrence-row").hidden=false;
 
@@ -241,61 +289,10 @@ exchangeEventDialog.prototype = {
 			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
 		};
 
-		// If DOM contain a "todo-entrydate", we check if we need to display our HTML body editor
-		if (this._document.getElementById("todo-entrydate")) {
-			this._initialized = true;
+		// Update screen according to task / event
+		this.updateScreen(item, item.calendar);
 
-			this.updateScreen(item, item.calendar);
-
-			// Display (or not) our body HTML editor
-
-			if (item.bodyType === undefined // item is not already defined
-					|| item.bodyType.toLowerCase() === "html" // current item contains HTML
-				) {
-				// Hidde original item description
-				if (this._document.getElementById("item-description")) {
-					this._document.getElementById("item-description").hidden = true;
-				}
-
-				// Display our own body editor
-				if (this._document.getElementById("exchWebService-body-editor")) {
-					this._document.getElementById("exchWebService-body-editor").hidden = false;
-				}
-			}
-
-			// Set content to our body HTML editor
-
-			// If item contains already HTML content, just use it
-			if (item.bodyType.toLowerCase() === "html") {
-				this._document.getElementById("exchWebService-body-editor").content = item.body;
-			}
-			else {
-				this.newItem = true;
-			}
-
-			// If the body is already filled and it contains HTML, save it to our body editor
-			if (item.body
-				&& item.body.toLowerCase().indexOf("<body>") > -1) {
-				this._document.getElementById("exchWebService-body-editor").content = item.body;
-			}
-			else {
-				// Otherwise, translate the DESCRIPTION property to HTML and give it to editor
-				this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
-			}
-		}
-		else {
-			// DOM doesn't contain "todo-entrydate"
-
-			// Display original editor and hidde our own HTML body editor
-
-			if (this._document.getElementById("item-description")) {
-				this._document.getElementById("item-description").hidden = false;
-			}
-
-			if (this._document.getElementById("exchWebService-body-editor")) {
-				this._document.getElementById("exchWebService-body-editor").hidden = true;
-			}
-		}
+		this._initialized = true;
 	},
 
 	/*

From 242a611e1b25a9217ab39faa8e6b9459958b7c5c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 31 May 2017 17:00:27 +0200
Subject: [PATCH 034/222] calendar-event-dialog.xul: add DTD locales back

---
 chrome/content/calendar-event-dialog.xul | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
index bc02d8a6..ed85cf40 100644
--- a/chrome/content/calendar-event-dialog.xul
+++ b/chrome/content/calendar-event-dialog.xul
@@ -31,9 +31,21 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 
+<!DOCTYPE dialog [
+
+<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
+    %eventDialogDTD;
+
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/calendar-event-dialog.dtd" >
+    %dtd1;
+]>
+
 <?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
+
 <overlay id="exchWebService-calendar-event-dialog.xul"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- Manage special Exchange items and provide attendee speicific dialog -->
     <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
 
     <!-- Override default attendees command for Options menu and tools in toolbar -->

From 09407d4b665ed5d527eb10a1009aec1cb92b1618 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 11:12:57 +0200
Subject: [PATCH 035/222] calendar-event-dialog: remove editAttendees overlay

This code was the same than the original Lightening code contained in
chrome://messenger/content/messenger.xul

Exchangecalendar has nothing added and the overlay is bugged:
 * it didn't overlay the context menu in the attendee tab on the
bottom of the dialog
 * it didn't display days and times in the header of attendee dialog
---
 chrome/content/calendar-event-dialog.js  | 103 -----------------------
 chrome/content/calendar-event-dialog.xul |  15 ----
 chrome/content/lightning-item-iframe.xul |   4 -
 3 files changed, 122 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 9ce708ba..c8e5fb27 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -303,109 +303,6 @@ exchangeEventDialog.prototype = {
 		updateCalendar();
 
 		this.updateScreen(this._window.calendarItem, getCurrentCalendar());
-	},
-
-	/*
-	 * editAttendees: call editAttendees with some already known informations
-	 */
-	editAttendees: function _editAttendees() {
-		var eventDialog = this._window;
-		var calendar = eventDialog.getCurrentCalendar();
-
-		var callback = function (attendees, organizer, startTime, endTime) {
-			eventDialog.attendees = attendees;
-
-			if (organizer) {
-				// In case we didn't have an organizer object before we
-				// added attendees to our event we take the one created
-				// by the 'invite attendee'-dialog.
-				if (eventDialog.organizer) {
-					// The other case is that we already had an organizer object
-					// before we went throught the 'invite attendee'-dialog. In that
-					// case make sure we don't carry over attributes that have been
-					// set to their default values by the dialog but don't actually
-					// exist in the original organizer object.
-					if (!eventDialog.organizer.id) {
-						organizer.id = null;
-					}
-					if (!eventDialog.organizer.role) {
-						organizer.role = null;
-					}
-					if (!eventDialog.organizer.participationStatus) {
-						organizer.participationStatus = null;
-					}
-					if (!eventDialog.organizer.commonName) {
-						organizer.commonName = null;
-					}
-				}
-				eventDialog.organizer = organizer;
-  		}
-
-			var duration = endTime.subtractDate(startTime);
-			var startTime = startTime.clone();
-			var endTime = endTime.clone();
-
-			var kDefaultTimezone = calendarDefaultTimezone();
-			var gStartTimezone = startTime.timezone;
-			var gEndTimezone = endTime.timezone;
-			var gStartTime = startTime.getInTimezone(kDefaultTimezone);
-			var gEndTime = endTime.getInTimezone(kDefaultTimezone);
-			var gItemDuration = duration;
-
-			updateDateTime();
-			updateAllDay();
-			if (isAllDay != gStartTime.isDate) {
-				setShowTimeAs(gStartTime.isDate)
-			}
-		};
-
-		var startTime = {};
-		var endTime = {};
-
-		if (eventDialog.gStartTime) {
-			startTime = eventDialog.gStartTime.getInTimezone(eventDialog.gStartTimezone);
-		}
-		if (eventDialog.gEndTime) {
-			endTime = eventDialog.gEndTime.getInTimezone(eventDialog.gEndTimezone);
-		}
-
-		var isAllDay = null;
-		var isAllDayBox = this._document.getElementById("event-all-day");
-		if (isAllDayBox) {
-			isAllDay = isAllDayBox.getAttribute('checked');
-		}
-		if (isAllDay) {
-			startTime.isDate = true;
-			endTime.isDate = true;
-			endTime.day += 1;
-		} else {
-			startTime.isDate = false;
-			endTime.isDate = false;
-		}
-
-		var menuItem = this._document.getElementById('options-timezone-menuitem');
-		var displayTimezone = true;
-		if( menuItem ){
-			displayTimezone = menuItem.getAttribute('checked');
-		}
-
-		var ewsDialogAttendees = {};
-		ewsDialogAttendees.endTime = endTime;
-		ewsDialogAttendees.startTime = startTime;
-		ewsDialogAttendees.displayTimezone = displayTimezone;
-		ewsDialogAttendees.attendees = eventDialog.attendees;
-		ewsDialogAttendees.organizer = eventDialog.organizer && eventDialog.organizer.clone();
-		ewsDialogAttendees.calendar = calendar;
-		ewsDialogAttendees.item = eventDialog.calendarItem;
-		ewsDialogAttendees.onOk = callback;
-		ewsDialogAttendees.fbWrapper = eventDialog.fbWrapper;
-
-		// open the dialog modally
-		openDialog(
-				"chrome://calendar/content/calendar-event-dialog-attendees.xul",
-				"_blank",
-				"chrome,titlebar,modal,resizable",
-				ewsDialogAttendees);
 	}
 }
 
diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
index ed85cf40..75b54f26 100644
--- a/chrome/content/calendar-event-dialog.xul
+++ b/chrome/content/calendar-event-dialog.xul
@@ -31,24 +31,9 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 
-<!DOCTYPE dialog [
-
-<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-    %eventDialogDTD;
-
-<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/calendar-event-dialog.dtd" >
-    %dtd1;
-]>
-
 <?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
 
 <overlay id="exchWebService-calendar-event-dialog.xul"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <!-- Manage special Exchange items and provide attendee speicific dialog -->
-    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
-
-    <!-- Override default attendees command for Options menu and tools in toolbar -->
-    <command id="cmd_attendees"
-             oncommand="exchToolsEventDialog.editAttendees();"/>
 </overlay>
diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
index 5ac1f6d7..68480817 100644
--- a/chrome/content/lightning-item-iframe.xul
+++ b/chrome/content/lightning-item-iframe.xul
@@ -52,10 +52,6 @@
     <!-- Manage special Exchange items and provide attendee speicific dialog -->
     <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
 
-    <!-- Override default attendees command for Options menu and tools in toolbar -->
-    <command id="cmd_attendees"
-             oncommand="exchToolsEventDialog.editAttendees();"/>
-
     <!-- These rows correspond to the full form under the toolbar -->
     <rows id="event-grid-rows">
         <!-- If the current element is a Task and is an Exchange one, add a label to show the current owner of the task. -->

From c4a4c18032e7e691fb17ce2097211e3f79a14baa Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 11:16:16 +0200
Subject: [PATCH 036/222] calendar-event-dialog.js: coding style

---
 chrome/content/calendar-event-dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index c8e5fb27..bc0becc2 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -126,9 +126,9 @@ exchangeEventDialog.prototype = {
 
 			// Set and display task owner
 
-			this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "false");
 			var ownerLabel = this._document.getElementById("exchWebService-owner-label");
 			if (ownerLabel) {
+				ownerLabel.setAttribute("collapsed", "false");
 				ownerLabel.value = item.owner;
 			}
 

From 40b8e4fa630415a075d94191b32df11fdfbbd1c8 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 15:22:21 +0200
Subject: [PATCH 037/222] exchWebServiceEditor: fix indentation

---
 chrome/content/exchWebServiceEditor.xml | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 39c43640..058c0d94 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -272,20 +272,20 @@
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").removeEventListener("click", this.editLinkFunction, true);
 		]]></destructor>
 			
-			<property name="content">
-				<getter>
-				  <![CDATA[
-				    return this.editorElement.contentDocument.documentElement.innerHTML;
-				  ]]>
-				</getter>
-				<setter>
-				  <![CDATA[
-					if (this.editorElement) {
-						this.editorElement.contentDocument.documentElement.innerHTML = val;
-					}
-				  ]]>
-				</setter>
-			</property>
+		<property name="content">
+			<getter>
+			  <![CDATA[
+			    return this.editorElement.contentDocument.documentElement.innerHTML;
+			  ]]>
+			</getter>
+			<setter>
+			  <![CDATA[
+				if (this.editorElement) {
+					this.editorElement.contentDocument.documentElement.innerHTML = val;
+				}
+			  ]]>
+			</setter>
+		</property>
 
 		<method name="fillFontFace">
 			<body><![CDATA[

From 7c87bc1d99d25e1eb2eb5ce44e19379e00b5e373 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 15:23:14 +0200
Subject: [PATCH 038/222] exchWebServiceEditor: coding style

---
 chrome/content/exchWebServiceEditor.xml | 64 ++++++++++++-------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 058c0d94..49cc344c 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -289,7 +289,7 @@
 
 		<method name="fillFontFace">
 			<body><![CDATA[
-			if (gExchWebServiceLocalFonts == undefined) {
+			if (gExchWebServiceLocalFonts === undefined) {
 				// Build list of all local fonts once per editor
 				try {
 					var enumerator = Components.classes["@mozilla.org/gfx/fontenumerator;1"]
@@ -300,7 +300,7 @@
 				catch(e) { }
 			}
 
-			if (gExchWebServiceLocalFonts != undefined) {
+			if (gExchWebServiceLocalFonts !== undefined) {
 
 				var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
 				itemNode.setAttribute("label", "Variable width");
@@ -335,7 +335,7 @@
 			if (toolbar) {
 				var toolbarButtons = toolbar.getElementsByTagName("xul:toolbarbutton");
 				for (var i=0; i<toolbarButtons.length;i++) {
-					if ((toolbarButtons[i].hasAttribute("connect")) && (toolbarButtons[i].getAttribute("connect") == "true")) {
+					if ((toolbarButtons[i].hasAttribute("connect")) && (toolbarButtons[i].getAttribute("connect") === "true")) {
 						this.connectButton(toolbarButtons[i].getAttribute("anonid"), aAnonId);
 					}
 				}
@@ -391,10 +391,7 @@
 		<method name="onKeyPressEditor">
 			<parameter name="aEvent" />
 			<body><![CDATA[
-//if (aEvent) {
-//dump("aEvent.keyCode:"+aEvent.keyCode+"\n");
-//}
-			if ( ( (aEvent.keyCode > 36) && (aEvent.keyCode < 41) ) || (aEvent.keyCode == 33) || (aEvent.keyCode == 34)) {
+			if ( ( (aEvent.keyCode > 36) && (aEvent.keyCode < 41) ) || (aEvent.keyCode === 33) || (aEvent.keyCode === 34)) {
 				this.onClickEditor(aEvent);
 			}
 		]]></body>
@@ -405,12 +402,9 @@
 			<body><![CDATA[
 			{
 				var href = "";
-				var isKeyCommand = (event.type == "command");
+				var isKeyCommand = (event.type === "command");
 				var linkNode = isKeyCommand ? this.editorElement.commandDispatcher.focusedElement
 							: event.originalTarget;
-//dump("event.type:"+event.type+"\n");
-//dump("event.originalTarget:"+event.originalTarget+"\n");
-//dump("linkNode:"+linkNode+"\n");
 				while (linkNode instanceof Element) {
 					if (linkNode instanceof HTMLAnchorElement ||
 					  linkNode instanceof HTMLAreaElement ||
@@ -434,7 +428,6 @@
 					}
 					linkNode = linkNode.parentNode;
 				}
-//dump("href:"+href+"\n");
 				return href ? {href: href, linkNode: linkNode} : null;
 			}
 		]]></body>
@@ -482,27 +475,27 @@
 			}
 
 			var color = this.getCStringCommandState("cmd_fontColor", this.commandManager, this.editorElement.contentWindow, "state_attribute");
-			if (color == "") {
+			if (color === "") {
 				color = "transparent";
 			}
 			else {
 				color = this.ConvertRGBColorIntoHEXColor(color);
 			}
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor").setAttribute("style","background-color:"+color);
-			
+
 			var aFirst = { value: false };
 			var aAny = { value: false };
 			var aAll = { value: false };
 			var propAtom = this.atomService.getAtom("font");
 			var edElement = this.editorElement.getHTMLEditor(this.editorElement.contentWindow);
-			color = edElement.getInlinePropertyWithAttrValue(propAtom, "bgcolor", null, aFirst, aAny, aAll);			
+			color = edElement.getInlinePropertyWithAttrValue(propAtom, "bgcolor", null, aFirst, aAny, aAll);
 
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor").setAttribute("style","background-color:"+color);
 			
 			var font = this.getCStringCommandState("cmd_fontFace", this.commandManager, this.editorElement.contentWindow, "state_attribute");
 			font = font.replace(/"/g, "");
 			var fontElement;
-			if (font.indexOf(",") > -1) {
+			if (font.indexOf(",") !== -1) {
 				var fonts = font.split(",");
 				for(var i = 0; ((i<fonts.length) && (!fontElement)); i++) {
 					fontElement = document.getAnonymousElementByAttribute(this, "label", fonts[i]);
@@ -577,7 +570,7 @@
 
 			// Get current color
 			var color = this.getCStringCommandState(aAnonId, this.commandManager, this.editorElement.contentWindow, "state_attribute");
-			if (color == "") {
+			if (color === "") {
 				color = "transparent";
 			}
 			else {
@@ -594,7 +587,7 @@
 
 			element.setAttribute("style","background-color:"+colorObj.TextColor);
 
-			if (aAnonId == "cmd_fontColor") {
+			if (aAnonId === "cmd_fontColor") {
 				var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
 						.createInstance(Components.interfaces.nsICommandParams);
 				state.setCStringValue("state_attribute", colorObj.TextColor);
@@ -614,11 +607,20 @@
 			<body><![CDATA[
 			  if ( /rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/.test(color) ) {
 			    var r = Number(RegExp.$1).toString(16);
-			    if (r.length == 1) r = "0"+r;
+			    if (r.length === 1){
+			    	r = "0"+r;
+			    }
+
 			    var g = Number(RegExp.$2).toString(16);
-			    if (g.length == 1) g = "0"+g;
+			    if (g.length === 1) {
+			    	g = "0"+g;
+			    }
+
 			    var b = Number(RegExp.$3).toString(16);
-			    if (b.length == 1) b = "0"+b;
+			    if (b.length === 1) {
+			    	b = "0"+b;
+			    }
+
 			    return "#"+r+g+b;
 			  }
 			  else
@@ -662,7 +664,7 @@
 			if (this.commandManager) {
 				var button = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
 				if (button.hasAttribute("state")) {
-					if (aAnonId.indexOf("cmd_align") > -1) {
+					if (aAnonId.indexOf("cmd_align") !== -1) {
 						button.checked = (aAnonId.indexOf(this.getCStringCommandState("cmd_align", this.commandManager, this.editorElement.contentWindow, "state_attribute")) > 0);
 					}
 					else {
@@ -676,7 +678,7 @@
 			<parameter name="aAnonId" />
 			<body><![CDATA[
 			if (this.commandManager) {
-				if (aAnonId.indexOf("cmd_align") > -1) {
+				if (aAnonId.indexOf("cmd_align") !== -1) {
 					var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
 							.createInstance(Components.interfaces.nsICommandParams);
 					state.setCStringValue("state_attribute", aAnonId.substr(10));
@@ -685,7 +687,7 @@
 				else {
 					this.commandManager.doCommand(aAnonId, null, null);
 				}
-//				this.setButtonState(aAnonId);
+
 				this.onClickEditor();
 			}
 		]]></body>
@@ -693,35 +695,31 @@
 
 		<method name="addLink">
 			<body><![CDATA[
-//dump("addLink\n");
+
 				var result = window.prompt("Link URL:", "http://");
 				if (result) {
 					var selObj = this.editorElement.contentDocument.getSelection();
-//dump("selObj.rangeCount:"+selObj.rangeCount+"\n");
+
 					var range  = selObj.getRangeAt(0);
 					var textElement = range.startContainer;
 					var parent = textElement.parentElement;
-//dump("parent:"+parent+"\n");
+
 					var startOffset = range.startOffset;
-//dump("1. parent.outerHTML:"+parent.outerHTML+"\n");
-//dump("range.startOffset:"+range.startOffset+"\n");
 					
 					var newLink = document.createElement("a");
 					newLink.setAttribute("href", result);
 					range.surroundContents(newLink);
-//dump("newLink.outerHTML:"+newLink.outerHTML+"\n");
 
 					var splitText = textElement.splitText(startOffset);
 					parent.insertBefore(newLink, splitText);
 					this.content = this.content;
-//dump("2. parent.outerHTML:"+parent.outerHTML+"\n");
 				}
 		]]></body>
 		</method>
 
 		<method name="removeLink">
 			<body><![CDATA[
-//dump("removeLink\n");
+
 			if (this.ceParams) {
 				var parent = this.ceParams.linkNode.parentElement;
 				while (this.ceParams.linkNode.firstChild) {
@@ -734,7 +732,7 @@
 
 		<method name="editLink">
 			<body><![CDATA[
-//dump("editLink\n");
+
 			if (this.ceParams) {
 				var result = window.prompt("Link URL:", this.ceParams.href);
 				if (result) {

From 36950d260de37094f08d646f401a23abe14a2ee2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 15:26:02 +0200
Subject: [PATCH 039/222] calendar-event-dialog.js: always update screen on
 window load

---
 chrome/content/calendar-event-dialog.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index bc0becc2..47bfdc62 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -253,7 +253,8 @@ exchangeEventDialog.prototype = {
 
 	/*
 	 * onLoad: setup event dialog window
-	 * - Add callback
+	 * - Update screen according to type of item (task / event)
+	 * - Add callback (once)
 	 **/
 	onLoad: function _onLoad()
 	{
@@ -272,16 +273,13 @@ exchangeEventDialog.prototype = {
 
 			return;
 		}
+		// Update screen according to task / event
+		this.updateScreen(item, item.calendar);
 
 		if (this._initialized) {
 			return;
 		}
 
-		// Set window.calendarItem to be able to call getCalendar()
-		var args = this._window.arguments[0];
-		var item = args.calendarEvent;
-		this._window.calendarItem = item.clone();
-
 		// Override dialog callback to add extra exchangecalendar information processing
 		this._oldCallback = this._window.onAcceptCallback;
 		var self = this;
@@ -289,9 +287,6 @@ exchangeEventDialog.prototype = {
 			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
 		};
 
-		// Update screen according to task / event
-		this.updateScreen(item, item.calendar);
-
 		this._initialized = true;
 	},
 

From 41eb28cd93b01818d459cae837b1e7a68bf6e770 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 15:29:04 +0200
Subject: [PATCH 040/222] calendar-event-dialog.js: conding style on the
 content editor display part

---
 chrome/content/calendar-event-dialog.js | 27 +++++++++++++++----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 47bfdc62..d8448218 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -150,22 +150,25 @@ exchangeEventDialog.prototype = {
 			// Set HTML content editor
 
 			// If item contains already HTML content, just use it
+			let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
 			if (item.bodyType
 				&& item.bodyType.toLowerCase() === "html") {
-				this._document.getElementById("exchWebService-body-editor").content = item.body;
+				itemBodyEditor.content = item.body;
 			}
 			else {
+				// If bodyType is not defined or not HTML, the item is interpreted as a new one,
+				// because our accept call back explecitly set the bodyType and define it as HTML
 				this.newItem = true;
-			}
 
-			// If the body is already filled and it contains HTML, save it to our body editor
-			if (item.body
-				&& item.body.toLowerCase().indexOf("<body>") > -1) {
-				this._document.getElementById("exchWebService-body-editor").content = item.body;
-			}
-			else {
-				// Otherwise, translate the DESCRIPTION property to HTML and give it to editor
-				this._document.getElementById("exchWebService-body-editor").content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+				// If the body is already filled and it contains HTML, save it to our body editor directly
+				if (item.body
+					&& item.body.toLowerCase().indexOf("<body>") > -1) {
+					itemBodyEditor.content = item.body;
+				}
+				// Otherwise try to convert it
+				else {
+					itemBodyEditor.content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+				}
 			}
 
 			// Display HTML content editor
@@ -176,7 +179,9 @@ exchangeEventDialog.prototype = {
 				this._document.getElementById("item-description").hidden = true;
 
 				// Display our own HTML content editor
-				this._document.getElementById("exchWebService-body-editor").hidden = false;
+				itemBodyEditor.hidden = false;
+
+				itemBodyEditor.setAttribute("scrollbars","yes");
 			}
 
 			// Remove some standard inputs

From 9f0aacb7f86a0db84dd3c6a44d883f8abcffb2f6 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 17:00:36 +0200
Subject: [PATCH 041/222] Use directly editor innerHTML to get exceptions

---
 chrome/content/calendar-event-dialog.js | 11 ++++++-----
 chrome/content/exchWebServiceEditor.xml | 15 ---------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index d8448218..25ecdb24 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -81,10 +81,11 @@ exchangeEventDialog.prototype = {
 		try{
 			if (this.newItem) {
 				aItem.bodyType = "HTML";
-				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+				aItem.body = this._document.getElementById("exchWebService-body-editor").innerHTML;
+				this.newItem = false;
 			}
 			else if (aItem.bodyType === "HTML") {
-				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+				aItem.body = this._document.getElementById("exchWebService-body-editor").innerHTML;
 			}
 		} catch(err) {
 			dump("Error saving content\n");
@@ -153,7 +154,7 @@ exchangeEventDialog.prototype = {
 			let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
 			if (item.bodyType
 				&& item.bodyType.toLowerCase() === "html") {
-				itemBodyEditor.content = item.body;
+				itemBodyEditor.innerHTML = item.body;
 			}
 			else {
 				// If bodyType is not defined or not HTML, the item is interpreted as a new one,
@@ -163,11 +164,11 @@ exchangeEventDialog.prototype = {
 				// If the body is already filled and it contains HTML, save it to our body editor directly
 				if (item.body
 					&& item.body.toLowerCase().indexOf("<body>") > -1) {
-					itemBodyEditor.content = item.body;
+					itemBodyEditor.innerHTML = item.body;
 				}
 				// Otherwise try to convert it
 				else {
-					itemBodyEditor.content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+					itemBodyEditor.innerHTML = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
 				}
 			}
 
diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 49cc344c..715e0a14 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -271,21 +271,6 @@
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").removeEventListener("click", this.removeLinkFunction, true);
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").removeEventListener("click", this.editLinkFunction, true);
 		]]></destructor>
-			
-		<property name="content">
-			<getter>
-			  <![CDATA[
-			    return this.editorElement.contentDocument.documentElement.innerHTML;
-			  ]]>
-			</getter>
-			<setter>
-			  <![CDATA[
-				if (this.editorElement) {
-					this.editorElement.contentDocument.documentElement.innerHTML = val;
-				}
-			  ]]>
-			</setter>
-		</property>
 
 		<method name="fillFontFace">
 			<body><![CDATA[

From d179acf988506bfd745a146e42ad06fb5a6b7494 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 2 Jun 2017 17:01:07 +0200
Subject: [PATCH 042/222] add a tested html converter

---
 interfaces/global/mivFunctions.js | 83 ++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 7 deletions(-)

diff --git a/interfaces/global/mivFunctions.js b/interfaces/global/mivFunctions.js
index d57615d4..2541be0d 100644
--- a/interfaces/global/mivFunctions.js
+++ b/interfaces/global/mivFunctions.js
@@ -875,17 +875,86 @@ mivFunctions.prototype = {
 
 	fromText2HTML: function _fromText2HTML(aString)
 	{
-		var html = convertSpecialCharatersToXML(aString);
-		if (html) {
-			html = html.replace(/\n/g, '<br>');
+		let html;
+		html = this.htmlspecialchars(aString, 1, null, true)
+		return '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>'+html+'</body></html>';
+	},
+
+	// Original code from locutus.io
+	// License: MIT
+	// Source: https://raw.githubusercontent.com/kvz/locutus/master/src/php/strings/htmlspecialchars.js
+	htmlspecialchars: function _htmlspecialchars(string, quoteStyle, charset, doubleEncode)
+	{
+		//       discuss at: http://locutus.io/php/htmlspecialchars/
+		//      original by: Mirek Slugen
+		//      improved by: Kevin van Zonneveld (http://kvz.io)
+		//      bugfixed by: Nathan
+		//      bugfixed by: Arno
+		//      bugfixed by: Brett Zamir (http://brett-zamir.me)
+		//      bugfixed by: Brett Zamir (http://brett-zamir.me)
+		//       revised by: Kevin van Zonneveld (http://kvz.io)
+		//         input by: Ratheous
+		//         input by: Mailfaker (http://www.weedem.fr/)
+		//         input by: felix
+		// reimplemented by: Brett Zamir (http://brett-zamir.me)
+		//           note 1: charset argument not supported
+		//        example 1: htmlspecialchars("<a href='test'>Test</a>", 'ENT_QUOTES')
+		//        returns 1: '&lt;a href=&#039;test&#039;&gt;Test&lt;/a&gt;'
+		//        example 2: htmlspecialchars("ab\"c'd", ['ENT_NOQUOTES', 'ENT_QUOTES'])
+		//        returns 2: 'ab"c&#039;d'
+		//        example 3: htmlspecialchars('my "&entity;" is still here', null, null, false)
+		//        returns 3: 'my &quot;&entity;&quot; is still here'
+
+		var optTemp = 0
+		var i = 0
+		var noquotes = false
+		if (typeof quoteStyle === 'undefined' || quoteStyle === null) {
+			quoteStyle = 2
+		}
+		string = string || ''
+		string = string.toString()
+
+		if (doubleEncode !== false) {
+			// Put this first to avoid double-encoding
+			string = string.replace(/&/g, '&amp;')
+		}
+
+		string = string
+			.replace(/</g, '&lt;')
+			.replace(/>/g, '&gt;')
+
+		var OPTS = {
+			'ENT_NOQUOTES': 0,
+			'ENT_HTML_QUOTE_SINGLE': 1,
+			'ENT_HTML_QUOTE_DOUBLE': 2,
+			'ENT_COMPAT': 2,
+			'ENT_QUOTES': 3,
+			'ENT_IGNORE': 4
+		}
+		if (quoteStyle === 0) {
+			noquotes = true
+		}
+		if (typeof quoteStyle !== 'number') {
+			// Allow for a single string or an array of string flags
+			quoteStyle = [].concat(quoteStyle)
+			for (i = 0; i < quoteStyle.length; i++) {
+				// Resolve string input to bitwise e.g. 'ENT_IGNORE' becomes 4
+				if (OPTS[quoteStyle[i]] === 0) {
+					noquotes = true
+				} else if (OPTS[quoteStyle[i]]) {
+				optTemp = optTemp | OPTS[quoteStyle[i]]
+				}
+			}
+			quoteStyle = optTemp
 		}
-		else {
-			html = "";
+		if (quoteStyle & OPTS.ENT_HTML_QUOTE_SINGLE) {
+			string = string.replace(/'/g, '&#039;')
+		}
+		if (!noquotes) {
+			string = string.replace(/"/g, '&quot;')
 		}
-		return '<HTML><HEAD><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></HEAD><BODY>'+html+'</BODY></HTML>';
 	},
 
-
 }
 
 function NSGetFactory(cid) {

From db5ff368d9899ef93a01b639d7159eb6a805337a Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Jun 2017 23:25:39 +0200
Subject: [PATCH 043/222] mivFunctions: fromText2HTML uses now standard DOM
 Parser and XML Serializer

to get valid xhtml code (with XML tags well terminated)
---
 interfaces/global/mivFunctions.js | 86 +++----------------------------
 1 file changed, 7 insertions(+), 79 deletions(-)

diff --git a/interfaces/global/mivFunctions.js b/interfaces/global/mivFunctions.js
index 2541be0d..1c75b889 100644
--- a/interfaces/global/mivFunctions.js
+++ b/interfaces/global/mivFunctions.js
@@ -35,7 +35,11 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 function mivFunctions()
 {
-	//dump("\n ++ mivFunctions.init\n");
+	// Mozilla helpers
+	this.domParser = Cc["@mozilla.org/xmlextras/domparser;1"]
+		.getService(Ci.nsIDOMParser);
+	this.xmlSerializer = Cc["@mozilla.org/xmlextras/xmlserializer;1"]
+		.createInstance(Ci.nsIDOMSerializer);
 }
 
 mivFunctions.prototype = {
@@ -875,84 +879,8 @@ mivFunctions.prototype = {
 
 	fromText2HTML: function _fromText2HTML(aString)
 	{
-		let html;
-		html = this.htmlspecialchars(aString, 1, null, true)
-		return '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>'+html+'</body></html>';
-	},
-
-	// Original code from locutus.io
-	// License: MIT
-	// Source: https://raw.githubusercontent.com/kvz/locutus/master/src/php/strings/htmlspecialchars.js
-	htmlspecialchars: function _htmlspecialchars(string, quoteStyle, charset, doubleEncode)
-	{
-		//       discuss at: http://locutus.io/php/htmlspecialchars/
-		//      original by: Mirek Slugen
-		//      improved by: Kevin van Zonneveld (http://kvz.io)
-		//      bugfixed by: Nathan
-		//      bugfixed by: Arno
-		//      bugfixed by: Brett Zamir (http://brett-zamir.me)
-		//      bugfixed by: Brett Zamir (http://brett-zamir.me)
-		//       revised by: Kevin van Zonneveld (http://kvz.io)
-		//         input by: Ratheous
-		//         input by: Mailfaker (http://www.weedem.fr/)
-		//         input by: felix
-		// reimplemented by: Brett Zamir (http://brett-zamir.me)
-		//           note 1: charset argument not supported
-		//        example 1: htmlspecialchars("<a href='test'>Test</a>", 'ENT_QUOTES')
-		//        returns 1: '&lt;a href=&#039;test&#039;&gt;Test&lt;/a&gt;'
-		//        example 2: htmlspecialchars("ab\"c'd", ['ENT_NOQUOTES', 'ENT_QUOTES'])
-		//        returns 2: 'ab"c&#039;d'
-		//        example 3: htmlspecialchars('my "&entity;" is still here', null, null, false)
-		//        returns 3: 'my &quot;&entity;&quot; is still here'
-
-		var optTemp = 0
-		var i = 0
-		var noquotes = false
-		if (typeof quoteStyle === 'undefined' || quoteStyle === null) {
-			quoteStyle = 2
-		}
-		string = string || ''
-		string = string.toString()
-
-		if (doubleEncode !== false) {
-			// Put this first to avoid double-encoding
-			string = string.replace(/&/g, '&amp;')
-		}
-
-		string = string
-			.replace(/</g, '&lt;')
-			.replace(/>/g, '&gt;')
-
-		var OPTS = {
-			'ENT_NOQUOTES': 0,
-			'ENT_HTML_QUOTE_SINGLE': 1,
-			'ENT_HTML_QUOTE_DOUBLE': 2,
-			'ENT_COMPAT': 2,
-			'ENT_QUOTES': 3,
-			'ENT_IGNORE': 4
-		}
-		if (quoteStyle === 0) {
-			noquotes = true
-		}
-		if (typeof quoteStyle !== 'number') {
-			// Allow for a single string or an array of string flags
-			quoteStyle = [].concat(quoteStyle)
-			for (i = 0; i < quoteStyle.length; i++) {
-				// Resolve string input to bitwise e.g. 'ENT_IGNORE' becomes 4
-				if (OPTS[quoteStyle[i]] === 0) {
-					noquotes = true
-				} else if (OPTS[quoteStyle[i]]) {
-				optTemp = optTemp | OPTS[quoteStyle[i]]
-				}
-			}
-			quoteStyle = optTemp
-		}
-		if (quoteStyle & OPTS.ENT_HTML_QUOTE_SINGLE) {
-			string = string.replace(/'/g, '&#039;')
-		}
-		if (!noquotes) {
-			string = string.replace(/"/g, '&quot;')
-		}
+		let parsedHtml = this.domParser.parseFromString(aString, 'text/html');
+		return this.xmlSerializer.serializeToString(parsedHtml);
 	},
 
 }

From 7a96087e7548eef06cdb8cc604ebcd6e1f43b204 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Jun 2017 23:26:51 +0200
Subject: [PATCH 044/222] calendar-event-dialog.js: stop erase Lightning window
 load, but let it

correctly setup current window.
---
 chrome/content/calendar-event-dialog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 25ecdb24..4980fdbb 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -280,6 +280,7 @@ exchangeEventDialog.prototype = {
 			return;
 		}
 		// Update screen according to task / event
+		let item = this._window.calendarItem;
 		this.updateScreen(item, item.calendar);
 
 		if (this._initialized) {
@@ -309,5 +310,5 @@ exchangeEventDialog.prototype = {
 
 
 var exchToolsEventDialog = new exchangeEventDialog(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); exchToolsEventDialog.onLoad(); }, true);
+window.addEventListener("load", function () { exchToolsEventDialog.onLoad(); }, true);
 

From e7b5f2153d7ba984cd535d44d76d0a49dcf72f0d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Jun 2017 23:28:43 +0200
Subject: [PATCH 045/222] Revert "Use directly editor innerHTML to get
 exceptions"

This reverts commit 9f0aacb7f86a0db84dd3c6a44d883f8abcffb2f6.

I'm reverting this change, since I use now correctly formatted xhtml which avoids exceptions while saving content to innerHTML.
---
 chrome/content/calendar-event-dialog.js | 11 +++++------
 chrome/content/exchWebServiceEditor.xml | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 4980fdbb..58e1de4f 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -81,11 +81,10 @@ exchangeEventDialog.prototype = {
 		try{
 			if (this.newItem) {
 				aItem.bodyType = "HTML";
-				aItem.body = this._document.getElementById("exchWebService-body-editor").innerHTML;
-				this.newItem = false;
+				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
 			}
 			else if (aItem.bodyType === "HTML") {
-				aItem.body = this._document.getElementById("exchWebService-body-editor").innerHTML;
+				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
 			}
 		} catch(err) {
 			dump("Error saving content\n");
@@ -154,7 +153,7 @@ exchangeEventDialog.prototype = {
 			let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
 			if (item.bodyType
 				&& item.bodyType.toLowerCase() === "html") {
-				itemBodyEditor.innerHTML = item.body;
+				itemBodyEditor.content = item.body;
 			}
 			else {
 				// If bodyType is not defined or not HTML, the item is interpreted as a new one,
@@ -164,11 +163,11 @@ exchangeEventDialog.prototype = {
 				// If the body is already filled and it contains HTML, save it to our body editor directly
 				if (item.body
 					&& item.body.toLowerCase().indexOf("<body>") > -1) {
-					itemBodyEditor.innerHTML = item.body;
+					itemBodyEditor.content = item.body;
 				}
 				// Otherwise try to convert it
 				else {
-					itemBodyEditor.innerHTML = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
+					itemBodyEditor.content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
 				}
 			}
 
diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 715e0a14..49cc344c 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -271,6 +271,21 @@
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").removeEventListener("click", this.removeLinkFunction, true);
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").removeEventListener("click", this.editLinkFunction, true);
 		]]></destructor>
+			
+		<property name="content">
+			<getter>
+			  <![CDATA[
+			    return this.editorElement.contentDocument.documentElement.innerHTML;
+			  ]]>
+			</getter>
+			<setter>
+			  <![CDATA[
+				if (this.editorElement) {
+					this.editorElement.contentDocument.documentElement.innerHTML = val;
+				}
+			  ]]>
+			</setter>
+		</property>
 
 		<method name="fillFontFace">
 			<body><![CDATA[

From a49f5de38c3cd1db09e47f5ab77f216575d9273a Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 6 Jun 2017 13:31:35 +0200
Subject: [PATCH 046/222] calendar-event-dialog.js: Copy content from HTML
 editor only when Exchange task is edited

---
 chrome/content/calendar-event-dialog.js | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 58e1de4f..b90c3278 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -61,7 +61,7 @@ exchangeEventDialog.prototype = {
 					aItem = newItem;
 				}
 			}
-			else if (!cal.isEvent(aItem)) {
+			else {
 				// Save extra exchange fields to item.
 				if (!aItem.className) {
 					var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
@@ -75,19 +75,21 @@ exchangeEventDialog.prototype = {
 				aItem.mileage = this._document.getElementById("exchWebService-mileage-count").value;
 				aItem.billingInformation = this._document.getElementById("exchWebService-billingInformation-count").value;
 				aItem.companies = this._document.getElementById("exchWebService-companies-count").value;
-			}
-		}
 
-		try{
-			if (this.newItem) {
-				aItem.bodyType = "HTML";
-				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
-			}
-			else if (aItem.bodyType === "HTML") {
-				aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+				// Copy content from HTML editor
+				try{
+					if (this.newItem) {
+						aItem.bodyType = "HTML";
+						aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+						this.newItem = false;
+					}
+					else if (aItem.bodyType === "HTML") {
+						aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+					}
+				} catch(err) {
+					dump("Error saving content\n");
+				}
 			}
-		} catch(err) {
-			dump("Error saving content\n");
 		}
 
 		if (this._oldCallback) {

From 4b462ee29dd2e2f02dabc9929e31012da98da795 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 7 Jun 2017 10:25:57 +0200
Subject: [PATCH 047/222] calendar-event-dialog.js: add EventListener in the
 bubbling phase instead of capture

This is to be sure to be called after the Lightening onLoad() listener.
---
 chrome/content/calendar-event-dialog.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index b90c3278..90ef80f5 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -311,5 +311,7 @@ exchangeEventDialog.prototype = {
 
 
 var exchToolsEventDialog = new exchangeEventDialog(document, window);
-window.addEventListener("load", function () { exchToolsEventDialog.onLoad(); }, true);
+
+// Add our loader to update dialog window with Exchange extra widgets if needed
+window.addEventListener("load", function () { exchToolsEventDialog.onLoad(); }, false);
 

From 5a66f0ad55625d87ec8124e9471d9f11ef6fcdb7 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 7 Jun 2017 10:27:50 +0200
Subject: [PATCH 048/222] calendar-event-dialog.js: remove code already
 contained in updateScreen method

---
 chrome/content/calendar-event-dialog.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 90ef80f5..75b0340d 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -265,21 +265,6 @@ exchangeEventDialog.prototype = {
 	 **/
 	onLoad: function _onLoad()
 	{
-		if (this._document.getElementById("exchWebService-body-editor")) {
-			this._document.getElementById("exchWebService-body-editor").setAttribute("scrollbars","yes");
-		}
-
- 		if (this._window.arguments[0].calendarEvent.calendar.type != "exchangecalendar") {
-			if (this._document.getElementById("item-description")) {
-				this._document.getElementById("item-description").hidden = false;
-			}
-
-			if (this._document.getElementById("exchWebService-body-editor")) {
-				this._document.getElementById("exchWebService-body-editor").hidden = true;
-			}
-
-			return;
-		}
 		// Update screen according to task / event
 		let item = this._window.calendarItem;
 		this.updateScreen(item, item.calendar);

From 371176e400f2db01de68c11fef432be1f81b7507 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 7 Jun 2017 11:20:34 +0200
Subject: [PATCH 049/222] global functions: fromText2HTML insert blank instead
 of "null"

---
 interfaces/global/mivFunctions.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/interfaces/global/mivFunctions.js b/interfaces/global/mivFunctions.js
index 1c75b889..c4e00028 100644
--- a/interfaces/global/mivFunctions.js
+++ b/interfaces/global/mivFunctions.js
@@ -879,7 +879,14 @@ mivFunctions.prototype = {
 
 	fromText2HTML: function _fromText2HTML(aString)
 	{
-		let parsedHtml = this.domParser.parseFromString(aString, 'text/html');
+		let parsedHtml = null;
+
+		if (!aString) {
+			aString = "";
+		}
+
+		parsedHtml = this.domParser.parseFromString(aString, 'text/html');
+
 		return this.xmlSerializer.serializeToString(parsedHtml);
 	},
 

From 25e0cf9e0128277bcbd30bf3a50603f550a49033 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 7 Jun 2017 11:21:19 +0200
Subject: [PATCH 050/222] exchWebServiceEditor: always parse content to HTML on
 external set

---
 chrome/content/exchWebServiceEditor.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 49cc344c..296dc576 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -216,7 +216,13 @@
 
 			}
 
-			this.atomService = Components.classes["@mozilla.org/atom-service;1"].getService(Components.interfaces.nsIAtomService);
+			this.atomService = Components.classes["@mozilla.org/atom-service;1"]
+				.getService(Components.interfaces.nsIAtomService);
+
+			// Set initial content to empty HTML body
+			this.globalFunctions = Components.classes["@1st-setup.nl/global/functions;1"]
+				.getService(Components.interfaces.mivFunctions);
+			this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(null);
 
 			this.connectButtons("FormatToolbar");
 			// Connect color button
@@ -248,7 +254,6 @@
 			this.editLinkFunction = function(){ self.editLink();};
 			var editLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
 			editLinkElement.addEventListener("click", this.editLinkFunction, true);
-
 		]]></constructor>
 
 		<destructor><![CDATA[
@@ -281,7 +286,7 @@
 			<setter>
 			  <![CDATA[
 				if (this.editorElement) {
-					this.editorElement.contentDocument.documentElement.innerHTML = val;
+					this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(val);
 				}
 			  ]]>
 			</setter>

From 60ea79dfd64fb86378e15ff5d3883e90f932693e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 7 Jun 2017 11:22:17 +0200
Subject: [PATCH 051/222] calendar-event-dialog.js: remove HTML content guess
 as editor correctly parse it now

---
 chrome/content/calendar-event-dialog.js | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 75b0340d..7eb1bfa1 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -151,26 +151,18 @@ exchangeEventDialog.prototype = {
 
 			// Set HTML content editor
 
-			// If item contains already HTML content, just use it
 			let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
-			if (item.bodyType
-				&& item.bodyType.toLowerCase() === "html") {
+
+			// Try to read directly item body, otherwise fallback to item description property
+			if (item.body) {
 				itemBodyEditor.content = item.body;
+
+				// As this dialog set the bodyType, we check it to know if it's a new Item or not
+				this.newItem = item.bodyType.toLowerCase() !== "html";
 			}
 			else {
-				// If bodyType is not defined or not HTML, the item is interpreted as a new one,
-				// because our accept call back explecitly set the bodyType and define it as HTML
-				this.newItem = true;
-
-				// If the body is already filled and it contains HTML, save it to our body editor directly
-				if (item.body
-					&& item.body.toLowerCase().indexOf("<body>") > -1) {
-					itemBodyEditor.content = item.body;
-				}
-				// Otherwise try to convert it
-				else {
-					itemBodyEditor.content = this.globalFunctions.fromText2HTML(item.getProperty("DESCRIPTION"));
-				}
+				this._newItem = true;
+				itemBodyEditor.content = item.getProperty("DESCRIPTION");
 			}
 
 			// Display HTML content editor

From b4da51ef92fa8b634646d733f2ffa5cdc4edf38c Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Wed, 7 Jun 2017 22:00:22 +0200
Subject: [PATCH 052/222] Bump version number to `4.0.0-beta2`

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index 8a0f7176..aa1fed07 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>4.0.0-beta1</em:version>
+    <em:version>4.0.0-beta2</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->

From 4276b2b45b51cbe092c6548cb636d960323e82af Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 8 Jun 2017 09:06:14 +0200
Subject: [PATCH 053/222] lightning-item-iframe: load only relevant CSS to
 avoid modify display of datetime picker

---
 chrome/content/lightning-item-iframe.xul | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
index 68480817..4d547e53 100644
--- a/chrome/content/lightning-item-iframe.xul
+++ b/chrome/content/lightning-item-iframe.xul
@@ -31,9 +31,7 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 
-<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messengercompose/messengercompose.css"?>
+<!-- CSS for the HTML content editor -->
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/itemBodyEditor.css"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
 

From a23964c602680ede92222a0788920806aef4a021 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 7 Jun 2017 16:27:04 +0200
Subject: [PATCH 054/222] attachment-view.js: update toolbar default items to
 latest Ligthning

Fix javascript code to:
 * avoid removing event listener
 * avoid using try/catch without need
 * avoid to reset current set of items, but instead add back attachment
   if not already in toolbar and url attachment is there
---
 chrome/content/attachments-view.js  | 38 +++++++++++++++++------------
 chrome/content/attachments-view.xul |  7 ++++--
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index da40f9e3..fbc7bca3 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -239,33 +239,41 @@ exchAttachments.prototype = {
 		var args = this._window.arguments[0];
 		var item = args.calendarEvent;
 
-		//this.globalFunctions.LOG("  -- onLoad 2 ("+this.globalFunctions.STACKshort()+")");
 		this.attachmentListboxVisible = false;
 
 		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
 			this.globalFunctions.LOG("  -- It is an Exchange Calendar event:"+item.title);
 
-			
-			try {
-				// Hide Lightning URL button 
-				this._document.getElementById("button-url").hidden = true;
-				this._document.getElementById("event-toolbar").setAttribute("currentset", "button-save,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete");
-				this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
-				if(this._document.getElementById("options-attachments-menuitem")){
+			let eventToolbar = this._document.getElementById("event-toolbar");
+
+			// If add url button was enabled, hidde it and show exchangecalendar attachment
+			this._document.getElementById("button-url").hidden = true;
+
+			let currentSet = eventToolbar.getAttribute("currentset");
+			if ( currentSet.indexOf("button-url") === 1
+					&& currentSet.indexOf("exchWebService-add-attachment-button") === -1 ) {
+				currentSet = currentSet + "exchWebService-add-attachment-button";
+			}
+
+			this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
+
+			if(this._document.getElementById("options-attachments-menuitem")){
 				this._document.getElementById("options-attachments-menuitem").setAttribute("label", this._document.getElementById("exchWebService-add-attachment-button").getAttribute("label"));
 				this._document.getElementById("options-attachments-menuitem").setAttribute("command", "exchWebService_addAttachmentDialog");
-				}
 			}
-			catch (ex) {this.globalFunctions.LOG("  -- Could not add exchange attachment buttons:"+ex.toString());}
 
 			// calendar-event-dialog (hide existing attachment view)
-			try {
-				this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", "true");
-			}
-			catch (ex) {}
+			this._document.getElementById("event-grid-attachment-row").collapsed = true;
 
 			this.addAttachmentsFromItem(item);
 		}
+		else {
+			this._document.getElementById("button-url").hidden = false;
+			this._document.getElementById("exchWebService-add-attachment-button").hidden = true;
+
+			this._document.getElementById("event-grid-attachment-row").collapsed = false ;
+		}
+
 	},
 
 	addAttachmentsFromItem: function _addAttachmentsFromItem(aItem)
@@ -584,6 +592,6 @@ exchAttachments.prototype = {
 }
 
 var tmpAttachment = new exchAttachments(document, window);
-window.addEventListener("load", function _onLoad() { window.removeEventListener("load",arguments.callee,false); tmpAttachment.onLoad(); }, true);
+window.addEventListener("load", function _onLoad() { tmpAttachment.onLoad(); }, false);
 
 
diff --git a/chrome/content/attachments-view.xul b/chrome/content/attachments-view.xul
index 9f47a7e2..3c02c581 100644
--- a/chrome/content/attachments-view.xul
+++ b/chrome/content/attachments-view.xul
@@ -87,10 +87,13 @@
 			disable-on-readonly="true"
 			removable="true"
 			command="exchWebService_addAttachmentDialog"
-			oncommand="tmpAttachment.addAttachmentDialog();" 
 			hidden="true"/>
 	</toolbarpalette>
-     <toolbar id="event-toolbar" defaultset="button-save,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete"> 
+
+	// Add exchangecalendar attachment button
+	// Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul
+     <toolbar id="event-toolbar"
+		defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
      </toolbar> 
  
 

From 8039656ab031aa9e95dbf6ce46aa0d95f0ad690e Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Wed, 7 Jun 2017 20:57:13 +0200
Subject: [PATCH 055/222] Fix code formatting

---
 chrome/content/attachments-view.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index fbc7bca3..418076b4 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -250,14 +250,14 @@ exchAttachments.prototype = {
 			this._document.getElementById("button-url").hidden = true;
 
 			let currentSet = eventToolbar.getAttribute("currentset");
-			if ( currentSet.indexOf("button-url") === 1
-					&& currentSet.indexOf("exchWebService-add-attachment-button") === -1 ) {
+			if (currentSet.indexOf("button-url") === 1
+					&& currentSet.indexOf("exchWebService-add-attachment-button") === -1) {
 				currentSet = currentSet + "exchWebService-add-attachment-button";
 			}
 
 			this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
 
-			if(this._document.getElementById("options-attachments-menuitem")){
+			if (this._document.getElementById("options-attachments-menuitem")) {
 				this._document.getElementById("options-attachments-menuitem").setAttribute("label", this._document.getElementById("exchWebService-add-attachment-button").getAttribute("label"));
 				this._document.getElementById("options-attachments-menuitem").setAttribute("command", "exchWebService_addAttachmentDialog");
 			}
@@ -266,14 +266,12 @@ exchAttachments.prototype = {
 			this._document.getElementById("event-grid-attachment-row").collapsed = true;
 
 			this.addAttachmentsFromItem(item);
-		}
-		else {
+		} else {
 			this._document.getElementById("button-url").hidden = false;
 			this._document.getElementById("exchWebService-add-attachment-button").hidden = true;
 
 			this._document.getElementById("event-grid-attachment-row").collapsed = false ;
 		}
-
 	},
 
 	addAttachmentsFromItem: function _addAttachmentsFromItem(aItem)

From 0a7a806c5c38eab98f5f23d4f56ebbee5df6c53f Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 8 Jun 2017 14:43:08 +0200
Subject: [PATCH 056/222] attachments-view.css: update icon to use the new svg
 toolbar icons

---
 chrome/skins/mac/attachments-view.css     | 34 +++++++++++------------
 chrome/skins/unix/attachments-view.css    | 28 +++++++------------
 chrome/skins/win/attachments-view.css     | 28 +++++++------------
 chrome/skins/winaero/attachments-view.css | 14 ++++++++--
 4 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/chrome/skins/mac/attachments-view.css b/chrome/skins/mac/attachments-view.css
index 0d849380..657c699a 100644
--- a/chrome/skins/mac/attachments-view.css
+++ b/chrome/skins/mac/attachments-view.css
@@ -1,22 +1,20 @@
-#exchWebService-add-attachment-button {
-	-moz-image-region: rect(0px 96px 24px 72px);
-}
-#exchWebService-add-attachment-button[disabled="true"],
-#exchWebService-add-attachment-button[disabled="true"]:hover {
-	-moz-image-region: rect(48px 96px 72px 72px);
-}
-#exchWebService-add-attachment-button:hover {
-	-moz-image-region: rect(24px 96px 48px 72px);
-}
+/*
+ * Should be synced with chrome://calendar/skin/calendar-event-dialog.css
+ * especially the #button-url rules (as it displays the attachment icon)
+ */
 
-toolbar[iconsize="small"] #exchWebService-add-attachment-button {
-	-moz-image-region: rect(0px 64px 16px 48px);
+@media not all and (-moz-mac-yosemite-theme) {
+  #exchWebService-add-attachment-button  {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#attach);
+  }
 }
-toolbar[iconsize="small"] #exchWebService-add-attachment-button[disabled="true"],
-toolbar[iconsize="small"] #exchWebService-add-attachment-button[disabled="true"]:hover {
-	-moz-image-region: rect(32px 64px 48px 48px);
-}
-toolbar[iconsize="small"] #exchWebService-add-attachment-button:hover {
-	-moz-image-region: rect(16px 64px 32px 48px);
+
+@media (-moz-mac-yosemite-theme) {
+  #exchWebService-add-attachment-button  {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
+  }
+
+toolbar[brighttext] #exchWebService-add-attachment-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach-inverted);
 }
 
diff --git a/chrome/skins/unix/attachments-view.css b/chrome/skins/unix/attachments-view.css
index 46bca3e1..fe664d63 100644
--- a/chrome/skins/unix/attachments-view.css
+++ b/chrome/skins/unix/attachments-view.css
@@ -1,21 +1,13 @@
-#exchWebService-add-attachment-button {
-	-moz-image-region: rect(0px 96px 24px 72px);
-}
-#exchWebService-add-attachment-button[disabled="true"],
-#exchWebService-add-attachment-button[disabled="true"]:hover {
-	-moz-image-region: rect(48px 96px 72px 72px);
-}
-#exchWebService-add-attachment-button:hover {
-	-moz-image-region: rect(24px 96px 48px 72px);
-}
+/*
+ * Should be synced with chrome://calendar/skin/calendar-event-dialog.css
+ * especially the #button-url rules (as it displays the attachment icon)
+ */
 
-toolbar[iconsize="small"] #exchWebService-add-attachment-button {
-	-moz-image-region: rect(0px 64px 16px 48px);
+#exchWebService-add-attachment-button  {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
 }
-toolbar[iconsize="small"] #exchWebService-add-attachment-button[disabled="true"],
-toolbar[iconsize="small"] #exchWebService-add-attachment-button[disabled="true"]:hover {
-	-moz-image-region: rect(32px 64px 48px 48px);
-}
-toolbar[iconsize="small"] #exchWebService-add-attachment-button:hover {
-	-moz-image-region: rect(16px 64px 32px 48px);
+
+toolbar[brighttext] #exchWebService-add-attachment-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach-inverted);
 }
+
diff --git a/chrome/skins/win/attachments-view.css b/chrome/skins/win/attachments-view.css
index 3267bb4c..fe664d63 100644
--- a/chrome/skins/win/attachments-view.css
+++ b/chrome/skins/win/attachments-view.css
@@ -1,21 +1,13 @@
-#exchWebService-add-attachment-button {
-	-moz-image-region: rect(0px 96px 24px 72px);
-}
-#exchWebService-add-attachment-button[disabled="true"],
-#exchWebService-add-attachment-button[disabled="true"]:hover {
-	-moz-image-region: rect(48px 96px 72px 72px);
-}
-#exchWebService-add-attachment-button:hover {
-	-moz-image-region: rect(24px 96px 48px 72px);
-}
+/*
+ * Should be synced with chrome://calendar/skin/calendar-event-dialog.css
+ * especially the #button-url rules (as it displays the attachment icon)
+ */
 
-toolbar[iconsize="small"] #exchWebService-add-attachment-button {
-	-moz-image-region: rect(0px 64px 16px 48px);
+#exchWebService-add-attachment-button  {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
 }
-toolbar[iconsize="small"] #exchWebService-add-attachment-button[disabled="true"],
-toolbar[iconsize="small"] #exchWebService-add-attachment-button[disabled="true"]:hover {
-	-moz-image-region: rect(32px 64px 48px 48px);
+
+toolbar[brighttext] #exchWebService-add-attachment-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach-inverted);
 }
-toolbar[iconsize="small"] #exchWebService-add-attachment-button:hover {
-	-moz-image-region: rect(16px 64px 32px 48px);
-}
\ No newline at end of file
+
diff --git a/chrome/skins/winaero/attachments-view.css b/chrome/skins/winaero/attachments-view.css
index 20ef7322..fe664d63 100644
--- a/chrome/skins/winaero/attachments-view.css
+++ b/chrome/skins/winaero/attachments-view.css
@@ -1,3 +1,13 @@
-#exchWebService-add-attachment-button {
-	-moz-image-region: rect(1px 71px 17px 55px);
+/*
+ * Should be synced with chrome://calendar/skin/calendar-event-dialog.css
+ * especially the #button-url rules (as it displays the attachment icon)
+ */
+
+#exchWebService-add-attachment-button  {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
 }
+
+toolbar[brighttext] #exchWebService-add-attachment-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach-inverted);
+}
+

From 6ebc2bfd1cd7fc32c22d05438b0cce5fa702e26c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 8 Jun 2017 14:45:53 +0200
Subject: [PATCH 057/222] attachments-view.dtd: update fr-FR locale for the
 attachment button

---
 locale/exchangecalendar/fr-FR/attachments-view.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/exchangecalendar/fr-FR/attachments-view.dtd b/locale/exchangecalendar/fr-FR/attachments-view.dtd
index 6c38e5ab..79b9022f 100644
--- a/locale/exchangecalendar/fr-FR/attachments-view.dtd
+++ b/locale/exchangecalendar/fr-FR/attachments-view.dtd
@@ -1,2 +1,2 @@
-<!ENTITY exchWebServie.add.attachment.button.label "Attachements">
+<!ENTITY exchWebServie.add.attachment.button.label "Pièces jointes">
 

From f0a9f24e6db2412a3f12281db3c5b0a10e7dcb74 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 8 Jun 2017 16:37:54 +0200
Subject: [PATCH 058/222] calendar-event-dialog.js/xul/dtd: replace all
 calendar-event-dialog

To reflect clearly the calendar event dialog has been moved to an iframe
by Lightning, we move all our stuff to the new name.
---
 chrome.manifest                               |  1 -
 chrome/content/calendar-event-dialog.xul      | 39 -------------------
 ...ent-dialog.js => lightning-item-iframe.js} |  0
 chrome/content/lightning-item-iframe.xul      | 11 ++++--
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 ...t-dialog.dtd => lightning-item-iframe.dtd} |  0
 12 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 chrome/content/calendar-event-dialog.xul
 rename chrome/content/{calendar-event-dialog.js => lightning-item-iframe.js} (100%)
 rename locale/exchangecalendar/de/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/en-US/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/fr-FR/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/ja-JP/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/nl/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/ru/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/sv/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)
 rename locale/exchangecalendar/tr/{calendar-event-dialog.dtd => lightning-item-iframe.dtd} (100%)

diff --git a/chrome.manifest b/chrome.manifest
index 18c63b4d..c48c8b9d 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -13,7 +13,6 @@ overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/conte
 overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
 overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecalendar/content/progress_panel.xul
 
-overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
 overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
 
 overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
deleted file mode 100644
index 75b54f26..00000000
--- a/chrome/content/calendar-event-dialog.xul
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * ## Exchange 2007/2010 Calendar and Tasks Provider.
- * ## For Thunderbird with the Lightning add-on.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/wordpress/?page_id=133
- * email: exchangecalendar@extensions.1st-setup.nl
- *
- *
- * This code uses parts of the Microsoft Exchange Calendar Provider code on which the
- * "Exchange Data Provider for Lightning" was based.
- * The Initial Developer of the Microsoft Exchange Calendar Provider Code is
- *   Andrea Bittau <a.bittau@cs.ucl.ac.uk>, University College London
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * ***** BEGIN LICENSE BLOCK *****/
--->
-
-<?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
-
-<overlay id="exchWebService-calendar-event-dialog.xul"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-</overlay>
diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/lightning-item-iframe.js
similarity index 100%
rename from chrome/content/calendar-event-dialog.js
rename to chrome/content/lightning-item-iframe.js
diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
index 4d547e53..581417a5 100644
--- a/chrome/content/lightning-item-iframe.xul
+++ b/chrome/content/lightning-item-iframe.xul
@@ -35,12 +35,15 @@
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/itemBodyEditor.css"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
 
+<!-- Attachment overlay -->
+<?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
+
 <!DOCTYPE dialog [
 
 <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
 
-<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/calendar-event-dialog.dtd" >
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/lightning-item-iframe.dtd" >
     %dtd1;
 ]>
 
@@ -48,7 +51,7 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- Manage special Exchange items and provide attendee speicific dialog -->
-    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
+    <script type="application/javascript" src="chrome://exchangecalendar/content/lightning-item-iframe.js"/>
 
     <!-- These rows correspond to the full form under the toolbar -->
     <rows id="event-grid-rows">
@@ -66,7 +69,7 @@
         <row id="event-grid-category-color-row">
             <hbox id="event-grid-category-box">
                 <menulist id="item-calendar"
-                    oncommand="exchToolsEventDialog.selectedCalendarChanged(this);" />
+                    oncommand="exchToolsEventDialog.selectedCalendarChanged(this); tmpAttachment.selectedCalendarChanged(this);" />
             </hbox>
         </row>
 
@@ -141,6 +144,8 @@
                     disable-on-readonly="true"
                     hidden="true"/>
             </tabpanel>
+
         </tabpanels>
     </tabbox>
+
 </overlay>
diff --git a/locale/exchangecalendar/de/calendar-event-dialog.dtd b/locale/exchangecalendar/de/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/de/calendar-event-dialog.dtd
rename to locale/exchangecalendar/de/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/en-US/calendar-event-dialog.dtd b/locale/exchangecalendar/en-US/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/calendar-event-dialog.dtd
rename to locale/exchangecalendar/en-US/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/fr-FR/calendar-event-dialog.dtd b/locale/exchangecalendar/fr-FR/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/calendar-event-dialog.dtd
rename to locale/exchangecalendar/fr-FR/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/ja-JP/calendar-event-dialog.dtd b/locale/exchangecalendar/ja-JP/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/calendar-event-dialog.dtd
rename to locale/exchangecalendar/ja-JP/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/nl/calendar-event-dialog.dtd b/locale/exchangecalendar/nl/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/calendar-event-dialog.dtd
rename to locale/exchangecalendar/nl/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/ru/calendar-event-dialog.dtd b/locale/exchangecalendar/ru/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/calendar-event-dialog.dtd
rename to locale/exchangecalendar/ru/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/sv/calendar-event-dialog.dtd b/locale/exchangecalendar/sv/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/calendar-event-dialog.dtd
rename to locale/exchangecalendar/sv/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/tr/calendar-event-dialog.dtd b/locale/exchangecalendar/tr/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/calendar-event-dialog.dtd
rename to locale/exchangecalendar/tr/lightning-item-iframe.dtd

From ac8805647b4a6b9156be38eb6e72f511554581a4 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 8 Jun 2017 16:42:10 +0200
Subject: [PATCH 059/222] attachment-view.xul: overlay correctly updates window
 menu and context menu

Tabs have been replaced by spaces too as most of the file where replaced
too.
---
 chrome/content/attachments-view.xul | 72 ++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/chrome/content/attachments-view.xul b/chrome/content/attachments-view.xul
index 3c02c581..2c8c24fd 100644
--- a/chrome/content/attachments-view.xul
+++ b/chrome/content/attachments-view.xul
@@ -47,20 +47,56 @@
 <overlay id="exchWebService-attachment-view"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/attachments-view.js"/> 
+    <script type="application/javascript" src="chrome://exchangecalendar/content/attachments-view.js"/>
 
     <!-- Commands -->
     <commandset id="itemCommands">
         <command id="exchWebService_openAttachment"
-                 oncommand="tmpAttachment.openAttachment();"/> 
+                 oncommand="tmpAttachment.openAttachment();"/>
         <command id="exchWebService_saveAttachment"
-                 oncommand="tmpAttachment.saveAttachment();"/> 
+                 oncommand="tmpAttachment.saveAttachment();"/>
         <command id="exchWebService_deleteAttachment"
-                 oncommand="tmpAttachment.deleteAttachment();"/> 
-	<command id="exchWebService_addAttachmentDialog"
-		 oncommand="tmpAttachment.addAttachmentDialog();"/>
+                 oncommand="tmpAttachment.deleteAttachment();"/>
+        <command id="exchWebService_addAttachmentDialog"
+                 oncommand="tmpAttachment.addAttachmentDialog();"/>
     </commandset>
 
+    <!-- Update windows menu -->
+    <toolbox id="event-toolbox">
+        <menubar id="event-menubar">
+            <menu id="options-menu">
+                <menupopup id="options-menupopup">
+                    <menu removeelement="true" id="options-attachments-menu" />
+
+                    <menuitem id="exchWebService-options-attachments"
+                              insertafter="options-attendees-menuitem"
+                              label="&exchWebServie.add.attachment.button.label;"
+                              command="exchWebService_addAttachmentDialog" />
+                </menupopup>
+            </menu>
+        </menubar>
+    </toolbox>
+
+    <!-- Update toolbar -->
+    <toolbarpalette id="event-toolbarpalette">
+        <toolbarbutton id="exchWebService-add-attachment-button"
+            mode="dialog"
+            class="cal-event-toolbarbutton toolbarbutton-1"
+            label="&exchWebServie.add.attachment.button.label;"
+            disable-on-readonly="true"
+            removable="true"
+            command="exchWebService_addAttachmentDialog"
+            hidden="true"/>
+    </toolbarpalette>
+
+    // Add exchangecalendar attachment button
+    // Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul
+     <toolbar id="event-toolbar"
+        defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
+     </toolbar>
+
+
+    <!-- Update context popup-->
     <popupset id="event-dialog-popupset">
       <menupopup id="exchWebService-attachment-popup">
             <menuitem id="exchWebService-attachment-popup-open"
@@ -74,29 +110,13 @@
             <menuitem id="exchWebService-attachment-popup-delete"
                       label="&event.menu.item.delete.label;"
                       accesskey="&event.menu.item.delete.accesskey;"
-			disable-on-readonly="true"
+                      disable-on-readonly="true"
                       command="exchWebService_deleteAttachment"/>
       </menupopup>
     </popupset>
- 
-        <toolbarpalette id="event-toolbarpalette">
-		<toolbarbutton id="exchWebService-add-attachment-button" 
-			mode="dialog"
-			class="cal-event-toolbarbutton toolbarbutton-1"
-			label="&exchWebServie.add.attachment.button.label;"
-			disable-on-readonly="true"
-			removable="true"
-			command="exchWebService_addAttachmentDialog"
-			hidden="true"/>
-	</toolbarpalette>
 
-	// Add exchangecalendar attachment button
-	// Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul
-     <toolbar id="event-toolbar"
-		defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
-     </toolbar> 
- 
+    <!-- Modify context menu for the attachment list inside the "Attachment" panel -->
+    <listbox id="attachment-link"
+             context="exchWebService-attachment-popup"/>
 
 </overlay>
-
-

From fdce77ed5014174afab03f37a671c7e1cf104785 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 9 Jun 2017 14:37:34 +0200
Subject: [PATCH 060/222] calendar-event-dialog.xul/.js: create again these
 files to manage window menu and toolbar

Now that the main dialog is included in an iframe, we have to communicate
with the iframe from the parent to give to the iframe the good commands.

The structure of sendMessage/receiveMessage come from the Lightning project.
Especially the sendMessage() function which send command with the good event id
(needed for tab view).
---
 chrome.manifest                          |  1 +
 chrome/content/calendar-event-dialog.js  | 59 ++++++++++++++++++++++
 chrome/content/calendar-event-dialog.xul | 62 ++++++++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 chrome/content/calendar-event-dialog.js
 create mode 100644 chrome/content/calendar-event-dialog.xul

diff --git a/chrome.manifest b/chrome.manifest
index c48c8b9d..18c63b4d 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -13,6 +13,7 @@ overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/conte
 overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
 overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecalendar/content/progress_panel.xul
 
+overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
 overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
 
 overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
new file mode 100644
index 00000000..8695b604
--- /dev/null
+++ b/chrome/content/calendar-event-dialog.js
@@ -0,0 +1,59 @@
+var Cu = Components.utils;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function exchCalendarEventDialog(aDocument, aWindow)
+{
+	this._document = aDocument;
+	this._window = aWindow;
+
+	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+				.getService(Ci.mivFunctions);
+}
+
+exchCalendarEventDialog.prototype = {
+
+	/*
+	 * setup menu window and button toolbars when editing an Exchange item
+	 */
+	onLoad: function _onLoad()
+	{
+		let args = this._window.arguments[0];
+		let item = args.calendarEvent;
+
+		// We can't update toolbar from iframe
+		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
+
+			let eventToolbar = this._document.getElementById("event-toolbar");
+
+			// If the standard add url button was enabled, hidde it and show exchangecalendar attachment
+			let currentSet = eventToolbar.getAttribute("currentset");
+			if (currentSet.indexOf("button-url") === 1
+					&& currentSet.indexOf("exchWebService-add-attachment-button") === -1) {
+				currentSet = currentSet.replace("button-url", "exchWebService-add-attachment-button");
+			}
+
+			// Switch toolbar buttons display
+			this._document.getElementById("button-url").hidden = true;
+			this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
+
+			// Switch window menu display
+			this._document.getElementById("options-attachments-menu").collapsed = true;
+			this._document.getElementById("exchWebService-options-attachments").collapsed = false;
+
+		} else {
+			// Switch toolbar buttons display
+			this._document.getElementById("button-url").hidden = false;
+			this._document.getElementById("exchWebService-add-attachment-button").hidden = true;
+
+			// Switch window menu display
+			this._document.getElementById("options-attachments-menu").collapsed = false;
+			this._document.getElementById("exchWebService-options-attachments").collapsed = true;
+		}
+	},
+}
+
+var ewsCalendarEventDialog = new exchCalendarEventDialog(document, window);
+window.addEventListener("load", function () { ewsCalendarEventDialog.onLoad(); }, false);
diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
new file mode 100644
index 00000000..cef7fb5d
--- /dev/null
+++ b/chrome/content/calendar-event-dialog.xul
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE dialog [
+    <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
+    %eventDialogDTD;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/attachments-view.dtd" >
+    %dtd1;
+]>
+
+<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/attachments-view.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
+
+
+<overlay id="exchWebService-calendar-event-dialog"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
+
+    <!-- Commands -->
+    <commandset id="itemCommands">
+        <command id="exchWebService_addAttachmentDialog"
+                 oncommand='sendMessage( {command: "exchWebService_addAttachmentDialog"} );'/>
+    </commandset>
+
+    <!-- Update windows menu -->
+    <toolbox id="event-toolbox">
+        <menubar id="event-menubar">
+            <menu id="options-menu">
+                <menupopup id="options-menupopup">
+                    <menu id="options-attachments-menu"
+                          collapsed="false" />
+
+                    <menuitem id="exchWebService-options-attachments"
+                              insertafter="options-attendees-menuitem"
+                              label="&exchWebServie.add.attachment.button.label;"
+                              command="exchWebService_addAttachmentDialog"
+                              collapsed="true" />
+                </menupopup>
+            </menu>
+        </menubar>
+    </toolbox>
+
+    <!-- Update toolbar -->
+    <toolbarpalette id="event-toolbarpalette">
+        <toolbarbutton id="exchWebService-add-attachment-button"
+            mode="dialog"
+            class="cal-event-toolbarbutton toolbarbutton-1"
+            label="&exchWebServie.add.attachment.button.label;"
+            disable-on-readonly="true"
+            removable="true"
+            command="exchWebService_addAttachmentDialog"
+            hidden="true"/>
+    </toolbarpalette>
+
+    <!-- Add exchangecalendar attachment button
+         Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul -->
+     <toolbar id="event-toolbar"
+        defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
+     </toolbar>
+
+</overlay>

From 25dcd7bcfe17f241ced7c7fcc895396c71e2867e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 9 Jun 2017 14:41:04 +0200
Subject: [PATCH 061/222] event-dialog: modify scripts inside the iframe to be
 able to receive commands

from parent using the receiveMessage() function.
---
 chrome/content/attachments-view.js      | 30 +++++++++++++++++++++++--
 chrome/content/lightning-item-iframe.js | 22 +++++++++++++++++-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index 418076b4..c08c8ed4 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -44,6 +44,7 @@ function exchAttachments(aDocument, aWindow)
 }
 
 exchAttachments.prototype = {
+	_initialized: false,
 
 	addAttachmentDialog: function _addAttachmentDialog()
 	{
@@ -227,14 +228,34 @@ exchAttachments.prototype = {
 		}
 	},
 
+	/**
+	 * Receives asynchronous messages from the parent context that contains the iframe.
+	 *
+	 * @param {MessageEvent} aEvent  Contains the message being received
+	 */
+	receiveMessage: function _receiveMessage(aEvent) {
+		let validOrigin = gTabmail ? "chrome://messenger" : "chrome://calendar";
+		if (aEvent.origin !== validOrigin) {
+			return;
+		}
+		switch (aEvent.data.command) {
+			case "exchWebService_addAttachmentDialog": this.addAttachmentDialog(); break;
+		}
+	},
+
 	onLoad: function _onLoad()
 	{
+		if(this._initialized){
+			return;
+		}
+
+		var self = this;
+
 		if (this._document.getElementById("calendar-task-tree")) {
 			this.globalFunctions.LOG("  -- calendar-task-tree --");
-			var self = this;
 			this._document.getElementById("calendar-task-tree").addEventListener("select", function(){ self.onSelectTask();}, true);
 			return;
-		} 
+		}
 
 		var args = this._window.arguments[0];
 		var item = args.calendarEvent;
@@ -272,6 +293,11 @@ exchAttachments.prototype = {
 
 			this._document.getElementById("event-grid-attachment-row").collapsed = false ;
 		}
+
+		// Add message listener to be able to receive message from parent window or tab
+		window.addEventListener("message", function(aEvent) { self.receiveMessage(aEvent); }, false);
+
+		this._initialized = true;
 	},
 
 	addAttachmentsFromItem: function _addAttachmentsFromItem(aItem)
diff --git a/chrome/content/lightning-item-iframe.js b/chrome/content/lightning-item-iframe.js
index 7eb1bfa1..0d73a6b5 100644
--- a/chrome/content/lightning-item-iframe.js
+++ b/chrome/content/lightning-item-iframe.js
@@ -250,6 +250,22 @@ exchangeEventDialog.prototype = {
 		}
 	},
 
+
+	/**
+	 * Receives asynchronous messages from the parent context that contains the iframe.
+	 *
+	 * @param {MessageEvent} aEvent  Contains the message being received
+	 */
+	receiveMessage: function _receiveMessage(aEvent) {
+		let validOrigin = gTabmail ? "chrome://messenger" : "chrome://calendar";
+		if (aEvent.origin !== validOrigin) {
+			return;
+		}
+		switch (aEvent.data.command) {
+			//case "exchWebService_addAttachmentDialog": this.addAttachmentDialog(); break;
+		}
+	},
+
 	/*
 	 * onLoad: setup event dialog window
 	 * - Update screen according to type of item (task / event)
@@ -265,13 +281,17 @@ exchangeEventDialog.prototype = {
 			return;
 		}
 
+		var self = this;
+
 		// Override dialog callback to add extra exchangecalendar information processing
 		this._oldCallback = this._window.onAcceptCallback;
-		var self = this;
 		this._window.onAcceptCallback = function(aItem, aCalendar, aOriginalItem, aIsClosing) {
 			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
 		};
 
+		// Add message listener to be able to receive message from parent window or tab
+		window.addEventListener("message", function(aEvent) { self.receiveMessage(aEvent); }, false);
+
 		this._initialized = true;
 	},
 

From c2889a90762aa8dde454f6eafce5a3224dae55a5 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 9 Jun 2017 14:44:53 +0200
Subject: [PATCH 062/222] attachment-view: remove all code which update window
 menu and toolbar

As window menu and toolbar belong to the parent, the inner iframe can't
modify them.
---
 chrome/content/attachments-view.js  | 18 +------------
 chrome/content/attachments-view.xul | 41 -----------------------------
 2 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index c08c8ed4..fc6dfc30 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -262,34 +262,18 @@ exchAttachments.prototype = {
 
 		this.attachmentListboxVisible = false;
 
+		// We can't update toolbar from iframe
 		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
 			this.globalFunctions.LOG("  -- It is an Exchange Calendar event:"+item.title);
 
-			let eventToolbar = this._document.getElementById("event-toolbar");
-
-			// If add url button was enabled, hidde it and show exchangecalendar attachment
-			this._document.getElementById("button-url").hidden = true;
-
-			let currentSet = eventToolbar.getAttribute("currentset");
-			if (currentSet.indexOf("button-url") === 1
-					&& currentSet.indexOf("exchWebService-add-attachment-button") === -1) {
-				currentSet = currentSet + "exchWebService-add-attachment-button";
 			}
 
-			this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
-
-			if (this._document.getElementById("options-attachments-menuitem")) {
-				this._document.getElementById("options-attachments-menuitem").setAttribute("label", this._document.getElementById("exchWebService-add-attachment-button").getAttribute("label"));
-				this._document.getElementById("options-attachments-menuitem").setAttribute("command", "exchWebService_addAttachmentDialog");
-			}
 
 			// calendar-event-dialog (hide existing attachment view)
 			this._document.getElementById("event-grid-attachment-row").collapsed = true;
 
 			this.addAttachmentsFromItem(item);
 		} else {
-			this._document.getElementById("button-url").hidden = false;
-			this._document.getElementById("exchWebService-add-attachment-button").hidden = true;
 
 			this._document.getElementById("event-grid-attachment-row").collapsed = false ;
 		}
diff --git a/chrome/content/attachments-view.xul b/chrome/content/attachments-view.xul
index 2c8c24fd..67525a18 100644
--- a/chrome/content/attachments-view.xul
+++ b/chrome/content/attachments-view.xul
@@ -57,45 +57,8 @@
                  oncommand="tmpAttachment.saveAttachment();"/>
         <command id="exchWebService_deleteAttachment"
                  oncommand="tmpAttachment.deleteAttachment();"/>
-        <command id="exchWebService_addAttachmentDialog"
-                 oncommand="tmpAttachment.addAttachmentDialog();"/>
     </commandset>
 
-    <!-- Update windows menu -->
-    <toolbox id="event-toolbox">
-        <menubar id="event-menubar">
-            <menu id="options-menu">
-                <menupopup id="options-menupopup">
-                    <menu removeelement="true" id="options-attachments-menu" />
-
-                    <menuitem id="exchWebService-options-attachments"
-                              insertafter="options-attendees-menuitem"
-                              label="&exchWebServie.add.attachment.button.label;"
-                              command="exchWebService_addAttachmentDialog" />
-                </menupopup>
-            </menu>
-        </menubar>
-    </toolbox>
-
-    <!-- Update toolbar -->
-    <toolbarpalette id="event-toolbarpalette">
-        <toolbarbutton id="exchWebService-add-attachment-button"
-            mode="dialog"
-            class="cal-event-toolbarbutton toolbarbutton-1"
-            label="&exchWebServie.add.attachment.button.label;"
-            disable-on-readonly="true"
-            removable="true"
-            command="exchWebService_addAttachmentDialog"
-            hidden="true"/>
-    </toolbarpalette>
-
-    // Add exchangecalendar attachment button
-    // Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul
-     <toolbar id="event-toolbar"
-        defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
-     </toolbar>
-
-
     <!-- Update context popup-->
     <popupset id="event-dialog-popupset">
       <menupopup id="exchWebService-attachment-popup">
@@ -115,8 +78,4 @@
       </menupopup>
     </popupset>
 
-    <!-- Modify context menu for the attachment list inside the "Attachment" panel -->
-    <listbox id="attachment-link"
-             context="exchWebService-attachment-popup"/>
-
 </overlay>

From 2132ce90a8119d75bd00bd8e592e679b0aa1c032 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 9 Jun 2017 14:46:38 +0200
Subject: [PATCH 063/222] attachments-view: fix context menu on attachment list

---
 chrome/content/attachments-view.js  | 21 ++++++++++++++++++---
 chrome/content/attachments-view.xul |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index fc6dfc30..fc4d8133 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -266,16 +266,31 @@ exchAttachments.prototype = {
 		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
 			this.globalFunctions.LOG("  -- It is an Exchange Calendar event:"+item.title);
 
+			if (this._document.getElementById("event-grid-attachment-row")) {
+				this._document.getElementById("event-grid-attachment-row").collapsed = true;
 			}
 
+			// Modify context menu for the attachment list inside the "Attachment" panel
+			let attachmentListbox = this._document.getElementById("attachment-link");
 
-			// calendar-event-dialog (hide existing attachment view)
-			this._document.getElementById("event-grid-attachment-row").collapsed = true;
+			attachmentListbox.context = "exchWebService-attachment-popup" ;
+			attachmentListbox.onkeypress = function (aEvent) { self.onKeyPress(aEvent);  };
+			attachmentListbox.onclick = function (aEvent) { self.onSelect(aEvent);  };
+			attachmentListbox.ondblclick = function (aEvent) { self.onDblClick(aEvent); };
 
 			this.addAttachmentsFromItem(item);
 		} else {
+			if (this._document.getElementById("event-grid-attachment-row")) {
+				this._document.getElementById("event-grid-attachment-row").collapsed = false;
+			}
+
+			// Modify context menu for the attachment list inside the "Attachment" panel
+			let attachmentListbox = this._document.getElementById("attachment-link");
 
-			this._document.getElementById("event-grid-attachment-row").collapsed = false ;
+			attachmentListbox.context = "attachment-popup" ;
+			attachmentListbox.onkeypress="attachmentLinkKeyPress(event)" ;
+			attachmentListbox.onclick="attachmentClick(event);" ;
+			attachmentListbox.ondblclick="attachmentDblClick(event)" ;
 		}
 
 		// Add message listener to be able to receive message from parent window or tab
diff --git a/chrome/content/attachments-view.xul b/chrome/content/attachments-view.xul
index 67525a18..79d2235b 100644
--- a/chrome/content/attachments-view.xul
+++ b/chrome/content/attachments-view.xul
@@ -50,7 +50,7 @@
     <script type="application/javascript" src="chrome://exchangecalendar/content/attachments-view.js"/>
 
     <!-- Commands -->
-    <commandset id="itemCommands">
+    <commandset>
         <command id="exchWebService_openAttachment"
                  oncommand="tmpAttachment.openAttachment();"/>
         <command id="exchWebService_saveAttachment"

From e8ca1a81a938d253342d8aa6372f17476d060fcb Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sat, 10 Jun 2017 12:35:05 +0200
Subject: [PATCH 064/222] Improve changelog formatting and add information
 about 4.0.0-beta2

---
 history.en_US.txt => CHANGELOG.md | 239 +++++++++++++++---------------
 1 file changed, 123 insertions(+), 116 deletions(-)
 rename history.en_US.txt => CHANGELOG.md (86%)

diff --git a/history.en_US.txt b/CHANGELOG.md
similarity index 86%
rename from history.en_US.txt
rename to CHANGELOG.md
index 50148f82..4b79ce2b 100644
--- a/history.en_US.txt
+++ b/CHANGELOG.md
@@ -1,9 +1,16 @@
-Version 3.7.0:
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [4.0.0-beta2] - 2017-06-10
+### Fixed
+- Opening and working with Attachment dialog #12
+
+## [3.7.0] - unknown release date
 - d1b2860 (origin/master, origin/HEAD, master) revert calendar-event-dialog
 - df713f4 Merge pull request #458 from enozkan/patch-5
 - 180e91a Update preferences.dtd for Turkish locale
 
-Version 3.6.0:
+## [3.6.0] - unknown release date
 - a2a50be strict mode error fix
 - 5db3c8d task sync and strict mode error fix
 - 16d56bf translation for preference password fix
@@ -26,14 +33,14 @@ Version 3.6.0:
 - 3f9de40 string not translatable #409
 - 9a82408 its good to have xpi filename with 'v' preceeding the version
 
-Version 3.5.0:
+## [3.5.0] - unknown release date
 - Fix Thunderbird hangs on startup
 - Fix Be more defensive about terminating the loop: under some circumstances startYearDay (and I presume startYear) can be greater than endYear[Day] on entry to the loop.
 - Fix Reword log, Bug #373 "Incorrect exhortationto MAIL THIS LINE TO ..."
 - Fix Bug #371 "Cannot add custom reminder (alarm) to an event ..."
 - Fix Lightning 4.0.2.1
 
-Version 3.4.0:
+## [3.4.0] - unknown release date
 - New Support Extended to Lightning 4.0.0.1
 - New Support Extended to Thunderbird 38.*
 - New EWS Tagger - Feature
@@ -74,10 +81,10 @@ Version 3.4.0:
 - Change Platform based CSS thanks to git-hub user  "@mariolorenz"
 - Change Clear Logging.
 
-Version 3.3.2:
+## [3.3.2] - unknown release date
 - Bug fix release
 
-Version 3.3.1:
+## [3.3.1] - unknown release date
 - New     New Column for invite mail in message list pane
 - New     Support for Thunderbird Nightly Aurora 38.0+
 - New     Locale improved
@@ -98,7 +105,7 @@ Version 3.3.1:
 - Fixed  Breaking other add on columns in message list pane
 - Fixed  UX error when saving Out of Office 
 
-Version 3.2.0:
+## [3.2.0] - unknown release date
 - changed add-on name to "Exchange EWS Provider" as it is shorter than including all the exchange versions it can connect to.
 - Fixes bug where sometimes the date/time is shifted on Free/busy info in calendar of someone else.
 - Added preference userAgent. User can now specify their own userAgent string to use in communication.
@@ -117,36 +124,36 @@ Version 3.2.0:
 - Fixed problem where offline cache became out of sync.
 - You can click on links in the description text of invitation and read-only events/tasks
 
-Version 3.2.0-Beta20:
+## [3.2.0-Beta20] - unknown release date
 - Fixed Bug 276 - Duplicate entries, wrong hours and sometimes missing entries when viewving other calendars
 
-Version 3.2.0-Beta16:
+## [3.2.0-Beta16] - unknown release date
 - Fixed Bug 273 - Tmezone in US or Canada triggers XML error and results in HTTP 400 Bad Request.
 
-Version 3.2.0-Beta14:
+## [3.2.0-Beta14] - unknown release date
 - Received new German translation from Björn Töpper.
 - Fixed some small outstanding bugs which will get mentioned when I release the final version.
 
-Version 3.2.0-Beta11:
+## [3.2.0-Beta11] - unknown release date
 - Bug 267 - Problem with upgrade from 3.1.2-bug175-3 to 3.2.0-Beta10
 
-Version 3.2.0-Beta10:
+## [3.2.0-Beta10] - unknown release date
 - Fixed problem where the add-on would not show events and task against an Exchange2013 server.
 - Changed the title of the add-on to "Exchange 2007/2010/2013 Calendar, Tasks, Contacts and GAL Provider"
 - Started work on improving the progress tooltip info.
 - Fixes bug 162 Changing recurring meeting to Wednesdays, moved it to Thursday
 
-Version 3.2.0-Beta9:
+## [3.2.0-Beta9] - unknown release date
 - Introduced loading/showing image when one is available for a contact (addressbook). Only works starting from Exchange server 2010_SP2
 - Fixes a bug where creation of new tasks and Event was not possible since Beta8.
 - Finalized autocompletion. Depending on the connetion speed with the exchange server it can take some time to fill the autocomplete list.
 
-Version 3.2.0-Beta8:
+## [3.2.0-Beta8] - unknown release date
 - Introduced an icon which shows connection status to the exchange server.
 - Introduced autocompletion. It works but could use some refinement.
 - Improved CPU load when the add-on has problems connecting to the exchange server .
 
-Version 3.2.0-Beta6:
+## [3.2.0-Beta6] - unknown release date
 - Improved copying between exchange calendars and non exchange calendars.
 - Fixed snooze/dismiss reminder problems for events and tasks.
 - Improved UI scripts used in XUL.
@@ -157,13 +164,13 @@ Version 3.2.0-Beta6:
 - Fixes Bug 253 - Import Calendar into Exchange Calendar / copy calendar items from one to another
 - Fixes Bug 252 - Internal server error on reminder dismissal
 
-Version 3.2.0-Beta5:
+## [3.2.0-Beta5] - unknown release date
 - Fixed working with attachments lists in the different views/dialogs/panes
 - Customized settings reminders on events and tasks according to what is possible in Exchange.
 - Fixes Bug 255 - Complete state of tasks not working in today pane
 - Fixes Bug 256 - Set custom reminder on task created in outlook without due or entry date not possible
 
-Version 3.2.0-Beta4:
+## [3.2.0-Beta4] - unknown release date
 - Split mivExchangeEvent object into mivExchangeEvent and mivExchangeBaseItem. As preparation for mivExchangeTodo.
 - Improved the conversion from Exchange Timezone to Lightning timezone and from Lightning timezone to Exchange timezone.
 - Added the Exchange task/todo detail fields. Lightning does not known about the by default.
@@ -174,7 +181,7 @@ Version 3.2.0-Beta4:
 - Fixes Bug 235 - Try to set a task due date aways sets the current date time
 - Fixes Bug 250 - No tasks with current 3.2.0 beta
 
-Version 3.2.0-Beta3:
+## [3.2.0-Beta3] - unknown release date
 - Fixes Bug 150 - Dismissing reminders asks to send update for meeting
 - Fixes Bug 180 - NTLM and Kerberos fail
 - Fixes bug 229 - Creating a custom repeating event - creates event on following day
@@ -184,19 +191,19 @@ Version 3.2.0-Beta3:
 - Moved exchangecalendar object into it's own interface.
 - Create our own recurrenceInfo object/interface.
 
-Version 3.2.0-Beta2:
+## [3.2.0-Beta2] - unknown release date
 - Fixes bug 241 -  Autodiscover RedirectAddr not followed
 
-Version 3.2.0-Beta1:
+## [3.2.0-Beta1] - unknown release date
 - Added own ExchangeEvent Interface. With this creation of items from cache or exchange server should be faster.
 - Converted handling of timezones to own interface. 
 - Timezone of Lightning events are set to those of Exchange. As close as possible because the timezone databases between Exchange and Lighting are not the same.
 - Added new SOAP Autodiscovery functionality which is supported since Exchange2010. It will use this when available.
 
-Version 3.1.102:
+## [3.1.102] - unknown release date
 - Fixes bug 226: No more than 20 contacts are shown.
 
-Version 3.1.99:
+## [3.1.99] - unknown release date
 - Fixes Bug 212 - version >= 3.x leaks memory
 - Fixes Bug 211 - 3.1.2 breaks login (3.1.1 working)
 - Fixes Bug 188 - Adding a new Exchange 2010 EWS Calendar via add-on goes into an infinite password prompt loop
@@ -206,118 +213,118 @@ Version 3.1.99:
 - Fixes Bug 157 - Infinity Loope for Password/Username
 - Fixes Bug 143 - The adding uses wrong folder and does not fetch contacts
 
-Version 3.1.2:
+## [3.1.2] - unknown release date
 - Fixed bug 175: After 10 calendars the jobs will hang up
 - Fixed bug 201: Number of Jobs displayed in status bar is negative
 - Added new loadbalancer for request to Exchange servers. You can now control the simultaneous request to the exchange server.
 - Created new interface for the global functions.
 - Added extra info to progress indicator. It now also uses the new loadbalancer for the statistics.
 
-Version 3.1.1:
+## [3.1.1] - unknown release date
 - Fixed bug 205 Extension overwrites URI for non-exchange calendars
 
-Version 3.1.0:
+## [3.1.0] - unknown release date
 - Fixed part of bug51. When emailaddress of attendee is empty do not throw an error.
 - Fixed: Bug where removal of last attachment was not possible.
 - Enhancement: Startup of Thunderbird has been improved.
 - Fixed problem when turning off and on offlineCache.
 
-Version 3.0.2:
+## [3.0.2] - unknown release date
 - Minor bug fix.
 
-Version 3.0.1:
+## [3.0.1] - unknown release date
 - Fixed bug 196: Version 3.0.0-rc3 seems to interfere with address autocompletion
 - Fixed bug 204: Thunderbird hangs when creating a new item with attachment
 - Added automatic update functionality. This will check the developer website for new versions and give the change to autmoatically install it. 
 
-Version 3.0.0:
+## [3.0.0] - unknown release date
 - Removed all references to e4x
 - Removed some bugs and stabilized the code.
 
-Version 3.0.0-rc4:
+## [3.0.0-rc4] - unknown release date
 - Add Japanese translation.
 - Added fix for new chunked message responses from Exchange server.
 
-Version 3.0.0-rc3:
+## [3.0.0-rc3] - unknown release date
 - Optimized the code to improve speed.
 
-Version 3.0.0-rc2:
+## [3.0.0-rc2] - unknown release date
 - Optimized the xml handling code so startup and other communications are faster.
 
-Version 3.0.0-rc1:
+## [3.0.0-rc1] - unknown release date
 - Converted last part, editing of tasks, from e4x to xml2jxon.
 
-Version 3.0.0-beta4:
+## [3.0.0-beta4] - unknown release date
 - Fixed problem where a reminder change (dismiss or new time) was not saved to exchange.
 
-Version 3.0.0-beta3:
+## [3.0.0-beta3] - unknown release date
 - Fixed bug 182: Reoccuring Events keep popping up in reminder.
 
-Version 3.0.0-beta2:
+## [3.0.0-beta2] - unknown release date
 - Fixed two parts which were not yet converted. Editing of tasks still to do.
 
-Version 3.0.0-beta:
+## [3.0.0-beta] - unknown release date
 - Complete rewrite of all xml handling stuff from using e4x to the new xmlToJxon object.
 
-Version 2.2.3:
+## [2.2.3] - unknown release date
 - Fixed: bug 176 - Calendars whose names contains a slash can't be opened
 
-Version 2.2.2:
+## [2.2.2] - unknown release date
 - Fixed: bug 160 - Meeting invitation received does not get added after accepting
 
-Version 2.2.1:
+## [2.2.1] - unknown release date
 - Fixed bug when closing TB the offline cache would be emptyed.
 - Fixed: Bug 161 - pb accessing calendars
 
-Version 2.2.0:
+## [2.2.0] - unknown release date
 - Fixed complaint of ad-on checker.
 - Fixed bug of cloning a calendar showed empty fields.
 
-Version 2.1.4:
+## [2.1.4] - unknown release date
 - Fixed: "Unresponsive script" bug.
 
-Version 2.1.3:
+## [2.1.3] - unknown release date
 - Fixed: Bug 52 - Incorrect sync: random calendar events missing, others duplicated
 
-Version 2.1.2:
+## [2.1.2] - unknown release date
 -Fixed: Bug 118 - Kerberos authentication broken in 1.8.11
 
-Version 2.1.1:
+## [2.1.1] - unknown release date
 - Fixed: Bug 151 - Email id property of exchange calendar becomes None on updating thunderbird to 13.0
 - Fixed: Bug 153 - "allday" event -> invite someone -> password request -> communication stopped
 - Improved: Disabled calendars are not started on TB startup.
 - Fixed: The way a calendar startup after is has been created newly.
 
-Version 2.1.0:
+## [2.1.0] - unknown release date
 - Fixed filtering of events
 - Fixed saving of the EWS settings.
 - Fixed calendarReset.
 - Improved getItems function.
 
-Version 2.0.5:
+## [2.0.5] - unknown release date
 - Added: Processing of getItemsFromOfflineCache into a seperate thread.
 - Fixed: Problem when turning on offline cache this would only start after restarting TB. 
 
-Version 2.0.4:
+## [2.0.4] - unknown release date
 - Fixed: bug with reminders in offline cache.
 - Added: Extra dialog when answering an invitation.
 
-Version 2.0.2:
+## [2.0.2] - unknown release date
 - Improved: Further improved Offline cache items retrieval.
 - Fixed: Bug when receiving a HTTP 302 relative redirect. Because of a typo in the code it threw an exception. Possibly bug 51.
 
-Version 2.0.1:
+## [2.0.1] - unknown release date
 - Improved: Offline cache items retrieval.
 
-Version 2.0.0:
+## [2.0.0] - unknown release date
 - Added: Offline cache functionality. (When not connected or offline it goes into Read-Only mode)
 - Added: Invitation forwarding functionality.
 
-Version 1.8.19:
+## [1.8.19] - unknown release date
 - Fixes: problem where Out Of Office stopped working int TB12. Fix replaces the WYSIWYG editor into a flat text editor.
 - Fixes: Several small bugs.
 
-Version 1.8.18:
+## [1.8.18] - unknown release date
 - Addedd access to exchange contacts folders. (Currently READ-ONLY)
 - Fixed: Problem with dismissing and snoozing alarms.
 - Fixed: Problem on autodiscovery where sometimes a EWS URL select list was shown with duplicate entries.
@@ -325,45 +332,45 @@ Version 1.8.18:
 - Fixed: Bug 116 - Authentication fails after Thunderbird-restart
 - Fixed: Bug 24 - Accepting or rejecting of invitations changes owner
 
-Version 1.8.16:
+## [1.8.16] - unknown release date
 - Fixed: Bug 122 - New: I get "Event Invitation" email for my own meetings when I import them
 - Fixed: Bug 91 - Recurring appointment causes immediate reminders for all future
 - Fixed a lot of smaller bugs.
 
-Version 1.8.13:
+## [1.8.13] - unknown release date
 - Fixed: Bug 120 - All my calendar appointments are not visible in Thunderbird
 - Fixed: Bug 94 - Credentials (Username, Password) for calendars are not stored
 
-Version 1.8.12:
+## [1.8.12] - unknown release date
 - Fixed: Bug 117 - tasks calendar shows calendar items
 - Fixed: Problem where only Free/Busy information would be shown for defalt personal calendar.
 
-Version 1.8.6:
+## [1.8.6] - unknown release date
 - Fixed: Bug 111 - No events are visible when user only has calendar permission to see Free/Busy info
 
-Version 1.8.5:
+## [1.8.5] - unknown release date
 - Fixed: Bug 91 - Recurring appointment causes immediate reminders for all future occurrences
 - Fixed: Bug 107 - Snooze state of tasks gets lost after restart
 - Updated: Code for setting of alarms and snooze parameters changed completely.
 
-Version 1.8.4:
+## [1.8.4] - unknown release date
 - Fixed: Bug 103 - aListener not defined in calExchangeCalendar
 - Added: Global minimal memory cache size preferences.
 
-Version 1.8.3:
+## [1.8.3] - unknown release date
 - fixed: Bug 102 - Extension continually asks for password
 
-Version 1.8.1:
+## [1.8.1] - unknown release date
 - Fixed: Bug 99 - Tasks do not show up in the tasks pane/tab
 
-Version 1.8.0:
+## [1.8.0] - unknown release date
 - Added: Full attachment functionality. 
 - Fixed: Bug 97 - Last month's events are missing
 
-Version 1.7.18:
+## [1.7.18] - unknown release date
 - Fixed: Bug it is not possible to accept or decline a meeting invitation
 
-Version 1.7.17:
+## [1.7.17] - unknown release date
 - Fixed: Bug where a HTTP 302 redirect which was called as an error was not handled correctly.
 - Fixed: Bug 31 - Unable to invite attendees
 - Fixed: Bug 45 - Cannot display users own calendar
@@ -382,7 +389,7 @@ Version 1.7.17:
 - Added: Exporting to ICS. Currently it only export what is has requested from the Exchange server. Default a period of one month ahead and one month back from currentdate.
 - Changed: Changed default CalendarPollInterval to once every 60 seconds and InboxPollInterval to once every 180 seconds.
 
-Version 1.7.15:
+## [1.7.15] - unknown release date
 - Fixed: Bug 59 - Exchange sends extra invitations when first one is accepted
 - Fixed: Bug 32 - Unable to add event to calendar using iTIP buttons 
 - Fixed: Bug 33 - Accept multiple-day appointment request via iTIP creates single-day event
@@ -395,7 +402,7 @@ Version 1.7.15:
 - Added: New debugging preferences and possibility to create a log/debug file.
 - Added: Finer info/error control in communication object.
 
-Version 1.7.13:
+## [1.7.13] - unknown release date
 - Added: Folder properties visible in EWS Settings dialog.
 - Added: Mouse cursor wait indication when browsing folders.
 - Added: Add a new calendar base on the information in a share calendar invitation from someone.
@@ -411,7 +418,7 @@ Version 1.7.13:
 - Added: Mouse cursor wait indicatie when checking server and username on creating an calendar or changing the server settings.
 
 
-Version 1.7.12:
+## [1.7.12] - unknown release date
 - Added: Support for Seamonkey.
 - Added: Access to public/shared folders without a mailbox. Only windows username, domain & password required.
 - Added: You can use now a username consisting of a username part followed by ampersand (@) and full domainname and empty domain field or a username and domain field value.
@@ -424,43 +431,43 @@ Version 1.7.12:
 - Change: Changed namespacing on request of Mozilla.
 
 
-Version 1.7.11:
+## [1.7.11] - unknown release date
 - Modified: Debug log lines show more usefull information.
 - Fixed: BUG 30: Accept via iTIP button fails for requests sent to distribution lists
 - Improved: The processing of meeting invitations is complete. Even the iTIP buttons work.
 
-Version 1.7.10a3:
+## [1.7.10a3] - unknown release date
 - Fixed an Exchange server version problem in function GetMeetingRequestByUID. It did not work correctly on Exchange 2007
 
-Version 1.7.10a1:
+## [1.7.10a1] - unknown release date
 - Fixed: BUG 28 "NL -> EN translation string" EN != "Settings voor calendar"
 - Fixed: BUG 24 "Accepting or rejecting of invitations changes owner". Meeting invitations are not yet working as wanted when using iTIP buttons.
 
-Version 1.7.9:
+## [1.7.9] - unknown release date
 - Fixed: Meeting requests and updates to these requests were not processed in the right way.
 
-Version 1.7.8:
+## [1.7.8] - unknown release date
 - Fixed: BUG 25 Recuring event with reminder prevents calendar refresh
 - Fixed: BUG 26 Deleting a single occurrence in a sequence has no effect
 - Fixed: BUG 27 Today Pane Tasks fails to show newly created tasks
 
-Version 1.7.7:
+## [1.7.7] - unknown release date
 - Fixed: BUG 24 "Accepting or rejecting of invitations changes owner"
 - Fixed: Stabilized meeting invitations in global. Now works with distribution lists, other alias name, etc...
 
-Version 1.7.7a3:
+## [1.7.7a3] - unknown release date
 - Fixed: BUG 23 "Request sent instead of Confirmation; wrong Timezone"
 - Fixed: Trying to mark a task as completed gives an update error: "CompleteDate cannot be set to a date in the future."
 - Fixed: Removing the completed task status through the checkbox in the task view produces an error.
 
-Version 1.7.7a2:
+## [1.7.7a2] - unknown release date
 - Fixed: Could not respond to aa meeting invitation where the mailbox name was different in character Upper/Lowercase than the emailaddress in the invitation.
 
-Version 1.7.7a1:
+## [1.7.7a1] - unknown release date
 - Fixed: Chagning/updating of an existing item where you are the organiser but also on the attendee list, created by outlook, gave an error.
 - Added: The add-on now modifies the Exchange nextreminderdate on the Exchange server as the old Exchange provider add-on did. This is part of the merge of the add-ons.
 
-Version 1.7.6:
+## [1.7.6] - unknown release date
 - Added: Progres indicator with tooltip. (closes BUG report 14)
 - Solved: BUG 16 Cannot create event due to Time Zone error (reported by Sven)
 - solved: BUG 17 Out of office retrieval of incorrect values (reported by Sven)
@@ -468,158 +475,158 @@ Version 1.7.6:
 - Added: It is not possible anymore to add tasks to a calendar folder and calendaritems in a tasks folder. This would produce an error.
 - Fixed: BUG 18 Changing the end or start date of an allday event produces an error. (reported by Sven)
 
-Version 1.7.5:
+## [1.7.5] - unknown release date
 - Minor changes to keep the add-on working in version 10.0a2.
 - Fixed: Problem where timezone information downloading did not work for exchange 2007.
 
-Version 1.7.4:
+## [1.7.4] - unknown release date
 - Added: The snooze and dismiss states are saved on the exchange server so they survive a restart of TB. Was a problem when "show missed alarms" was on. (BUG 12 reported by pazz)
 - Solved: Shut-down is faster.
 
-Version 1.7.3:
+## [1.7.3] - unknown release date
 - Solved: BUG 11/ During creation of an allday event with a reminder or turning on the reminder on an existing allday event triggers an error and change is not saved.  (reported by gislair)
 
-Version 1.7.2:
+## [1.7.2] - unknown release date
 - Solved: When the windows account got locked the password manager kept asking for a password. Now after tree failed attempts it will stop asking until a restart.
 - Solved: Respong to a meeting request through the iTIP buttons generated an error and did not work.
 
-Version 1.7.1:
+## [1.7.1] - unknown release date
 - Solved: When an organiser removed a meeting which was confirmed the update in your calendar was performed every 3 seconds.
 
-Version 1.7.0:
+## [1.7.0] - unknown release date
 - Changed: Folder browser shows different icons for different folderclass property.
 - Solved: Removing a meeting in a public folder did not work an give error.
 - Solved: Buttons Save and cancel in the EWS settings dialog would drop of dialog window.
 - Major version changed into 1 because the add-on is feature complete.
 
-Version 0.7.47:
+## [0.7.47] - unknown release date
 - New: Selecting the right folder below the folderbase can now be done through a folder browser.
 
-Version 0.7.46
+## [0.7.46] - unknown release date
 - Improved: Creation, modification and deletion of repeating events.
 
-Version 0.7.45
+## [0.7.45] - unknown release date
 - Solved: Removing a repeating event did not allways work.
 
-Version 0.7.44
+## [0.7.44] - unknown release date
 - Solved: Creating an all day event did not work anymore.
 
-Version 0.7.42
+## [0.7.42] - unknown release date
 - Solved: Some alarms could not be removed.
 - Solved: For repeating meetings multiple alarms were shown, with same titel and date, when option show missed alarms was on in Lightning settings.
 - Added: Option to automatically remove responses to meetingrequest from your inbox when you are not the organiser.
 - Solved: BUG10 reported by P.Palai.
 
-Version 0.7.41
+## [0.7.41] - unknown release date
 - Solved: Checking/searching for certain folderpath locations did not work.
 - Solved: Manipulating occurrences in a repeating meeting did not always work.
 - Solved: Changing the EWS settings did not refresh the calendar and therefore the changes were not visible.
 
-Version 0.7.40
+## [0.7.40] - unknown release date
 - Some small changed to make shared funcitonality available to the Exchange Contacts add-on
 - Meetingrequest in a non personal folder we show als invitation request to the use. Now they are not shown anymore as invitation request.
 - Added different job queues for synchronization and modify actions to the EWS server. During startup changes are show earlier.
 
-Version 0.7.39
+## [0.7.39] - unknown release date
 - User must choose to whom invitation updates are send.
 - Added a new calender folder poller which will sync by default every 10 seconds.
 
-Version 0.7.38
+## [0.7.38] - unknown release date
 - Changes in meetings in personal calendars will be send always to all involved persons. 
 - In a later version the extension will ask the user to specify what he wants (send updates or not)
 
-Version 0.7.37
+## [0.7.37] - unknown release date
 - Fixed problem where after an autodiscovery and server and mailbox check did not work.
 - Removing a calendar will remove all settings and running processes.
 
-Version 0.7.36
+## [0.7.36] - unknown release date
 - Fixed a warning in the Mozilla tests.
 
-Version 0.7.35
+## [0.7.35] - unknown release date
 - Fixed bug (reported by Tudor Timisescu). Check for server and mailbox did not work anymore.
 
-Version 0.7.34
+## [0.7.34] - unknown release date
 - Added management of Out of Office settings.
 
-Version 0.7.33
+## [0.7.33] - unknown release date
 - Added three new options to the EWS preferences for each calendar.
 - Completed list of "base folder" options.
 
-Version 0.7.32
+## [0.7.32] - unknown release date
 - EWS Timezome information added for Exchange2007(_SP1) servers
 - Problems with allday event solved (see version 0.7.30)
 - Tasks date and times are working now for different timezones.
 - Version is stable for production use.
 
-Version 0.7.31
+## [0.7.31] - unknown release date
 - Fixed upgrade problem between versions 0.7.29 and 0.7.30
 
-Version 0.7.30
+## [0.7.30] - unknown release date
 - Timezone is added correctly. There is even a difference between a 2010 or 2007 version of Exchange.
 - Starting mechanism is optimized.
 - A calendar reset is done completely now.
 - Known problem: If you add a alldayevent EWS will add an extra day infront of it. So 1 allday becomes two.
 
-Version 0.7.29
+## [0.7.29] - unknown release date
 - Added the posibility to change your reaction to an invitation request in the meetingresponse screen.
 
-Version 0.7.28
+## [0.7.28] - unknown release date
 - Addedd extra options to the EWS Settings.
 
-Version 0.7.27
+## [0.7.27] - unknown release date
 - Fixed bug 6. TB becomes unresponsive on paging back in week view.
 
-Version 0.7.26
+## [0.7.26] - unknown release date
 - Extra settings for each calendar (poll inbox)
 - Inbox poller results are better processed.
 - Settings are now saved in the right location within preferences..
 
-Version 0.7.22
+## [0.7.22] - unknown release date
 - Deleting of an occurrence from a string does work now.
 - Alarms can be dismissed or gesnoozed. 
 	This status is not saved between TB restarts.
 	This is an in memory status maintained by TB.
 
-Version 0.7.21
+## [0.7.21] - unknown release date
 - iTIP processing improved.
 
-Version 0.7.20
+## [0.7.20] - unknown release date
 - Settings and alarm on recurring appointments is better handled.
 
-Version 0.7.19
+## [0.7.19] - unknown release date
 - Fixed BUG 4.
 - Fixed BUG 5.
 - So called observers are broken down in the right way.
 
-Version 0.7.18
+## [0.7.18] - unknown release date
 - Fixed BUG 3.
 - Alarm changing improved.
 
-Version 0.7.17
+## [0.7.17] - unknown release date
 - Fixed BUG 2.
 
-Version 0.7.16
+## [0.7.16] - unknown release date
 - Task alarms are being set in the right way.
 - Dismiss or snooze the alarm of a task is working now.
 
-Version 0.7.15
+## [0.7.15] - unknown release date
 - Removed all storage of passwords in Memory. All password are only stored by the default Thunderbird Password Manager.
 
-Version 0.7.14
+## [0.7.14] - unknown release date
 - Imporved iTIP processing.
 
-Version 0.7.13
+## [0.7.13] - unknown release date
 - Source code cleanup.
 - Exception "nsIAuthPrompt2.asyncPromptAuth" solved.
 - Failures during creating connections to server are better handled.
 
-Version 0.7.12
+## [0.7.12] - unknown release date
 - Changed text on buttons for MessageRespons screen.
 - Fixed where it was not possible to create an alldayevent.
 - Dismissing an alarm will work.
 
-Version 0.7.11
+## [0.7.11] - unknown release date
 - Improved iTIP processing.
 
-Version 0.7.10
+## [0.7.10] - unknown release date
 - Fixed problem for date/time conversions. Through this problem some appointments were show on the wrong date or time.

From 949bc47915219230e171ad28ae48c37614321f4e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 12 Jun 2017 10:17:39 +0200
Subject: [PATCH 065/222] attachments-view.js: use setAttribute DOM API

Thus the XUL context popup on attachment list is really updated.
As we don't modify attributes like "value" or "selected", we can
use this function without any issue.
---
 chrome/content/attachments-view.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index fc4d8133..60cda393 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -267,30 +267,30 @@ exchAttachments.prototype = {
 			this.globalFunctions.LOG("  -- It is an Exchange Calendar event:"+item.title);
 
 			if (this._document.getElementById("event-grid-attachment-row")) {
-				this._document.getElementById("event-grid-attachment-row").collapsed = true;
+				this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", true);
 			}
 
 			// Modify context menu for the attachment list inside the "Attachment" panel
 			let attachmentListbox = this._document.getElementById("attachment-link");
 
-			attachmentListbox.context = "exchWebService-attachment-popup" ;
-			attachmentListbox.onkeypress = function (aEvent) { self.onKeyPress(aEvent);  };
-			attachmentListbox.onclick = function (aEvent) { self.onSelect(aEvent);  };
-			attachmentListbox.ondblclick = function (aEvent) { self.onDblClick(aEvent); };
+			attachmentListbox.setAttribute("context", "exchWebService-attachment-popup") ;
+			attachmentListbox.setAttribute("onkeypress", function (aEvent) { self.onKeyPress(aEvent);  }) ;
+			attachmentListbox.setAttribute("onclick", function (aEvent) { self.onSelect(aEvent);  }) ;
+			attachmentListbox.setAttribute("ondblclick", function (aEvent) { self.onDblClick(aEvent); }) ;
 
 			this.addAttachmentsFromItem(item);
 		} else {
 			if (this._document.getElementById("event-grid-attachment-row")) {
-				this._document.getElementById("event-grid-attachment-row").collapsed = false;
+				this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", false);
 			}
 
 			// Modify context menu for the attachment list inside the "Attachment" panel
 			let attachmentListbox = this._document.getElementById("attachment-link");
 
-			attachmentListbox.context = "attachment-popup" ;
-			attachmentListbox.onkeypress="attachmentLinkKeyPress(event)" ;
-			attachmentListbox.onclick="attachmentClick(event);" ;
-			attachmentListbox.ondblclick="attachmentDblClick(event)" ;
+			attachmentListbox.setAttribute("context", "attachment-popup") ;
+			attachmentListbox.setAttribute("onkeypress", "attachmentLinkKeyPress(event)") ;
+			attachmentListbox.setAttribute("onclick", "attachmentClick(event);") ;
+			attachmentListbox.setAttribute("ondblclick", "attachmentDblClick(event)") ;
 		}
 
 		// Add message listener to be able to receive message from parent window or tab

From 354cef51ef0111890cc08cd5e5ef969d6753601d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 12 Jun 2017 16:37:50 +0200
Subject: [PATCH 066/222] lightning-item-iframe.js: fix content saving for new
 items

---
 chrome/content/lightning-item-iframe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/lightning-item-iframe.js b/chrome/content/lightning-item-iframe.js
index 0d73a6b5..512c67f3 100644
--- a/chrome/content/lightning-item-iframe.js
+++ b/chrome/content/lightning-item-iframe.js
@@ -161,7 +161,7 @@ exchangeEventDialog.prototype = {
 				this.newItem = item.bodyType.toLowerCase() !== "html";
 			}
 			else {
-				this._newItem = true;
+				this.newItem = true;
 				itemBodyEditor.content = item.getProperty("DESCRIPTION");
 			}
 

From 67960729acc94848840f1a70f3180f4bf8af744b Mon Sep 17 00:00:00 2001
From: Alessandro Menti <alessandro.menti@alessandromenti.it>
Date: Sun, 18 Jun 2017 15:50:53 +0200
Subject: [PATCH 067/222] Translate the addon to Italian

---
 install.rdf                                   | 17 +++++-
 .../it-IT/attachments-view.dtd                |  2 +
 .../exchangecalendar/it-IT/browseFolder.dtd   | 12 ++++
 .../it-IT/calExchangeCalendar.properties      | 49 ++++++++++++++++
 .../it-IT/calendar-calendars-list.dtd         |  5 ++
 .../it-IT/calendar-summary-dialog.dtd         |  3 +
 .../it-IT/delegate-calendar-dialog.dtd        | 25 +++++++++
 .../it-IT/delegate-folder.dtd                 | 45 +++++++++++++++
 .../it-IT/ecCalendarCreation.dtd              |  5 ++
 .../it-IT/exchangeCloneSettings.dtd           |  6 ++
 .../it-IT/exchangeReminderDialog.dtd          |  4 ++
 .../it-IT/exchangeSettings.dtd                | 54 ++++++++++++++++++
 .../it-IT/exchangeSettingsOverlay.dtd         | 56 +++++++++++++++++++
 .../exchangecalendar/it-IT/extra-priority.dtd | 18 ++++++
 .../it-IT/invitationResponse.dtd              | 20 +++++++
 locale/exchangecalendar/it-IT/inviteStyle.dtd |  2 +
 .../it-IT/lightning-item-iframe.dtd           |  7 +++
 .../it-IT/manageEWSAccounts.dtd               | 16 ++++++
 .../it-IT/messenger_task_delegation.dtd       |  6 ++
 locale/exchangecalendar/it-IT/oofSettings.dtd | 26 +++++++++
 .../it-IT/preInvitationResponse.dtd           | 14 +++++
 locale/exchangecalendar/it-IT/preferences.dtd | 48 ++++++++++++++++
 locale/exchangecalendar/it-IT/rtews.dtd       | 15 +++++
 .../exchangecalendar/it-IT/rtews.properties   |  2 +
 .../exchangecalendar/it-IT/selectEWSUrl.dtd   |  9 +++
 .../exchangecalendar/it-IT/sendUpdateTo.dtd   |  9 +++
 .../it-IT/sharedCalendarParser.dtd            |  3 +
 .../it-IT/timezonePreference.dtd              |  1 +
 28 files changed, 478 insertions(+), 1 deletion(-)
 create mode 100644 locale/exchangecalendar/it-IT/attachments-view.dtd
 create mode 100644 locale/exchangecalendar/it-IT/browseFolder.dtd
 create mode 100644 locale/exchangecalendar/it-IT/calExchangeCalendar.properties
 create mode 100644 locale/exchangecalendar/it-IT/calendar-calendars-list.dtd
 create mode 100644 locale/exchangecalendar/it-IT/calendar-summary-dialog.dtd
 create mode 100644 locale/exchangecalendar/it-IT/delegate-calendar-dialog.dtd
 create mode 100644 locale/exchangecalendar/it-IT/delegate-folder.dtd
 create mode 100644 locale/exchangecalendar/it-IT/ecCalendarCreation.dtd
 create mode 100644 locale/exchangecalendar/it-IT/exchangeCloneSettings.dtd
 create mode 100644 locale/exchangecalendar/it-IT/exchangeReminderDialog.dtd
 create mode 100644 locale/exchangecalendar/it-IT/exchangeSettings.dtd
 create mode 100644 locale/exchangecalendar/it-IT/exchangeSettingsOverlay.dtd
 create mode 100644 locale/exchangecalendar/it-IT/extra-priority.dtd
 create mode 100644 locale/exchangecalendar/it-IT/invitationResponse.dtd
 create mode 100644 locale/exchangecalendar/it-IT/inviteStyle.dtd
 create mode 100644 locale/exchangecalendar/it-IT/lightning-item-iframe.dtd
 create mode 100644 locale/exchangecalendar/it-IT/manageEWSAccounts.dtd
 create mode 100644 locale/exchangecalendar/it-IT/messenger_task_delegation.dtd
 create mode 100644 locale/exchangecalendar/it-IT/oofSettings.dtd
 create mode 100644 locale/exchangecalendar/it-IT/preInvitationResponse.dtd
 create mode 100644 locale/exchangecalendar/it-IT/preferences.dtd
 create mode 100755 locale/exchangecalendar/it-IT/rtews.dtd
 create mode 100755 locale/exchangecalendar/it-IT/rtews.properties
 create mode 100644 locale/exchangecalendar/it-IT/selectEWSUrl.dtd
 create mode 100644 locale/exchangecalendar/it-IT/sendUpdateTo.dtd
 create mode 100644 locale/exchangecalendar/it-IT/sharedCalendarParser.dtd
 create mode 100644 locale/exchangecalendar/it-IT/timezonePreference.dtd

diff --git a/install.rdf b/install.rdf
index aa1fed07..b86b8c86 100644
--- a/install.rdf
+++ b/install.rdf
@@ -42,6 +42,7 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
     <em:translator>Björn Töpper (de)</em:translator>
     <em:translator>Hiroshi Miura (ja-JP)</em:translator>
     <em:translator>Alexey Sinitsyn (ru)</em:translator>
+    <em:translator>Alessandro Menti (it-IT)</em:translator>
     <em:homepageURL>http://www.1st-setup.nl/wordpress/?page_id=133</em:homepageURL>
     <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
     <em:type>2</em:type> <!-- type: extension -->
@@ -56,7 +57,7 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
 You can view, delete, create and update calendar and task/todo items. And manage "Out of Office" settings.
 You can read and use contacts and global addres list contacts for address autcompletion.
 
-Dutch, French, English, German, Swedish and Japanese localizations.
+Dutch, French, English, German, Swedish, Japanese and Italian localizations.
 
 Some of the icons and images used are from the Fugue Icons Collection made by Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
 		</Description>
@@ -123,5 +124,19 @@ Sommige van de iconen en plaatjes komen uit de Fugue Icons collectie gemaakt doo
 		</Description>
 	</em:localized>
 
+	<em:localized>
+		<Description>
+			<em:locale>it-IT</em:locale>
+			<em:name>Provider Exchange EWS</em:name>
+			<em:description>Consente di sincronizzare i propri Calendario, Attività e Contatti con un server Microsoft Exchange 2007/2010/2013 EWS da Lightning.
+
+È possibile visualizzare, eliminare, creare e aggiornare elementi del Calendario e Attività/Da fare e gestire le opzioni Fuori sede.
+È possibile leggere e utilizzare i propri contatti e i contatti della Global Address List per l'autocompletamento degli indirizzi.
+
+Localizzato in olandese, francese, inglese, tedesco, svedese, giapponese e italiano.
+
+Alcune delle icone e immagini utilizzate sono state tratte dalla Fugue Icons Collection di Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
+		</Description>
+	</em:localized>
 	</Description>
 </RDF>
diff --git a/locale/exchangecalendar/it-IT/attachments-view.dtd b/locale/exchangecalendar/it-IT/attachments-view.dtd
new file mode 100644
index 00000000..5d9f242c
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/attachments-view.dtd
@@ -0,0 +1,2 @@
+<!ENTITY exchWebServie.add.attachment.button.label "Allegati">
+
diff --git a/locale/exchangecalendar/it-IT/browseFolder.dtd b/locale/exchangecalendar/it-IT/browseFolder.dtd
new file mode 100644
index 00000000..cfb453a0
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/browseFolder.dtd
@@ -0,0 +1,12 @@
+<!ENTITY label.acceptbutton "Seleziona">
+<!ENTITY label.cancelbutton "Annulla">
+
+<!ENTITY browsefolder.title "Sfoglia cartelle">
+
+<!ENTITY treecol.label.foldername "Nome cartella">
+<!ENTITY treecol.label.folderclass "Classe cartella">
+
+
+
+
+
diff --git a/locale/exchangecalendar/it-IT/calExchangeCalendar.properties b/locale/exchangecalendar/it-IT/calExchangeCalendar.properties
new file mode 100644
index 00000000..2f8a517c
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/calExchangeCalendar.properties
@@ -0,0 +1,49 @@
+displayName=Provider Calendario e Attività per Exchange 2007/2010
+
+resetEventMessage=Il calendario "%1$S" è stato reimpostato.
+addTaskEventMessage=Aggiunta attività "%1$S" (%2$S).
+addCalendarEventMessage=Aggiunto appuntamento "%1$S" (%2$S).
+ewsErrorEventMessage=Errore durante la comunicazione con il server EWS per "%1$S". Errore: %2$S, codice: %3$S.
+updateCalendarEventMessage=L'appuntamento "%1$S" è stato modificato (%2$S).
+updateTaskEventMessage=L'attività "%1$S" è stata modificata (%2$S).
+deleteCalendarEventMessage=L'appuntamento "%1$S" è stato rimosso (%2$S).
+deleteTaskEventMessage=L'attività "%1$S" è stata rimossa (%2$S).
+syncFolderEventMessage="%4$S": ricevuti aggiornamenti dal server EWS (nuovi: %1$S, modificati: %2$S, eliminati: %3$S).
+syncInboxRequests="%4$S": ricevuti aggiornamenti inviti a riunione dal server EWS nella Posta in arrivo (nuovi: %1$S, modificati: %2$S, eliminati: %3$S).
+syncInboxCancelations="%4$S": ricevuti annullamenti inviti a riunione dal server EWS nella Posta in arrivo (nuovi: %1$S, modificati: %2$S, eliminati: %3$S).
+syncInboxResponses="%4$S": ricevuti aggiornamenti risposte riunione dal server EWS nella Posta in arrivo (nuovi: %1$S, modificati: %2$S, eliminati: %3$S).
+ewsMeetingResponsEventMessage=Risposta "%2$S" ricevuta per la richiesta riunione "%1$S" (%3$S). Messaggio:
+
+ecErrorServerCheck=Errore durante il controllo sul server: %1$S (%2$S)
+ecErrorAutodiscovery=Errore durante la ricerca automatica: %1$S (%2$S)
+ecErrorAutodiscoveryURLInvalid=Non è stato possibile determinare le impostazioni tramite la ricerca automatica utilizzando la parte nome di dominio della casella di posta (%1$S).\nSolitamente ciò significa che non esiste un server ricerca automatica definito con la parte di dominio come nome host.
+ecErrorServerCheckURLInvalid=Il server "%1$S" non esiste.
+ecErrorServerAndMailboxCheck=Errore durante il controllo del server e della casella di posta: %1$S (codice: %2$S)
+
+updateUserPrefs1=Opzioni utente aggiornate per la nuova versione (dalla 0.7.26)
+
+autoRemoveConfirmedInvitationOnCancellation=L'appuntamento confermato "%1$S" è stato annullato ed è stato rimosso automaticamente come specificato dalle opzioni utente (%2$S).
+
+sendAutoRespondMeetingRequestMessage=È stata automaticamente inviata una risposta alla richiesta di riunione "%1$S" come specificato dalle opzioni utente (%2$S).
+
+ecLoadingOofSettings=(Recupero dati in corso)
+ecLoadedOofSettings=(Dati recuperati)
+ecErrorLoadingOofSettings=Errore durante il caricamento delle opzioni Fuori sede. Codice: %2$S, messaggio: %1$S.
+ecSavingOofSettings=(Salvataggio dati in corso)
+ecSavedOofSettings=(Dati salvati)
+ecErrorSavingOofSettings=Errore durante il salvataggio delle opzioni Fuori sede. Codice: %2$S, messaggio: %1$S.
+
+
+exchWebService.PidLidTaskHistory.duedate.changed=La data di scadenza è stata modificata
+exchWebService.PidLidTaskHistory.some.property.changed=È stata modificata una proprietà
+exchWebService.PidLidTaskHistory.accepted=Attività accettata da %1$S
+exchWebService.PidLidTaskHistory.rejected=Attività rifiutata da %1$S
+exchWebService.PidLidTaskHistory.assigned=Attività assegnata a %1$S
+exchWebService.PidLidTaskHistory.no.changes=Nessuna modifica
+
+ecErrorServerAndMailboxCheckFolderNotFound=Non si dispone delle autorizzazioni di lettura sulla casella di posta selezionata o la casella di posta non è corretta.\n\nDopo che la casella di posta sarà stata corretta si potrebbe disporre delle autorizzazioni di visualizzazione dello stato di disponibilità utente (occupato/provvisorio/fuori sede) per il suo calendario.\n\n(%2$S: %1$S)
+
+tooltipCalendarDisconnected=Il calendario %1$S non è connesso al server Exchange\n(Motivo: %2$S).
+tooltipCalendarDisconnectedReadOnly=Il calendario %1$S non è connesso al server Exchange ed è in sola lettura\n(Motivo: %2$S).
+tooltipCalendarConnected=Il calendario %1$S è connesso al server Exchange.
+tooltipCalendarConnectedReadOnly=Il calendario %1$S è connesso al server Exchange ed è in sola lettura.
diff --git a/locale/exchangecalendar/it-IT/calendar-calendars-list.dtd b/locale/exchangecalendar/it-IT/calendar-calendars-list.dtd
new file mode 100644
index 00000000..7a7fc88d
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/calendar-calendars-list.dtd
@@ -0,0 +1,5 @@
+<!ENTITY calendar.context.exchange.convert.label "Converti a componente aggiuntivo Calendario e Attività Exchange 2007/2010">
+<!ENTITY calendar.context.exchange.properties.label "Proprietà Exchange (EWS)">
+<!ENTITY calendar.context.exchange.oof.settings.label "Opzioni Fuori sede">
+<!ENTITY calendar.context.exchange.clone.settings.label "Clona opzioni in un nuovo calendario">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delega calendario">
diff --git a/locale/exchangecalendar/it-IT/calendar-summary-dialog.dtd b/locale/exchangecalendar/it-IT/calendar-summary-dialog.dtd
new file mode 100644
index 00000000..ccf4ff91
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/calendar-summary-dialog.dtd
@@ -0,0 +1,3 @@
+<!ENTITY forward.invite.label "Inoltra invito">
+<!ENTITY required.attendee.label "Partecipante richiesto">
+<!ENTITY optional.attendee.label "Partecipante facoltativo">
diff --git a/locale/exchangecalendar/it-IT/delegate-calendar-dialog.dtd b/locale/exchangecalendar/it-IT/delegate-calendar-dialog.dtd
new file mode 100644
index 00000000..af6f0697
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/delegate-calendar-dialog.dtd
@@ -0,0 +1,25 @@
+
+<!ENTITY  label.delegateCalendar.cancelbutton "Annulla">
+<!ENTITY  label.delegateCalendar.userEmail "Indirizzo di posta elettronica">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Recapita richieste riunione">
+
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Solo ai delegati">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Ai delegati e a me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Ai delegati e inviami le notifiche">
+
+<!ENTITY  label.delegateCalendar.permission "Autorizzazioni">
+<!ENTITY  menuitem.delegateCalendar.permission.author "Autore">
+<!ENTITY  menuitem.delegateCalendar.permission.editor "Editor">
+<!ENTITY  menuitem.delegateCalendar.permission.reviewer "Revisore">
+<!ENTITY  menuitem.delegateCalendar.permission.none "Nessuno">
+
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Ricevi copie dei messaggi riunione" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "Visualizza elementi privati" >
+
+
+<!ENTITY  delegateCalendar.permission.description.author "Leggi e crea elementi nella cartella Calendario." >
+<!ENTITY  delegateCalendar.permission.description.editor "Leggi, crea e modifica elementi nella cartella Calendario." >
+<!ENTITY  delegateCalendar.permission.description.reviewer "Leggi elementi nella cartella Calendario." >
+<!ENTITY  delegateCalendar.permission.description.none "Nessuna autorizzazione di accesso alla cartella Calendario." >
+
+<!ENTITY  delegateCalendar.permission.details.label "Dettagli autorizzazioni: " >
diff --git a/locale/exchangecalendar/it-IT/delegate-folder.dtd b/locale/exchangecalendar/it-IT/delegate-folder.dtd
new file mode 100644
index 00000000..8f48d591
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/delegate-folder.dtd
@@ -0,0 +1,45 @@
+
+<!ENTITY  label.delegatefolder.cancelbutton "Annulla">
+<!ENTITY  label.delegatefolder.userEmail "Indirizzo di posta elettronica">
+
+<!ENTITY  label.delegatefolder.permissionLevel "Livello autorizzazioni">
+<!ENTITY  label.delegatefolder.userboxcolumn1 "Utente">
+<!ENTITY  label.delegatefolder.userboxcolumn2 "Permessi">
+
+<!ENTITY  menuitem.delegatefolder.permission.author "Autore">
+<!ENTITY  menuitem.delegatefolder.permission.editor "Editor">
+<!ENTITY  menuitem.delegatefolder.permission.reviewer "Revisore">
+<!ENTITY  menuitem.delegatefolder.permission.none "Nessuno">
+<!ENTITY  menuitem.delegatefolder.permission.owner "Proprietario" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "Supervisore pubblicazione" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "Autore pubblicazione" >
+<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "Autore nonediting" >
+<!ENTITY  menuitem.delegatefolder.permission.contributor "Collaboratore" >
+<!ENTITY  menuitem.delegatefolder.permission.custom "Personalizzato" >
+
+<!ENTITY  delegatefolder.permission.description.author "Leggi e crea elementi nella cartella." >
+<!ENTITY  delegatefolder.permission.description.editor "Leggi, crea e modifica elementi nella cartella." >
+<!ENTITY  delegatefolder.permission.description.reviewer "Leggi elementi nella cartella." >
+<!ENTITY  delegatefolder.permission.description.none "Nessuna autorizzazione di accesso alla cartella." >
+
+<!ENTITY  delegatefolder.permission.details.caption "Autorizzazioni ">
+
+<!ENTITY  delegatefolder.tab.msg.label  "Calendario e Attività non trovati per questo account di posta.">
+<!ENTITY  delegatefolder.tab.name  "Condivisione cartelle Exchange">
+
+<!ENTITY  delegatefolder.permissions.none  "Nessuno">
+<!ENTITY  delegatefolder.permissions.own  "Propri elementi">
+<!ENTITY  delegatefolder.permissions.all  "Tutti gli elementi">
+<!ENTITY  delegatefolder.permissions.full  "Dettagli completi">
+
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Creazione elementi">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Creazione sottocartelle">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Proprietario cartella">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Cartella visibile">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Cartella contatti">
+<!ENTITY  delegatefolder.permissions.edititems  "Modifica elementi">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Eliminazione elementi">
+<!ENTITY  delegatefolder.permissions.readitems  "Lettura elementi">
+
+<!ENTITY  delegatefolder.permissions.true  "Vero">
+<!ENTITY  delegatefolder.permissions.false  "Falso">
diff --git a/locale/exchangecalendar/it-IT/ecCalendarCreation.dtd b/locale/exchangecalendar/it-IT/ecCalendarCreation.dtd
new file mode 100644
index 00000000..4f108e0c
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/ecCalendarCreation.dtd
@@ -0,0 +1,5 @@
+<!ENTITY exchange1.description "Opzioni Exchange/Windows Active Directory">
+<!ENTITY exchange.cache.label "Utilizza cache offline">
+
+
+
diff --git a/locale/exchangecalendar/it-IT/exchangeCloneSettings.dtd b/locale/exchangecalendar/it-IT/exchangeCloneSettings.dtd
new file mode 100644
index 00000000..c8ccf764
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/exchangeCloneSettings.dtd
@@ -0,0 +1,6 @@
+<!ENTITY label.acceptbutton "Salva">
+<!ENTITY label.cancelbutton "Annulla">
+
+<!ENTITY label.ecExchangeSettings.title "Nuova descrizione:">
+
+
diff --git a/locale/exchangecalendar/it-IT/exchangeReminderDialog.dtd b/locale/exchangecalendar/it-IT/exchangeReminderDialog.dtd
new file mode 100644
index 00000000..3320f889
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/exchangeReminderDialog.dtd
@@ -0,0 +1,4 @@
+<!ENTITY exchWebService.reminder.relation.origin.label "prima dell'inizio dell'evento">
+
+
+
diff --git a/locale/exchangecalendar/it-IT/exchangeSettings.dtd b/locale/exchangecalendar/it-IT/exchangeSettings.dtd
new file mode 100644
index 00000000..3c6e23d2
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/exchangeSettings.dtd
@@ -0,0 +1,54 @@
+<!ENTITY label.acceptbutton "Salva e reimposta">
+<!ENTITY label.cancelbutton "Annulla">
+<!ENTITY ecsettings.title "Opzioni Calendario e Posta EWS">
+<!ENTITY ecsettings.tab.adsettings "Exchange/AD Windows">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Richieste riunione">
+<!ENTITY ecsettings.tab.calendarfolderproperties "Proprietà cartella">
+
+<!ENTITY label.ecExchangeSettings.title "Opzioni per il calendario:">
+
+<!ENTITY label.poll.inbox "Esegui il polling della Posta in arrivo per gestire richieste, modifiche e annullamenti.">
+<!ENTITY label.poll.inbox.interval "Frequenza di polling Posta in arrivo (in secondi):">
+<!ENTITY label.poll.calendar.interval "Frequenza di polling Calendario (in secondi):">
+
+<!ENTITY label.nomeetingrequestsettings "Impossibile impostare la richiesta riunione perché non si è selezionato il calendario principale per la casella di posta">
+
+<!ENTITY label.autorespond.meetingrequest "Rispondi automaticamente a un nuovo invito con ">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "Forse parteciperò">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "Parteciperò">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "Non parteciperò">
+
+<!ENTITY label.autoremove.invitation_cancellation1 "Rimuovi automaticamente l'invito e il messaggio di annullamento abbinato se non si è ancora risposto all'invito.">
+<!ENTITY label.autoremove.invitation_cancellation2 "Rimuovi automaticamente un invito confermato quando si riceve un messaggio di annullamento.">
+
+<!ENTITY label.autoremove.invitation_response1 "Rimuovi automaticamente una risposta di terzi a un invito di cui non si è l'organizzatore.">
+
+<!ENTITY label.doautorespond.meetingrequest.message "Invia il seguente messaggio con le risposte anziché richiedere un messaggio.">
+<!ENTITY label.autorespond.meetingrequest.message "Messaggio:">
+
+<!ENTITY treecol.label.userid "Nome utente">
+<!ENTITY treecol.label.email "Indirizzo di posta elettronica">
+
+
+<!ENTITY ecsettings.tab.offlineCachingproperties "Cache non in linea">
+
+<!ENTITY label.offlineCacheproperties.cachingStartDate "Data di inizio cache:">
+<!ENTITY label.offlineCacheproperties.cachingEndDate "Data di fine cache:">
+<!ENTITY label.offlineCacheproperties.totalEvents "Numero totale di eventi in cache:">
+<!ENTITY label.offlineCacheproperties.totalTasks "Numero totale di attività in cache:">
+
+<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate "Numero di mesi prima di oggi per cui mantenere gli elementi in cache:">
+<!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Numero di mesi dopo di oggi per cui mantenere gli elementi in cache:">
+
+<!ENTITY button.offlineCacheproperties.clearCache "Elimina dati nella cache non in linea">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Elaborazione automatica">
+<!ENTITY ecsettings.tab.mailitemsProperties "Opzioni EWS (Posta)">
+
+<!ENTITY label.syncmailitems.interval "Ritarda sincronizzazione elementi di posta (tag, ecc.)">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "Rimuovi automaticamente eventi annullati">
+<!ENTITY label.autoprocessingproperties.markeventtentative "Contrassegna automaticamente gli eventi come provvisori e invia la risposta all'organizzatore">
+<!ENTITY label.syncmailitems.active "Mantieni attiva la sincronizzazione degli elementi di posta (tag, ecc.)">
+
+<!ENTITY label.syncfollowup.deactivtate "Disabilita Contrassegna attività per il completamento">
+
diff --git a/locale/exchangecalendar/it-IT/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/it-IT/exchangeSettingsOverlay.dtd
new file mode 100644
index 00000000..b195074e
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/exchangeSettingsOverlay.dtd
@@ -0,0 +1,56 @@
+<!ENTITY ecautodiscover "Utilizza funzionalità ricerca automatica di Exchange.">
+<!ENTITY ecfolderbase.label "Cartella base:">
+<!ENTITY ecfolderpath.label "Percorso entro la cartella base:">
+<!ENTITY ecfolderidofshare.label "ID cartella condivisa:">
+<!ENTITY exchWebServices.SharedFolderID.label "Nome visualizzato cartella condivisa:">
+
+<!ENTITY menuitem.label.ecfolderbase.calendar "Cartella Calendario">
+<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Cartelle pubbliche">
+<!ENTITY menuitem.label.ecfolderbase.inbox "Cartella Posta in arrivo">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Cartella Segreteria telefonica">
+<!ENTITY menuitem.label.ecfolderbase.msgfolderroot "Radice cartella messaggi">
+<!ENTITY menuitem.label.ecfolderbase.root "Radice casella di posta">
+<!ENTITY menuitem.label.ecfolderbase.tasks "Cartella Attività">
+
+<!ENTITY menuitem.label.ecfolderbase.contacts "Cartella Contatti">
+<!ENTITY menuitem.label.ecfolderbase.deleteditems "Cartella Elementi eliminati">
+<!ENTITY menuitem.label.ecfolderbase.drafts "Cartella Bozze">
+<!ENTITY menuitem.label.ecfolderbase.journal "Cartella Diario">
+<!ENTITY menuitem.label.ecfolderbase.notes "Cartella Note">
+<!ENTITY menuitem.label.ecfolderbase.outbox "Cartella Posta in uscita">
+<!ENTITY menuitem.label.ecfolderbase.sentitems "Cartella Posta inviata">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Cartella Posta indesiderata">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Cartella Ricerca cartelle">
+<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Le opzioni sottostanti sono valide solo per Exchange 2010 --">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Cartella radice Elementi ripristinabili">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Cartella Eliminazioni in Elementi ripristinabili">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Cartella Versioni in Elementi ripristinabili">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges "Cartella Elimina in Elementi ripristinabili">
+<!ENTITY menuitem.label.ecfolderbase.archiveroot "Cartella radice Archivio">
+<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot "Cartella radice messaggi Archivio">
+<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems "Cartella Elementi eliminati Archivio">
+<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot "Cartella radice Elementi ripristinabili - Archivio">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions "Cartella Eliminazioni in Elementi ripristinabili - Archivio">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsversions "Cartella Versioni in Elementi ripristinabili - Archivio">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemspurges "Cartella Elimina in Elementi ripristinabili - Archivio">
+
+<!ENTITY button.label.autodiscovercheck "Esegui ricerca automatica">
+<!ENTITY button.label.serverandmailboxcheck "Controlla server e casella di posta">
+<!ENTITY button.label.servercheck "Controlla server e account">
+
+<!ENTITY ecmailbox.label "Indirizzo di posta elettronica principale:">
+<!ENTITY ecmailbox.tooltip "Non specificando una casella di posta si sarà in grado di accedere solamente alle cartelle pubbliche.">
+<!ENTITY ecwindowsuser.label "Nome utente:">
+<!ENTITY ecwindowsdomain.label "Nome dominio:">
+<!ENTITY ecwindowspassword.label "Password:">
+
+<!ENTITY button.label.folderpathcheck "Controlla">
+<!ENTITY button.label.folderbrowse "Sfoglia">
+
+<!ENTITY exchWebServices.UserAvailability.label "Per il calendario della casella di posta sarà visibile unicamente lo stato di disponibilità utente.">
+
+<!ENTITY exchWebServices.exchtype.label "Tipo Exchange">
+<!ENTITY exchWebServices.hostexch.label "Exchange hosted">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office 365">
+<!ENTITY exchWebServices.detail.label "Dettagli">
+
diff --git a/locale/exchangecalendar/it-IT/extra-priority.dtd b/locale/exchangecalendar/it-IT/extra-priority.dtd
new file mode 100644
index 00000000..a0c210b0
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/extra-priority.dtd
@@ -0,0 +1,18 @@
+<!ENTITY prefwindow.title "Opzioni aggiuntive">
+<!ENTITY general.label  "Generale">
+<!ENTITY about.label "Informazioni su">
+
+<!ENTITY about.description.label "Funzionalità avanzate per Thunderbird e SeaMonkey">
+<!ENTITY iconify.label "Visualizza solo icone priorità">
+<!ENTITY shadeHigh.label "Aggiungi un colore di sfondo ai messaggi con priorità alta">
+<!ENTITY shadeLow.label "Aggiungi un colore di sfondo ai messaggi con priorità bassa">
+<!ENTITY tagImportant.label "Contrassegna automaticamente i messaggi con priorità alta come Importante">
+
+<!ENTITY highestColor.label "Massima">
+
+<!ENTITY highColor.label "Alta">
+<!ENTITY lowColor.label "Bassa">
+<!ENTITY lowestColor.label "Minima">
+
+<!ENTITY prioritycolor  "Colore personalizzato">
+<!ENTITY pref.color "Opzioni colore:">
diff --git a/locale/exchangecalendar/it-IT/invitationResponse.dtd b/locale/exchangecalendar/it-IT/invitationResponse.dtd
new file mode 100644
index 00000000..1a20500e
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/invitationResponse.dtd
@@ -0,0 +1,20 @@
+<!ENTITY label.acceptbutton "Conferma modifica">
+<!ENTITY label.cancelbutton "Annulla modifica">
+
+<!ENTITY description.invitationResponse "Conferma la modifica della risposta per la riunione.">
+
+<!ENTITY label.calendarName "Calendario:">
+<!ENTITY label.itemTitle "Oggetto:">
+<!ENTITY label.itemStart "Ora di inizio:">
+<!ENTITY label.itemResponse "Risposta:">
+<!ENTITY label.meetingOrganiser "Organizzatore:">
+
+<!ENTITY label.messageReponseBody "Messaggio risposta:">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "Forse parteciperò">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "Parteciperò">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "Non parteciperò">
+
+<!ENTITY label.proposenewtime.title "Proponi nuovo orario (Exchange 2013 o successivo)">
+<!ENTITY label.proposenewtime.start "Ora di inizio">
+<!ENTITY label.proposenewtime.end "Ora di fine">
diff --git a/locale/exchangecalendar/it-IT/inviteStyle.dtd b/locale/exchangecalendar/it-IT/inviteStyle.dtd
new file mode 100644
index 00000000..b3672185
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/inviteStyle.dtd
@@ -0,0 +1,2 @@
+<!ENTITY label.inviteCol "Invito a calendario">
+<!ENTITY tooltip.inviteCol "Ordina per invito">
diff --git a/locale/exchangecalendar/it-IT/lightning-item-iframe.dtd b/locale/exchangecalendar/it-IT/lightning-item-iframe.dtd
new file mode 100644
index 00000000..b3523433
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/lightning-item-iframe.dtd
@@ -0,0 +1,7 @@
+<!ENTITY exchWebService.owner.label "Proprietario:">
+<!ENTITY exchWebService.totalWork.label "Lavoro totale:">
+<!ENTITY exchWebService.actualWork.label "Lavoro effettivo:">
+<!ENTITY exchWebService.mileage.label "Chilometraggio:">
+<!ENTITY exchWebService.billingInformation.label "Informazioni di fatturazione:">
+<!ENTITY exchWebService.companies.label "Azienda:">
+
diff --git a/locale/exchangecalendar/it-IT/manageEWSAccounts.dtd b/locale/exchangecalendar/it-IT/manageEWSAccounts.dtd
new file mode 100644
index 00000000..921a477b
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/manageEWSAccounts.dtd
@@ -0,0 +1,16 @@
+<!ENTITY label.acceptbutton "Chiudi">
+
+<!ENTITY exchWebService.manageEWSAccounts.newAccount.button "Aggiungi account">
+<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button "Rimuovi account">
+<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button "Salva impostazioni">
+
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.label "Utilizza la funzionalità di ricerca automatica di Exchange.">
+<!ENTITY exchWebService.manageEWSAccounts.mailbox.label "Nome casella di posta:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label "Nome utente:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label "Nome dominio:">
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button "Esegui ricerca automatica">
+<!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Controlla server e account">
+<!ENTITY exchWebService.manageEWSAccounts.name.label "Nome:">
+
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Account Exchange Web Services">
+
diff --git a/locale/exchangecalendar/it-IT/messenger_task_delegation.dtd b/locale/exchangecalendar/it-IT/messenger_task_delegation.dtd
new file mode 100644
index 00000000..19f584cb
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/messenger_task_delegation.dtd
@@ -0,0 +1,6 @@
+<!ENTITY exchWebService.task.delegation.owner.name "Proprietario attività">
+<!ENTITY exchWebService.task.delegation.delegator.name "Delegato attività">
+<!ENTITY exchWebService.task.delegation.accept.button "Accetta">
+<!ENTITY exchWebService.task.delegation.decline.button "Rifiuta">
+<!ENTITY exchWebService.task.delegation.lastUpdateDate "Ultima modifica">
+
diff --git a/locale/exchangecalendar/it-IT/oofSettings.dtd b/locale/exchangecalendar/it-IT/oofSettings.dtd
new file mode 100644
index 00000000..babb3d46
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/oofSettings.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.oofsettings "Opzioni Fuori sede">
+<!ENTITY label.acceptbutton "Salva">
+<!ENTITY label.cancelbutton "Chiudi">
+<!ENTITY label.oofsettings.title "Opzioni Fuori sede per:">
+
+<!ENTITY label.oofstatus "Stato Fuori sede:">
+
+<!ENTITY label.externalaudience "Persone esterne a cui inviare messaggi Fuori sede: ">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "Nessuno">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Solo persone nel mio elenco contatti">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "Tutti">
+
+<!ENTITY button.label.internal "Messaggio interno">
+<!ENTITY button.label.external "Messaggio esterno">
+<!ENTITY label.internalreply "Messaggio che sarà inviato alle persone nella propria impresa:">
+<!ENTITY label.externalreply "Messaggio che sarà inviato alle persone al di fuori della propria impresa:">
+
+<!ENTITY menuitem.label.exchWebService-oof-status.disabled "Disabilitato">
+<!ENTITY menuitem.label.exchWebService-oof-status.enabled "Abilitato">
+
+<!ENTITY checkbox.label.exchWebService-oof-scheduled "Abilitato solo nell'intervallo temporale specificato:">
+<!ENTITY label.hbox-oof-scheduled-startTime "Ora di inizio:">
+<!ENTITY label.hbox-oof-scheduled-endTime "Ora di fine:">
+
+
+
diff --git a/locale/exchangecalendar/it-IT/preInvitationResponse.dtd b/locale/exchangecalendar/it-IT/preInvitationResponse.dtd
new file mode 100644
index 00000000..359a7b6f
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/preInvitationResponse.dtd
@@ -0,0 +1,14 @@
+<!ENTITY dialog.exchWebService.preInvitationResponse.title "Come si desidera rispondere?">
+<!ENTITY label.acceptbutton "OK">
+<!ENTITY label.cancelbutton "Annulla">
+
+<!ENTITY label.calendarName "Calendario:">
+<!ENTITY label.itemTitle "Oggetto:">
+<!ENTITY label.itemStart "Ora di inizio:">
+<!ENTITY label.itemResponse "Risposta:">
+<!ENTITY label.meetingOrganiser "Organizzatore:">
+
+<!ENTITY radio.label.exchWebService.preInvitationResponse.edit "Modifica la risposta prima di inviarla.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow "Invia la risposta ora.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend "Non inviare una risposta.">
+
diff --git a/locale/exchangecalendar/it-IT/preferences.dtd b/locale/exchangecalendar/it-IT/preferences.dtd
new file mode 100644
index 00000000..2979c1de
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/preferences.dtd
@@ -0,0 +1,48 @@
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Registrazione eventi">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Account">
+<!ENTITY exchangeWebService.preferences.tab.debug "Registrazione eventi">
+<!ENTITY exchangeWebService.preference.debug.file "Percorso file di log:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Comunicazioni con il server Exchange:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Registra informazioni sulla console e/o su un file">
+<!ENTITY exchangeWebService.preference.debug.file.button "Sfoglia">
+<!ENTITY exchangeWebService.preference.network.debug.label "Registra comunicazioni con il server Exchange">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Livello di log">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = informazioni di base, 2 = comunicazioni integrali">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Registra informazioni sull'avanzamento delle comunicazioni (ad es. autenticazione)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Visualizza la password come testo in chiaro nel file di log.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Rubrica/Contatti:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Livello di log">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = informazioni di base, 2 = comunicazioni integrali">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Registra informazioni relative alla Rubrica/Contatti">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Opzioni Exchange (EWS)">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Oggetto core provider:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = nessuna informazione, 1 = informazioni di base, 2 = comunicazioni integrali">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Caching">
+<!ENTITY exchangeWebService.preference.cache.memory.label "Cache minimale temporanea in memoria">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Numero di giorni di cui scaricare i dati prima della data di avvio del programma:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Numero di giorni di cui scaricare i dati dopo la data di avvio del programma:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Altro">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Opzioni comunicazioni:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Numero massimo di tentativi per le comunicazioni con Exchange:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Funzionalità aggiornamento componente aggiuntivo:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Controlla automaticamente la disponibilità di una nuova versione del componente aggiuntivo su Internet all'avvio di Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Visualizza un avviso se una nuova versione è disponibile per consentirne un'installazione facile.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Visualizza un avviso se una nuova versione non definitiva (beta, RC, ecc.) è disponibile.">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Bilanciamento del carico:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Bilanciamento del carico:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Numero massimo di richieste contemporanee al server Exchange:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Tempo minimo di attesa fra richieste al server Exchange:">
+<!ENTITY exchangeWebService.preference.userAgent.label "Agente utente HTTP:">
+
+<!ENTITY exchangeWebService.preference.ntlmv1.label "Opzioni NTLM-v1:">
+<!ENTITY exchangeWebService.preference.ntlmv1.true.label "Abilita">
+<!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disabilita">
diff --git a/locale/exchangecalendar/it-IT/rtews.dtd b/locale/exchangecalendar/it-IT/rtews.dtd
new file mode 100755
index 00000000..56bd4e15
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/rtews.dtd
@@ -0,0 +1,15 @@
+ <!ENTITY rtews.selectaccountdesc "Selezionare l'account di posta elettronica da configurare. L'account deve essere basato su Microsoft Exchange">
+ <!ENTITY rtews.accconfigured "Account già configurato">
+ <!ENTITY rtews.dicoverdesc "È possibile scegliere di ricercare automaticamente l'URL del server Microsoft Exchange (EWS) URL o configurarlo manualmente">
+ <!ENTITY rtews.dicoverdesc2 "Per configurarlo manualmente, immettere l'URL nel campo sottostante.">
+ <!ENTITY rtews.autodiscover "Ricerca automatica">
+ <!ENTITY rtews.doautodicover "Esegui ricerca automatica">
+ <!ENTITY rtews.manual "Manuale">
+ <!ENTITY rtews.test "Fare clic qui per verificare l'URL EWS">
+ <!ENTITY rtews.msexchewsurl "URL EWS Microsoft Exchange EWS verificato. Cliccare Fine per completare la configurazione">
+ <!ENTITY rtews.selectaccount "Seleziona account">
+ <!ENTITY rtews.configure.label "Configura...">
+ <!ENTITY rtews.rtforexch "Contrassegni remoti per Microsoft Exchange">
+ <!ENTITY rtews.confirmAccDetail "Confermare i seguenti dettagli dell'account">
+ <!ENTITY rtews.username "Nome utente">
+ <!ENTITY rtews.domain "Dominio">
diff --git a/locale/exchangecalendar/it-IT/rtews.properties b/locale/exchangecalendar/it-IT/rtews.properties
new file mode 100755
index 00000000..795994f8
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/rtews.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=Si è verificato un errore durante la creazione del tag per la categoria
diff --git a/locale/exchangecalendar/it-IT/selectEWSUrl.dtd b/locale/exchangecalendar/it-IT/selectEWSUrl.dtd
new file mode 100644
index 00000000..43adbaab
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/selectEWSUrl.dtd
@@ -0,0 +1,9 @@
+<!ENTITY label.acceptbutton "Seleziona">
+<!ENTITY label.cancelbutton "Annulla">
+
+<!ENTITY description.selectews "Selezionare dall'elenco un server EWS adatto alla posizione corrente.">
+<!ENTITY label.selectews "Elenco server EWS:">
+
+
+
+
diff --git a/locale/exchangecalendar/it-IT/sendUpdateTo.dtd b/locale/exchangecalendar/it-IT/sendUpdateTo.dtd
new file mode 100644
index 00000000..36263e4b
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/sendUpdateTo.dtd
@@ -0,0 +1,9 @@
+<!ENTITY title.sendupdateto "A chi dev'essere inviato quest'aggiornamento?">
+<!ENTITY label.acceptbutton "Esegui">
+<!ENTITY label.cancelbutton "Annulla">
+<!ENTITY label.calendaritem.title "Invia aggiornamento per la riunione:">
+
+<!ENTITY radio.label.sendtonone "Non inviare l'aggiornamento a nessuno.">
+<!ENTITY radio.label.sendtoall "Invia l'aggiornamento a tutti gli invitati.">
+<!ENTITY radio.label.sendtochanged "Invia l'aggiornamento solo alle persone aggiunte o rimosse.">
+
diff --git a/locale/exchangecalendar/it-IT/sharedCalendarParser.dtd b/locale/exchangecalendar/it-IT/sharedCalendarParser.dtd
new file mode 100644
index 00000000..261f6d14
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/sharedCalendarParser.dtd
@@ -0,0 +1,3 @@
+<!ENTITY exchWebService_vbox_label "Rilevato invito condivisione Exchange">
+<!ENTITY exchWebService_button_label_add_calendar "Aggiungi calendario">
+
diff --git a/locale/exchangecalendar/it-IT/timezonePreference.dtd b/locale/exchangecalendar/it-IT/timezonePreference.dtd
new file mode 100644
index 00000000..eef697cc
--- /dev/null
+++ b/locale/exchangecalendar/it-IT/timezonePreference.dtd
@@ -0,0 +1 @@
+<!ENTITY calendar.timezone.local.auto.label  "Modifica fuso orario automaticamente">

From aed5e9734bfc9750ceacf72c606875543994413c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 23 Jun 2017 15:25:52 +0200
Subject: [PATCH 068/222] ecCalendarCreation.js: retrieve correctly user
 selected color

On calendar creation, all calendar were created with the default blue.

Fix #19
---
 chrome/content/ecCalendarCreation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/ecCalendarCreation.js b/chrome/content/ecCalendarCreation.js
index db0e37d9..ad0f3e48 100644
--- a/chrome/content/ecCalendarCreation.js
+++ b/chrome/content/ecCalendarCreation.js
@@ -182,7 +182,7 @@ exchCalendarCreation.prototype = {
 
 		calPrefs.setCharPref("name", this._document.getElementById("calendar-name").value);
 
-		newCal.setProperty("color", this._document.getElementById('calendar-color').color);
+		newCal.setProperty("color", this._document.getElementById('calendar-color').value);
 		if (!this._document.getElementById("fire-alarms").checked) {
 			newCal.setProperty("suppressAlarms", true);
 		}

From 8d6ea14b6f735265465d138879ff9b827969f868 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 23 Jun 2017 15:35:06 +0200
Subject: [PATCH 069/222] ecCalendarCreation.js: add comments and fix coding
 style

---
 chrome/content/ecCalendarCreation.js | 53 +++++++++++++++++-----------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/chrome/content/ecCalendarCreation.js b/chrome/content/ecCalendarCreation.js
index ad0f3e48..5c02fa79 100644
--- a/chrome/content/ecCalendarCreation.js
+++ b/chrome/content/ecCalendarCreation.js
@@ -147,50 +147,65 @@ exchCalendarCreation.prototype = {
 	
 	},
 
+	/*
+	 * saveSettings: save calendar settings after calendar wizard completed
+	 *
+	 * Lightning original code to save calendar can be found in:
+	 * comm-central/calendar/resources/content/calendarCreation.js
+	 */
 	saveSettings: function _saveSettings()
 	{
 		this.globalFunctions.LOG("saveSettings Going to create the calendar in prefs.js");
 
-		// Calculate the new calendar.id
-		var newCalId = this.globalFunctions.getUUID();
+		// Calculate the new calendar.id and properties
+		let newCalId = this.globalFunctions.getUUID();
+		let newCalName = this._document.getElementById("calendar-name").value;
+		let newCalColor = this._document.getElementById("calendar-color").value;
 
 		// Save settings in dialog to new cal id.
 		tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
 
 		// Need to save the useOfflineCache preference separetly because it is not part of the main.
 		this.prefs = Cc["@mozilla.org/preferences-service;1"]
-	                    .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+newCalId+".");
+			.getService(Ci.nsIPrefService)
+			.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+newCalId+".");
 		this.prefs.setBoolPref("useOfflineCache", this._document.getElementById("exchange-cache").checked);
 		this.prefs.setIntPref("exchangePrefVersion", 1);
 
 		// We create a new URI for this calendar which will contain the calendar.id
-		var ioService = Cc["@mozilla.org/network/io-service;1"]  
-				.getService(Ci.nsIIOService);  
-		var tmpURI = ioService.newURI("https://auto/"+newCalId, null, null);  
+		var ioService = Cc["@mozilla.org/network/io-service;1"]
+				.getService(Ci.nsIIOService);
+		var tmpURI = ioService.newURI("https://auto/"+newCalId, null, null);
 
+		// Register calendar to global settings
+		var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+			.getService(Ci.nsIPrefService)
+			.getBranch("calendar.registry."+newCalId+".");
+		calPrefs.setCharPref("name", newCalName);
+
+		// Create the new calendar object
+		// Should be synced with Lightning doCreateCalendar() code
 		var calManager = Cc["@mozilla.org/calendar/manager;1"]
 			.getService(Ci.calICalendarManager);
+
 		var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
 
 		newCal.id = newCalId;
-		newCal.name = this._document.getElementById("calendar-name").value;
+		newCal.name = newCalName;
 
-		var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+newCalId+".");
+		newCal.setProperty("color", newCalColor);
 
-		calPrefs.setCharPref("name", this._document.getElementById("calendar-name").value);
+		newCal.setProperty("cache.enabled", false);
 
-		newCal.setProperty("color", this._document.getElementById('calendar-color').value);
 		if (!this._document.getElementById("fire-alarms").checked) {
 			newCal.setProperty("suppressAlarms", true);
 		}
+		// End of sync
 
+		var emailCalendarIdentity = this._document.getElementById("email-identity-menulist").selectedItem;
 
-		var selItem = this._document.getElementById("email-identity-menulist").selectedItem;
-		if (selItem) {
-			var identity = selItem.getAttribute("value");
+		if (emailCalendarIdentity) {
+			var identity = emailCalendarIdentity.getAttribute("value");
 		}
 		else {
 			var identity = "";
@@ -199,13 +214,11 @@ exchCalendarCreation.prototype = {
 		newCal.setProperty("imip.identity.key", identity); 
 
 
-		newCal.setProperty("cache.enabled", false);
-
 		Cc["@mozilla.org/preferences-service;1"]
-	                    .getService(Ci.nsIPrefService).savePrefFile(null);
+			.getService(Ci.nsIPrefService).savePrefFile(null);
 
+		// Finally register completly the new calendar
 		calManager.registerCalendar(newCal);
-
 	},
 }
 

From 3e1f509f7f83550197f3ad91c67156c37991629c Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sun, 25 Jun 2017 22:40:28 +0200
Subject: [PATCH 070/222] Bump version number to `4.0.0-beta3`

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index b86b8c86..7f193961 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>4.0.0-beta2</em:version>
+    <em:version>4.0.0-beta3</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->

From ff59f4641d2b41a6e7a568c12fdf1b9c3c80f864 Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sun, 25 Jun 2017 22:51:30 +0200
Subject: [PATCH 071/222] Update CHANGELOG.md to include changes for
 `4.0.0-beta3`

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b79ce2b..6bc3fa07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.0.0-beta3] - 2017-06-25
+### Added
+- Added Italian translation #22
+
+### Changed
+- Updated README.md #26, master
+
+### Fixed
+- Colorpick on calender creation doesn't work #19 
+- Can't update tasks/events descriptions #5
+
 ## [4.0.0-beta2] - 2017-06-10
 ### Fixed
 - Opening and working with Attachment dialog #12

From 9e9d92e94dff93412acf92a488eb7c3a6ef961f5 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 27 Jun 2017 10:10:12 +0200
Subject: [PATCH 072/222] lightning-item-iframe.js: updateScreen() shows always
 HTML content editor

exchangecalendar <4.0 did a test on existence of an element with id
"todo-entrydate" to decide whether it should display or hide the
HTML content editor.

(this code was in the onLoad() function of calendar-event-dialog.js)

Because of the name of the ID, I misunderstood the test and thought
the HTML editor has to be displayed only for tasks.

This commit fixes the dialog display.
The next one will fix the content saving.
---
 chrome/content/lightning-item-iframe.js | 120 +++++++++++++-----------
 1 file changed, 65 insertions(+), 55 deletions(-)

diff --git a/chrome/content/lightning-item-iframe.js b/chrome/content/lightning-item-iframe.js
index 512c67f3..15fbc61f 100644
--- a/chrome/content/lightning-item-iframe.js
+++ b/chrome/content/lightning-item-iframe.js
@@ -114,43 +114,21 @@ exchangeEventDialog.prototype = {
 	},
 
 	/*
-	 * This function is used to add extra informations for Exchange tasks
+	 * Adds HTML editor for exchangecalendar items
+	 * Adds extra informations for Exchange tasks
+	 *
 	 * As the same dialog is used for non-Exchange tasks and for events, this function
-	 * remove too these details when necessary.
+	 * removes too these details when necessary.
 	 */
 	updateScreen: function _updateScreen(aItem, aCalendar)
 	{
 		var item = aItem;
 
-		// If not an event and calendar type is exchangeCalendar, add Exchange task extra informations
-		if (!cal.isEvent(item)
-			&& aCalendar.type === "exchangecalendar") {
-
-			// Set and display task owner
-
-			var ownerLabel = this._document.getElementById("exchWebService-owner-label");
-			if (ownerLabel) {
-				ownerLabel.setAttribute("collapsed", "false");
-				ownerLabel.value = item.owner;
-			}
-
-			// Set and display Exchange task details
-
-			this._document.getElementById("exchWebService-details-separator").hidden = false;
-			this._document.getElementById("exchWebService-details-row1").collapsed = false;
-			this._document.getElementById("exchWebService-details-row2").collapsed = false;
-			this._document.getElementById("exchWebService-details-row3").collapsed = false;
+		if (aCalendar.type === "exchangecalendar") {
 
-			if (item.className) {
-				this._document.getElementById("exchWebService-totalWork-count").value = item.totalWork;
-				this._document.getElementById("exchWebService-actualWork-count").value = item.actualWork;
-				this._document.getElementById("exchWebService-mileage-count").value = item.mileage;
-				this._document.getElementById("exchWebService-billingInformation-count").value = item.billingInformation;
-				this._document.getElementById("exchWebService-companies-count").value = item.companies;
-			}
+			// For all item type, enable HTML editor
 
 			// Set HTML content editor
-
 			let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
 
 			// Try to read directly item body, otherwise fallback to item description property
@@ -178,37 +156,66 @@ exchangeEventDialog.prototype = {
 				itemBodyEditor.setAttribute("scrollbars","yes");
 			}
 
-			// Remove some standard inputs
+			// If not an event, add Exchange task extra informations
+			if (!cal.isEvent(item)) {
 
-			this._document.getElementById("event-grid-location-row").hidden = true;
+				// Set and display task owner
 
-			this._document.getElementById("reminder-none-separator").hidden = true;
-			this._document.getElementById("reminder-0minutes-menuitem").hidden = true;
-			this._document.getElementById("reminder-5minutes-menuitem").hidden = true;
-			this._document.getElementById("reminder-15minutes-menuitem").hidden = true;
-			this._document.getElementById("reminder-30minutes-menuitem").hidden = true;
-			this._document.getElementById("reminder-minutes-separator").hidden = true;
-			this._document.getElementById("reminder-1hour-menuitem").hidden = true;
-			this._document.getElementById("reminder-2hours-menuitem").hidden = true;
-			this._document.getElementById("reminder-12hours-menuitem").hidden = true;
-			this._document.getElementById("reminder-hours-separator").hidden = true;
-			this._document.getElementById("reminder-1day-menuitem").hidden = true;
-			this._document.getElementById("reminder-2days-menuitem").hidden = true;
-			this._document.getElementById("reminder-1week-menuitem").hidden = true;
+				var ownerLabel = this._document.getElementById("exchWebService-owner-label");
+				if (ownerLabel) {
+					ownerLabel.setAttribute("collapsed", "false");
+					ownerLabel.value = item.owner;
+				}
 
-			this._document.getElementById("timezone-starttime").hidden = true;
-			this._document.getElementById("timezone-endtime").hidden = true;
+				// Set and display Exchange task details
 
-			// Manage repeat for Exchange tasks
+				this._document.getElementById("exchWebService-details-separator").hidden = false;
+				this._document.getElementById("exchWebService-details-row1").collapsed = false;
+				this._document.getElementById("exchWebService-details-row2").collapsed = false;
+				this._document.getElementById("exchWebService-details-row3").collapsed = false;
 
-			if (this._document.getElementById("item-repeat")) {
-				this._document.getElementById("item-repeat").addEventListener("command", function() { self.updateRepeat(); }, false);
-			}
+				if (item.className) {
+					this._document.getElementById("exchWebService-totalWork-count").value = item.totalWork;
+					this._document.getElementById("exchWebService-actualWork-count").value = item.actualWork;
+					this._document.getElementById("exchWebService-mileage-count").value = item.mileage;
+					this._document.getElementById("exchWebService-billingInformation-count").value = item.billingInformation;
+					this._document.getElementById("exchWebService-companies-count").value = item.companies;
+				}
+
+				// Remove some standard inputs
+
+				this._document.getElementById("event-grid-location-row").hidden = true;
 
-			this.updateRepeat();
+				this._document.getElementById("reminder-none-separator").hidden = true;
+				this._document.getElementById("reminder-0minutes-menuitem").hidden = true;
+				this._document.getElementById("reminder-5minutes-menuitem").hidden = true;
+				this._document.getElementById("reminder-15minutes-menuitem").hidden = true;
+				this._document.getElementById("reminder-30minutes-menuitem").hidden = true;
+				this._document.getElementById("reminder-minutes-separator").hidden = true;
+				this._document.getElementById("reminder-1hour-menuitem").hidden = true;
+				this._document.getElementById("reminder-2hours-menuitem").hidden = true;
+				this._document.getElementById("reminder-12hours-menuitem").hidden = true;
+				this._document.getElementById("reminder-hours-separator").hidden = true;
+				this._document.getElementById("reminder-1day-menuitem").hidden = true;
+				this._document.getElementById("reminder-2days-menuitem").hidden = true;
+				this._document.getElementById("reminder-1week-menuitem").hidden = true;
+
+				this._document.getElementById("timezone-starttime").hidden = true;
+				this._document.getElementById("timezone-endtime").hidden = true;
+
+				// Manage repeat for Exchange tasks
+
+				if (this._document.getElementById("item-repeat")) {
+					this._document.getElementById("item-repeat").addEventListener("command", function() { self.updateRepeat(); }, false);
+				}
+
+				this.updateRepeat();
+			}
 		}
+
 		// For events and other calendar type, hidde back all Exchange task details, display back standard items
-		else {
+		if (cal.isEvent(item)
+			|| cal.type !== "exchangecalendar") {
 
 			// Hide Exchange task details
 
@@ -221,10 +228,6 @@ exchangeEventDialog.prototype = {
 			this._document.getElementById("exchWebService-details-row2").collapsed = true;
 			this._document.getElementById("exchWebService-details-row3").collapsed = true;
 
-			// HTML Task content editor
-			this._document.getElementById("item-description").hidden = false;
-			this._document.getElementById("exchWebService-body-editor").hidden = true;
-
 			// Reset standard form
 			this._document.getElementById("event-grid-location-row").hidden = false;
 			this._document.getElementById("event-grid-recurrence-row").hidden=false;
@@ -248,6 +251,13 @@ exchangeEventDialog.prototype = {
 			this._document.getElementById("timezone-starttime").hidden = false;
 			this._document.getElementById("timezone-endtime").hidden = false;
 		}
+
+		// Reset content editor when not exchangecalendar items
+		if (aCalendar.type !== "exchangecalendar") {
+			// Hidde HTML content editor
+			this._document.getElementById("item-description").hidden = false;
+			this._document.getElementById("exchWebService-body-editor").hidden = true;
+		}
 	},
 
 

From 72b0ec6f54b50638f620ae5b0e0fcdd0a5a8e564 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 27 Jun 2017 10:16:04 +0200
Subject: [PATCH 073/222] lightning-item-iframe.js: on save, records HTML
 content for all items

Fix #29: as we know save content to HTML body, we are correctly synced
with exchange server.
---
 chrome/content/lightning-item-iframe.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/chrome/content/lightning-item-iframe.js b/chrome/content/lightning-item-iframe.js
index 15fbc61f..124df91e 100644
--- a/chrome/content/lightning-item-iframe.js
+++ b/chrome/content/lightning-item-iframe.js
@@ -75,20 +75,20 @@ exchangeEventDialog.prototype = {
 				aItem.mileage = this._document.getElementById("exchWebService-mileage-count").value;
 				aItem.billingInformation = this._document.getElementById("exchWebService-billingInformation-count").value;
 				aItem.companies = this._document.getElementById("exchWebService-companies-count").value;
+			}
 
-				// Copy content from HTML editor
-				try{
-					if (this.newItem) {
-						aItem.bodyType = "HTML";
-						aItem.body = this._document.getElementById("exchWebService-body-editor").content;
-						this.newItem = false;
-					}
-					else if (aItem.bodyType === "HTML") {
-						aItem.body = this._document.getElementById("exchWebService-body-editor").content;
-					}
-				} catch(err) {
-					dump("Error saving content\n");
+			// Copy content from HTML editor
+			try{
+				if (this.newItem) {
+					aItem.bodyType = "HTML";
+					aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+					this.newItem = false;
+				}
+				else if (aItem.bodyType === "HTML") {
+					aItem.body = this._document.getElementById("exchWebService-body-editor").content;
 				}
+			} catch(err) {
+				dump("Error saving content\n");
 			}
 		}
 

From 6fb004084f36a68793229a3e84776c1895f687c4 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 12 Jun 2017 14:07:07 +0200
Subject: [PATCH 074/222] exchWebServiceEditor: fix constructor to set content
 only when editor available

---
 chrome/content/exchWebServiceEditor.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 296dc576..e10804d7 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -195,8 +195,13 @@
     </content>
 	<implementation>
 		<constructor><![CDATA[
-			this.editorElement = document.getAnonymousElementByAttribute(this, "anonid", "editor");
 			var self=this;
+
+			// To be able to set correct HTML content
+			this.globalFunctions = Components.classes["@1st-setup.nl/global/functions;1"]
+				.getService(Components.interfaces.mivFunctions);
+
+			this.editorElement = document.getAnonymousElementByAttribute(this, "anonid", "editor");
 			if (this.editorElement) {
 				this.commandManager = this.editorElement.commandManager;
 				this.editorClickFunction = function(aEvent) { self.onClickEditor(aEvent);};
@@ -214,16 +219,13 @@
 				this.editorElement.addEventListener("mouseover", this.editorMouseOver , false);
 				this.editorElement.addEventListener("mouseout", this.editorMouseOut, false);
 
+				// Set default document to empty HTML content
+				this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(null);
 			}
 
 			this.atomService = Components.classes["@mozilla.org/atom-service;1"]
 				.getService(Components.interfaces.nsIAtomService);
 
-			// Set initial content to empty HTML body
-			this.globalFunctions = Components.classes["@1st-setup.nl/global/functions;1"]
-				.getService(Components.interfaces.mivFunctions);
-			this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(null);
-
 			this.connectButtons("FormatToolbar");
 			// Connect color button
 			this.bgColorFunction = function(){ self.selectColor("cmd_backgroundColor");};

From 4b2a3f539ad04977766410efe1b046c150c6d631 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 13 Jun 2017 14:13:44 +0200
Subject: [PATCH 075/222] exchWebServiceEditor: fix typo in attributes of a
 toolbar button

---
 chrome/content/exchWebServiceEditor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index e10804d7..d91087b5 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -105,7 +105,7 @@
 					state="state_all"/>
 				<xul:toolbarseparator class="toolbarseparator-standard"/>
 				<xul:toolbaritem class="formatting-button">
-					<xul:stack align="enter" state="rgb(102,102,102)">
+					<xul:stack align="center" state="rgb(102,102,102)">
 						<xul:box style="background-color:#FFFFFF"
 							anonid="cmd_backgroundColor"
 							class="color-button"

From db6963fd23b0fc0e62ce53c66e89128c49492308 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 13 Jun 2017 14:14:14 +0200
Subject: [PATCH 076/222] exchWebServiceEditor.xml: add messengercompose.css to
 fix button display

As we removed this CSS from event-dialog, the font color and background
color buttons were not any more correctly displayed in the HTML editor.
---
 chrome/content/exchWebServiceEditor.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index d91087b5..a7b06a04 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -36,7 +36,12 @@
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<binding id="exchWebServiceEditor">
 
-    <content>
+	<!-- CSS needed to correctly display color buttons (font and background) -->
+	<resources>
+		<stylesheet src="chrome://messenger/skin/messengercompose/messengercompose.css" />
+	</resources>
+
+	<content>
 
 	<xul:vbox flex="1">
 		<xul:toolbox anonid="FormatToolbox" mode="icons">
@@ -192,7 +197,7 @@
 			flex="1"/>
 	</xul:vbox>
 
-    </content>
+	</content>
 	<implementation>
 		<constructor><![CDATA[
 			var self=this;

From 2a35697e40de7d641eb17e181e4ffbc49966704d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 14 Jun 2017 16:53:01 +0200
Subject: [PATCH 077/222] exchWebServiceEditor.xml: use explicit method name to
 add event listener to buttons

---
 chrome/content/exchWebServiceEditor.xml | 27 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index a7b06a04..5f4cbe39 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -231,7 +231,8 @@
 			this.atomService = Components.classes["@mozilla.org/atom-service;1"]
 				.getService(Components.interfaces.nsIAtomService);
 
-			this.connectButtons("FormatToolbar");
+			this.connectAllCommandListenerToolbar("FormatToolbar");
+
 			// Connect color button
 			this.bgColorFunction = function(){ self.selectColor("cmd_backgroundColor");};
 			var bgColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
@@ -244,12 +245,13 @@
 			this.highlightColor = "#FFFFFF";
 			this.fontColor = "#000000";
 
-			// Fill fontfac popup menu
+			// Connect FontFace popup menu
 			this.menuPopupFunction = function(event){ self.selectFont("cmd_fontFace", event.target.value);};
 			this.menuPopup = document.getAnonymousElementByAttribute(this, "anonid", "fontFaceSelect");
 			this.menuPopup.addEventListener("command", this.menuPopupFunction, true);
 			this.fillFontFace();
 
+			// Connect HyperLink buttons
 			this.addLinkFunction = function(){ self.addLink();};
 			var addLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
 			addLinkElement.addEventListener("click", this.addLinkFunction, true);
@@ -273,12 +275,19 @@
 				this.editorElement.removeEventListener("mouseover", this.editorMouseOver , false);
 				this.editorElement.removeEventListener("mouseout", this.editorMouseOut, false);
 			}
-			this.disconnectButtons("FormatToolbar");
+
+			this.removeAllCommandListenerToolbar("FormatToolbar");
+
+			// Disconnect color button
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor").removeEventListener("click", this.bgColorFunction, false);
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor").removeEventListener("click", this.fontColorFunction, false);
+
+			// Disconnect Font face button
 			if (this.menuPopupFunction) {
 				this.menuPopup.removeEventListener("command", this.menuPopupFunction, false);
 			}
+
+			// Disconnect HyperLink buttons
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link").removeEventListener("click", this.addLinkFunction, true);
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").removeEventListener("click", this.removeLinkFunction, true);
 			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").removeEventListener("click", this.editLinkFunction, true);
@@ -335,7 +344,7 @@
 		]]></body>
 		</method>
 
-		<method name="connectButtons">
+		<method name="connectAllCommandListenerToolbar">
 			<parameter name="aAnonId" />
 			<body><![CDATA[
 			var toolbar = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
@@ -348,14 +357,14 @@
 				var toolbarButtons = toolbar.getElementsByTagName("xul:toolbarbutton");
 				for (var i=0; i<toolbarButtons.length;i++) {
 					if ((toolbarButtons[i].hasAttribute("connect")) && (toolbarButtons[i].getAttribute("connect") === "true")) {
-						this.connectButton(toolbarButtons[i].getAttribute("anonid"), aAnonId);
+						this.addCommandListener(toolbarButtons[i].getAttribute("anonid"), aAnonId);
 					}
 				}
 			}
 		]]></body>
 		</method>
 
-		<method name="connectButton">
+		<method name="addCommandListener">
 			<parameter name="aAnonId" />
 			<parameter name="aStore" />
 			<body><![CDATA[
@@ -369,18 +378,18 @@
 		]]></body>
 		</method>
 
-		<method name="disconnectButtons">
+		<method name="removeAllCommandListenerToolbar">
 			<parameter name="aAnonId" />
 			<body><![CDATA[
 			if ((this.functions) && (this.functions[aAnonId])) {
 				for (var name in this.functions[aAnonId]) {
-					this.disconnectButton(name, aAnonId);
+					this.removeCommandListener(name, aAnonId);
 				}
 			}
 		]]></body>
 		</method>
 
-		<method name="disconnectButton">
+		<method name="removeCommandListener">
 			<parameter name="aAnonId" />
 			<parameter name="aStore" />
 			<body><![CDATA[

From e748b895e3df1f2ac138fbeaae6ee772b201bc7b Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 14 Jun 2017 16:54:22 +0200
Subject: [PATCH 078/222] exchWebServiceEditor.xml: add event listener in the
 bubbling phase

This ensures us that button are in a ready state when we apply commands
---
 chrome/content/exchWebServiceEditor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 5f4cbe39..6ade70cc 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -374,7 +374,7 @@
 				this.functions[aStore] = {};
 			}
 			this.functions[aStore][aAnonId] = function() { self.toggleButton(aAnonId);};
-			document.getAnonymousElementByAttribute(this, "anonid", aAnonId).addEventListener("command", this.functions[aStore][aAnonId], true);
+			document.getAnonymousElementByAttribute(this, "anonid", aAnonId).addEventListener("command", this.functions[aStore][aAnonId], false);
 		]]></body>
 		</method>
 

From 893310cb9f079ecaa25ee4fc22418c9292fbdbc7 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 14 Jun 2017 17:41:27 +0200
Subject: [PATCH 079/222] exchWebServiceEditor: code style

---
 chrome/content/exchWebServiceEditor.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 6ade70cc..1b6a707b 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -219,9 +219,9 @@
 				this.editorElement.addEventListener("keyup", this.editorKeyPressFunction, true);
 
 				this.editorMouseOver = function(aEvent) { self.onMouseOver(aEvent);};
-				this.editorMouseOut = function(aEvent) { self.onMouseOut(aEvent);};
-
 				this.editorElement.addEventListener("mouseover", this.editorMouseOver , false);
+
+				this.editorMouseOut = function(aEvent) { self.onMouseOut(aEvent);};
 				this.editorElement.addEventListener("mouseout", this.editorMouseOut, false);
 
 				// Set default document to empty HTML content

From 54d5c877ce2677f6239e2510589c2e730ca13da8 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 14 Jun 2017 17:40:57 +0200
Subject: [PATCH 080/222] exchWebServiceEditor.xml: add listener on bubbling
 phase to avoid issue with uninitilized interface

Note that desctructor and constructor were not handling handlers on the same phase.
---
 chrome/content/exchWebServiceEditor.xml | 35 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index 1b6a707b..a3113529 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -210,13 +210,13 @@
 			if (this.editorElement) {
 				this.commandManager = this.editorElement.commandManager;
 				this.editorClickFunction = function(aEvent) { self.onClickEditor(aEvent);};
-				this.editorElement.addEventListener("click", this.editorClickFunction, true);
+				this.editorElement.addEventListener("click", this.editorClickFunction, false);
 
 				this.editorDblClickFunction = function(aEvent) { self.onDblClickEditor(aEvent);};
-				this.editorElement.addEventListener("dblclick", this.editorDblClickFunction, true);
+				this.editorElement.addEventListener("dblclick", this.editorDblClickFunction, false);
 
 				this.editorKeyPressFunction = function(aEvent) { self.onKeyPressEditor(aEvent);};
-				this.editorElement.addEventListener("keyup", this.editorKeyPressFunction, true);
+				this.editorElement.addEventListener("keyup", this.editorKeyPressFunction, false);
 
 				this.editorMouseOver = function(aEvent) { self.onMouseOver(aEvent);};
 				this.editorElement.addEventListener("mouseover", this.editorMouseOver , false);
@@ -236,11 +236,11 @@
 			// Connect color button
 			this.bgColorFunction = function(){ self.selectColor("cmd_backgroundColor");};
 			var bgColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
-			bgColorElement.addEventListener("click", this.bgColorFunction, true);
+			bgColorElement.addEventListener("click", this.bgColorFunction, false);
 
 			this.fontColorFunction = function(){ self.selectColor("cmd_fontColor");};
 			var fontColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor")
-			fontColorElement.addEventListener("click", this.fontColorFunction, true);
+			fontColorElement.addEventListener("click", this.fontColorFunction, false);
 
 			this.highlightColor = "#FFFFFF";
 			this.fontColor = "#000000";
@@ -248,21 +248,21 @@
 			// Connect FontFace popup menu
 			this.menuPopupFunction = function(event){ self.selectFont("cmd_fontFace", event.target.value);};
 			this.menuPopup = document.getAnonymousElementByAttribute(this, "anonid", "fontFaceSelect");
-			this.menuPopup.addEventListener("command", this.menuPopupFunction, true);
+			this.menuPopup.addEventListener("command", this.menuPopupFunction, false);
 			this.fillFontFace();
 
 			// Connect HyperLink buttons
 			this.addLinkFunction = function(){ self.addLink();};
 			var addLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
-			addLinkElement.addEventListener("click", this.addLinkFunction, true);
+			addLinkElement.addEventListener("click", this.addLinkFunction, false);
 
 			this.removeLinkFunction = function(){ self.removeLink();};
 			var removeLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link")
-			removeLinkElement.addEventListener("click", this.removeLinkFunction, true);
+			removeLinkElement.addEventListener("click", this.removeLinkFunction, false);
 
 			this.editLinkFunction = function(){ self.editLink();};
 			var editLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
-			editLinkElement.addEventListener("click", this.editLinkFunction, true);
+			editLinkElement.addEventListener("click", this.editLinkFunction, false);
 		]]></constructor>
 
 		<destructor><![CDATA[
@@ -270,7 +270,7 @@
 				this.editorElement.removeEventListener("click", this.editorClickFunction, false);
 				this.editorElement.removeEventListener("keyup", this.editorKeyPressFunction, false);
 
-				this.editorElement.removeEventListener("dblclick", this.editorDblClickFunction, true);
+				this.editorElement.removeEventListener("dblclick", this.editorDblClickFunction, false);
 
 				this.editorElement.removeEventListener("mouseover", this.editorMouseOver , false);
 				this.editorElement.removeEventListener("mouseout", this.editorMouseOut, false);
@@ -279,8 +279,10 @@
 			this.removeAllCommandListenerToolbar("FormatToolbar");
 
 			// Disconnect color button
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor").removeEventListener("click", this.bgColorFunction, false);
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor").removeEventListener("click", this.fontColorFunction, false);
+			document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
+				.removeEventListener("click", this.bgColorFunction, false);
+			document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor")
+				.removeEventListener("click", this.fontColorFunction, false);
 
 			// Disconnect Font face button
 			if (this.menuPopupFunction) {
@@ -288,9 +290,12 @@
 			}
 
 			// Disconnect HyperLink buttons
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link").removeEventListener("click", this.addLinkFunction, true);
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").removeEventListener("click", this.removeLinkFunction, true);
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").removeEventListener("click", this.editLinkFunction, true);
+			document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
+				.removeEventListener("click", this.addLinkFunction, false);
+			document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link")
+				.removeEventListener("click", this.removeLinkFunction, false);
+			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
+				.removeEventListener("click", this.editLinkFunction, false);
 		]]></destructor>
 			
 		<property name="content">

From b90673fa758b156a513387cc57310f7f81c5c4cc Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 27 Jun 2017 11:38:47 +0200
Subject: [PATCH 081/222] lightning-item-iframe: use collapsed attribute to
 display/hide HTML editor

As advised by the "Rapid Application Development with Mozilla" book by
Nigel McFarlane.

Indeed, a tag sole any binding when we use attribute like "display:none"
because a XBL binding requires a frame (styleable area).

Fixes #28
---
 chrome/content/lightning-item-iframe.js  | 4 ++--
 chrome/content/lightning-item-iframe.xul | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/lightning-item-iframe.js b/chrome/content/lightning-item-iframe.js
index 124df91e..ea00139c 100644
--- a/chrome/content/lightning-item-iframe.js
+++ b/chrome/content/lightning-item-iframe.js
@@ -151,7 +151,7 @@ exchangeEventDialog.prototype = {
 				this._document.getElementById("item-description").hidden = true;
 
 				// Display our own HTML content editor
-				itemBodyEditor.hidden = false;
+				itemBodyEditor.setAttribute("collapsed", "false");;
 
 				itemBodyEditor.setAttribute("scrollbars","yes");
 			}
@@ -256,7 +256,7 @@ exchangeEventDialog.prototype = {
 		if (aCalendar.type !== "exchangecalendar") {
 			// Hidde HTML content editor
 			this._document.getElementById("item-description").hidden = false;
-			this._document.getElementById("exchWebService-body-editor").hidden = true;
+			this._document.getElementById("exchWebService-body-editor").setAttribute("collapsed", "true");
 		}
 	},
 
diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
index 581417a5..dfe516a7 100644
--- a/chrome/content/lightning-item-iframe.xul
+++ b/chrome/content/lightning-item-iframe.xul
@@ -142,7 +142,7 @@
                     flex="1"
                     insertafter="item-description"
                     disable-on-readonly="true"
-                    hidden="true"/>
+                    collapsed="true"/>
             </tabpanel>
 
         </tabpanels>

From d0a37d0153b3b9ef19b90957d093073b7f19dc14 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 14:55:47 +0200
Subject: [PATCH 082/222] Copy-editing; fix outdated instructions.
 ExchangeCalendar/exchangecalendar/#32

---
 README.md | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b04e3321..e1333c34 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,25 @@
-Exchange Calendar is an **add-on for Thunderbird and Lightning** that provides **Exchange calendar support**.
+Exchange Calendar is an **add-on for
+[Thunderbird](https://mozilla.org/thunderbird) and
+[Lightning](https://mozilla.org/calendar)** that provides
+**[Microsoft Exchange](http://microsoft.com/exchange) calendar
+support**.
 
 ## Contributing
-This add-on is open-source and based on the work of many [contributors](https://github.com/ExchangeCalendar/exchangecalendar/graphs/contributors).
 
-### Installing developement tools
-You will need to install Dom Inspector, Javascript Debugger and some other development tools. Fortunately `Thunderbird addons` makes it easy to install all of these: 
-  
-Now using bash we'll compile the addon we need (which are written in wiki)
+This add-on is open source and based on the work of many
+[contributors](https://github.com/ExchangeCalendar/exchangecalendar/graphs/contributors).
+
+### Installing the developement tools
 
-    cd ./exchangecalendar_master; chmod +x ./build.sh; ./build.sh;
+You will need to install the
+[DOM Inspector](https://addons.mozilla.org/en-US/thunderbird/addon/dom-inspector-6622/),
+the
+[JavaScript Debugger](https://addons.mozilla.org/thunderbird/addon/javascript-debugger/),
+and some other development tools.
+  
+To compile the add-on, run the `build.sh` script.
 
 ## License
-This software is licensed under the [GNU GPL] Version 3 
-[GNU GPL]: http://www.gnu.org/licenses/gpl.html
+
+This software is licensed under the
+[GNU General Public License, Version 3](http://www.gnu.org/licenses/gpl.html).

From b22cdcaf6b1a864047deddc0cff3531ffecc3e66 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 14:57:27 +0200
Subject: [PATCH 083/222] Make project name match what's in the UI.
 ExchangeCalendar/exchangecalendar/#32

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e1333c34..e7193a6c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Exchange Calendar is an **add-on for
+Exchange EWS Provider is an **add-on for
 [Thunderbird](https://mozilla.org/thunderbird) and
 [Lightning](https://mozilla.org/calendar)** that provides
 **[Microsoft Exchange](http://microsoft.com/exchange) calendar

From 5dfcf9306f9ece2d1bbcecfa700653864f119060 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 15:11:22 +0200
Subject: [PATCH 084/222] Copy-editing English.
 ExchangeCalendar/exchangecalendar/#32.

---
 install.rdf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/install.rdf b/install.rdf
index 36fbf7c8..85311770 100644
--- a/install.rdf
+++ b/install.rdf
@@ -25,10 +25,10 @@
     </em:targetApplication>
 
     <em:name>Exchange EWS Provider</em:name>
-    <em:description>Allows you to sync Calendar and Tasks with your Microsoft Exchange 2007/2010/2013 EWS server from within lightning.
-You can also search your contacts folder and the Exchange Global Address List (Read-Only).
+    <em:description>Allows you to sync calendars, tasks, and contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within Lightning.
 
-You can view, delete, create and update calendar and task/todo items. And manage "Out of Office" settings.
+You can view, delete, create, and update calendar and task/todo items, and manage "out of office" settings.
+You can read and use contacts and global address list contacts for address autcompletion.
 
 Dutch, French, English, German, Swedish and Japanese localizations.
 
@@ -51,10 +51,10 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
 		<Description>
 			<em:locale>en-US</em:locale>
 			<em:name>Exchange EWS Provider</em:name>
-			<em:description>Allows you to sync Calendar, Tasks and Contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within lightning.
+			<em:description>Allows you to sync calendars, tasks, and contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within Lightning.
 
-You can view, delete, create and update calendar and task/todo items. And manage "Out of Office" settings.
-You can read and use contacts and global addres list contacts for address autcompletion.
+You can view, delete, create, and update calendar and task/todo items, and manage "out of office" settings.
+You can read and use contacts and global address list contacts for address autcompletion.
 
 Dutch, French, English, German, Swedish and Japanese localizations.
 

From 70ee408b031903340438ced740033f9eb1a2a0ae Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 15:35:31 +0200
Subject: [PATCH 085/222] Copy-editing English UI strings.
 ExchangeCalendar/exchangecalendar/#32.

---
 .../en-US/calExchangeCalendar.properties      | 18 ++++++-------
 .../en-US/calendar-calendars-list.dtd         |  8 +++---
 .../en-US/calendar-summary-dialog.dtd         |  4 +--
 .../en-US/delegate-calendar-dialog.dtd        | 20 +++++++-------
 .../en-US/delegate-folder.dtd                 | 22 ++++++++--------
 .../en-US/exchangeSettings.dtd                | 26 +++++++++----------
 .../en-US/exchangeSettingsOverlay.dtd         | 16 ++++++------
 .../exchangecalendar/en-US/extra-priority.dtd |  6 ++---
 locale/exchangecalendar/en-US/inviteStyle.dtd |  2 +-
 .../en-US/manageEWSAccounts.dtd               |  2 +-
 locale/exchangecalendar/en-US/oofSettings.dtd | 10 +++----
 .../en-US/preInvitationResponse.dtd           |  2 +-
 locale/exchangecalendar/en-US/preferences.dtd | 14 +++++-----
 locale/exchangecalendar/en-US/rtews.dtd       | 10 +++----
 .../exchangecalendar/en-US/rtews.properties   |  2 +-
 .../exchangecalendar/en-US/selectEWSUrl.dtd   |  2 +-
 .../en-US/sharedCalendarParser.dtd            |  2 +-
 17 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/locale/exchangecalendar/en-US/calExchangeCalendar.properties b/locale/exchangecalendar/en-US/calExchangeCalendar.properties
index d5c53d3e..feb1af9c 100644
--- a/locale/exchangecalendar/en-US/calExchangeCalendar.properties
+++ b/locale/exchangecalendar/en-US/calExchangeCalendar.properties
@@ -10,7 +10,7 @@ deleteCalendarEventMessage=Appointment "%1$S" has been removed (%2$S).
 deleteTaskEventMessage=Task "%1$S" has been removed (%2$S).
 syncFolderEventMessage="%4$S": Received updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
 syncInboxRequests="%4$S": Inbox received meeting invitation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
-syncInboxCancelations="%4$S": Inbox received meeting cancellation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxCancelations="%4$S": Inbox received meeting cancelation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
 syncInboxResponses="%4$S": Inbox received meeting response updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
 ewsMeetingResponsEventMessage=Meeting request "%1$S" answered with "%2$S" (%3$S). Your message:
 
@@ -22,16 +22,16 @@ ecErrorServerAndMailboxCheck=Error during checking of server and mailbox: %1$S (
 
 updateUserPrefs1=User preferences updated for new version (since 0.7.26)
 
-autoRemoveConfirmedInvitationOnCancellation=Confirmed appointment "%1$S" has been cancelled and was automatically removed as specified by user settings (%2$S).
+autoRemoveConfirmedInvitationOnCancellation=Confirmed appointment "%1$S" has been canceled and was automatically removed as specified by user settings (%2$S).
 
 sendAutoRespondMeetingRequestMessage=Meeting request "%1$S" has been automatically answered as specified by the user settings (%2$S).
 
 ecLoadingOofSettings=(Retrieving data)
 ecLoadedOofSettings=(Data retrieved)
-ecErrorLoadingOofSettings=Error during loading of Out of Office settings. Code: %2$S, Message: %1$S.
+ecErrorLoadingOofSettings=Error during loading of out of office settings. Code: %2$S, Message: %1$S.
 ecSavingOofSettings=(Saving data)
 ecSavedOofSettings=(Data saved)
-ecErrorSavingOofSettings=Error during saving of Out of Office settings. Code: %2$S, Message: %1$S.
+ecErrorSavingOofSettings=Error during saving of out of office settings. Code: %2$S, Message: %1$S.
 
 
 exchWebService.PidLidTaskHistory.duedate.changed=Due date was changed
@@ -41,9 +41,9 @@ exchWebService.PidLidTaskHistory.rejected=Task rejected by %1$S
 exchWebService.PidLidTaskHistory.assigned=Task assigned to %1$S
 exchWebService.PidLidTaskHistory.no.changes=No changes
 
-ecErrorServerAndMailboxCheckFolderNotFound=Either you do not have read permission on the selected mailbox or the mailbox is incorrect.\n\nWhen the mailbox is corrected you might have permissions to view the Busy/Tentative/OOO user availability status for its calendar.\n\n(%2$S: %1$S)
+ecErrorServerAndMailboxCheckFolderNotFound=Either you do not have read permission on the selected mailbox or the mailbox is incorrect.\n\nWhen the mailbox is corrected you might have permissions to view the busy/tentative/OOO user availability status for its calendar.\n\n(%2$S: %1$S)
 
-tooltipCalendarDisconnected=The calendar %1$S is not connected to the exchange server\n(Reason: %2$S).
-tooltipCalendarDisconnectedReadOnly=The calendar %1$S is not connected to the exchange server and is readonly\n(Reason: %2$S).
-tooltipCalendarConnected=The calendar %1$S is connected to the exchange server.
-tooltipCalendarConnectedReadOnly=The calendar %1$S is connected to the exchange server and is readonly.
+tooltipCalendarDisconnected=The calendar %1$S is not connected to the Exchange server\n(Reason: %2$S).
+tooltipCalendarDisconnectedReadOnly=The calendar %1$S is not connected to the Exchange server and is read only\n(Reason: %2$S).
+tooltipCalendarConnected=The calendar %1$S is connected to the Exchange server.
+tooltipCalendarConnectedReadOnly=The calendar %1$S is connected to the Exchange server and is readonly.
diff --git a/locale/exchangecalendar/en-US/calendar-calendars-list.dtd b/locale/exchangecalendar/en-US/calendar-calendars-list.dtd
index 04934534..0e815eff 100644
--- a/locale/exchangecalendar/en-US/calendar-calendars-list.dtd
+++ b/locale/exchangecalendar/en-US/calendar-calendars-list.dtd
@@ -1,5 +1,5 @@
 <!ENTITY calendar.context.exchange.convert.label "Convert to Exchange 2007/2010 Calendar and Tasks Add-on">
-<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) Properties">
-<!ENTITY calendar.context.exchange.oof.settings.label "Out of Office settings">
-<!ENTITY calendar.context.exchange.clone.settings.label "Clone settings to New Calendar">
-<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delegate Calendar">
+<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) properties">
+<!ENTITY calendar.context.exchange.oof.settings.label "Out of office settings">
+<!ENTITY calendar.context.exchange.clone.settings.label "Clone settings to new calendar">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delegate calendar">
diff --git a/locale/exchangecalendar/en-US/calendar-summary-dialog.dtd b/locale/exchangecalendar/en-US/calendar-summary-dialog.dtd
index 705d8132..ba560434 100644
--- a/locale/exchangecalendar/en-US/calendar-summary-dialog.dtd
+++ b/locale/exchangecalendar/en-US/calendar-summary-dialog.dtd
@@ -1,3 +1,3 @@
 <!ENTITY forward.invite.label "Forward invite">
-<!ENTITY required.attendee.label "Required Attendee">
-<!ENTITY optional.attendee.label "Optional Attendee">
\ No newline at end of file
+<!ENTITY required.attendee.label "Required attendee">
+<!ENTITY optional.attendee.label "Optional attendee">
diff --git a/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd b/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
index c84e0b14..a8e3fa73 100644
--- a/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
+++ b/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
@@ -1,10 +1,10 @@
  
 <!ENTITY  label.delegateCalendar.cancelbutton "Cancel">
 <!ENTITY  label.delegateCalendar.userEmail "Email">
-<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Deliver Meeting Requests">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Deliver meeting requests">
 
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates Only">
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and Me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates only">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and me">
 <!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Delegates and send notifications to me">
 
 <!ENTITY  label.delegateCalendar.permission "Permission">
@@ -13,13 +13,13 @@
 <!ENTITY  menuitem.delegateCalendar.permission.reviewer "Reviewer">
 <!ENTITY  menuitem.delegateCalendar.permission.none "None">
 
-<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Receive Copies Of Meeting Messages" >
-<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "View Private Items" >
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Receive copies Of meeting messages" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "View private items" >
 
 
-<!ENTITY  delegateCalendar.permission.description.author "Read and create items in the Calendar folder." >
-<!ENTITY  delegateCalendar.permission.description.editor "Read, create, and modify items in the Calendar folder." >
-<!ENTITY  delegateCalendar.permission.description.reviewer "Read items in the Calendar folder." >
-<!ENTITY  delegateCalendar.permission.description.none "No access permissions to the Calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.author "Read and create items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.editor "Read, create, and modify items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.reviewer "Read items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.none "No access permissions to the calendar folder." >
 
-<!ENTITY  delegateCalendar.permission.details.label "Permission Details: " >
\ No newline at end of file
+<!ENTITY  delegateCalendar.permission.details.label "Permission details: " >
diff --git a/locale/exchangecalendar/en-US/delegate-folder.dtd b/locale/exchangecalendar/en-US/delegate-folder.dtd
index 2ce88d16..28dbfd40 100644
--- a/locale/exchangecalendar/en-US/delegate-folder.dtd
+++ b/locale/exchangecalendar/en-US/delegate-folder.dtd
@@ -2,7 +2,7 @@
 <!ENTITY  label.delegatefolder.cancelbutton "Cancel">
 <!ENTITY  label.delegatefolder.userEmail "Email">
  
-<!ENTITY  label.delegatefolder.permissionLevel "Permission Level">
+<!ENTITY  label.delegatefolder.permissionLevel "Permission level">
 <!ENTITY  label.delegatefolder.userboxcolumn1 "User"> 
 <!ENTITY  label.delegatefolder.userboxcolumn2 "Permissions"> 
 
@@ -24,22 +24,22 @@
 
  <!ENTITY  delegatefolder.permission.details.caption "Permission "> 
 
-<!ENTITY  delegatefolder.tab.msg.label  "No Calendar or Task found for this mail account.">
-<!ENTITY  delegatefolder.tab.name  "Exchange Folder Sharing">
+<!ENTITY  delegatefolder.tab.msg.label  "No calendar or task found for this mail account.">
+<!ENTITY  delegatefolder.tab.name  "Exchange folder sharing">
 
 <!ENTITY  delegatefolder.permissions.none  "None">
 <!ENTITY  delegatefolder.permissions.own  "Own items">
 <!ENTITY  delegatefolder.permissions.all  "All items">
 <!ENTITY  delegatefolder.permissions.full  "Full details">
 
-<!ENTITY  delegatefolder.permissions.cancreateitems  "Create Items">
-<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Create SubFolders">
-<!ENTITY  delegatefolder.permissions.isfolderowner  "Folder Owner">
-<!ENTITY  delegatefolder.permissions.isfoldervisible  "Folder Visible">
-<!ENTITY  delegatefolder.permissions.isfoldercontact  "Folder Contact">
-<!ENTITY  delegatefolder.permissions.edititems  "Edit Items">
-<!ENTITY  delegatefolder.permissions.deleteitems  "Delete Items">
-<!ENTITY  delegatefolder.permissions.readitems  "Read Items">  
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Create items">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Create subfolders">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Folder owner">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Folder visible">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Folder contact">
+<!ENTITY  delegatefolder.permissions.edititems  "Edit items">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Delete items">
+<!ENTITY  delegatefolder.permissions.readitems  "Read items">  
  
 <!ENTITY  delegatefolder.permissions.true  "True">
 <!ENTITY  delegatefolder.permissions.false  "False">
diff --git a/locale/exchangecalendar/en-US/exchangeSettings.dtd b/locale/exchangecalendar/en-US/exchangeSettings.dtd
index 4449f898..9e88575e 100644
--- a/locale/exchangecalendar/en-US/exchangeSettings.dtd
+++ b/locale/exchangecalendar/en-US/exchangeSettings.dtd
@@ -1,6 +1,6 @@
-<!ENTITY label.acceptbutton "Save and Reset">
+<!ENTITY label.acceptbutton "Save and reset">
 <!ENTITY label.cancelbutton "Cancel">
-<!ENTITY ecsettings.title "EWS Calendar and Mail settings">
+<!ENTITY ecsettings.title "EWS calendar and mail settings">
 <!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
 <!ENTITY ecsettings.tab.meetingrequestsettings "Meeting requests">
 <!ENTITY ecsettings.tab.calendarfolderproperties "Folder properties">
@@ -11,7 +11,7 @@
 <!ENTITY label.poll.inbox.interval "Frequency (in seconds) to poll inbox:">
 <!ENTITY label.poll.calendar.interval "Frequency (in seconds) to poll calendar:">
 
-<!ENTITY label.nomeetingrequestsettings "You cannot set meeting request because you did not select the main calendar for the mailbox">
+<!ENTITY label.nomeetingrequestsettings "You cannot set a meeting request because you did not select the main calendar for the mailbox">
 
 <!ENTITY label.autorespond.meetingrequest "Automatically respond to a new invitation with ">
 
@@ -19,19 +19,19 @@
 <!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
 <!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
 
-<!ENTITY label.autoremove.invitation_cancellation1 "Automatically remove the invitation and accompanying cancellation message if you did not yet respond to the invitation request.">
-<!ENTITY label.autoremove.invitation_cancellation2 "Automatically remove a confirmed invitation when you receive a cancellation message.">
+<!ENTITY label.autoremove.invitation_cancellation1 "Automatically remove the invitation and accompanying cancelation message if you did not yet respond to the invitation request.">
+<!ENTITY label.autoremove.invitation_cancellation2 "Automatically remove a confirmed invitation when you receive a cancelation message.">
 
 <!ENTITY label.autoremove.invitation_response1 "Automatically remove a response from others to a meeting invitation of which you are not the organizer.">
 
 <!ENTITY label.doautorespond.meetingrequest.message "Send the following message with responses instead of asking for a message.">
 <!ENTITY label.autorespond.meetingrequest.message "Your message:">
 
-<!ENTITY treecol.label.userid "Userid">
+<!ENTITY treecol.label.userid "User ID">
 <!ENTITY treecol.label.email "Email">
 
 
-<!ENTITY ecsettings.tab.offlineCachingproperties "Offline Caching">
+<!ENTITY ecsettings.tab.offlineCachingproperties "Offline caching">
 
 <!ENTITY label.offlineCacheproperties.cachingStartDate "Start date of caching:">
 <!ENTITY label.offlineCacheproperties.cachingEndDate "End date of caching:">
@@ -42,13 +42,13 @@
 <!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Number of months to cache items after today:">
 
 <!ENTITY button.offlineCacheproperties.clearCache "Clear offline cached data">
-<!ENTITY ecsettings.tab.autoprocessingproperties "Automatic Processing">
-<!ENTITY ecsettings.tab.mailitemsProperties "EWS Settings (Mail)">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Automatic processing">
+<!ENTITY ecsettings.tab.mailitemsProperties "EWS settings (mail)">
 
-<!ENTITY label.syncmailitems.interval "Delay syncing mail items (Tags,etc.)">
-<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove cancelled events">
+<!ENTITY label.syncmailitems.interval "Delay syncing mail items (tags, etc.)">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove canceled events">
 <!ENTITY label.autoprocessingproperties.markeventtentative "Automatically mark event as tentative and send response to organizer">
-<!ENTITY label.syncmailitems.active "Keep enabled syncing mail items (Tags,etc.)">
+<!ENTITY label.syncmailitems.active "Keep enabled syncing mail items (tags, etc.)">
 
-<!ENTITY label.syncfollowup.deactivtate "Disable Followup Task">
+<!ENTITY label.syncfollowup.deactivtate "Disable followup task">
  
diff --git a/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
index 446239d4..cc52398a 100644
--- a/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
@@ -1,13 +1,13 @@
 <!ENTITY ecautodiscover "Use Exchange's autodiscovery function.">
 <!ENTITY ecfolderbase.label "Folder base:">
 <!ENTITY ecfolderpath.label "Path below folder base:">
-<!ENTITY ecfolderidofshare.label "Share Folder Id:">
+<!ENTITY ecfolderidofshare.label "Share Folder ID:">
 <!ENTITY exchWebServices.SharedFolderID.label "Shared display name:">
 
 <!ENTITY menuitem.label.ecfolderbase.calendar "Calendar folder">
 <!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Public folders">
 <!ENTITY menuitem.label.ecfolderbase.inbox "Mail inbox folder">
-<!ENTITY menuitem.label.ecfolderbase.voicemail "Voice Mail folder">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Voice mail folder">
 <!ENTITY menuitem.label.ecfolderbase.msgfolderroot "Message folder root">
 <!ENTITY menuitem.label.ecfolderbase.root "Root of the mailbox">
 <!ENTITY menuitem.label.ecfolderbase.tasks "Tasks folder">
@@ -19,9 +19,9 @@
 <!ENTITY menuitem.label.ecfolderbase.notes "Notes folder">
 <!ENTITY menuitem.label.ecfolderbase.outbox "Mail outbox folder">
 <!ENTITY menuitem.label.ecfolderbase.sentitems "Sent items folder">
-<!ENTITY menuitem.label.ecfolderbase.junkemail "Junk E-Mail folder">
-<!ENTITY menuitem.label.ecfolderbase.searchfolders "Search Folders folder">
-<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Options below are only for Exchange2010 --">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Junk email folder">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Search folders folder">
+<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Options below are only for Exchange 2010 --">
 <!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Dumpster root folder">
 <!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Dumpster deletions folder">
 <!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Dumpster versions folder">
@@ -49,8 +49,8 @@
 
 <!ENTITY exchWebServices.UserAvailability.label "Only user availability status for the mailbox's calendar will be visible.">
 
-<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.exchtype.label "Exchange type">
 <!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
-<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office 365">
 <!ENTITY exchWebServices.detail.label "Details">
- 
\ No newline at end of file
+ 
diff --git a/locale/exchangecalendar/en-US/extra-priority.dtd b/locale/exchangecalendar/en-US/extra-priority.dtd
index 78df09db..f06cd6e4 100644
--- a/locale/exchangecalendar/en-US/extra-priority.dtd
+++ b/locale/exchangecalendar/en-US/extra-priority.dtd
@@ -2,11 +2,11 @@
 <!ENTITY general.label  "General"> 
 <!ENTITY about.label "About"> 
  
-<!ENTITY about.description.label "Enhanced Features for thunderbird and seamonkey applications">
+<!ENTITY about.description.label "Enhanced Features for Thunderbird and SeaMonkey applications">
 <!ENTITY iconify.label "Display priority icons only"> 
 <!ENTITY shadeHigh.label "Color background for high-priority messages">
 <!ENTITY shadeLow.label "Color background for low-priority messages">
-<!ENTITY tagImportant.label "Automatically tag high priority mail as Important">
+<!ENTITY tagImportant.label "Automatically tag high-priority mail as important">
  
 <!ENTITY highestColor.label "Highest">
 
@@ -15,4 +15,4 @@
 <!ENTITY lowestColor.label "Lowest">
  
 <!ENTITY prioritycolor  "Custom Color">
-<!ENTITY pref.color "Color Preferences:">
+<!ENTITY pref.color "Color preferences:">
diff --git a/locale/exchangecalendar/en-US/inviteStyle.dtd b/locale/exchangecalendar/en-US/inviteStyle.dtd
index 3de3d61d..ada3d520 100644
--- a/locale/exchangecalendar/en-US/inviteStyle.dtd
+++ b/locale/exchangecalendar/en-US/inviteStyle.dtd
@@ -1,2 +1,2 @@
-<!ENTITY label.inviteCol "Calendar Invite">
+<!ENTITY label.inviteCol "Calendar invite">
 <!ENTITY tooltip.inviteCol "Sort by invitation">
diff --git a/locale/exchangecalendar/en-US/manageEWSAccounts.dtd b/locale/exchangecalendar/en-US/manageEWSAccounts.dtd
index 33f3b49a..21b6c947 100644
--- a/locale/exchangecalendar/en-US/manageEWSAccounts.dtd
+++ b/locale/exchangecalendar/en-US/manageEWSAccounts.dtd
@@ -12,5 +12,5 @@
 <!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Check server and account">
 <!ENTITY exchWebService.manageEWSAccounts.name.label "Name:">
 
-<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services Accounts">
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services accounts">
 
diff --git a/locale/exchangecalendar/en-US/oofSettings.dtd b/locale/exchangecalendar/en-US/oofSettings.dtd
index 3bf38c3f..19061349 100644
--- a/locale/exchangecalendar/en-US/oofSettings.dtd
+++ b/locale/exchangecalendar/en-US/oofSettings.dtd
@@ -1,13 +1,13 @@
-<!ENTITY title.oofsettings "Out of Office settings">
+<!ENTITY title.oofsettings "Out of office settings">
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Close">
-<!ENTITY label.oofsettings.title "Out of Office settings for:">
+<!ENTITY label.oofsettings.title "Out of office settings for:">
 
-<!ENTITY label.oofstatus "Out of Office status:">
+<!ENTITY label.oofstatus "Out of office status:">
 
-<!ENTITY label.externalaudience "To which external persons do you want to send Out Of Office messages: ">
+<!ENTITY label.externalaudience "To which external persons do you want to send out of office messages: ">
 <!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "To nobody">
-<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Only persons in my contact list">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Only to persons in my contact list">
 <!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "To everybody">
 
 <!ENTITY button.label.internal "Internal message">
diff --git a/locale/exchangecalendar/en-US/preInvitationResponse.dtd b/locale/exchangecalendar/en-US/preInvitationResponse.dtd
index 7c38f9cb..d8c0ea54 100644
--- a/locale/exchangecalendar/en-US/preInvitationResponse.dtd
+++ b/locale/exchangecalendar/en-US/preInvitationResponse.dtd
@@ -1,5 +1,5 @@
 <!ENTITY dialog.exchWebService.preInvitationResponse.title "How do you want to react?">
-<!ENTITY label.acceptbutton "Ok">
+<!ENTITY label.acceptbutton "OK">
 <!ENTITY label.cancelbutton "Cancel">
 
 <!ENTITY label.calendarName "Calendar:">
diff --git a/locale/exchangecalendar/en-US/preferences.dtd b/locale/exchangecalendar/en-US/preferences.dtd
index fef92f73..b5922ad7 100644
--- a/locale/exchangecalendar/en-US/preferences.dtd
+++ b/locale/exchangecalendar/en-US/preferences.dtd
@@ -10,7 +10,7 @@
 <!ENTITY exchangeWebService.preference.network.debug.label "Log communication with Exchange server">
 <!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Log level">
 <!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
-<!ENTITY exchangeWebService.preference.authentication.debug.label "Log communication progress information (e.g.,  Authentication)">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Log communication progress information (e.g., Authentication)">
 <!ENTITY exchangeWebService.preference.authentication.showpassword.label "Show password in clear text in log file.">
 
 <!ENTITY exchangeWebService.preference.contacts.debug.caption "Addressbook/Contacts:">
@@ -29,20 +29,20 @@
 <!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Number of days to download after start date of program:">
 
 <!ENTITY exchangeWebService.preferences.tab.others "Others">
-<!ENTITY exchangeWebService.preference.others.prefs.label "Communication Preferences:">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Communication preferences:">
 <!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Maximum number of retries for exchange communication:">
 
-<!ENTITY exchangeWebService.preference.updateFunction.label "Addon update function:">
-<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatically check for a new addon version online when starting Thunderbird.">
-<!ENTITY exchangeWebService.preference.warnForUpdates.label "Show warning when a new version is available. So you can easily install it.">
+<!ENTITY exchangeWebService.preference.updateFunction.label "Add-on update function:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatically check for a new add-on version online when starting Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Show warning when a new version is available so you can easily install it.">
 <!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
 
 <!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximum number of simultaneous request to exchange server:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to exchange server:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
-<!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Preferences:">
+<!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/locale/exchangecalendar/en-US/rtews.dtd b/locale/exchangecalendar/en-US/rtews.dtd
index b60f11fd..157ef830 100755
--- a/locale/exchangecalendar/en-US/rtews.dtd
+++ b/locale/exchangecalendar/en-US/rtews.dtd
@@ -1,15 +1,15 @@
- <!ENTITY rtews.selectaccountdesc "Select mail account for which to configure. The account has to be a Microsoft Exchange based account">
+ <!ENTITY rtews.selectaccountdesc "Select Microsoft Exchange mail account for which to configure.">
  <!ENTITY rtews.accconfigured "Account already configured">
- <!ENTITY rtews.dicoverdesc "You may select to autodiscover the Microsoft Exchange Server (EWS) URL or configure it manually">
+ <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Microsoft Exchange Server (EWS) URL or configure it manually">
  <!ENTITY rtews.dicoverdesc2 "To configure it manually enter the URL in the field below.">
  <!ENTITY rtews.autodiscover "Autodiscover">
- <!ENTITY rtews.doautodicover "Do autodiscover">
+ <!ENTITY rtews.doautodicover "Do autodiscovery">
  <!ENTITY rtews.manual "Manual">
- <!ENTITY rtews.test "Click here to verify EWS URL">
+ <!ENTITY rtews.test "Click here to verify the EWS URL">
  <!ENTITY rtews.msexchewsurl "Verified Microsoft Exchange EWS URL. Click Finish to complete the configuration">
  <!ENTITY rtews.selectaccount "Select account">
  <!ENTITY rtews.configure.label "Configure...">
- <!ENTITY rtews.rtforexch "Remote Tagger for Microsoft Exchange">
+ <!ENTITY rtews.rtforexch "Remote tagger for Microsoft Exchange">
  <!ENTITY rtews.confirmAccDetail "Confirm following account details">
  <!ENTITY rtews.username "Username">
  <!ENTITY rtews.domain "Domain">
diff --git a/locale/exchangecalendar/en-US/rtews.properties b/locale/exchangecalendar/en-US/rtews.properties
index 61b55b2d..5b07c0df 100755
--- a/locale/exchangecalendar/en-US/rtews.properties
+++ b/locale/exchangecalendar/en-US/rtews.properties
@@ -1,2 +1,2 @@
 rtews.title=EWStagger  
-rtews.tagAddError=There was error creating tag for category
\ No newline at end of file
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/locale/exchangecalendar/en-US/selectEWSUrl.dtd b/locale/exchangecalendar/en-US/selectEWSUrl.dtd
index a62bf2cd..b69a27b8 100644
--- a/locale/exchangecalendar/en-US/selectEWSUrl.dtd
+++ b/locale/exchangecalendar/en-US/selectEWSUrl.dtd
@@ -1,7 +1,7 @@
 <!ENTITY label.acceptbutton "Select">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY description.selectews "Choose an EWS server from the list which is suitable for you current location.">
+<!ENTITY description.selectews "Choose an EWS server from the list which is suitable for your current location.">
 <!ENTITY label.selectews "EWS server list:">
 
 
diff --git a/locale/exchangecalendar/en-US/sharedCalendarParser.dtd b/locale/exchangecalendar/en-US/sharedCalendarParser.dtd
index 5ead380b..39c9f897 100644
--- a/locale/exchangecalendar/en-US/sharedCalendarParser.dtd
+++ b/locale/exchangecalendar/en-US/sharedCalendarParser.dtd
@@ -1,3 +1,3 @@
 <!ENTITY exchWebService_vbox_label "Detected an Exchange sharing invitation">
-<!ENTITY exchWebService_button_label_add_calendar "Add Calendar">
+<!ENTITY exchWebService_button_label_add_calendar "Add calendar">
 

From 580fe909eff3bc1b1a8f0b1e9fcdefeb9c1dfcb3 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 15:44:52 +0200
Subject: [PATCH 086/222] Fix file permissions.
 ExchangeCalendar/exchangecalendar/#36

---
 chrome/content/exchService-common-sets.js            | 0
 chrome/content/exchService-followup-event-dialog.xml | 0
 defaults/preferences/rtews.prefs.js                  | 0
 locale/exchangecalendar/de/rtews.dtd                 | 0
 locale/exchangecalendar/en-US/rtews.dtd              | 0
 locale/exchangecalendar/en-US/rtews.properties       | 0
 locale/exchangecalendar/ja-JP/rtews.dtd              | 0
 locale/exchangecalendar/nl/rtews.dtd                 | 0
 locale/exchangecalendar/ru/rtews.dtd                 | 0
 locale/exchangecalendar/sv/rtews.dtd                 | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 chrome/content/exchService-common-sets.js
 mode change 100755 => 100644 chrome/content/exchService-followup-event-dialog.xml
 mode change 100755 => 100644 defaults/preferences/rtews.prefs.js
 mode change 100755 => 100644 locale/exchangecalendar/de/rtews.dtd
 mode change 100755 => 100644 locale/exchangecalendar/en-US/rtews.dtd
 mode change 100755 => 100644 locale/exchangecalendar/en-US/rtews.properties
 mode change 100755 => 100644 locale/exchangecalendar/ja-JP/rtews.dtd
 mode change 100755 => 100644 locale/exchangecalendar/nl/rtews.dtd
 mode change 100755 => 100644 locale/exchangecalendar/ru/rtews.dtd
 mode change 100755 => 100644 locale/exchangecalendar/sv/rtews.dtd

diff --git a/chrome/content/exchService-common-sets.js b/chrome/content/exchService-common-sets.js
old mode 100755
new mode 100644
diff --git a/chrome/content/exchService-followup-event-dialog.xml b/chrome/content/exchService-followup-event-dialog.xml
old mode 100755
new mode 100644
diff --git a/defaults/preferences/rtews.prefs.js b/defaults/preferences/rtews.prefs.js
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/de/rtews.dtd b/locale/exchangecalendar/de/rtews.dtd
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/en-US/rtews.dtd b/locale/exchangecalendar/en-US/rtews.dtd
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/en-US/rtews.properties b/locale/exchangecalendar/en-US/rtews.properties
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/ja-JP/rtews.dtd b/locale/exchangecalendar/ja-JP/rtews.dtd
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/nl/rtews.dtd b/locale/exchangecalendar/nl/rtews.dtd
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/ru/rtews.dtd b/locale/exchangecalendar/ru/rtews.dtd
old mode 100755
new mode 100644
diff --git a/locale/exchangecalendar/sv/rtews.dtd b/locale/exchangecalendar/sv/rtews.dtd
old mode 100755
new mode 100644

From 7c2a27d408bed76f00939579d9d05dbcf50e56db Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 16:14:10 +0200
Subject: [PATCH 087/222] Delint build script.
 ExchangeCalendar/exchangecalendar/#38

---
 build.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/build.sh b/build.sh
index b1da063b..74e7f71f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,28 +1,32 @@
 #!/bin/sh
 
-usage() { echo "Usage: $0 [-u | -d ]" 1>&2;echo "-u:enable update";echo "-d:disable update"; exit 1; }
+usage() {
+    printf "Usage: %s [ -u | -d ]\n" "$0" 1>&2
+    printf "  -u   enable update\n" 1>&2
+    printf "  -d   disable update\n" 1>&2
+    exit 1
+}
 
-if [  $#  =  0 ];then
-usage
+if [ $# = 0 ];then
+    usage
 fi
 
-version=`sed -n -e "s/.*<em:version>\(.*\)<\/em:version>/\1/p" install.rdf`
-while getopts  ":ud" OPTION
+version=$(sed -n -e "s/.*<em:version>\(.*\)<\/em:version>/\1/p" install.rdf)
+while getopts ":ud" OPTION
 do
     case ${OPTION} in
         u) echo "update"  
-	cat defaults/preferences/update_enable.txt > defaults/preferences/update.js
- 	zip -r exchangecalendar-v$version.xpi * -x \*.git \*.xpi \*.sh  update\*.txt
-	exit
-	;;
+	   cat defaults/preferences/update_enable.txt > defaults/preferences/update.js
+ 	   zip -r exchangecalendar-v"$version".xpi ./* -x \*.git \*.xpi \*.sh  update\*.txt
+	   exit
+	   ;;
         d) echo "no update" 
-	cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
- 	zip -r exchangecalendar-v$version.xpi * -x \*.git \*.xpi \*.sh  update\*.txt
-	exit
-	;;
+	   cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
+ 	   zip -r exchangecalendar-v"$version".xpi ./* -x \*.git \*.xpi \*.sh  update\*.txt
+	   exit
+	   ;;
 	*) usage ;; 
     esac
 done 
- 
-usage
 
+usage

From 0a48059b78f38865ef4c73bbb67545bbf7c2f605 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 16:21:26 +0200
Subject: [PATCH 088/222] Fix another typo

---
 install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.rdf b/install.rdf
index 85311770..a4209dc0 100644
--- a/install.rdf
+++ b/install.rdf
@@ -28,7 +28,7 @@
     <em:description>Allows you to sync calendars, tasks, and contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within Lightning.
 
 You can view, delete, create, and update calendar and task/todo items, and manage "out of office" settings.
-You can read and use contacts and global address list contacts for address autcompletion.
+You can read and use contacts and global address list contacts for address autocompletion.
 
 Dutch, French, English, German, Swedish and Japanese localizations.
 
@@ -54,7 +54,7 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
 			<em:description>Allows you to sync calendars, tasks, and contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within Lightning.
 
 You can view, delete, create, and update calendar and task/todo items, and manage "out of office" settings.
-You can read and use contacts and global address list contacts for address autcompletion.
+You can read and use contacts and global address list contacts for address autocompletion.
 
 Dutch, French, English, German, Swedish and Japanese localizations.
 

From 7c319de13bc87edba8be2d55566abcba12bc440f Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 28 Jun 2017 17:42:44 +0200
Subject: [PATCH 089/222] Microsoft Exchange Server -> Exchange Web Server

---
 locale/exchangecalendar/en-US/rtews.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/exchangecalendar/en-US/rtews.dtd b/locale/exchangecalendar/en-US/rtews.dtd
index 157ef830..7d4e75ea 100755
--- a/locale/exchangecalendar/en-US/rtews.dtd
+++ b/locale/exchangecalendar/en-US/rtews.dtd
@@ -1,6 +1,6 @@
  <!ENTITY rtews.selectaccountdesc "Select Microsoft Exchange mail account for which to configure.">
  <!ENTITY rtews.accconfigured "Account already configured">
- <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Microsoft Exchange Server (EWS) URL or configure it manually">
+ <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Exchange Web Server (EWS) URL or configure it manually">
  <!ENTITY rtews.dicoverdesc2 "To configure it manually enter the URL in the field below.">
  <!ENTITY rtews.autodiscover "Autodiscover">
  <!ENTITY rtews.doautodicover "Do autodiscovery">

From ae4857a6f6632fd0cb340eca08a039aaaa58adbe Mon Sep 17 00:00:00 2001
From: enozkan <enozkan@yahoo.com>
Date: Thu, 29 Jun 2017 01:26:50 -0500
Subject: [PATCH 090/222] Update delegate-folder.dtd in tr locale

---
 .../exchangecalendar/tr/delegate-folder.dtd   | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/locale/exchangecalendar/tr/delegate-folder.dtd b/locale/exchangecalendar/tr/delegate-folder.dtd
index 2ce88d16..b6b76462 100644
--- a/locale/exchangecalendar/tr/delegate-folder.dtd
+++ b/locale/exchangecalendar/tr/delegate-folder.dtd
@@ -1,45 +1,45 @@
  
-<!ENTITY  label.delegatefolder.cancelbutton "Cancel">
-<!ENTITY  label.delegatefolder.userEmail "Email">
+<!ENTITY  label.delegatefolder.cancelbutton "İptal Et">
+<!ENTITY  label.delegatefolder.userEmail "E-posta">
  
-<!ENTITY  label.delegatefolder.permissionLevel "Permission Level">
-<!ENTITY  label.delegatefolder.userboxcolumn1 "User"> 
-<!ENTITY  label.delegatefolder.userboxcolumn2 "Permissions"> 
+<!ENTITY  label.delegatefolder.permissionLevel "İzin Seviyesi">
+<!ENTITY  label.delegatefolder.userboxcolumn1 "Kullanıcı"> 
+<!ENTITY  label.delegatefolder.userboxcolumn2 "İzinler"> 
 
-<!ENTITY  menuitem.delegatefolder.permission.author "Author">
-<!ENTITY  menuitem.delegatefolder.permission.editor "Editor">
-<!ENTITY  menuitem.delegatefolder.permission.reviewer "Reviewer">
-<!ENTITY  menuitem.delegatefolder.permission.none "None">
-<!ENTITY  menuitem.delegatefolder.permission.owner "Owner" > 
-<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "PublishingEditor" >
-<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "PublishingAuthor" >
-<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "NoneditingAuthor" >
-<!ENTITY  menuitem.delegatefolder.permission.contributor "Contributor" >
-<!ENTITY  menuitem.delegatefolder.permission.custom "Custom" >
+<!ENTITY  menuitem.delegatefolder.permission.author "Yazıcı">
+<!ENTITY  menuitem.delegatefolder.permission.editor "Düzenleyici">
+<!ENTITY  menuitem.delegatefolder.permission.reviewer "Okuyucu">
+<!ENTITY  menuitem.delegatefolder.permission.none "Yok">
+<!ENTITY  menuitem.delegatefolder.permission.owner "Sahip" > 
+<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "YayınlayanDüzenleyici" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "YayınlayanYazıcı" >
+<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "DüzenleyemeyenYazıcı" >
+<!ENTITY  menuitem.delegatefolder.permission.contributor "Yardımcı" >
+<!ENTITY  menuitem.delegatefolder.permission.custom "Özel" >
                             
-<!ENTITY  delegatefolder.permission.description.author "Read and create items in the folder." >
-<!ENTITY  delegatefolder.permission.description.editor "Read, create, and modify items in the folder." >
-<!ENTITY  delegatefolder.permission.description.reviewer "Read items in the folder." >
-<!ENTITY  delegatefolder.permission.description.none "No access permissions to the folder." >
+<!ENTITY  delegatefolder.permission.description.author "Dizindeki maddeleri okuyabilir ve yaratabilir." >
+<!ENTITY  delegatefolder.permission.description.editor "Dizindeki maddeleri okuyabilir, yaratabilir ve değiştirebilir." >
+<!ENTITY  delegatefolder.permission.description.reviewer "Dizindeki maddeleri okuyabilir." >
+<!ENTITY  delegatefolder.permission.description.none "Bu dizine erişim izni yok." >
 
- <!ENTITY  delegatefolder.permission.details.caption "Permission "> 
+ <!ENTITY  delegatefolder.permission.details.caption "İzin "> 
 
-<!ENTITY  delegatefolder.tab.msg.label  "No Calendar or Task found for this mail account.">
-<!ENTITY  delegatefolder.tab.name  "Exchange Folder Sharing">
+<!ENTITY  delegatefolder.tab.msg.label  "Bu posta hesabı için bir Takvim ya da Görev Listesi bulunamadı.">
+<!ENTITY  delegatefolder.tab.name  "Exchange Dizin Paylaşımı">
 
-<!ENTITY  delegatefolder.permissions.none  "None">
-<!ENTITY  delegatefolder.permissions.own  "Own items">
-<!ENTITY  delegatefolder.permissions.all  "All items">
-<!ENTITY  delegatefolder.permissions.full  "Full details">
+<!ENTITY  delegatefolder.permissions.none  "Yok">
+<!ENTITY  delegatefolder.permissions.own  "Kendi maddeleri">
+<!ENTITY  delegatefolder.permissions.all  "Bütün maddeler">
+<!ENTITY  delegatefolder.permissions.full  "Tüm detaylar">
 
-<!ENTITY  delegatefolder.permissions.cancreateitems  "Create Items">
-<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Create SubFolders">
-<!ENTITY  delegatefolder.permissions.isfolderowner  "Folder Owner">
-<!ENTITY  delegatefolder.permissions.isfoldervisible  "Folder Visible">
-<!ENTITY  delegatefolder.permissions.isfoldercontact  "Folder Contact">
-<!ENTITY  delegatefolder.permissions.edititems  "Edit Items">
-<!ENTITY  delegatefolder.permissions.deleteitems  "Delete Items">
-<!ENTITY  delegatefolder.permissions.readitems  "Read Items">  
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Madde Yarat">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Altdizinler Yarat">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Dizin Sahibi">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Dizin Görülebiliyor">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Dizinle İlişkili Kişi">
+<!ENTITY  delegatefolder.permissions.edititems  "Maddeleri Düzenleyebilir">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Maddeleri Silebilir">
+<!ENTITY  delegatefolder.permissions.readitems  "Maddeleri Okuyabilir">  
  
-<!ENTITY  delegatefolder.permissions.true  "True">
-<!ENTITY  delegatefolder.permissions.false  "False">
+<!ENTITY  delegatefolder.permissions.true  "Doğru">
+<!ENTITY  delegatefolder.permissions.false  "Yanlış">

From 2c6993d24d5a085f1bf3bcfdacf449f4acb20199 Mon Sep 17 00:00:00 2001
From: enozkan <enozkan@yahoo.com>
Date: Thu, 29 Jun 2017 01:49:46 -0500
Subject: [PATCH 091/222] install.rdf to include mention of all locales

---
 install.rdf | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/install.rdf b/install.rdf
index 7f193961..8ac9e2c7 100644
--- a/install.rdf
+++ b/install.rdf
@@ -30,7 +30,7 @@ You can also search your contacts folder and the Exchange Global Address List (R
 
 You can view, delete, create and update calendar and task/todo items. And manage "Out of Office" settings.
 
-Dutch, French, English, German, Swedish and Japanese localizations.
+Dutch, French, English, German, Swedish, Japanese, Russian, Italian and Turkish localizations.
 
 Some of the icons and images used are from the Fugue Icons Collection made by Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
     <em:creator>Ericsson (exchangecalendar@ericsson.com)</em:creator>
@@ -43,6 +43,7 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
     <em:translator>Hiroshi Miura (ja-JP)</em:translator>
     <em:translator>Alexey Sinitsyn (ru)</em:translator>
     <em:translator>Alessandro Menti (it-IT)</em:translator>
+    <em:translator>Engin Özkan (tr)</em:translator>
     <em:homepageURL>http://www.1st-setup.nl/wordpress/?page_id=133</em:homepageURL>
     <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
     <em:type>2</em:type> <!-- type: extension -->
@@ -57,7 +58,7 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
 You can view, delete, create and update calendar and task/todo items. And manage "Out of Office" settings.
 You can read and use contacts and global addres list contacts for address autcompletion.
 
-Dutch, French, English, German, Swedish, Japanese and Italian localizations.
+Dutch, French, English, German, Swedish, Japanese, Russian, Italian and Turkish localizations.
 
 Some of the icons and images used are from the Fugue Icons Collection made by Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
 		</Description>
@@ -72,7 +73,7 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
 Sie können diese Kalender- und Aufgabeneinträge betrachten, löschen, erstellen und aktualisieren. Sie können die "Out of Office"-Einstellungen verwalten.
 Sie können Kontakte und globale Adresslisten lesen und für die Autovervollständigung der Adressen nutzen.
 
-Übersetzungen in Niederländisch, Französisch, Deutsch Schwedisch und Japanisch.
+Übersetzungen in Niederländisch, Französisch, Deutsch, Schwedisch, Japanisch, Russisch, Italienisch und Türkisch.
 
 Einige der Icons und die Bilder werden aus der Fugue Icons Collection erstellt von Yusuke Kamiyamane (http://p.yusukekamiyamane.com/) genutzt.
                </em:description>
@@ -138,5 +139,20 @@ Localizzato in olandese, francese, inglese, tedesco, svedese, giapponese e itali
 Alcune delle icone e immagini utilizzate sono state tratte dalla Fugue Icons Collection di Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
 		</Description>
 	</em:localized>
+	  	  
+	<em:localized>
+		<Description>
+			<em:locale>tr</em:locale>
+			<em:name>Exchange EWS Sağlayıcısı</em:name>
+			<em:description>Lightning içinde, Takvim, Görevler ve Kişileri Microsoft Exchange 2007/2010/2013 EWS sunucunuzla eşitlemenizi sağlar.
+
+Takvim ve Görev-Yapılacaklarınızdaki maddeleri görebilir ve silebilir, yeni maddeler yaratabilir ya da maddeleri güncelleyebilirsiniz. "İşyeri Dışında" ayarlarınızı da denetleyebilirsiniz.
+Kişilerinizdeki ve Genel Adres Listesindeki kişileri görebilir ve automatik adres tamamlamada kullanabilirsiniz.
+				
+Almanca, Flemenkçe, Fransızca, İngilizce, İsveççe, İtalyanca, Japonca, Rusça, ve Türkçe yerelleştirmeleri vardır.
+
+Bazı ikon ve imgeler, Yusuke Kamiyamane tarafından yapılmış olan Fugue Icons Collection'dan alınıp kullanılmıştır. (http://p.yusukekamiyamane.com/)</em:description>
+		</Description>
+	</em:localized>
 	</Description>
 </RDF>

From 4405ef6c71b264ca43a9900ccdcc42a709ebf712 Mon Sep 17 00:00:00 2001
From: enozkan <enozkan@yahoo.com>
Date: Thu, 29 Jun 2017 13:00:21 -0500
Subject: [PATCH 092/222] update chrome.manifest to enable it and tr L10ns

---
 chrome.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/chrome.manifest b/chrome.manifest
index 18c63b4d..9ea656b9 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -50,6 +50,8 @@ locale exchangecalendar de locale/exchangecalendar/de/
 locale exchangecalendar ja-JP locale/exchangecalendar/ja-JP/
 locale exchangecalendar sv locale/exchangecalendar/sv/
 locale exchangecalendar ru locale/exchangecalendar/ru/
+locale exchangecalendar it-IT locale/exchangecalendar/it-IT/
+locale exchangecalendar tr locale/exchangecalendar/tr/
 
 manifest interfaces/exchangeCalendar/mivExchangeCalendar.manifest
 

From d9689f16375160a5123e2e246a732733a4a00da3 Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Mon, 3 Jul 2017 22:07:59 +0200
Subject: [PATCH 093/222] Add release notes for `4.0.0-beta4`

---
 CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bc3fa07..b805a1c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.0.0-beta4] - 2017-07-03
+### Added
+- Turkish localization #43, #44, #46
+- Missing release notes of 3.9 and 3.8 releases #35
+- Support for shared task list #41
+
+### Changed
+- Clean up and improve compatibility of build scripts #38, #40
+
+### Fixed
+- File permissions #36
+- HTML content editor #28, #29
+- Activate Italian localization #46
+
 ## [4.0.0-beta3] - 2017-06-25
 ### Added
 - Added Italian translation #22
@@ -16,6 +30,33 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Opening and working with Attachment dialog #12
 
+## [3.9.0] - unknown release date
+- Stable Release
+- Support enabled for TB 50.*
+- Tested on TB 45.5.1 Lightning 4.7.4
+- We don't support TB/Lightning beta.
+- bug: add new calendar or no password prompt
+
+## [3.8.0] - unknown release date
+- Support of Thunderbird 45.0
+- Support to Office365 calendar new calendar. Note: New users has to Create calendar using office365 type.
+- fix auto discovery for new hosted calendar
+- fix cancelled not removed
+- fix forward event
+- d9f170f fix #459 #426 #466 #464 #462 remove extra info
+- 1d4b8b4 fix #459 #426 #466 #464 #462
+- 0d1a78a fix: #459
+- 5e02727 (origin/master, origin/HEAD, master) rename folowup mail window
+- ab836f9 task-fixed
+- eaa1c2d (HEAD -> ec-3.8, tag: v3.8-beta3) bump-version
+- a641199 (master) bump-version-tb-support
+- 98c047c (origin/master, origin/HEAD) status-undefined-for-ipmnote
+- c8af0bd strict-error
+- 78377ee Merge branch 'master' into ec-3.8
+- 8edfea3 js strict error
+- 65f46a5 strict error
+- 4f92738 js strict error
+
 ## [3.7.0] - unknown release date
 - d1b2860 (origin/master, origin/HEAD, master) revert calendar-event-dialog
 - df713f4 Merge pull request #458 from enozkan/patch-5

From 40a3415cdfbb8fa111450ccb358d03941fce46ab Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Mon, 3 Jul 2017 22:09:19 +0200
Subject: [PATCH 094/222] Bump version number to `4.0.0-beta4`

---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index 7f193961..29b3e7b6 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>4.0.0-beta3</em:version>
+    <em:version>4.0.0-beta4</em:version>
     <em:targetApplication>
       <Description>
       	<!-- Thunderbird -->

From 49c6b87454c125b3a64fe11753d40879ee29d7ad Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Sun, 9 Jul 2017 18:04:03 +0200
Subject: [PATCH 095/222] Remove references to unnecessary tools

---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e7193a6c..d133202c 100644
--- a/README.md
+++ b/README.md
@@ -9,14 +9,8 @@ support**.
 This add-on is open source and based on the work of many
 [contributors](https://github.com/ExchangeCalendar/exchangecalendar/graphs/contributors).
 
-### Installing the developement tools
+### Building
 
-You will need to install the
-[DOM Inspector](https://addons.mozilla.org/en-US/thunderbird/addon/dom-inspector-6622/),
-the
-[JavaScript Debugger](https://addons.mozilla.org/thunderbird/addon/javascript-debugger/),
-and some other development tools.
-  
 To compile the add-on, run the `build.sh` script.
 
 ## License

From d7d21257799a6923d237677de82b2fe783fe886e Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Sun, 9 Jul 2017 18:08:42 +0200
Subject: [PATCH 096/222] Fix EWS nomenclature per Comment #22812648

---
 locale/exchangecalendar/en-US/rtews.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/exchangecalendar/en-US/rtews.dtd b/locale/exchangecalendar/en-US/rtews.dtd
index 7d4e75ea..bb3cd384 100755
--- a/locale/exchangecalendar/en-US/rtews.dtd
+++ b/locale/exchangecalendar/en-US/rtews.dtd
@@ -1,12 +1,12 @@
  <!ENTITY rtews.selectaccountdesc "Select Microsoft Exchange mail account for which to configure.">
  <!ENTITY rtews.accconfigured "Account already configured">
- <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Exchange Web Server (EWS) URL or configure it manually">
+ <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Exchange Web Services (EWS) URL or configure it manually">
  <!ENTITY rtews.dicoverdesc2 "To configure it manually enter the URL in the field below.">
  <!ENTITY rtews.autodiscover "Autodiscover">
  <!ENTITY rtews.doautodicover "Do autodiscovery">
  <!ENTITY rtews.manual "Manual">
  <!ENTITY rtews.test "Click here to verify the EWS URL">
- <!ENTITY rtews.msexchewsurl "Verified Microsoft Exchange EWS URL. Click Finish to complete the configuration">
+ <!ENTITY rtews.msexchewsurl "Verified EWS URL. Click Finish to complete the configuration">
  <!ENTITY rtews.selectaccount "Select account">
  <!ENTITY rtews.configure.label "Configure...">
  <!ENTITY rtews.rtforexch "Remote tagger for Microsoft Exchange">

From 23ddbe79842f69dcadc781d31cb2cfa4b3cb0fe1 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Sun, 9 Jul 2017 18:15:26 +0200
Subject: [PATCH 097/222] (Re)capitalize menu items.
 ExchangeCalendar/exchangecalendar/#32.

---
 locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd b/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
index a8e3fa73..2b13f6fe 100644
--- a/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
+++ b/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
@@ -3,9 +3,9 @@
 <!ENTITY  label.delegateCalendar.userEmail "Email">
 <!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Deliver meeting requests">
 
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates only">
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and me">
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Delegates and send notifications to me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates Only">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and Me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Delegates and Send Notifications to Me">
 
 <!ENTITY  label.delegateCalendar.permission "Permission">
 <!ENTITY  menuitem.delegateCalendar.permission.author "Author">

From 9589696f24d69dab76f3170e0a2ecf4f5e593625 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 20 Jul 2017 10:31:25 +0200
Subject: [PATCH 098/222] cleanup code by removing exchService-common-sets.js

This code were overriding the one in comm-central repo (file calendar/base/content/calendar-item-editing.js).
It didn't follow the latest development of Lightning (5.7) and it didn't add anything used inside the Exchange Calendar plugin.

Furthermore, removing it benefits to users too, because since Thunderbird 52 release, users can now create (and modify) events (and tasks) in a tab instead of a dialog window.
---
 chrome/content/calendar-common-sets.xul   |   3 +-
 chrome/content/exchService-common-sets.js | 145 ----------------------
 2 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 chrome/content/exchService-common-sets.js

diff --git a/chrome/content/calendar-common-sets.xul b/chrome/content/calendar-common-sets.xul
index 90b5ce34..21440219 100644
--- a/chrome/content/calendar-common-sets.xul
+++ b/chrome/content/calendar-common-sets.xul
@@ -43,8 +43,7 @@
 ]>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-common-sets.js" />
-    <script type="application/javascript" src="chrome://exchangecalendar/content/exchService-common-sets.js" />
-    
+
 	<commandset id="calendar_commands" commandupdater="true"
 		events="calendar_commands" oncommandupdate="calendarController.updateCommands()">
 		<command id="calendar_forward_event_command" oncommand="tmpForewardEvent.onForEve()" />
diff --git a/chrome/content/exchService-common-sets.js b/chrome/content/exchService-common-sets.js
deleted file mode 100644
index 42e08ec1..00000000
--- a/chrome/content/exchService-common-sets.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*********************************************************************************
-*  This file is part of Ericsson's Ews Provider. 
-* Ericsson's Ews Provider is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-
-*  Ericsson's Ews Provider 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 Ericsson's Ews Provider.  If not, see <http://www.gnu.org/licenses/>.
-***********************************************************************************/
-
-var orig_openEventDialog=openEventDialog;
-
-openEventDialog=function(calendarItem, calendar, mode, callback, job, initialDate) {
-	
-newOpenEventDialog(calendarItem, calendar, mode, callback, job, initialDate);
-
-}
-
-function newOpenEventDialog(calendarItem, calendar, mode, callback, job, initialDate) {
-   let dlg = cal.findItemWindow(calendarItem);
-    if (dlg) {
-        dlg.focus();
-        disposeJob(job);
-        return;
-    }
-
-    // Set up some defaults
-    mode = mode || "new";
-    calendar = calendar || getSelectedCalendar();
-    var calendars = getCalendarManager().getCalendars({});
-    calendars = calendars.filter(isCalendarWritable);
-
-    var isItemSupported;
-    if (isToDo(calendarItem)) {
-        isItemSupported = function isTodoSupported(aCalendar) {
-            return (aCalendar.getProperty("capabilities.tasks.supported") !== false);
-        };
-    } else if (isEvent(calendarItem)) {
-        isItemSupported = function isEventSupported(aCalendar) {
-            return (aCalendar.getProperty("capabilities.events.supported") !== false);
-        };
-    }
-
-    // Filter out calendars that don't support the given calendar item
-    calendars = calendars.filter(isItemSupported);
-
-    // Filter out calendar/items that we cannot write to/modify
-    if (mode == "new") {
-        calendars = calendars.filter(userCanAddItemsToCalendar);
-    } else { /* modify */
-        
-        calendars = calendars.filter(function calendarCanModifyItems(aCalendar) {
-            /* If the calendar is the item calendar, we check that the item
-             * can be modified. If the calendar is NOT the item calendar, we
-             * check that the user can remove items from that calendar and
-             * add items to the current one.
-             */
-            return (((calendarItem.calendar != aCalendar)
-                     && userCanDeleteItemsFromCalendar(calendarItem.calendar)
-                     && userCanAddItemsToCalendar(aCalendar))
-                    || ((calendarItem.calendar == aCalendar)
-                        && userCanModifyItem(calendarItem)));
-        });
-    }
-
-    if (mode == "new"
-        && (!isCalendarWritable(calendar)
-            || !userCanAddItemsToCalendar(calendar)
-            || !isItemSupported(calendar))) {
-        if (calendars.length < 1) {
-            // There are no writable calendars or no calendar supports the given
-            // item. Don't show the dialog.
-            disposeJob(job);
-            return;
-        } else  {
-            // Pick the first calendar that supports the item and is writable
-            calendar = calendars[0];
-            if (calendarItem) {
-                // XXX The dialog currently uses the items calendar as a first
-                // choice. Since we are shortly before a release to keep
-                // regression risk low, explicitly set the item's calendar here.
-                calendarItem.calendar = calendars[0];
-            }
-        }
-    }
-
-    // Setup the window arguments
-    var args = new Object();
-    args.calendarEvent = calendarItem;
-    args.calendar = calendar;
-    args.mode = mode;
-    args.onOk = callback;
-    args.job = job;
-    args.initialStartDateValue = (initialDate || getDefaultStartDate());
-
-    // this will be called if file->new has been selected from within the dialog
-    args.onNewEvent = function(calendar) {
-        createEventWithDialog(calendar, null, null);
-    };
-    args.onNewTodo = function(calendar) {
-        createTodoWithDialog(calendar);
-    };
-
-    // the dialog will reset this to auto when it is done loading.
-    window.setCursor("wait");
-
-    // ask the provide if this item is an invitation. if this is the case
-    // we'll open the summary dialog since the user is not allowed to change
-    // the details of the item.
-    let wrappedCalendar = cal.wrapInstance(calendar, Components.interfaces.calISchedulingSupport);
-    let isInvitation = wrappedCalendar && wrappedCalendar.isInvitation(calendarItem);
-
-    // open the dialog modeless
-    let url;
-    if (isCalendarWritable(calendar)
-        && (mode == "new"
-            || (mode == "modify" && !isInvitation && userCanModifyItem((calendarItem))))) {
-        url = "chrome://calendar/content/calendar-event-dialog.xul";
-    } else {
-        url = "chrome://calendar/content/calendar-summary-dialog.xul";
-    }
- 
-    if( calendarItem.itemClass == "IPM.Note" )   url = "chrome://exchangecalendar/content/exchService-followup-event-dialog.xul";
-    
-    // reminder: event dialog should not be modal (cf bug 122671)
-    var features;
-    // keyword "dependent" should not be used (cf bug 752206)
-    if (Services.appinfo.OS == "WINNT") {
-        features = "chrome,titlebar,resizable";
-    } else if (Services.appinfo.OS == "Darwin") {
-        features = "chrome,titlebar,resizable,minimizable=no";
-    } else {
-        // All other targets, mostly Linux flavors using gnome.
-        features = "chrome,titlebar,resizable,minimizable=no,dialog=no";
-    }
-
-    openDialog(url, "_blank", features, args);
-}
-

From 60514fbcf910ceb4db51a2b4a010a38ce13d5b63 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 20 Jul 2017 14:30:59 +0200
Subject: [PATCH 099/222] locale: add cs-CZ translation (thanks to p-bo)

Thanks to @p-bo who is the author of the translation.
---
 chrome.manifest                               |  1 +
 .../cs-CZ/attachments-view.dtd                |  2 +
 .../exchangecalendar/cs-CZ/browseFolder.dtd   | 12 ++++
 .../cs-CZ/calExchangeCalendar.properties      | 49 ++++++++++++++++
 .../cs-CZ/calendar-calendars-list.dtd         |  5 ++
 .../cs-CZ/calendar-summary-dialog.dtd         |  3 +
 .../cs-CZ/delegate-calendar-dialog.dtd        | 25 +++++++++
 .../cs-CZ/delegate-folder.dtd                 | 45 +++++++++++++++
 .../cs-CZ/ecCalendarCreation.dtd              |  5 ++
 .../cs-CZ/exchangeCloneSettings.dtd           |  6 ++
 .../cs-CZ/exchangeReminderDialog.dtd          |  4 ++
 .../cs-CZ/exchangeSettings.dtd                | 54 ++++++++++++++++++
 .../cs-CZ/exchangeSettingsOverlay.dtd         | 56 +++++++++++++++++++
 .../exchangecalendar/cs-CZ/extra-priority.dtd | 18 ++++++
 .../cs-CZ/invitationResponse.dtd              | 19 +++++++
 locale/exchangecalendar/cs-CZ/inviteStyle.dtd |  2 +
 .../cs-CZ/lightning-item-iframe.dtd           |  7 +++
 .../cs-CZ/manageEWSAccounts.dtd               | 16 ++++++
 .../cs-CZ/messenger_task_delegation.dtd       |  6 ++
 locale/exchangecalendar/cs-CZ/oofSettings.dtd | 26 +++++++++
 .../cs-CZ/preInvitationResponse.dtd           | 14 +++++
 locale/exchangecalendar/cs-CZ/preferences.dtd | 48 ++++++++++++++++
 locale/exchangecalendar/cs-CZ/rtews.dtd       | 15 +++++
 .../exchangecalendar/cs-CZ/rtews.properties   |  2 +
 .../exchangecalendar/cs-CZ/selectEWSUrl.dtd   |  9 +++
 .../exchangecalendar/cs-CZ/sendUpdateTo.dtd   |  9 +++
 .../cs-CZ/sharedCalendarParser.dtd            |  3 +
 .../cs-CZ/timezonePreference.dtd              |  1 +
 28 files changed, 462 insertions(+)
 create mode 100644 locale/exchangecalendar/cs-CZ/attachments-view.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/browseFolder.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/calExchangeCalendar.properties
 create mode 100644 locale/exchangecalendar/cs-CZ/calendar-calendars-list.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/calendar-summary-dialog.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/delegate-calendar-dialog.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/delegate-folder.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/ecCalendarCreation.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/exchangeCloneSettings.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/exchangeReminderDialog.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/exchangeSettings.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/exchangeSettingsOverlay.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/extra-priority.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/invitationResponse.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/inviteStyle.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/lightning-item-iframe.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/manageEWSAccounts.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/messenger_task_delegation.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/oofSettings.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/preInvitationResponse.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/preferences.dtd
 create mode 100755 locale/exchangecalendar/cs-CZ/rtews.dtd
 create mode 100755 locale/exchangecalendar/cs-CZ/rtews.properties
 create mode 100644 locale/exchangecalendar/cs-CZ/selectEWSUrl.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/sendUpdateTo.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/sharedCalendarParser.dtd
 create mode 100644 locale/exchangecalendar/cs-CZ/timezonePreference.dtd

diff --git a/chrome.manifest b/chrome.manifest
index 9ea656b9..4acc3405 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -52,6 +52,7 @@ locale exchangecalendar sv locale/exchangecalendar/sv/
 locale exchangecalendar ru locale/exchangecalendar/ru/
 locale exchangecalendar it-IT locale/exchangecalendar/it-IT/
 locale exchangecalendar tr locale/exchangecalendar/tr/
+locale exchangecalendar cs-CZ locale/exchangecalendar/cs-CZ/
 
 manifest interfaces/exchangeCalendar/mivExchangeCalendar.manifest
 
diff --git a/locale/exchangecalendar/cs-CZ/attachments-view.dtd b/locale/exchangecalendar/cs-CZ/attachments-view.dtd
new file mode 100644
index 00000000..f5402eea
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/attachments-view.dtd
@@ -0,0 +1,2 @@
+<!ENTITY exchWebServie.add.attachment.button.label "Přílohy">
+
diff --git a/locale/exchangecalendar/cs-CZ/browseFolder.dtd b/locale/exchangecalendar/cs-CZ/browseFolder.dtd
new file mode 100644
index 00000000..2844c5e1
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/browseFolder.dtd
@@ -0,0 +1,12 @@
+<!ENTITY label.acceptbutton "Vybrat">
+<!ENTITY label.cancelbutton "Storno">
+
+<!ENTITY browsefolder.title "Procházet složky">
+
+<!ENTITY treecol.label.foldername "Název složky">
+<!ENTITY treecol.label.folderclass "Třída složky">
+
+
+
+
+
diff --git a/locale/exchangecalendar/cs-CZ/calExchangeCalendar.properties b/locale/exchangecalendar/cs-CZ/calExchangeCalendar.properties
new file mode 100644
index 00000000..039c6552
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/calExchangeCalendar.properties
@@ -0,0 +1,49 @@
+displayName=Poskytovatel kalendáře a úkolů na Exchange 2007/2010/2013
+
+resetEventMessage=Kalednář „%1$S“ byl resetován.
+addTaskEventMessage=Přidán úkol „%1$S“ (%2$S).
+addCalendarEventMessage=Přidáno setkání „%1$S“ (%2$S).
+ewsErrorEventMessage=Chyba při komunikaci s EWS serverem pro „%1$S". Chyba: %2$S, Kód: %3$S.
+updateCalendarEventMessage=Schůzka „%1$S“ byla upravena (%2$S).
+updateTaskEventMessage=Úkol „%1$S“ byl upraven (%2$S).
+deleteCalendarEventMessage=Schůzka „%1$S“ byla odebrána (%2$S).
+deleteTaskEventMessage=Úkol „%1$S“ byl změněn odebrán (%2$S).
+syncFolderEventMessage="%4$S": Obdrženy aktualizace z  EWS serveru (Nové: %1$S, Změněné: %2$S, Smazané: %3$S).
+syncInboxRequests="%4$S": Do příchozích zpráv dorazily aktualizace pozvánek z EWS serveru (Nové: %1$S, Změněné: %2$S, Smazané: %3$S).
+syncInboxCancelations="%4$S": Do příchozích zpráv dorazila zrušení pozvánek z EWS serveru (Nové: %1$S, Změněné: %2$S, Smazané: %3$S).
+syncInboxResponses="%4$S": Do příchozích zpráv dorazily aktualizace odpovědí na pozvánky z EWS serveru (Nové: %1$S, Změněné: %2$S, Smazané: %3$S).
+ewsMeetingResponsEventMessage=Žádost o schůzku „%1$S“ zodpovězena s „%2$S“ (%3$S). Vaše zpráva:
+
+ecErrorServerCheck=Error while checking with server: %1$S (%2$S)
+ecErrorAutodiscovery=Error during autodiscovery: %1$S (%2$S)
+ecErrorAutodiscoveryURLInvalid=Nepodařilo se najít nastavení pomocí automatického zjišťování pomocí doménové části názvu e-mailové schránky (%1$S).\nObvykle to znamená že není určen žádný server pro automatické zjišťování s částí doménového názvu coby názvem stroje.
+ecErrorServerCheckURLInvalid=Server „%1$S“ neexistuje.
+ecErrorServerAndMailboxCheck=Chyba při kontrole serveru a schránky: %1$S (Kód: %2$S)
+
+updateUserPrefs1=Předvolby uživatele byly v nové verzi aktualizovány (počínaje 0.7.26)
+
+autoRemoveConfirmedInvitationOnCancellation=Confirmed appointment „%1$S“ has been cancelled and was automatically removed as specified by user settings (%2$S).
+
+sendAutoRespondMeetingRequestMessage=Meeting request „%1$S“ has been automatically answered as specified by the user settings (%2$S).
+
+ecLoadingOofSettings=(Získávání dat)
+ecLoadedOofSettings=(Data obdržena)
+ecErrorLoadingOofSettings=Chyba při načítání nastavení nepřítomnosti v kanceláři. Kód: %2$S, Hlášení: %1$S.
+ecSavingOofSettings=(Ukládání dat)
+ecSavedOofSettings=(Data uložena)
+ecErrorSavingOofSettings=Chyba při ukládání nastavení nepřítomnosti v kanceláři. Kód: %2$S, Hlášení: %1$S.
+
+
+exchWebService.PidLidTaskHistory.duedate.changed=Termín byl změněn
+exchWebService.PidLidTaskHistory.some.property.changed=Vlastnost byla změněna
+exchWebService.PidLidTaskHistory.accepted=Úkol přijat %1$S
+exchWebService.PidLidTaskHistory.rejected=Úkol odmítnut %1$S
+exchWebService.PidLidTaskHistory.assigned=Úkol přidělen %1$S
+exchWebService.PidLidTaskHistory.no.changes=Beze změn
+
+ecErrorServerAndMailboxCheckFolderNotFound=Buď nemáte oprávnění číst označenou e-mailovou schránku nebo e-mailová schránka není zadaná správně.\n\nPokud je schránka správně, mohli byste mít oprávnění pro zobrazení stavu Zaneprázdněn/Dočasně/OOO dostupnosti uživatele pro kalendář schránky.\n\n(%2$S: %1$S)
+
+tooltipCalendarDisconnected=Kalendář %1$S není připojen k exchange serveru\n(Důvod: %2$S).
+tooltipCalendarDisconnectedReadOnly=Kalendář %1$S není připojen k exchange serveru a je pouze pro čtení\n(Důvod: %2$S).
+tooltipCalendarConnected=Kalendář %1$S je připojen k exchange serveru.
+tooltipCalendarConnectedReadOnly=Kalendář %1$S je připojen k exchange serveru a je pouze pro čtení.
diff --git a/locale/exchangecalendar/cs-CZ/calendar-calendars-list.dtd b/locale/exchangecalendar/cs-CZ/calendar-calendars-list.dtd
new file mode 100644
index 00000000..d49a2f46
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/calendar-calendars-list.dtd
@@ -0,0 +1,5 @@
+<!ENTITY calendar.context.exchange.convert.label "Přídavek pro převod Exchange 2007/2010/2013 kalendářů a úkolů">
+<!ENTITY calendar.context.exchange.properties.label "Vlastnosti Exchange (EWS)">
+<!ENTITY calendar.context.exchange.oof.settings.label "Nastavení pro Mimo kancelář">
+<!ENTITY calendar.context.exchange.clone.settings.label "Klonovat nastavení do nového kalendáře">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delegovat kalendář">
diff --git a/locale/exchangecalendar/cs-CZ/calendar-summary-dialog.dtd b/locale/exchangecalendar/cs-CZ/calendar-summary-dialog.dtd
new file mode 100644
index 00000000..93797c19
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/calendar-summary-dialog.dtd
@@ -0,0 +1,3 @@
+<!ENTITY forward.invite.label "Přeposlat pozvánku">
+<!ENTITY required.attendee.label "Povinní účastníci">
+<!ENTITY optional.attendee.label "Nepovinní účastníci">
\ No newline at end of file
diff --git a/locale/exchangecalendar/cs-CZ/delegate-calendar-dialog.dtd b/locale/exchangecalendar/cs-CZ/delegate-calendar-dialog.dtd
new file mode 100644
index 00000000..dcbc961c
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/delegate-calendar-dialog.dtd
@@ -0,0 +1,25 @@
+ 
+<!ENTITY  label.delegateCalendar.cancelbutton "Storno">
+<!ENTITY  label.delegateCalendar.userEmail "E-mail">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Doručení žádostí o schůzku">
+
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Pouze pověření">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Pověření a já">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Pověření a mně poslat oznámení">
+
+<!ENTITY  label.delegateCalendar.permission "Oprávnění">
+<!ENTITY  menuitem.delegateCalendar.permission.author "Autor">
+<!ENTITY  menuitem.delegateCalendar.permission.editor "Editor">
+<!ENTITY  menuitem.delegateCalendar.permission.reviewer "Recenzent">
+<!ENTITY  menuitem.delegateCalendar.permission.none "Žádná">
+
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Dostávat kopie zpráv ohledně schůzky" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "Zobrazit soukromé položky" >
+
+
+<!ENTITY  delegateCalendar.permission.description.author "Číst a vytvářet položky ve složce Kalendář." >
+<!ENTITY  delegateCalendar.permission.description.editor "Číst, vytvářet a upravovat položky ve složce Kalendář." >
+<!ENTITY  delegateCalendar.permission.description.reviewer "Číst položky ve složce Kalendář." >
+<!ENTITY  delegateCalendar.permission.description.none "Žádná oprávnění k přístupu do složky Kalendář." >
+
+<!ENTITY  delegateCalendar.permission.details.label "Podrobnosti o oprávnění: " >
\ No newline at end of file
diff --git a/locale/exchangecalendar/cs-CZ/delegate-folder.dtd b/locale/exchangecalendar/cs-CZ/delegate-folder.dtd
new file mode 100644
index 00000000..293bb542
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/delegate-folder.dtd
@@ -0,0 +1,45 @@
+ 
+<!ENTITY  label.delegatefolder.cancelbutton "Storno">
+<!ENTITY  label.delegatefolder.userEmail "E-mail">
+ 
+<!ENTITY  label.delegatefolder.permissionLevel "Úroveň oprávnění">
+<!ENTITY  label.delegatefolder.userboxcolumn1 "Uživatel"> 
+<!ENTITY  label.delegatefolder.userboxcolumn2 "Oprávnění"> 
+
+<!ENTITY  menuitem.delegatefolder.permission.author "Autor">
+<!ENTITY  menuitem.delegatefolder.permission.editor "Editor">
+<!ENTITY  menuitem.delegatefolder.permission.reviewer "Recenzent">
+<!ENTITY  menuitem.delegatefolder.permission.none "Žádná">
+<!ENTITY  menuitem.delegatefolder.permission.owner "Vlastník" > 
+<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "Publikující editor" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "Publikující autor" >
+<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "Nic neupravující autor" >
+<!ENTITY  menuitem.delegatefolder.permission.contributor "Přispěvatel" >
+<!ENTITY  menuitem.delegatefolder.permission.custom "Vlastní" >
+                            
+<!ENTITY  delegatefolder.permission.description.author "Číst a vytvářet položky ve složce." >
+<!ENTITY  delegatefolder.permission.description.editor "Číst, vytvářet a upravovat položky ve složce." >
+<!ENTITY  delegatefolder.permission.description.reviewer "Číst položky ve složce." >
+<!ENTITY  delegatefolder.permission.description.none "Žádná přístupová práva ke složce." >
+
+ <!ENTITY  delegatefolder.permission.details.caption "Oprávnění "> 
+
+<!ENTITY  delegatefolder.tab.msg.label  "Pro tento e-mailový účet nebyl nalezen žádný kalendář nebo úkoly.">
+<!ENTITY  delegatefolder.tab.name  "Sdílení Exchange složky">
+
+<!ENTITY  delegatefolder.permissions.none  "Žádné">
+<!ENTITY  delegatefolder.permissions.own  "Vlastní položky">
+<!ENTITY  delegatefolder.permissions.all  "Všechny položky">
+<!ENTITY  delegatefolder.permissions.full  "Veškeré podrobnosti">
+
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Vytvářet položky">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Vytvářet podsložky">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Vlastník složky">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Složka viditelná">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Kontakt složky">
+<!ENTITY  delegatefolder.permissions.edititems  "Upravovat položky">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Mazat položky">
+<!ENTITY  delegatefolder.permissions.readitems  "Číst položky">  
+ 
+<!ENTITY  delegatefolder.permissions.true  "Ano">
+<!ENTITY  delegatefolder.permissions.false  "Ne">
diff --git a/locale/exchangecalendar/cs-CZ/ecCalendarCreation.dtd b/locale/exchangecalendar/cs-CZ/ecCalendarCreation.dtd
new file mode 100644
index 00000000..8914cc94
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/ecCalendarCreation.dtd
@@ -0,0 +1,5 @@
+<!ENTITY exchange1.description "Nastavení Exchange/Windows Active Directory">
+<!ENTITY exchange.cache.label "Používat mezipaměť pro práci při odpojení">
+
+
+
diff --git a/locale/exchangecalendar/cs-CZ/exchangeCloneSettings.dtd b/locale/exchangecalendar/cs-CZ/exchangeCloneSettings.dtd
new file mode 100644
index 00000000..3863f296
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/exchangeCloneSettings.dtd
@@ -0,0 +1,6 @@
+<!ENTITY label.acceptbutton "Uložit">
+<!ENTITY label.cancelbutton "Storno">
+
+<!ENTITY label.ecExchangeSettings.title "Nový popis:">
+
+
diff --git a/locale/exchangecalendar/cs-CZ/exchangeReminderDialog.dtd b/locale/exchangecalendar/cs-CZ/exchangeReminderDialog.dtd
new file mode 100644
index 00000000..e9df74d8
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/exchangeReminderDialog.dtd
@@ -0,0 +1,4 @@
+<!ENTITY exchWebService.reminder.relation.origin.label "před začátkem události">
+
+
+
diff --git a/locale/exchangecalendar/cs-CZ/exchangeSettings.dtd b/locale/exchangecalendar/cs-CZ/exchangeSettings.dtd
new file mode 100644
index 00000000..53900ec0
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/exchangeSettings.dtd
@@ -0,0 +1,54 @@
+<!ENTITY label.acceptbutton "Uložit a resetovat">
+<!ENTITY label.cancelbutton "Storno">
+<!ENTITY ecsettings.title "Nastavení EWS kalendáře a e-mailu">
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Žádosti o schůzku">
+<!ENTITY ecsettings.tab.calendarfolderproperties "Vlastnosti složky">
+
+<!ENTITY label.ecExchangeSettings.title "Nastavení pro kalendář:">
+
+<!ENTITY label.poll.inbox "Zjišťovat v doručené poště žádosti, změny a zrušení.">
+<!ENTITY label.poll.inbox.interval "Četnost (v sekundách) zjišťování nových zpráv:">
+<!ENTITY label.poll.calendar.interval "Četnost (v sekundách) zjišťování změn v kalendáři:">
+
+<!ENTITY label.nomeetingrequestsettings "Nemůžete nastavovat schůzku protože jste nevybrali hlavní kalendář pro e-mailovou schránku">
+
+<!ENTITY label.autorespond.meetingrequest "Automaticky odpovídat na nové pozvánky že ">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "Možná se zúčastním">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "Zúčastním se">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "Nezúčastním se">
+
+<!ENTITY label.autoremove.invitation_cancellation1 "Automaticky odebrat pozvánku a související zprávu o zrušení pokud jste doposud neodpověděli.">
+<!ENTITY label.autoremove.invitation_cancellation2 "Automaticky odebrat potvrzené pozvání pokud obdržíte zprávu o zrušení.">
+
+<!ENTITY label.autoremove.invitation_response1 "V případě schůzek které neorganizujete automaticky odebírat odpovědi ostatních na pozvánku.">
+
+<!ENTITY label.doautorespond.meetingrequest.message "Namísto dotazování se co odpovědět rovnou posílat následující zprávu.">
+<!ENTITY label.autorespond.meetingrequest.message "Vaše zpráva:">
+
+<!ENTITY treecol.label.userid "Identifikátor uživatele">
+<!ENTITY treecol.label.email "E-mail">
+
+
+<!ENTITY ecsettings.tab.offlineCachingproperties "Ukládání do mezipaměti pro práci při odpojení">
+
+<!ENTITY label.offlineCacheproperties.cachingStartDate "Datum zahájení ukládání do mezipaměti:">
+<!ENTITY label.offlineCacheproperties.cachingEndDate "Datum ukončení ukládání do mezipaměti:">
+<!ENTITY label.offlineCacheproperties.totalEvents "Celkový počet událostí v mezipaměti:">
+<!ENTITY label.offlineCacheproperties.totalTasks "Celkový počet úkolů v mezipaměti:">
+
+<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate "Kolik měsíců před dneškem uchovávat položky v mezipaměti:">
+<!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Kolik měsíců ode dneška uchovávat položky v mezipaměti:">
+
+<!ENTITY button.offlineCacheproperties.clearCache "Vyčistit data z mezipaměti pro práci při odpojení">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Automatické zpracování">
+<!ENTITY ecsettings.tab.mailitemsProperties "Nastavení EWS (pošta)">
+
+<!ENTITY label.syncmailitems.interval "Odložit synchronizaci položek zpráv (štítky, atd.)">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automaticky odstraňovat zrušené události">
+<!ENTITY label.autoprocessingproperties.markeventtentative "Automaticky označovat události jako předběžné a posílat odpovědi organizátorovi">
+<!ENTITY label.syncmailitems.active "Udržovat synchronizaci položek zpráv (štítky, atd.)">
+
+<!ENTITY label.syncfollowup.deactivtate "Vypnout navazující úkol">
+ 
diff --git a/locale/exchangecalendar/cs-CZ/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/cs-CZ/exchangeSettingsOverlay.dtd
new file mode 100644
index 00000000..96703eb6
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/exchangeSettingsOverlay.dtd
@@ -0,0 +1,56 @@
+<!ENTITY ecautodiscover "Použít funkci Exchange automatického zjištění.">
+<!ENTITY ecfolderbase.label "Základ složky:">
+<!ENTITY ecfolderpath.label "Popis umístění pod základem složky:">
+<!ENTITY ecfolderidofshare.label "Identifikátor sdílené složky:">
+<!ENTITY exchWebServices.SharedFolderID.label "Zobrazovaný název sdílení:">
+
+<!ENTITY menuitem.label.ecfolderbase.calendar "Složka s kalendářem">
+<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Veřejné složky">
+<!ENTITY menuitem.label.ecfolderbase.inbox "Složka s příchozími zprávami">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Složka hlasové schránky">
+<!ENTITY menuitem.label.ecfolderbase.msgfolderroot "Kořen složky se zprávami">
+<!ENTITY menuitem.label.ecfolderbase.root "Kořen e-mailové schránky">
+<!ENTITY menuitem.label.ecfolderbase.tasks "Složka s úkoly">
+
+<!ENTITY menuitem.label.ecfolderbase.contacts "Složka s kontakty">
+<!ENTITY menuitem.label.ecfolderbase.deleteditems "Složka se smazanými položkami">
+<!ENTITY menuitem.label.ecfolderbase.drafts "Složka s koncepty">
+<!ENTITY menuitem.label.ecfolderbase.journal "Složka s deníkem">
+<!ENTITY menuitem.label.ecfolderbase.notes "Složka s poznámkami">
+<!ENTITY menuitem.label.ecfolderbase.outbox "Složka s odesílanými zprávami">
+<!ENTITY menuitem.label.ecfolderbase.sentitems "Složka s už odeslanými zprávami">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Složka s nevyžádanými zprávami">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Složka s hledáními">
+<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Níze uvedené předvolby platní pouze pro Exchange2010 --">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Dumpster root folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Dumpster deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Dumpster versions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges "Dumpster purges folder">
+<!ENTITY menuitem.label.ecfolderbase.archiveroot "Root archive folder">
+<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot "Root archive message folder">
+<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems "Archive deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot "Archive recoverable items root folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions "Archive recoverable items deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsversions "Archive recoverable items versions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemspurges "Archive recoverable items purges folder">
+
+<!ENTITY button.label.autodiscovercheck "Zjistit automaticky">
+<!ENTITY button.label.serverandmailboxcheck "Zkontrolovat server a schránku">
+<!ENTITY button.label.servercheck "Zkontrolovat server a účet">
+
+<!ENTITY ecmailbox.label "Hlavní e-mailová adresa:">
+<!ENTITY ecmailbox.tooltip "Pokud nezadáte e-mailovou schránku, budete mít přístup pouze do věřejných složek.">
+<!ENTITY ecwindowsuser.label "Uživatelské jméno:">
+<!ENTITY ecwindowsdomain.label "Název domény:">
+<!ENTITY ecwindowspassword.label "Heslo:">
+
+<!ENTITY button.label.folderpathcheck "Zkontrolovat">
+<!ENTITY button.label.folderbrowse "Procházet">
+
+<!ENTITY exchWebServices.UserAvailability.label "Pro kalendář schránky bude viditelný pouze stav dostupnosti uživatele.">
+
+<!ENTITY exchWebServices.exchtype.label "Typ Exchange">
+<!ENTITY exchWebServices.hostexch.label "Vlastní instalace">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Podrobnosti">
+ 
\ No newline at end of file
diff --git a/locale/exchangecalendar/cs-CZ/extra-priority.dtd b/locale/exchangecalendar/cs-CZ/extra-priority.dtd
new file mode 100644
index 00000000..157a5561
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/extra-priority.dtd
@@ -0,0 +1,18 @@
+<!ENTITY prefwindow.title "Extras">
+<!ENTITY general.label  "Obecné"> 
+<!ENTITY about.label "O aplikaci"> 
+ 
+<!ENTITY about.description.label "Enhanced Features for thunderbird and seamonkey applications">
+<!ENTITY iconify.label "Zobrazovat pouze ikony priorit"> 
+<!ENTITY shadeHigh.label "Barevné pozadí pro zprávy s vysokou prioritou">
+<!ENTITY shadeLow.label "Barevné pozadí pro zprávy s nízkou prioritou">
+<!ENTITY tagImportant.label "Automaticky označovat zprávy se štítkem vysoké priority jako důležité">
+ 
+<!ENTITY highestColor.label "Nejvyšší">
+
+<!ENTITY highColor.label "Vysoká">
+<!ENTITY lowColor.label "Nízká">
+<!ENTITY lowestColor.label "Nejnižší">
+ 
+<!ENTITY prioritycolor  "Vlastní barva">
+<!ENTITY pref.color "Předvolby barev:">
diff --git a/locale/exchangecalendar/cs-CZ/invitationResponse.dtd b/locale/exchangecalendar/cs-CZ/invitationResponse.dtd
new file mode 100644
index 00000000..08982029
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/invitationResponse.dtd
@@ -0,0 +1,19 @@
+<!ENTITY label.acceptbutton "Potvrdit změnu">
+<!ENTITY label.cancelbutton "Zrušit změnu">
+
+<!ENTITY description.invitationResponse "Potvrďte změny ve vaší odpovědi na setkání.">
+
+<!ENTITY label.calendarName "Kalendář:">
+<!ENTITY label.itemTitle "Předmět:">
+<!ENTITY label.itemStart "Čas zahájení:">
+<!ENTITY label.itemResponse "Vaše odpověď:">
+<!ENTITY label.meetingOrganiser "Organizátor:">
+
+<!ENTITY label.messageReponseBody "Odpovědní zpráva:">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "Možná se zúčastním">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "Zúčastním se">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "Nezúčastním se">
+
+
+
diff --git a/locale/exchangecalendar/cs-CZ/inviteStyle.dtd b/locale/exchangecalendar/cs-CZ/inviteStyle.dtd
new file mode 100644
index 00000000..e237723a
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/inviteStyle.dtd
@@ -0,0 +1,2 @@
+<!ENTITY label.inviteCol "Pozvání kalendáře">
+<!ENTITY tooltip.inviteCol "Seřadit dle pozvání">
diff --git a/locale/exchangecalendar/cs-CZ/lightning-item-iframe.dtd b/locale/exchangecalendar/cs-CZ/lightning-item-iframe.dtd
new file mode 100644
index 00000000..956830b6
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/lightning-item-iframe.dtd
@@ -0,0 +1,7 @@
+<!ENTITY exchWebService.owner.label "Vlastník:">
+<!ENTITY exchWebService.totalWork.label "Práce celkem:">
+<!ENTITY exchWebService.actualWork.label "Stávající práce:">
+<!ENTITY exchWebService.mileage.label "Postup:">
+<!ENTITY exchWebService.billingInformation.label "Účtovací údaje:">
+<!ENTITY exchWebService.companies.label "Společnost:">
+
diff --git a/locale/exchangecalendar/cs-CZ/manageEWSAccounts.dtd b/locale/exchangecalendar/cs-CZ/manageEWSAccounts.dtd
new file mode 100644
index 00000000..5b6f2cb4
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/manageEWSAccounts.dtd
@@ -0,0 +1,16 @@
+<!ENTITY label.acceptbutton "Zavřít">
+
+<!ENTITY exchWebService.manageEWSAccounts.newAccount.button "Přidat účet">
+<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button "Odebrat účet">
+<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button "Uložit nastavení">
+
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.label "Použít funkci Exchange automatického zjišťování.">
+<!ENTITY exchWebService.manageEWSAccounts.mailbox.label "Název schránky:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label "Uživatelské jméno:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label "Doménový název:">
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button "Automaticky zjistit">
+<!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Zkontrolovat server a účet">
+<!ENTITY exchWebService.manageEWSAccounts.name.label "Název:">
+
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Účty Exchange Web Services">
+
diff --git a/locale/exchangecalendar/cs-CZ/messenger_task_delegation.dtd b/locale/exchangecalendar/cs-CZ/messenger_task_delegation.dtd
new file mode 100644
index 00000000..564c615e
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/messenger_task_delegation.dtd
@@ -0,0 +1,6 @@
+<!ENTITY exchWebService.task.delegation.owner.name "Vlastník úkolu">
+<!ENTITY exchWebService.task.delegation.delegator.name "Kdo přiděluje">
+<!ENTITY exchWebService.task.delegation.accept.button "Přijmout">
+<!ENTITY exchWebService.task.delegation.decline.button "Odmítnout">
+<!ENTITY exchWebService.task.delegation.lastUpdateDate "Naposledy změněno">
+
diff --git a/locale/exchangecalendar/cs-CZ/oofSettings.dtd b/locale/exchangecalendar/cs-CZ/oofSettings.dtd
new file mode 100644
index 00000000..81a3428d
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/oofSettings.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.oofsettings "Nastavení nepřítomnosti v kanceláři">
+<!ENTITY label.acceptbutton "Uložit">
+<!ENTITY label.cancelbutton "Zavřít">
+<!ENTITY label.oofsettings.title "Mimo kancelář po dobu:">
+
+<!ENTITY label.oofstatus "Stav nepřítomnosti v kanceláři:">
+
+<!ENTITY label.externalaudience "Kterým osobám mimo organizaci posílat zprávy o nepřítomnosti v kanceláři: ">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "Nikomu">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Pouze osobám v mém seznamu kontaktů">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "Všem">
+
+<!ENTITY button.label.internal "Zpráva pro místí">
+<!ENTITY button.label.external "Zpráva pro ostatní">
+<!ENTITY label.internalreply "Zpráva bude posílána lidem uvnitř organizace:">
+<!ENTITY label.externalreply "Zpráva bude posílání lidem mimo organizaci:">
+
+<!ENTITY menuitem.label.exchWebService-oof-status.disabled "Vypnuto">
+<!ENTITY menuitem.label.exchWebService-oof-status.enabled "Zapnuto">
+
+<!ENTITY checkbox.label.exchWebService-oof-scheduled "Zapnuto pouze v zadaném období:">
+<!ENTITY label.hbox-oof-scheduled-startTime "Čas zahájení:">
+<!ENTITY label.hbox-oof-scheduled-endTime "Čas ukončení:">
+
+
+
diff --git a/locale/exchangecalendar/cs-CZ/preInvitationResponse.dtd b/locale/exchangecalendar/cs-CZ/preInvitationResponse.dtd
new file mode 100644
index 00000000..c1a9286d
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/preInvitationResponse.dtd
@@ -0,0 +1,14 @@
+<!ENTITY dialog.exchWebService.preInvitationResponse.title "Jak chcete zareagovat?">
+<!ENTITY label.acceptbutton "Ok">
+<!ENTITY label.cancelbutton "Storno">
+
+<!ENTITY label.calendarName "Kalendář:">
+<!ENTITY label.itemTitle "Předmět:">
+<!ENTITY label.itemStart "Čas zahájení:">
+<!ENTITY label.itemResponse "Vaše odpověď:">
+<!ENTITY label.meetingOrganiser "Organizátor:">
+
+<!ENTITY radio.label.exchWebService.preInvitationResponse.edit "Před odesláním upravit odpověď.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow "Odpovědět nyní.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend "Neposílat odpověď.">
+
diff --git a/locale/exchangecalendar/cs-CZ/preferences.dtd b/locale/exchangecalendar/cs-CZ/preferences.dtd
new file mode 100644
index 00000000..8382bbed
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/preferences.dtd
@@ -0,0 +1,48 @@
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Záznam událostí">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Účty">
+<!ENTITY exchangeWebService.preferences.tab.debug "Záznam událostí">
+<!ENTITY exchangeWebService.preference.debug.file "Umístění souboru se záznamem událostí:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Komuniace s Exchange serverem:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Zaznamenávat informace na konzoli a/nebo do souboru">
+<!ENTITY exchangeWebService.preference.debug.file.button "Procházet">
+<!ENTITY exchangeWebService.preference.network.debug.label "Zaznamenávat události komunikace s Exchange serverem">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Stupeň podrobnosti zaznamenávání">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Základní informace, 2 = Úplná komunikace">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Zaznamenávat údaje o průběhu komunikace (např. ověřování)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Hesla v souboru se záznamem zobrazovat v čitelné podobě.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Adresář kontaktů / kontakty:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Stupeň podrobnosti zaznamenávání">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Základní informace, 2 = Úplná komunikace">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Zaznamenávat informace o části týkající se adresáře kontaktů / kontaktů">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Předvolby Exchange (EWS)">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Objekt hlavního poskytovatele:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Žádný, 1 = Základní informace, 2 = Rozšířené informace">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Ukládání do mezipaměti">
+<!ENTITY exchangeWebService.preference.cache.memory.label "V dočasné mezipaměti nejméně">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Stáhnout dnů před datem spuštění aplikace:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Stáhnout dnů od data spuštění aplikace:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Ostatní">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Předvolby komunikace:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "O komunikaci s exchange se pokoušet nejvýše tolikrát:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Funkce automatické aktualizace přídavku:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automaticky zjišťovat dostupnost nové verze přídavku při spouštění aplikace Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Zobrazit varování když je k dispozici nová verze. Takže jí budete moci snadno nainstalovat.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Zobrazit varování když je k dispozici verze před vydáním (zkušební, kandidát na vydání, atd.).">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Rozdělování zátěže:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Rozdělování zátěže:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Souběžných požadavků na exchange server nejvýše:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Mezi jednotlivými požadavky na exchange server počkat alespoň:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
+
+<!ENTITY exchangeWebService.preference.ntlmv1.label "Předvolby Ntlm-v1:">
+<!ENTITY exchangeWebService.preference.ntlmv1.true.label "Zapnout">
+<!ENTITY exchangeWebService.preference.ntlmv1.false.label "Vypnout">
diff --git a/locale/exchangecalendar/cs-CZ/rtews.dtd b/locale/exchangecalendar/cs-CZ/rtews.dtd
new file mode 100755
index 00000000..964d8eed
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/rtews.dtd
@@ -0,0 +1,15 @@
+ <!ENTITY rtews.selectaccountdesc "Vyberte e-mailový účet pro který nastavit. Je třeba aby se jednalo o účet na Microsoft Exchange">
+ <!ENTITY rtews.accconfigured "Účet je už nastavený">
+ <!ENTITY rtews.dicoverdesc "URL adresu Microsoft Exchange Server (EWS) je možné zjistit automaticky nebo zadat ručně">
+ <!ENTITY rtews.dicoverdesc2 "Ručně nastavíte zadáním URL adresu do kolonky níže.">
+ <!ENTITY rtews.autodiscover "Automatické zjištění">
+ <!ENTITY rtews.doautodicover "Nezjišťovat automaticky">
+ <!ENTITY rtews.manual "Ruční">
+ <!ENTITY rtews.test "Kliknutím sem ověřte URL adresu EWS">
+ <!ENTITY rtews.msexchewsurl "URL adresa Microsoft Exchange EWS ověřena. Kliknutím na Dokončit ukončete nastavování">
+ <!ENTITY rtews.selectaccount "Vyberte účet">
+ <!ENTITY rtews.configure.label "Nastavit…">
+ <!ENTITY rtews.rtforexch "Štítkování na dálku pro Microsoft Exchange">
+ <!ENTITY rtews.confirmAccDetail "Potvrďte následující podrobnosti účtu">
+ <!ENTITY rtews.username "Uživatelské jméno">
+ <!ENTITY rtews.domain "Doména">
diff --git a/locale/exchangecalendar/cs-CZ/rtews.properties b/locale/exchangecalendar/cs-CZ/rtews.properties
new file mode 100755
index 00000000..82748665
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/rtews.properties
@@ -0,0 +1,2 @@
+rtews.title=EWS štítkování
+rtews.tagAddError=Došlo k chybě při vytváření štítku pro kategorii
\ No newline at end of file
diff --git a/locale/exchangecalendar/cs-CZ/selectEWSUrl.dtd b/locale/exchangecalendar/cs-CZ/selectEWSUrl.dtd
new file mode 100644
index 00000000..3b31ebd0
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/selectEWSUrl.dtd
@@ -0,0 +1,9 @@
+<!ENTITY label.acceptbutton "Vybrat">
+<!ENTITY label.cancelbutton "Storno">
+
+<!ENTITY description.selectews "Zvolte ze seznamu EWS server, který je použitelný pro vaše stávající umístění.">
+<!ENTITY label.selectews "Seznam EWS serverů:">
+
+
+
+
diff --git a/locale/exchangecalendar/cs-CZ/sendUpdateTo.dtd b/locale/exchangecalendar/cs-CZ/sendUpdateTo.dtd
new file mode 100644
index 00000000..6e67b7f0
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/sendUpdateTo.dtd
@@ -0,0 +1,9 @@
+<!ENTITY title.sendupdateto "Komu chcete poslat tuto aktualizaci?">
+<!ENTITY label.acceptbutton "Spustit">
+<!ENTITY label.cancelbutton "Storno">
+<!ENTITY label.calendaritem.title "Poslat aktualizaci pro schůzku:">
+
+<!ENTITY radio.label.sendtonone "Neposlat nikomu.">
+<!ENTITY radio.label.sendtoall "Poslat všem pozvaným.">
+<!ENTITY radio.label.sendtochanged "Poslat pouze přidaným nebo odebraným osobám.">
+
diff --git a/locale/exchangecalendar/cs-CZ/sharedCalendarParser.dtd b/locale/exchangecalendar/cs-CZ/sharedCalendarParser.dtd
new file mode 100644
index 00000000..858bbb4e
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/sharedCalendarParser.dtd
@@ -0,0 +1,3 @@
+<!ENTITY exchWebService_vbox_label "Zjištěno pozvání do Exchange sdílení">
+<!ENTITY exchWebService_button_label_add_calendar "Přidat kalendář">
+
diff --git a/locale/exchangecalendar/cs-CZ/timezonePreference.dtd b/locale/exchangecalendar/cs-CZ/timezonePreference.dtd
new file mode 100644
index 00000000..1826cf61
--- /dev/null
+++ b/locale/exchangecalendar/cs-CZ/timezonePreference.dtd
@@ -0,0 +1 @@
+<!ENTITY calendar.timezone.local.auto.label  "Automaticky změnit časovou zónu">

From 7a72817b638baaa9d5a0c4a7cd543eaf715c8cd6 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 16 Aug 2017 17:50:29 +0200
Subject: [PATCH 100/222] mivExchangeCalendar: automatic js formatted

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 7911 +++++++++--------
 1 file changed, 4026 insertions(+), 3885 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 28781bed..3c93c495 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -57,7 +57,7 @@ Cu.import("resource://exchangecalendar/erFindFolder.js");
 Cu.import("resource://exchangecalendar/erGetFolder.js");
 Cu.import("resource://exchangecalendar/erFindCalendarItems.js");
 Cu.import("resource://exchangecalendar/erFindTaskItems.js");
-Cu.import("resource://exchangecalendar/erFindFollowupItems.js"); 
+Cu.import("resource://exchangecalendar/erFindFollowupItems.js");
 Cu.import("resource://exchangecalendar/erGetItems.js");
 Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
 Cu.import("resource://exchangecalendar/erGetMeetingRequestByUID.js");
@@ -84,15 +84,15 @@ Cu.import("resource://interfaces/exchangeEvent/mivExchangeEvent.js");
 
 var globalStart = new Date().getTime();
 
-const nsIAP =  Ci.nsIActivityProcess;  
-const nsIAE =  Ci.nsIActivityEvent;  
+const nsIAP = Ci.nsIActivityProcess;
+const nsIAE = Ci.nsIActivityEvent;
 const nsIAM = Ci.nsIActivityManager;
 
 var gActivityManager;
 
-if( Cc["@mozilla.org/activity-manager;1"]){
-    gActivityManager = Cc["@mozilla.org/activity-manager;1"].getService(nsIAM);   
-    Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager available. Enabling it."); 
+if (Cc["@mozilla.org/activity-manager;1"]) {
+	gActivityManager = Cc["@mozilla.org/activity-manager;1"].getService(nsIAM);
+	Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager available. Enabling it.");
 }
 else {
 	Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager not available.");
@@ -100,185 +100,186 @@ else {
 
 
 const fieldPathMap = {
-	'ActualWork'			: 'task',
-	'AdjacentMeetingCount'		: 'calendar',
-	'AdjacentMeetings'		: 'calendar',
-	'AllowNewTimeProposal'		: 'calendar',
-	'AppointmentReplyTime'		: 'calendar',
-	'AppointmentSequenceNumber'	: 'calendar',
-	'AppointmentState'		: 'calendar',
-	'AssignedTime'			: 'task',
-	'AssociatedCalendarItemId'	: 'meeting',
-	'Attachments'			: 'item',
-	'BillingInformation'		: 'task',
-	'Body'				: 'item',
-	'CalendarItemType'		: 'calendar',
-	'Categories'			: 'item',
-	'ChangeCount'			: 'task',
-	'Companies'			: 'task',
-	'CompleteDate'			: 'task',
-	'ConferenceType'		: 'calendar',
-	'ConflictingMeetingCount'	: 'calendar',
-	'ConflictingMeetings'		: 'calendar',
-	'Contacts'			: 'task',
-	'ConversationId'		: 'item',
-	'Culture'			: 'item',
-	'DateTimeCreated'		: 'item',
-	'DateTimeReceived'		: 'item',
-	'DateTimeSent'			: 'item',
-	'DateTimeStamp'			: 'calendar',
-	'DelegationState'		: 'task',
-	'Delegator'			: 'task',
-	'DeletedOccurrences'		: 'calendar',
-	'DisplayCc'			: 'item',
-	'DisplayTo'			: 'item',
-	'DueDate'			: 'task',
-	'Duration'			: 'calendar',
-	'EffectiveRights'		: 'item',
-	'End'				: 'calendar',
-	'EndTimeZone'			: 'calendar',
-	'FirstOccurrence'		: 'calendar',
-	'FolderClass'			: 'folder',
-	'FolderId'			: 'folder',
-	'HasAttachments'		: 'item',
-	'HasBeenProcessed'		: 'meeting',
-	'Importance'			: 'item',
-	'InReplyTo'			: 'item',
-	'IntendedFreeBusyStatus'	: 'meetingRequest',
-	'InternetMessageHeaders'	: 'item',
-	'IsAllDayEvent'			: 'calendar',
-	'IsAssignmentEditable'		: 'task',
-	'IsAssociated'			: 'item',
-	'IsCancelled'			: 'calendar',
-	'IsComplete'			: 'task',
-	'IsDelegated'			: 'meeting',
-	'IsDraft'			: 'item',
-	'IsFromMe'			: 'item',
-	'IsMeeting'			: 'calendar',
-	'IsOnlineMeeting'		: 'calendar',
-	'IsOutOfDate'			: 'meeting',
-	'IsRecurring'			: 'calendar',
-	'IsResend'			: 'item',
-	'IsResponseRequested'		: 'calendar',
-	'IsSubmitted'			: 'item',
-	'IsTeamTask'			: 'task',
-	'IsUnmodified'			: 'item',
-	'ItemClass'			: 'item',
-	'messageId'			: 'item', 
-	'ItemId'			: 'item',
-	'LastModifiedName'		: 'item',
-	'LastModifiedTime'		: 'item',
-	'LastOccurrence'		: 'calendar',
-	'LegacyFreeBusyStatus'		: 'calendar',
-	'Location'			: 'calendar',
-	'MeetingRequestType'		: 'meetingRequest',
-	'MeetingRequestWasSent'		: 'calendar',
-	'MeetingTimeZone'		: 'calendar',
-	'MeetingWorkspaceUrl'		: 'calendar',
-	'Mileage'			: 'task',
-	'MimeContent'			: 'item',
-	'ModifiedOccurrences'		: 'calendar',
-	'MyResponseType'		: 'calendar',
-	'NetShowUrl'			: 'calendar',
-	'OptionalAttendees'		: 'calendar',
-	'Organizer'			: 'calendar',
-	'OriginalStart'			: 'calendar',
-	'Owner'				: 'task',
-	'ParentFolderId'		: 'item',
-	'PercentComplete'		: 'task',
-	'Recurrence'			: 'calendar',
-	'RecurrenceId'			: 'calendar',
-	'ReminderDueBy'			: 'item',
-	'ReminderIsSet'			: 'item',
-	'ReminderMinutesBeforeStart'	: 'item',
-	'RequiredAttendees'		: 'calendar',
-	'Resources'			: 'calendar',
-	'ResponseObjects'		: 'item',
-	'ResponseType'			: 'meeting',
-	'SearchParameters'		: 'folder',
-	'Sensitivity'			: 'item',
-	'Size'				: 'item',
-	'Start'				: 'calendar',
-	'StartDate'			: 'task',
-	'StartTimeZone'			: 'calendar',
-	'StatusDescription'		: 'task',
-	'Status'			: 'task',
-	'Subject'			: 'item',
-	'TimeZone'			: 'calendar',
-	'TotalWork'			: 'task',
-	'UID'				: 'calendar',
-	'UniqueBody'			: 'item',
-	'WebClientEditFormQueryString'	: 'item',
-	'WebClientReadFormQueryString'	: 'item',
-	'When'				: 'calendar'
+	'ActualWork': 'task',
+	'AdjacentMeetingCount': 'calendar',
+	'AdjacentMeetings': 'calendar',
+	'AllowNewTimeProposal': 'calendar',
+	'AppointmentReplyTime': 'calendar',
+	'AppointmentSequenceNumber': 'calendar',
+	'AppointmentState': 'calendar',
+	'AssignedTime': 'task',
+	'AssociatedCalendarItemId': 'meeting',
+	'Attachments': 'item',
+	'BillingInformation': 'task',
+	'Body': 'item',
+	'CalendarItemType': 'calendar',
+	'Categories': 'item',
+	'ChangeCount': 'task',
+	'Companies': 'task',
+	'CompleteDate': 'task',
+	'ConferenceType': 'calendar',
+	'ConflictingMeetingCount': 'calendar',
+	'ConflictingMeetings': 'calendar',
+	'Contacts': 'task',
+	'ConversationId': 'item',
+	'Culture': 'item',
+	'DateTimeCreated': 'item',
+	'DateTimeReceived': 'item',
+	'DateTimeSent': 'item',
+	'DateTimeStamp': 'calendar',
+	'DelegationState': 'task',
+	'Delegator': 'task',
+	'DeletedOccurrences': 'calendar',
+	'DisplayCc': 'item',
+	'DisplayTo': 'item',
+	'DueDate': 'task',
+	'Duration': 'calendar',
+	'EffectiveRights': 'item',
+	'End': 'calendar',
+	'EndTimeZone': 'calendar',
+	'FirstOccurrence': 'calendar',
+	'FolderClass': 'folder',
+	'FolderId': 'folder',
+	'HasAttachments': 'item',
+	'HasBeenProcessed': 'meeting',
+	'Importance': 'item',
+	'InReplyTo': 'item',
+	'IntendedFreeBusyStatus': 'meetingRequest',
+	'InternetMessageHeaders': 'item',
+	'IsAllDayEvent': 'calendar',
+	'IsAssignmentEditable': 'task',
+	'IsAssociated': 'item',
+	'IsCancelled': 'calendar',
+	'IsComplete': 'task',
+	'IsDelegated': 'meeting',
+	'IsDraft': 'item',
+	'IsFromMe': 'item',
+	'IsMeeting': 'calendar',
+	'IsOnlineMeeting': 'calendar',
+	'IsOutOfDate': 'meeting',
+	'IsRecurring': 'calendar',
+	'IsResend': 'item',
+	'IsResponseRequested': 'calendar',
+	'IsSubmitted': 'item',
+	'IsTeamTask': 'task',
+	'IsUnmodified': 'item',
+	'ItemClass': 'item',
+	'messageId': 'item',
+	'ItemId': 'item',
+	'LastModifiedName': 'item',
+	'LastModifiedTime': 'item',
+	'LastOccurrence': 'calendar',
+	'LegacyFreeBusyStatus': 'calendar',
+	'Location': 'calendar',
+	'MeetingRequestType': 'meetingRequest',
+	'MeetingRequestWasSent': 'calendar',
+	'MeetingTimeZone': 'calendar',
+	'MeetingWorkspaceUrl': 'calendar',
+	'Mileage': 'task',
+	'MimeContent': 'item',
+	'ModifiedOccurrences': 'calendar',
+	'MyResponseType': 'calendar',
+	'NetShowUrl': 'calendar',
+	'OptionalAttendees': 'calendar',
+	'Organizer': 'calendar',
+	'OriginalStart': 'calendar',
+	'Owner': 'task',
+	'ParentFolderId': 'item',
+	'PercentComplete': 'task',
+	'Recurrence': 'calendar',
+	'RecurrenceId': 'calendar',
+	'ReminderDueBy': 'item',
+	'ReminderIsSet': 'item',
+	'ReminderMinutesBeforeStart': 'item',
+	'RequiredAttendees': 'calendar',
+	'Resources': 'calendar',
+	'ResponseObjects': 'item',
+	'ResponseType': 'meeting',
+	'SearchParameters': 'folder',
+	'Sensitivity': 'item',
+	'Size': 'item',
+	'Start': 'calendar',
+	'StartDate': 'task',
+	'StartTimeZone': 'calendar',
+	'StatusDescription': 'task',
+	'Status': 'task',
+	'Subject': 'item',
+	'TimeZone': 'calendar',
+	'TotalWork': 'task',
+	'UID': 'calendar',
+	'UniqueBody': 'item',
+	'WebClientEditFormQueryString': 'item',
+	'WebClientReadFormQueryString': 'item',
+	'When': 'calendar'
 };
 
 const dayRevMap = {
-	'MO' : 'Monday',
-	'TU' : 'Tuesday',
-	'WE' : 'Wednesday',
-	'TH' : 'Thursday',
-	'FR' : 'Friday',
-	'SA' : 'Saturday',
-	'SU' : 'Sunday'
+	'MO': 'Monday',
+	'TU': 'Tuesday',
+	'WE': 'Wednesday',
+	'TH': 'Thursday',
+	'FR': 'Friday',
+	'SA': 'Saturday',
+	'SU': 'Sunday'
 };
 
 const dayIdxMap = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'];
 
 const weekRevMap = {
-	'1' : 'First',
-	'2' : 'Second',
-	'3' : 'Third',
-	'4' : 'Fourth',
+	'1': 'First',
+	'2': 'Second',
+	'3': 'Third',
+	'4': 'Fourth',
 	'-1': 'Last'
 };
 
 const monthIdxMap = ['January', 'February', 'March', 'April', 'May', 'June',
-		     'July', 'August', 'September', 'October', 'November', 'December'];
+	'July', 'August', 'September', 'October', 'November', 'December'
+];
 
 const participationMap = {
-	"Unknown"	: "NEEDS-ACTION",
-	"NoResponseReceived" : "NEEDS-ACTION",
-	"Tentative"	: "TENTATIVE",
-	"Accept"	: "ACCEPTED",
-	"Decline"	: "DECLINED",
-	"Organizer"	: "ACCEPTED"
+	"Unknown": "NEEDS-ACTION",
+	"NoResponseReceived": "NEEDS-ACTION",
+	"Tentative": "TENTATIVE",
+	"Accept": "ACCEPTED",
+	"Decline": "DECLINED",
+	"Organizer": "ACCEPTED"
 };
 
 const dayMap = {
-	'Monday'	: 'MO',
-	'Tuesday'	: 'TU',
-	'Wednesday'	: 'WE',
-	'Thursday'	: 'TH',
-	'Friday'	: 'FR',
-	'Saturday'	: 'SA',
-	'Sunday'	: 'SU',
-	'Weekday'	: ['MO', 'TU', 'WE', 'TH', 'FR'],
-	'WeekendDay'	: ['SA', 'SO'],
-	'Day'		: ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
+	'Monday': 'MO',
+	'Tuesday': 'TU',
+	'Wednesday': 'WE',
+	'Thursday': 'TH',
+	'Friday': 'FR',
+	'Saturday': 'SA',
+	'Sunday': 'SU',
+	'Weekday': ['MO', 'TU', 'WE', 'TH', 'FR'],
+	'WeekendDay': ['SA', 'SO'],
+	'Day': ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
 };
 
 const weekMap = {
-	'First'		: 1,
-	'Second'	: 2,
-	'Third'		: 3,
-	'Fourth'	: 4,
-	'Last'		: -1
+	'First': 1,
+	'Second': 2,
+	'Third': 3,
+	'Fourth': 4,
+	'Last': -1
 };
 
 const monthMap = {
-	'January'	: 1,
-	'February'	: 2,
-	'March'		: 3,
-	'April'		: 4,
-	'May'		: 5,
-	'June'		: 6,
-	'July'		: 7,
-	'August'	: 8,
-	'September'	: 9,
-	'October'	: 10,
-	'November'	: 11,
-	'December'	: 12
+	'January': 1,
+	'February': 2,
+	'March': 3,
+	'April': 4,
+	'May': 5,
+	'June': 6,
+	'July': 7,
+	'August': 8,
+	'September': 9,
+	'October': 10,
+	'November': 11,
+	'December': 12
 };
 
 const MAPI_PidLidTaskAccepted = "33032";
@@ -299,135 +300,137 @@ const MAPI_PidLidReminderSet = "34051";
 
 function calExchangeCalendar() {
 
-try{
-	this.myId = null;
+	try {
+		this.myId = null;
 
-	this.initProviderBase();
+		this.initProviderBase();
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+		this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+			.getService(Ci.mivFunctions);
 
-	this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-				.getService(Ci.mivExchangeTimeZones);
+		this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
+			.getService(Ci.mivExchangeTimeZones);
 
-	this.setDoDebug();
+		this.setDoDebug();
 
-	this.noDB = true;
-	this.dbInit = false;
+		this.noDB = true;
+		this.dbInit = false;
 
-	this.folderPathStatus = 1;
-	this.firstrun = true;
-	this.mUri = "";
-	this.mid = null;
+		this.folderPathStatus = 1;
+		this.firstrun = true;
+		this.mUri = "";
+		this.mid = null;
 
-//	this.initialized = false;
+		//	this.initialized = false;
 
-//	this.prefs = null;
-	this.mUseOfflineCache = null;
-	this.mNotConnected = true;
+		//	this.prefs = null;
+		this.mUseOfflineCache = null;
+		this.mNotConnected = true;
 
-	this.myAvailable = false;
+		this.myAvailable = false;
 
-	this.mPrefs = null;
+		this.mPrefs = null;
 
-	this.itemCacheById = {};
-	this.itemCancelQueue = {};
+		this.itemCacheById = {};
+		this.itemCancelQueue = {};
 
-	this.itemCacheByStartDate = {};
-	this.itemCacheByEndDate = {};
-	this.recurringMasterCache = {};
-	this.recurringMasterCacheById ={};
-	this.newMasters = {};
-	this.parentLessItems = {};
+		this.itemCacheByStartDate = {};
+		this.itemCacheByEndDate = {};
+		this.recurringMasterCache = {};
+		this.recurringMasterCacheById = {};
+		this.newMasters = {};
+		this.parentLessItems = {};
 
-	this.startDate = null;
-	this.endDate = null;
+		this.startDate = null;
+		this.endDate = null;
 
-	this.syncState = null;
-	this.syncStateInbox=null;
-	this.syncInboxState = null;
-	this._weAreSyncing = false;
-	this.firstSyncDone = false;
+		this.syncState = null;
+		this.syncStateInbox = null;
+		this.syncInboxState = null;
+		this._weAreSyncing = false;
+		this.firstSyncDone = false;
 
-	this.meetingRequestsCache = [];
-	this.meetingCancelationsCache = [];
-	this.meetingrequestAnswered = [];
-	this.meetingResponsesCache = [];
+		this.meetingRequestsCache = [];
+		this.meetingCancelationsCache = [];
+		this.meetingrequestAnswered = [];
+		this.meetingResponsesCache = [];
 
-	this.getItemSyncQueue = [];
-	this.getItemsSyncQueue = [];
-	this.processItemSyncQueueBusy = false;
+		this.getItemSyncQueue = [];
+		this.getItemsSyncQueue = [];
+		this.processItemSyncQueueBusy = false;
 
-	this.offlineTimer = null;
-	this.offlineQueue = [];
+		this.offlineTimer = null;
+		this.offlineQueue = [];
 
-	this.doReset = false;
+		this.doReset = false;
 
-	this.shutdown = false;
+		this.shutdown = false;
 
-	this.inboxPoller = Cc["@mozilla.org/timer;1"]
+		this.inboxPoller = Cc["@mozilla.org/timer;1"]
 			.createInstance(Ci.nsITimer);
 
-	this.cacheLoader = Cc["@mozilla.org/timer;1"]
+		this.cacheLoader = Cc["@mozilla.org/timer;1"]
 			.createInstance(Ci.nsITimer);
-	this.loadingFromCache = false;
+		this.loadingFromCache = false;
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService);  
+		this.observerService = Cc["@mozilla.org/observer-service;1"]
+			.getService(Ci.nsIObserverService);
 
-	this.lightningNotifier = Cc["@1st-setup.nl/exchange/lightningnotifier;1"]  
-	                          .getService(Ci.mivExchangeLightningNotifier); 
+		this.lightningNotifier = Cc["@1st-setup.nl/exchange/lightningnotifier;1"]
+			.getService(Ci.mivExchangeLightningNotifier);
 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer); 
+		this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+			.getService(Ci.mivExchangeLoadBalancer);
 
-	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
 			.getService(Ci.mivExchangeStatistics);
 
-	this.calendarPoller = null;
+		this.calendarPoller = null;
 
-        this.mObserver = new ecObserver(this);
+		this.mObserver = new ecObserver(this);
 
-	this.supportsTasks = false;
-	this.supportsEvents = false;
+		this.supportsTasks = false;
+		this.supportsEvents = false;
+
+		this.folderProperties = null;
+		this._readOnly = true;
+		this.folderIsNotAvailable = true;
 
-	this.folderProperties = null;
-	this._readOnly = true;
-	this.folderIsNotAvailable = true;
+		this.exporting = false;
+		this.OnlyShowAvailability = false;
 
-	this.exporting = false;
-	this.OnlyShowAvailability = false;
+		this.updateCalendarItems = [];
+		this.updateCalendarTimer = Cc["@mozilla.org/timer;1"]
+			.createInstance(Ci.nsITimer);
+		this.updateCalendarTimerRunning = false;
 
-	this.updateCalendarItems = [];
-	this.updateCalendarTimer = Cc["@mozilla.org/timer;1"]
-			.createInstance(Ci.nsITimer); 
-	this.updateCalendarTimerRunning = false;
+		this._canDelete = false;
+		this._canModify = false;
+		this._canCreateContent = false;
 
-	this._canDelete = false;
-	this._canModify = false;
-	this._canCreateContent = false;
+		this.mIsOffline = Components.classes["@mozilla.org/network/io-service;1"]
+			.getService(Components.interfaces.nsIIOService).offline;
 
-	this.mIsOffline = Components.classes["@mozilla.org/network/io-service;1"]
-                             .getService(Components.interfaces.nsIIOService).offline;
-	
-	this._exchangeCurrentStatus = Cr.NS_OK; //Cr.NS_ERROR_FAILURE; //Cr.NS_OK;
+		this._exchangeCurrentStatus = Cr.NS_OK; //Cr.NS_ERROR_FAILURE; //Cr.NS_OK;
 
-	this._connectionStateDescription = "";
-	//this.globalFunctions.LOG("Our offline status is:"+this.mIsOffline+".");
+		this._connectionStateDescription = "";
+		//this.globalFunctions.LOG("Our offline status is:"+this.mIsOffline+".");
 
-	this.itemCount = 0;
-	this.itemUpdates = 0;
-	this.itemsFromExchange = 0;
-	this.masterCount = 0;
-}catch(err){dump("mivExchangeCalendar.new Err:"+err+"\n");}
+		this.itemCount = 0;
+		this.itemUpdates = 0;
+		this.itemsFromExchange = 0;
+		this.masterCount = 0;
+	}
+	catch (err) {
+		dump("mivExchangeCalendar.new Err:" + err + "\n");
+	}
 }
 
 var calExchangeCalendarGUID = "720a458e-b6cd-4883-8a4d-5be27ec454d8";
 
 calExchangeCalendar.prototype = {
 
-	get timeStamp()
-	{
+	get timeStamp() {
 		var elapsed = new Date().getTime() - globalStart;
 		//dump("elapsed:"+elapsed);
 		return elapsed;
@@ -435,14 +438,13 @@ calExchangeCalendar.prototype = {
 
 	__proto__: cal.ProviderBase.prototype,
 
-// Begin nsIClassInfo
-	classID: components.ID("{"+calExchangeCalendarGUID+"}"),
+	// Begin nsIClassInfo
+	classID: components.ID("{" + calExchangeCalendarGUID + "}"),
 	contractID: "@mozilla.org/calendar/calendar;1?type=exchangecalendar",
 	classDescription: "Exchange 2007/2010 Calendar and Tasks Provider",
 
 	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
+	getInterfaces: function _getInterfaces(count) {
 		var ifaces = [Ci.mivExchangeCalendar,
 			Ci.calICalendarACLManager,
 			Ci.calICalendar,
@@ -452,7 +454,8 @@ calExchangeCalendar.prototype = {
 			Ci.calISchedulingSupport,
 			Ci.calICalendarProvider,
 			Ci.nsIClassInfo,
-			Ci.nsISupports];
+			Ci.nsISupports
+		];
 		count.value = ifaces.length;
 		return ifaces;
 	},
@@ -464,9 +467,9 @@ calExchangeCalendar.prototype = {
 
 	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
 	flags: 0,
-// End nsIClassInfo
+	// End nsIClassInfo
 
-// Begin nsISupports
+	// Begin nsISupports
 	// void QueryInterface(in nsIIDRef uuid, [iid_is(uuid),retval] out nsQIResult result);
 	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeCalendar,
 		Ci.calICalendarACLManager,
@@ -477,10 +480,11 @@ calExchangeCalendar.prototype = {
 		Ci.calISchedulingSupport,
 		Ci.calICalendarProvider,
 		Ci.nsIClassInfo,
-		Ci.nsISupports]),
-// End nsISupports
+		Ci.nsISupports
+	]),
+	// End nsISupports
 
-// Begin calICalendarProvider
+	// Begin calICalendarProvider
 	// readonly attribute nsIURI prefChromeOverlay;
 	get prefChromeOverlay() {
 		if (this.debug) this.logInfo("get prefChromeOverlay()");
@@ -493,14 +497,14 @@ calExchangeCalendar.prototype = {
 	},
 
 	//  void createCalendar(in AUTF8String aName, in nsIURI aURL,
-        //	            in calIProviderListener aListener);
+	//	            in calIProviderListener aListener);
 	createCalendar: function calWcapCalendar_createCalendar(name, url, listener) {
 		if (this.debug) this.logInfo("createCalendar");
 		throw NS_ERROR_NOT_IMPLEMENTED;
 	},
 
 	//  void deleteCalendar(in calICalendar aCalendar,
-        //  	            in calIProviderListener aListener);
+	//  	            in calIProviderListener aListener);
 	deleteCalendar: function calWcapCalendar_deleteCalendar(calendar, listener) {
 		if (this.debug) this.logInfo("deleteCalendar");
 		throw NS_ERROR_NOT_IMPLEMENTED;
@@ -511,15 +515,14 @@ calExchangeCalendar.prototype = {
 		if (this.debug) this.logInfo("getCalendar");
 		throw NS_ERROR_NOT_IMPLEMENTED;
 	},
-// End calICalendarProvider
+	// End calICalendarProvider
 
-// Begin calICalendarACLManager
+	// Begin calICalendarACLManager
 	/* Gets the calICalendarACLEntry of the current user for the specified
 	calendar. */
 	//void getCalendarEntry(in calICalendar aCalendar,
 	//	          in calIOperationListener aListener);
-	getCalendarEntry: function _getCalendarEntry(aCalendar, aListener)
-	{
+	getCalendarEntry: function _getCalendarEntry(aCalendar, aListener) {
 		//dump("getCalendarEntry: aCalendar.name:"+aCalendar.name+", aLsitener:"+aListener+"\n");
 	},
 
@@ -528,63 +531,56 @@ calExchangeCalendar.prototype = {
 	different permissions based on specific attributes.
 	(TODO: should be made asynchronous one day) */
 	//calIItemACLEntry getItemEntry(in calIItemBase aItem);
-	getItemEntry: function _getItemEntry(aItem)
-	{
+	getItemEntry: function _getItemEntry(aItem) {
 		//dump("getItemEntry: aCalendar.name:"+this.name+", aItem:"+aItem.title+"\n");
 		if (this.itemCacheById[aItem.id]) {
 			return this.itemCacheById[aItem.id].aclEntry;
 		}
 	},
 
-// End calICalendarACLManager
+	// End calICalendarACLManager
 
-// Begin calICalendar
+	// Begin calICalendar
 
 	//  attribute AUTF8String id;
 
 	//   attribute AUTF8String name;
 
 	//  readonly attribute AUTF8String type;
-	get type()
-	{
-//		if (this.debug) this.logInfo("get type()");
+	get type() {
+		//		if (this.debug) this.logInfo("get type()");
 		return "exchangecalendar";
 	},
 
 	//  readonly attribute AString providerID;
-	get providerID()
-	{
+	get providerID() {
 		return "exchangecalendar@extensions.1st-setup.nl";
 	},
 
 	//  attribute calICalendar superCalendar;
 
-	get id()
-	{
+	get id() {
 		return this.myId;
 	},
 
-	set id(aValue)
-	{
+	set id(aValue) {
 		// We ignore this.
 		//dump("Someone is setting the id to '"+aValue+"' for calendar:"+this.name+"\n");
 	},
 
 	//  attribute nsIURI uri;
-	get uri()
-	{
-	        return this.mUri;
+	get uri() {
+		return this.mUri;
 	},
 
-	set uri(aUri)
-	{
+	set uri(aUri) {
 		//if (this.debug) this.logInfo("set uri:"+aUri.path);
 		this.myId = aUri.path.substr(1);
-	        this.mUri = aUri;
+		this.mUri = aUri;
 
 		this.mPrefs = Cc["@mozilla.org/preferences-service;1"]
-	                    .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+this.myId+".");
+			.getService(Ci.nsIPrefService)
+			.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + this.myId + ".");
 		if (this.exchangePrefVersion < 1) {
 			this.mPrefs = null;
 			this.myId = null;
@@ -599,11 +595,10 @@ calExchangeCalendar.prototype = {
 			this.newCalendar = true;
 		}
 
-	        return this.uri;
+		return this.uri;
 	},
 
-	startupLoadFromOfflineCache: function _startupLoadFromOfflineCache()
-	{
+	startupLoadFromOfflineCache: function _startupLoadFromOfflineCache() {
 		if (this.debug) this.logInfo("startupLoadFromOfflineCache: Starting load from offline cache.");
 
 		if (this.loadingFromCache) return;
@@ -622,15 +617,14 @@ calExchangeCalendar.prototype = {
 		if (itemsFromCache) {
 			var endTime = cal.createDateTime();
 			var duration = endTime.subtractDate(startTime);
-			if (this.debug) this.logInfo("We got '"+itemsFromCache.length+"' items from offline cache.(took "+duration.inSeconds+" seconds)");
+			if (this.debug) this.logInfo("We got '" + itemsFromCache.length + "' items from offline cache.(took " + duration.inSeconds + " seconds)");
 		}
 
 		this.loadingFromCache = false;
 
 	},
 
-	performStartup: function _performStartup()
-	{
+	performStartup: function _performStartup() {
 		if (this.debug) this.logInfo("Performing startup.");
 
 		if (this.getProperty("disabled")) {
@@ -639,53 +633,50 @@ calExchangeCalendar.prototype = {
 		}
 
 		// Load from offline Cache into memory cache.
-/*		if (this.useOfflineCache) {
-			if (this.debug) this.logInfo("Getting items from offlineCache.");
+		/*		if (this.useOfflineCache) {
+					if (this.debug) this.logInfo("Getting items from offlineCache.");
 
-			let self = this;
-			this.cacheLoader.cancel();
-			this.cacheLoader.initWithCallback({ notify: function setTimeout_notify() {self.startupLoadFromOfflineCache();	}}, 0, this.cacheLoader.TYPE_ONE_SHOT);
+					let self = this;
+					this.cacheLoader.cancel();
+					this.cacheLoader.initWithCallback({ notify: function setTimeout_notify() {self.startupLoadFromOfflineCache();	}}, 0, this.cacheLoader.TYPE_ONE_SHOT);
 
-		}
-*/
+				}
+		*/
 		if (!this.isOffline) {
 			// Start online processes.
 			// 1. Check folder.
 			// 2. Get timezone settings.
 			// 3. Start pollers.
-			if (this.debug) this.logInfo("Initialized:"+this.isInitialized);
+			if (this.debug) this.logInfo("Initialized:" + this.isInitialized);
 
-/*			if (this.useOfflineCache) {
-				this.syncExchangeToOfflineCache();
-			}*/ // Not necessary anymore as it will follow the cache by default.
+			/*			if (this.useOfflineCache) {
+							this.syncExchangeToOfflineCache();
+						}*/ // Not necessary anymore as it will follow the cache by default.
 		}
-		
+
 		//Enable cache on startup :)
-		this.prefs.setBoolPref("useOfflineCache",true);
+		this.prefs.setBoolPref("useOfflineCache", true);
 	},
 
-	set readOnly(aValue)
-	{
-//dump("set readOnly:"+this.name+"|"+this.globalFunctions.STACK(10)+"\n");
+	set readOnly(aValue) {
+		//dump("set readOnly:"+this.name+"|"+this.globalFunctions.STACK(10)+"\n");
 		this.prefs.setBoolPref("UserReadOnly", aValue);
 		this.readOnlyInternal = aValue;
 	},
 
-	get readOnly()
-	{
+	get readOnly() {
 		var userPref = this.globalFunctions.safeGetBoolPref(this.prefs, "UserReadOnly", false);
 		if (userPref === true) return true;
 		return this.readOnlyInternal;
 	},
 
-	set readOnlyInternal(aValue)
-	{
-//dump("set readOnlyInternal:"+this.name+"\n");
+	set readOnlyInternal(aValue) {
+		//dump("set readOnlyInternal:"+this.name+"\n");
 		if (this.folderProperties) {
 			var effectiveRights = this.folderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:CalendarFolder/t:EffectiveRights");
 			if (effectiveRights.length > 0) {
-				if (((effectiveRights[0].getTagValue("t:Delete") == "false") || (effectiveRights[0].getTagValue("t:Modify") == "false")) &&
-					(effectiveRights[0].getTagValue("t:CreateContents") == "false")) {
+				if (((effectiveRights[0].getTagValue("t:Delete") == "false") || (effectiveRights[0].getTagValue("t:Modify") == "false"))
+					&& (effectiveRights[0].getTagValue("t:CreateContents") == "false")) {
 					aValue = true;
 				}
 			}
@@ -695,11 +686,11 @@ calExchangeCalendar.prototype = {
 
 		var changed = false;
 		if (aValue != this._readOnly) {
-			if (this.debug) this.logInfo("readOnly property changed from "+this._readOnly+" to "+aValue);
+			if (this.debug) this.logInfo("readOnly property changed from " + this._readOnly + " to " + aValue);
 			changed = true;
 		}
 
-		if (this.debug) this.logInfo("set readOnly to '"+aValue+"'");
+		if (this.debug) this.logInfo("set readOnly to '" + aValue + "'");
 		this._readOnly = aValue;
 
 		if (changed) {
@@ -707,7 +698,7 @@ calExchangeCalendar.prototype = {
 			if ((userPref === true) && (aValue === false)) return; // Do not change icon when use wants it readonly.
 
 			this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", aValue, !aValue]);
-			this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);  
+			this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
 		}
 	},
 
@@ -717,24 +708,22 @@ calExchangeCalendar.prototype = {
 		return ((this._readOnly) || (this.notConnected));
 	},
 
-	set notConnected(aValue)
-	{
+	set notConnected(aValue) {
 		if (aValue != this.mNotConnected) {
 			this.mNotConnected = aValue;
 			if (aValue) {
 				this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", true, false]);
-				this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);  
+				this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
 			}
 			else {
 				this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", false, true]);
-				this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);  
+				this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
 			}
 		}
 
 	},
 
-	get notConnected()
-	{
+	get notConnected() {
 		return this.mNotConnected;
 	},
 
@@ -746,11 +735,10 @@ calExchangeCalendar.prototype = {
 	//  attribute boolean transientProperties;
 
 	//  nsIVariant getProperty(in AUTF8String aName);
-	getProperty: function _getProperty(aName) 
-	{
-	//	if (!this.isInitialized) {
-	//		return;
-	//	}
+	getProperty: function _getProperty(aName) {
+		//	if (!this.isInitialized) {
+		//		return;
+		//	}
 
 		//dump("2 getProperty("+aName+")\n");
 		switch (aName) {
@@ -774,10 +762,10 @@ calExchangeCalendar.prototype = {
 			this.checkFolderPath();
 			return "ok";
 			break;
-		case "capabilities.tasks.supported" :
+		case "capabilities.tasks.supported":
 			return this.supportsTasks;
 			break;
-		case "capabilities.events.supported" :
+		case "capabilities.events.supported":
 			return this.supportsEvents;
 			break;
 		case "auto-enabled":
@@ -786,14 +774,14 @@ calExchangeCalendar.prototype = {
 			//if (this.debug) this.logInfo("getProperty: organizerId");
 			//return "exchangecalendar:" + this.mailbox;
 			return "mailto:" + this.mailbox;
-	                break;
+			break;
 		case "organizerCN":
 			return this.userDisplayName;
-	                break;
+			break;
 		case "cache.supported":
 			return false;
 		case "requiresNetwork":
-                	return false;
+			return false;
 		case "disabled":
 			if (this.prefs) {
 				this._disabled = this.globalFunctions.safeGetBoolPref(this.prefs, "disabled", false);
@@ -808,26 +796,25 @@ calExchangeCalendar.prototype = {
 			return this.QueryInterface(Ci.calIItipTransport);
 			break;
 			//return true;
-            	case "capabilities.autoschedule.supported":
+		case "capabilities.autoschedule.supported":
 			if (this.debug) this.logInfo("capabilities.autoschedule.supported");
-                	return true;
+			return true;
 		case "exchangeCurrentStatus":
 			return this._exchangeCurrentStatus;
-	        }
+		}
 		// itip.disableRevisionChecks
 
 		// capabilities.events.supported
 		// capabilities.tasks.supported
 
 		//dump("1 getProperty("+aName+")="+this.__proto__.__proto__.getProperty.apply(this, arguments)+"\n");
-	        return this.__proto__.__proto__.getProperty.apply(this, arguments);
+		return this.__proto__.__proto__.getProperty.apply(this, arguments);
 	},
 
 	//  void setProperty(in AUTF8String aName, in nsIVariant aValue);
-	setProperty: function setProperty(aName, aValue)
-	{
+	setProperty: function setProperty(aName, aValue) {
 
-		 if (this.debug) this.logInfo("setProperty. aName:"+aName+", aValue:"+aValue);
+		if (this.debug) this.logInfo("setProperty. aName:" + aName + ", aValue:" + aValue);
 		switch (aName) {
 		case "exchangeCurrentStatus":
 			//dump("name1:"+this.name+", exchangeCurrentStatus:"+this._exchangeCurrentStatus+", newStatus:"+aValue+"\n");
@@ -838,12 +825,12 @@ calExchangeCalendar.prototype = {
 				this.observers.notify("onPropertyChanged", [this.superCalendar, "exchangeCurrentStatus", aValue, oldStatus]);
 			}
 			return;
-		case "disabled" :
+		case "disabled":
 			var oldDisabledState = this._disabled;
 			this._disabled = aValue;
 			this.prefs.setBoolPref("disabled", aValue);
 			if ((aValue) && (oldDisabledState != this._disabled)) {
-//dump("Calendar is set to disabled\n");
+				//dump("Calendar is set to disabled\n");
 				this.resetCalendar();
 			}
 			if ((!this._disabled) && (oldDisabledState != this._disabled)) {
@@ -854,22 +841,23 @@ calExchangeCalendar.prototype = {
 		case "exchWebService.useOfflineCache":
 
 			this.useOfflineCache = aValue;
-		    if (this.debug) this.logInfo("setProperty: useOfflineCache = " + this.useOfflineCache + "  offlineCacheDB  "  + this.offlineCacheDB);  
+			if (this.debug) this.logInfo("setProperty: useOfflineCache = " + this.useOfflineCache + "  offlineCacheDB  " + this.offlineCacheDB);
 
-		    if (!aValue) {
+			if (!aValue) {
 				if (this.offlineCacheDB) {
 					try {
-						 if (this.offlineCacheDB) this.offlineCacheDB.close();
-                                                 this.offlineCacheDB = null;
-                                         } catch(exc) {}
-                                }
- 
-                                // Remove the offline cache database when we delete the calendar.
-                            if (this.dbFile) {
-                                    this.dbFile.remove(true);
-                                     this.offlineCacheDB = null;
-                            }
-                    } 
+						if (this.offlineCacheDB) this.offlineCacheDB.close();
+						this.offlineCacheDB = null;
+					}
+					catch (exc) {}
+				}
+
+				// Remove the offline cache database when we delete the calendar.
+				if (this.dbFile) {
+					this.dbFile.remove(true);
+					this.offlineCacheDB = null;
+				}
+			}
 			return;
 		}
 
@@ -883,17 +871,16 @@ calExchangeCalendar.prototype = {
 	//  void removeObserver( in calIObserver observer );
 
 	//  calIOperation addItem(in calIItemBase aItem,
-        //                in calIOperationListener aListener);
-	addItem: function _addItem(aItem, aListener)
-	{
-		if (this.debug) this.logInfo("addItem id="+aItem.id+", aItem.calendar:"+aItem.calendar);
+	//                in calIOperationListener aListener);
+	addItem: function _addItem(aItem, aListener) {
+		if (this.debug) this.logInfo("addItem id=" + aItem.id + ", aItem.calendar:" + aItem.calendar);
 
 		var itemEnum = aItem.propertyEnumerator;
-/*		dump("Properties of:"+aItem.title+"\n");
-		while (itemEnum.hasMoreElements()) {
-			var property = itemEnum.getNext().QueryInterface(Components.interfaces.nsIProperty);
-			dump(property.name+":"+property.value+"\n");
-		}*/
+		/*		dump("Properties of:"+aItem.title+"\n");
+				while (itemEnum.hasMoreElements()) {
+					var property = itemEnum.getNext().QueryInterface(Components.interfaces.nsIProperty);
+					dump(property.name+":"+property.value+"\n");
+				}*/
 		var invite = aItem.getAttendees({});
 		//dump("a. Attendee count:"+invite.length+"\n");
 
@@ -902,46 +889,46 @@ calExchangeCalendar.prototype = {
 		// if aItem.id == "31d9835f-1c29-4d18-ab39-7587c56e3982" paste in lightning after a copy in lightning.
 		// if aItem.id == "AAMkAGFkNzVhOGVlLTYxMDktNGU0MC05YWZjLWIzMWY1YmNmOTAzNQBGAAAAAAD9bSPYK6piTIbhfZ5n6SOXBwAfSIGbKdCWQbNg+oqR8EJMAAAA9OKyAAAfSIGbKdCWQbNg+oqR8EJMAAB8S1QtAAA=" copy back and forth between exchange to other type and exchange.
 
-	        if (this.OnlyShowAvailability) {
+		if (this.OnlyShowAvailability) {
 			this.readOnlyInternal = true;
 			this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.OPERATION_CANCELLED,
-                        	             Ci.calIOperationListener.ADD,
-                        	             aItem.id,
-                        	             aItem);
-
-/*	            this.notifyOperationComplete(aListener,
-	                                         Ci.calIErrors.CAL_IS_READONLY,
-	                                         Ci.calIOperationListener.ADD,
-	                                         null,
-	                                         "Calendar is readonly");*/
+				Ci.calIErrors.OPERATION_CANCELLED,
+				Ci.calIOperationListener.ADD,
+				aItem.id,
+				aItem);
+
+			/*	            this.notifyOperationComplete(aListener,
+				                                         Ci.calIErrors.CAL_IS_READONLY,
+				                                         Ci.calIOperationListener.ADD,
+				                                         null,
+				                                         "Calendar is readonly");*/
 			return null;
-	        }
+		}
 
-	        var newItem = aItem;
+		var newItem = aItem;
 
 		// Make sure we have one of our own object types
 		if ((cal.isEvent(aItem)) && (!aItem.className)) {
 			var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-					.createInstance(Ci.mivExchangeEvent);
+				.createInstance(Ci.mivExchangeEvent);
 			newItem.cloneToCalEvent(aItem);
 		}
 
 		if ((!cal.isEvent(aItem)) && (!aItem.className)) {
 			var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
-					.createInstance(Ci.mivExchangeTodo);
+				.createInstance(Ci.mivExchangeTodo);
 			newItem.cloneToCalEvent(aItem);
 		}
 
 		if (aItem.calendar === null) {
-			if (this.debug) this.logInfo("addItem Calendar is null for item going add me '"+this.name+"' as calendar.\n");
+			if (this.debug) this.logInfo("addItem Calendar is null for item going add me '" + this.name + "' as calendar.\n");
 			newItem.calendar = this.superCalendar;
 		}
 
 		var invite = newItem.getAttendees({});
 		//dump("b. Attendee count:"+invite.length+"\n");
-	        //let newItem = aItem.clone();
-	
+		//let newItem = aItem.clone();
+
 		// We check if we not allready have this item in Cache. If so we modify.
 		// This will happen when someone pressed the accept,decline or tentative buttons
 		// in the itip status bar on the header of an email message.
@@ -954,7 +941,7 @@ calExchangeCalendar.prototype = {
 				return this.modifyItem(newItem, this.itemCacheById[newItem.id], aListener); // We do this when we receive an update for an invitation.
 			}
 			else {
-				this.deleteItem(this.itemCacheById[newItem.id], null);  // we do this on import of item which was exported earlier.
+				this.deleteItem(this.itemCacheById[newItem.id], null); // we do this on import of item which was exported earlier.
 			}
 		}
 
@@ -962,16 +949,16 @@ calExchangeCalendar.prototype = {
 			// This is added from a copy/paste procedure.
 			newItem.id = null;
 			newItem.clearId(null);
-			if (this.debug) this.logInfo("addItem Copy/pasted item. item.id:"+newItem.id);
+			if (this.debug) this.logInfo("addItem Copy/pasted item. item.id:" + newItem.id);
 			//newItem.deleteProperty("X-UID");
 
 			// If I am invited. Remove myself.
 			var attendees = newItem.getAttendees({});
 			newItem.removeAllAttendees(); // Need to have this. When we add attendees when we create a new calendaritem we become organizer.
-			for each (var attendee in attendees) {
-				if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) ||
-					(attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase()) ) {
-					if (this.debug) this.logInfo("addItem: FOUND myself as an attendee and we are going to remove myself:"+newItem.title);
+			for each(var attendee in attendees) {
+				if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase())
+					|| (attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase())) {
+					if (this.debug) this.logInfo("addItem: FOUND myself as an attendee and we are going to remove myself:" + newItem.title);
 					newItem.removeAttendee(attendee);
 				}
 			}
@@ -979,46 +966,45 @@ calExchangeCalendar.prototype = {
 
 		var invite = newItem.getAttendees({});
 		//dump("c. Attendee count:"+invite.length+"\n");
-	        return this.adoptItem(newItem, aListener);
+		return this.adoptItem(newItem, aListener);
 	},
 
 
 	//  calIOperation adoptItem(in calIItemBase aItem,
-        //                  in calIOperationListener aListener);
-	adoptItem: function _adoptItem(aItem, aListener)
-	{
+	//                  in calIOperationListener aListener);
+	adoptItem: function _adoptItem(aItem, aListener) {
 		if (this.debug) this.logInfo("adoptItem()");
 
 		if ((this.readOnly) || (this.OnlyShowAvailability)) {
 			this.readOnlyInternal = true;
 			if (this.OnlyShowAvailability) {
 				this.notifyOperationComplete(aListener,
-			                             Ci.calIErrors.OPERATION_CANCELLED,
-		                	             Ci.calIOperationListener.ADD,
-		                	             aItem.id,
-		                	             aItem);
+					Ci.calIErrors.OPERATION_CANCELLED,
+					Ci.calIOperationListener.ADD,
+					aItem.id,
+					aItem);
 			}
 			else {
 				this.notifyOperationComplete(aListener,
-		                                 Ci.calIErrors.CAL_IS_READONLY,
-		                                 Ci.calIOperationListener.ADD,
-		                                 null,
-		                                 "Calendar is readonly");
+					Ci.calIErrors.CAL_IS_READONLY,
+					Ci.calIOperationListener.ADD,
+					null,
+					"Calendar is readonly");
 			}
 			return;
 		}
 
-		if (isEvent(aItem)) {	
+		if (isEvent(aItem)) {
 			// michel123
 
 			if (aItem.exchangeXML) {
 				var tmpItem = aItem.clone();
-				if (this.debug) this.logInfo("adoptItem 1 Copy/pasted item. item.id:"+tmpItem.id);
+				if (this.debug) this.logInfo("adoptItem 1 Copy/pasted item. item.id:" + tmpItem.id);
 			}
 			else {
 				if (!aItem.className) {
 					var tmpItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-							.createInstance(Ci.mivExchangeEvent);
+						.createInstance(Ci.mivExchangeEvent);
 					tmpItem.addMailboxAlias(this.mailbox);
 					tmpItem.cloneToCalEvent(aItem);
 				}
@@ -1026,20 +1012,20 @@ calExchangeCalendar.prototype = {
 					var tmpItem = aItem.clone();
 					tmpItem.addMailboxAlias(this.mailbox);
 				}
-				if (this.debug) this.logInfo("adoptItem 2 Copy/pasted item. item.id:"+tmpItem.id);
+				if (this.debug) this.logInfo("adoptItem 2 Copy/pasted item. item.id:" + tmpItem.id);
 			}
 
-		var invite = tmpItem.getAttendees({});
-		//dump("d. Attendee count:"+invite.length+"\n");
+			var invite = tmpItem.getAttendees({});
+			//dump("d. Attendee count:"+invite.length+"\n");
 
-//			if ((tmpItem.id) && (tmpItem.id != "not a valid id")) {
+			//			if ((tmpItem.id) && (tmpItem.id != "not a valid id")) {
 			if ((tmpItem.hasProperty("UID")) && (!aItem.id)) {
 				// This is and item create through an iTIP response.
 
 				var cachedItem = null;
 				for (var index in this.meetingRequestsCache) {
 					if (this.meetingRequestsCache[index]) {
-//						if (this.meetingRequestsCache[index].uid == tmpItem.id) {
+						//						if (this.meetingRequestsCache[index].uid == tmpItem.id) {
 						if (this.meetingRequestsCache[index].uid == tmpItem.getProperty("UID")) {
 							cachedItem = this.meetingRequestsCache[index];
 							break;
@@ -1050,7 +1036,7 @@ calExchangeCalendar.prototype = {
 				if (cachedItem) {
 					// We have meeting request in our cache.
 					// Send meetingrespons base on status and remove message in inbox.
-					if (this.debug) this.logInfo("BOA: iTIP action item with STATUS:"+tmpItem.getProperty("STATUS"));
+					if (this.debug) this.logInfo("BOA: iTIP action item with STATUS:" + tmpItem.getProperty("STATUS"));
 
 					var aNewItem = this.cloneItem(tmpItem);
 					//aNewItem.setProperty("X-UID", cachedItem.uid);
@@ -1062,24 +1048,24 @@ calExchangeCalendar.prototype = {
 
 					if ((aNewItem) && (this.sendMeetingRespons(aNewItem, null, "new"))) {
 						this.notifyOperationComplete(aListener,
-			        	                             Cr.NS_OK,
-			                        	             Ci.calIOperationListener.ADD,
-			                        	             tmpItem.getProperty("UID"),
-			                        	             aNewItem);
+							Cr.NS_OK,
+							Ci.calIOperationListener.ADD,
+							tmpItem.getProperty("UID"),
+							aNewItem);
 					}
 					else {
 						// User cancel.. How to respond!!
 						this.notifyOperationComplete(aListener,
-			        	                             Ci.calIErrors.OPERATION_CANCELLED,
-			                        	             Ci.calIOperationListener.ADD,
-			                        	             tmpItem.getProperty("UID"),
-			                        	             aNewItem);
+							Ci.calIErrors.OPERATION_CANCELLED,
+							Ci.calIOperationListener.ADD,
+							tmpItem.getProperty("UID"),
+							aNewItem);
 					}
 					return;
 				}
 				else {
-					if (this.debug) this.logInfo("getMeetingRequestFromServer:"+tmpItem.title);
-//					this.getMeetingRequestFromServer(tmpItem, tmpItem.id, Ci.calIOperationListener.ADD, aListener);
+					if (this.debug) this.logInfo("getMeetingRequestFromServer:" + tmpItem.title);
+					//					this.getMeetingRequestFromServer(tmpItem, tmpItem.id, Ci.calIOperationListener.ADD, aListener);
 					this.getMeetingRequestFromServer(tmpItem, tmpItem.getProperty("UID"), Ci.calIOperationListener.ADD, aListener);
 					return;
 
@@ -1098,50 +1084,57 @@ calExchangeCalendar.prototype = {
 
 			var attachments = aItem.getAttachments({});
 			if (attachments.length > 0) {
-				if (this.debug) this.logInfo("  -- We have attachments:"+attachments.length);
-				var attachmentsUpdates = { create: [], delete:[] };
+				if (this.debug) this.logInfo("  -- We have attachments:" + attachments.length);
+				var attachmentsUpdates = {
+					create: [],
+					delete: []
+				};
 				for (var index in attachments) {
 					attachmentsUpdates.create.push(attachments[index]);
 				}
 			}
 
 			var self = this;
-			this.addToQueue( erCreateItemRequest,
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 folderBase: this.folderBase,
-				 serverUrl: this.serverUrl,
-				 item: aItem,
-				 folderID: this.folderID,
-				 changeKey: this.changeKey,
-				 createReq: ewsItem,
-				 newItem: aItem,
-				 attachmentsUpdates: attachmentsUpdates,
-				 actionStart: Date.now(),
-				 sendto: "sendtoall"}, 
-				function(erCreateItemRequest, aId, aChangeKey) { self.createItemOk(erCreateItemRequest, aId, aChangeKey);}, 
-				function(erCreateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erCreateItemRequest, aCode, aMsg);},
+			this.addToQueue(erCreateItemRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					item: aItem,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					createReq: ewsItem,
+					newItem: aItem,
+					attachmentsUpdates: attachmentsUpdates,
+					actionStart: Date.now(),
+					sendto: "sendtoall"
+				},
+				function (erCreateItemRequest, aId, aChangeKey) {
+					self.createItemOk(erCreateItemRequest, aId, aChangeKey);
+				},
+				function (erCreateItemRequest, aCode, aMsg) {
+					self.whichOccurrencegetOccurrenceIndexError(erCreateItemRequest, aCode, aMsg);
+				},
 				aListener);
 		}
 		else {
 			// notify the listener
 			this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.MODIFICATION_FAILED,
-                        	             Ci.calIOperationListener.ADD,
-                        	             aItem.id,
-                        	             aItem);
+				Ci.calIErrors.MODIFICATION_FAILED,
+				Ci.calIOperationListener.ADD,
+				aItem.id,
+				aItem);
 		}
 
 	},
 
-	getMeetingRequestByUIDOk: function _getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests)
-	{
+	getMeetingRequestByUIDOk: function _getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests) {
 		this.notConnected = false;
 		this.saveCredentials(erGetMeetingRequestByUIDRequest.argument);
-		if (this.debug) this.logInfo("getMeetingRequestByUIDOk: itemcount="+aMeetingRequests.length);
+		if (this.debug) this.logInfo("getMeetingRequestByUIDOk: itemcount=" + aMeetingRequests.length);
 
 		if (erGetMeetingRequestByUIDRequest.argument.item.organizer) {
-			if (this.debug) this.logInfo(" >>>>>>> 1 We have a organizer and SCHEDULE-AGENT="+erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+			if (this.debug) this.logInfo(" >>>>>>> 1 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
 		}
 		else {
 			if (this.debug) this.logInfo("item has no oranizer!!!!!!!!!!!!");
@@ -1150,7 +1143,7 @@ calExchangeCalendar.prototype = {
 		if (aMeetingRequests.length > 0) {
 			// Convert list to CalAppointment and try to find the matching one
 			var tmpList = [];
-			for (var i=0; i<aMeetingRequests.length; i++) {
+			for (var i = 0; i < aMeetingRequests.length; i++) {
 				var tmpItem = this.convertExchangeAppointmentToCalAppointment(aMeetingRequests[i], true);
 				if (tmpItem) {
 					tmpList.push(tmpItem);
@@ -1159,26 +1152,26 @@ calExchangeCalendar.prototype = {
 			var ewsItem = this.findItemInListByDatesAndID(tmpList, erGetMeetingRequestByUIDRequest.argument.item);
 
 			//var ewsItem = this.convertExchangeAppointmentToCalAppointment(aMeetingRequests[aMeetingRequests.length-1], true);
-					
-			if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with STATUS:"+erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS"));
+
+			if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with STATUS:" + erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS"));
 
 			var me = this.getInvitedAttendee(erGetMeetingRequestByUIDRequest.argument.item);
 			if (me) {
-				if (this.debug) this.logInfo("getMeetingRequestByUIDOk: me.participationStatus:"+me.participationStatus);
+				if (this.debug) this.logInfo("getMeetingRequestByUIDOk: me.participationStatus:" + me.participationStatus);
 				var tmpMe = this.getInvitedAttendee(ewsItem);
 				if (tmpMe) {
-					if (this.debug) this.logInfo("getMeetingRequestByUIDOk: tmpMe.participationStatus:"+tmpMe.participationStatus);
+					if (this.debug) this.logInfo("getMeetingRequestByUIDOk: tmpMe.participationStatus:" + tmpMe.participationStatus);
 					tmpMe.participationStatus = me.participationStatus;
 
 					switch (tmpMe.participationStatus) {
-					case "ACCEPTED": 
+					case "ACCEPTED":
 						ewsItem.setProperty("STATUS", "CONFIRMED");
 						break;
 					case null:
-					case "TENTATIVE": 
+					case "TENTATIVE":
 						ewsItem.setProperty("STATUS", "TENTATIVE");
 						break;
-					case "DECLINED": 
+					case "DECLINED":
 						ewsItem.setProperty("STATUS", "CANCELLED");
 						break;
 					}
@@ -1188,35 +1181,35 @@ calExchangeCalendar.prototype = {
 				// I'm not directly invited. Just through distributionlist or mailgroup.
 				if (this.debug) this.logInfo("getMeetingRequestByUIDOk: I'm not directly invited so we are going to create a dummy attendee for now.");
 				me = cal.createAttendee();
-				me.id = "mailto:"+this.mailbox;
+				me.id = "mailto:" + this.mailbox;
 				me.commonName = this.userDisplayName;
 				me.rsvp = "FALSE";
 				me.userType = "INDIVIDUAL";
 				me.role = "NON-PARTICIPANT";
 				switch (erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS")) {
-					case "CONFIRMED":
-						me.participationStatus = "ACCEPTED";
-						break;
-					case "TENTATIVE":
-						me.participationStatus = "TENTATIVE";
-						break;
-					case "CANCELLED":
-						me.participationStatus = "DECLINED";
-						break;
+				case "CONFIRMED":
+					me.participationStatus = "ACCEPTED";
+					break;
+				case "TENTATIVE":
+					me.participationStatus = "TENTATIVE";
+					break;
+				case "CANCELLED":
+					me.participationStatus = "DECLINED";
+					break;
 				}
-				
+
 			}
 
-			if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with ewsItem.STATUS:"+ewsItem.getProperty("STATUS"));
+			if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with ewsItem.STATUS:" + ewsItem.getProperty("STATUS"));
 
 			ewsItem.setProperty("X-MEETINGREQUEST", true);
 			if ((ewsItem) && (this.sendMeetingRespons(ewsItem, null, "new", me.participationStatus))) {
 				if (erGetMeetingRequestByUIDRequest.listener) {
-					this.notifyOperationComplete( erGetMeetingRequestByUIDRequest.listener,
-		        	                             Cr.NS_OK,
-		                        	             erGetMeetingRequestByUIDRequest.argument.operation,
-		                        	             erGetMeetingRequestByUIDRequest.argument.item.id,
-		                        	             ewsItem);
+					this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
+						Cr.NS_OK,
+						erGetMeetingRequestByUIDRequest.argument.operation,
+						erGetMeetingRequestByUIDRequest.argument.item.id,
+						ewsItem);
 				}
 				return;
 			}
@@ -1234,16 +1227,16 @@ calExchangeCalendar.prototype = {
 			var doStop = false;
 
 			if (erGetMeetingRequestByUIDRequest.argument.item.organizer) {
-				if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT="+erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+				if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
 				if (erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT") == "CLIENT") {
 					// looks like iTIP because SCHEDULE-AGENT is set. 
-					if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT="+erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+					if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
 					if (this.debug) this.logInfo(" !!!!!!!!!!!!!! THIS SHOULD NEVER HAPPEN ON AN iTIP. DO WE HAVE AN iTIP");
-					if (this.debug) this.logInfo("iCalString:"+erGetMeetingRequestByUIDRequest.argument.item.icalString);
+					if (this.debug) this.logInfo("iCalString:" + erGetMeetingRequestByUIDRequest.argument.item.icalString);
 					//if (this.debug) this.logInfo(" Stopping processing.. Report this problem to exchangecalendar@extensions.1st-setup.nl");
 					//doStop = true;  // For now we going to clean out the UID and me as an attendee
 					// We fake that we do a paste and that it is an invitation.
-					
+
 					if (this.debug) this.logInfo(" !!!>>  We are going to treat this as a copy/paste for a new event.");
 					var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
 					tmpItem.clearId("xxxx-xxxx-xxx-xxxx");
@@ -1252,11 +1245,11 @@ calExchangeCalendar.prototype = {
 					tmpItem.setProperty("X-IsMeeting", true);
 					this.addItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
 					return;
-					
+
 				}
 
 				if (erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT")) {
-					if (this.debug) this.logInfo("Unknown SCHEDULE-AGENT property for item. SCHEDULE-AGENT:"+erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+					if (this.debug) this.logInfo("Unknown SCHEDULE-AGENT property for item. SCHEDULE-AGENT:" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
 					if (this.debug) this.logInfo("Please mail the previous line to exchangecalendar@extensions.1st-setup.nl");
 					return;
 				}
@@ -1275,7 +1268,7 @@ calExchangeCalendar.prototype = {
 				if (erGetMeetingRequestByUIDRequest.argument.item.isMutable) {
 					if (this.debug) this.logInfo("item is Mutable.");
 					erGetMeetingRequestByUIDRequest.argument.item.clearId("not a valid id");
-					if (this.debug) this.logInfo("item is Mutable. item.id set to '"+erGetMeetingRequestByUIDRequest.argument.item.id+"'");
+					if (this.debug) this.logInfo("item is Mutable. item.id set to '" + erGetMeetingRequestByUIDRequest.argument.item.id + "'");
 					this.adoptItem(erGetMeetingRequestByUIDRequest.argument.item, erGetMeetingRequestByUIDRequest.listener);
 				}
 				else {
@@ -1291,32 +1284,30 @@ calExchangeCalendar.prototype = {
 		// User cancel.. How to respond!!
 		if (erGetMeetingRequestByUIDRequest.listener) {
 			this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
-	       	                             Ci.calIErrors.OPERATION_CANCELLED, 
-	                       	             erGetMeetingRequestByUIDRequest.argument.operation,
-	                       	             erGetMeetingRequestByUIDRequest.argument.item.id,
-	                       	             erGetMeetingRequestByUIDRequest.argument.item);
+				Ci.calIErrors.OPERATION_CANCELLED,
+				erGetMeetingRequestByUIDRequest.argument.operation,
+				erGetMeetingRequestByUIDRequest.argument.item.id,
+				erGetMeetingRequestByUIDRequest.argument.item);
 		}
 	},
 
-	getMeetingRequestByUIDError: function _getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg)
-	{
+	getMeetingRequestByUIDError: function _getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg) {
 		this.saveCredentials(erGetMeetingRequestByUIDRequest.argument);
 		this.notConnected = true;
-		if (this.debug) this.logInfo("getMeetingRequestByUIDError: aCode:"+aCode+", aMsg:"+aMsg);
+		if (this.debug) this.logInfo("getMeetingRequestByUIDError: aCode:" + aCode + ", aMsg:" + aMsg);
 
 		this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
-       	                             Ci.calIErrors.OPERATION_CANCELLED,
-                       	             Ci.calIOperationListener.ADD,
-                       	             erGetMeetingRequestByUIDRequest.argument.item.id,
-                       	             erGetMeetingRequestByUIDRequest.argument.item);
+			Ci.calIErrors.OPERATION_CANCELLED,
+			Ci.calIOperationListener.ADD,
+			erGetMeetingRequestByUIDRequest.argument.item.id,
+			erGetMeetingRequestByUIDRequest.argument.item);
 
 		var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-					.getService(Components.interfaces.nsIPromptService);
-		promptService.alert(null, "Error", aMsg+" ("+aCode+")");
+			.getService(Components.interfaces.nsIPromptService);
+		promptService.alert(null, "Error", aMsg + " (" + aCode + ")");
 	},
 
-	singleModified: function _singleModified(aModifiedSingle, doNotify, aFastNotify)
-	{
+	singleModified: function _singleModified(aModifiedSingle, doNotify, aFastNotify) {
 		if (this.itemCacheById[aModifiedSingle.id]) {
 			this.itemUpdates++;
 			//dump(" ==Cal:"+this.name+", item updated:"+this.itemUpdates+", title:"+aModifiedSingle.title+", startDate:"+aModifiedSingle.startDate+"\n");
@@ -1337,8 +1328,7 @@ calExchangeCalendar.prototype = {
 		}
 	},
 
-	masterModified: function _masterModified(aModifiedMaster)
-	{
+	masterModified: function _masterModified(aModifiedMaster) {
 		//if (this.debug) this.logInfo("masterModified:"+aModifiedMaster.title);
 		if (!this.recurringMasterCache[aModifiedMaster.uid]) {
 			return null;
@@ -1346,7 +1336,7 @@ calExchangeCalendar.prototype = {
 
 		// Master was modified so tell the chidlren they have a new parent.
 		for each(var item in this.itemCacheById) {
-//			if ((item) && (item.parentItem.id != item.id) && (item.uid == aModifiedMaster.uid)) {
+			//			if ((item) && (item.parentItem.id != item.id) && (item.uid == aModifiedMaster.uid)) {
 			if ((item) && (item.uid == aModifiedMaster.uid)) {
 				//var newItem = item.clone();
 				var newItem = this.cloneItem(item);
@@ -1356,26 +1346,25 @@ calExchangeCalendar.prototype = {
 				//this.itemCacheById[newItem.id] = newItem;
 			}
 		}
-		
+
 		// We send a modify for the master. But we do not show the masters in the calendar 
-//miv		this.notifyTheObservers("onModifyItem", [aModifiedMaster, this.recurringMasterCache[aModifiedMaster.uid]]);
+		//miv		this.notifyTheObservers("onModifyItem", [aModifiedMaster, this.recurringMasterCache[aModifiedMaster.uid]]);
 		// Because we do not want it to be visible and the previous modify made it visible.
-//miv		this.notifyTheObservers("onDeleteItem", [aModifiedMaster]);
+		//miv		this.notifyTheObservers("onDeleteItem", [aModifiedMaster]);
 		this.recurringMasterCache[aModifiedMaster.uid] = aModifiedMaster;
 		this.recurringMasterCacheById[aModifiedMaster.id] = aModifiedMaster;
 	},
 
 	/**
-	* Returns the acl entry associated to the calendar.
-	*/
+	 * Returns the acl entry associated to the calendar.
+	 */
 	//readonly attribute calICalendarACLEntry aclEntry;
-	get aclEntry()
-	{
+	get aclEntry() {
 		var accountMgr = Cc["@mozilla.org/messenger/account-manager;1"].getService(Ci.nsIMsgAccountManager);
 		var identities = accountMgr.allIdentities;
 		var idList = [];
 		if ((identities["Count"]) && (identities["QueryElementAt"])) {
-			for (var index=0; index < identities.Count; index++) {
+			for (var index = 0; index < identities.Count; index++) {
 				var identity = identities.QueryElementAt(index, Ci.nsIMsgIdentity);
 				idList.push(identity);
 				/*if (!this.name) {
@@ -1384,7 +1373,7 @@ calExchangeCalendar.prototype = {
 			}
 		}
 		else {
-			for (var index=0; index < identities.length; index++) {
+			for (var index = 0; index < identities.length; index++) {
 				var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
 				idList.push(identity);
 				/*if (!this.name) {
@@ -1399,106 +1388,123 @@ calExchangeCalendar.prototype = {
 			userIsOwner: (this.canDelete || this.canModify),
 			userCanAddItems: this._canCreateContent,
 			userCanDeleteItems: this._canDelete,
-			getUserAddresses: function(aCount) { dump("calICalendarACLEntry getUserAddresses:"+self.name+"\n"); aCount.value = 1; return ["babe"]; },
-			getUserIdentities: function(aCount) { dump("calICalendarACLEntry getUserIdentities:"+self.name+"\n"); aCount.value = idList.length; return idList; },
-			getOwnerIdentities: function(aCount) { dump("calICalendarACLEntry getOwnerIdentities:"+self.name+"\n"); aCount.value = idList.length; return idList; },
-			refresh: function() { dump("calICalendarACLEntry refresh:"+self.name+"\n");  },
-			};
+			getUserAddresses: function (aCount) {
+				dump("calICalendarACLEntry getUserAddresses:" + self.name + "\n");
+				aCount.value = 1;
+				return ["babe"];
+			},
+			getUserIdentities: function (aCount) {
+				dump("calICalendarACLEntry getUserIdentities:" + self.name + "\n");
+				aCount.value = idList.length;
+				return idList;
+			},
+			getOwnerIdentities: function (aCount) {
+				dump("calICalendarACLEntry getOwnerIdentities:" + self.name + "\n");
+				aCount.value = idList.length;
+				return idList;
+			},
+			refresh: function () {
+				dump("calICalendarACLEntry refresh:" + self.name + "\n");
+			},
+		};
 
 	},
 
 
 	//  calIOperation modifyItem(in calIItemBase aNewItem,
-        //                   in calIItemBase aOldItem,
-        //                   in calIOperationListener aListener);
+	//                   in calIItemBase aOldItem,
+	//                   in calIOperationListener aListener);
 
-	modifyItem: function _modifyItem(aNewItem, aOldItem, aListener)
-	{
+	modifyItem: function _modifyItem(aNewItem, aOldItem, aListener) {
 
 		if (this.debug) this.logInfo("modifyItem");
 		var result = Ci.calIErrors.MODIFICATION_FAILED;
 
-	        if (this.OnlyShowAvailability) {
+		if (this.OnlyShowAvailability) {
 			this.readOnlyInternal = true;
 			this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.OPERATION_CANCELLED,
-                        	             Ci.calIOperationListener.MODIFY,
-        	                             aNewItem.id,
-        	                             aNewItem);
+				Ci.calIErrors.OPERATION_CANCELLED,
+				Ci.calIOperationListener.MODIFY,
+				aNewItem.id,
+				aNewItem);
 			return null;
-	        }
+		}
 
-	        if (this.readOnly) {
+		if (this.readOnly) {
 			// When we hit this it probably is the change on a alarm. We will process this only in the local cache.
 			if (this.debug) this.logInfo("modifyItem and this calendar is ReadOnly");
 			this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
-	        	this.notifyOperationComplete(aListener,
-	        	                             Cr.NS_OK,
-	        	                             Ci.calIOperationListener.MODIFY,
-	        	                             aNewItem.id,
-	        	                             aNewItem);
+			this.notifyOperationComplete(aListener,
+				Cr.NS_OK,
+				Ci.calIOperationListener.MODIFY,
+				aNewItem.id,
+				aNewItem);
 			return null;
-	        }
+		}
 
 		if ((aOldItem.className) && (!aOldItem.canModify)) {
 			if (this.debug) this.logInfo("modifyItem and this item is ReadOnly for this user.");
-	        	this.notifyOperationComplete(aListener,
-	        	                             Cr.NS_OK,
-	        	                             Ci.calIOperationListener.MODIFY,
-	        	                             aOldItem.id,
-	        	                             aOldItem);
+			this.notifyOperationComplete(aListener,
+				Cr.NS_OK,
+				Ci.calIOperationListener.MODIFY,
+				aOldItem.id,
+				aOldItem);
 			return null;
 		}
 
-		if (this.debug) this.logInfo("1 -- aOldItem.recurrenceInfo:"+aOldItem.recurrenceInfo+", aNewItem.recurrenceInfo:"+aNewItem.recurrenceInfo);
-		if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("1 -- aOldItem.recurrenceInfo.toString():"+aOldItem.recurrenceInfo.toString());
-		if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("1 -- aNewItem.recurrenceInfo.toString():"+aNewItem.recurrenceInfo.toString());
+		if (this.debug) this.logInfo("1 -- aOldItem.recurrenceInfo:" + aOldItem.recurrenceInfo + ", aNewItem.recurrenceInfo:" + aNewItem.recurrenceInfo);
+		if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("1 -- aOldItem.recurrenceInfo.toString():" + aOldItem.recurrenceInfo.toString());
+		if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("1 -- aNewItem.recurrenceInfo.toString():" + aNewItem.recurrenceInfo.toString());
+
+		if (!aNewItem) {
+			throw Cr.NS_ERROR_INVALID_ARG;
+		}
 
-	        if (!aNewItem) {
-	            throw Cr.NS_ERROR_INVALID_ARG;
-	        }
+		var this_ = this;
 
-	        var this_ = this;
-	        function reportError(errStr, errId) {
-	            this_.notifyOperationComplete(aListener,
-	                                          errId ? errId : Cr.NS_ERROR_FAILURE,
-	                                          Ci.calIOperationListener.MODIFY,
-	                                          aNewItem.id,
-	                                          errStr);
-	            return null;
-	        }
+		function reportError(errStr, errId) {
+			this_.notifyOperationComplete(aListener,
+				errId ? errId : Cr.NS_ERROR_FAILURE,
+				Ci.calIOperationListener.MODIFY,
+				aNewItem.id,
+				errStr);
+			return null;
+		}
 
-	        if (aNewItem.id == null) {
-	            // this is definitely an error
-	            return reportError("ID for modifyItem item is null");
-	        }
+		if (aNewItem.id == null) {
+			// this is definitely an error
+			return reportError("ID for modifyItem item is null");
+		}
 
 		// See if attachments changed.
 		var newAttachments = aNewItem.getAttachments({});
 		var attachments = {};
 
-		var attachmentsUpdates = { create: [], delete:[] };
+		var attachmentsUpdates = {
+			create: [],
+			delete: []
+		};
 		if (newAttachments.length > 0) {
-			if (this.debug) this.logInfo("  -- We have newAttachments:"+newAttachments.length);
+			if (this.debug) this.logInfo("  -- We have newAttachments:" + newAttachments.length);
 			for (var index in newAttachments) {
 				if (newAttachments[index].getParameter("X-AttachmentId")) {
 					attachments[newAttachments[index].getParameter("X-AttachmentId")] = newAttachments[index];
 				}
 				else {
 					attachmentsUpdates.create.push(newAttachments[index]);
-					if (this.debug) this.logInfo("newAttachment:"+newAttachments[index].uri.spec);
+					if (this.debug) this.logInfo("newAttachment:" + newAttachments[index].uri.spec);
 				}
 			}
 		}
 		// Check which have been removed.
 		var oldAttachments = aOldItem.getAttachments({});
 		for (var index in oldAttachments) {
-			if (! attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
+			if (!attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
 				attachmentsUpdates.delete.push(oldAttachments[index]);
-				if (this.debug) this.logInfo("removedAttachment:"+oldAttachments[index].uri.spec);
+				if (this.debug) this.logInfo("removedAttachment:" + oldAttachments[index].uri.spec);
 			}
-		}			
-		
+		}
+
 
 		if (isEvent(aNewItem)) {
 			if (this.debug) this.logInfo("ModifyItem: it is an event.");
@@ -1519,8 +1525,8 @@ calExchangeCalendar.prototype = {
 
 			if (aOldItem.isInvitation) {
 
-				if (this.debug) this.logInfo("1 meOld.participationStatus="+meOld.participationStatus+", meNew.participationStatus="+meNew.participationStatus);
-				if (this.debug) this.logInfo("1 aOldItem.status="+aOldItem.getProperty("STATUS")+", aNewItem.status="+aNewItem.getProperty("STATUS"));
+				if (this.debug) this.logInfo("1 meOld.participationStatus=" + meOld.participationStatus + ", meNew.participationStatus=" + meNew.participationStatus);
+				if (this.debug) this.logInfo("1 aOldItem.status=" + aOldItem.getProperty("STATUS") + ", aNewItem.status=" + aNewItem.getProperty("STATUS"));
 
 				if ((meOld) && (meNew) && (meOld.participationStatus != meNew.participationStatus)) {
 					doSendMeetingRespons = true;
@@ -1528,25 +1534,25 @@ calExchangeCalendar.prototype = {
 
 				if ((meNew) && (meNew.participationStatus == "NEEDS-ACTION") && (meOld.participationStatus != meNew.participationStatus)) {
 					// They choose to confirm at a later state. Do not change this item.
-			        	this.notifyOperationComplete(aListener,
-			        	                             Cr.NS_OK,
-			        	                             Ci.calIOperationListener.MODIFY,
-			        	                             aNewItem.id,
-			        	                             aNewItem);
+					this.notifyOperationComplete(aListener,
+						Cr.NS_OK,
+						Ci.calIOperationListener.MODIFY,
+						aNewItem.id,
+						aNewItem);
 
-			        	return null;
+					return null;
 				}
 
 				if ((meOld) && (meNew) && (aOldItem.getProperty("STATUS") != aNewItem.getProperty("STATUS")) && (!doSendMeetingRespons)) {
 					switch (aNewItem.getProperty("STATUS")) {
-					case "CONFIRMED": 
+					case "CONFIRMED":
 						meNew.participationStatus = "ACCEPTED";
 						break;
 					case null:
-					case "TENTATIVE": 
+					case "TENTATIVE":
 						meNew.participationStatus = "TENTATIVE";
 						break;
-					case "CANCELLED": 
+					case "CANCELLED":
 						meNew.participationStatus = "DECLINED";
 						break;
 					}
@@ -1558,9 +1564,9 @@ calExchangeCalendar.prototype = {
 			if (doSendMeetingRespons) {
 				// The item is an invitation.
 				// My status has changed. Send to this.globalFunctions.
-				if (this.debug) this.logInfo("2 aOldItem.participationStatus="+meOld.participationStatus+", aNewItem.participationStatus="+(meNew ? meNew.participationStatus : ".."));
-				if (this.debug) this.logInfo("3a aOldItem.id="+aOldItem.id);
-				if (this.debug) this.logInfo("3b aNewItem.id="+aNewItem.id);
+				if (this.debug) this.logInfo("2 aOldItem.participationStatus=" + meOld.participationStatus + ", aNewItem.participationStatus=" + (meNew ? meNew.participationStatus : ".."));
+				if (this.debug) this.logInfo("3a aOldItem.id=" + aOldItem.id);
+				if (this.debug) this.logInfo("3b aNewItem.id=" + aNewItem.id);
 
 				var requestResponseItem = aNewItem;
 				requestResponseItem.setProperty("X-MEETINGREQUEST", true);
@@ -1587,7 +1593,7 @@ calExchangeCalendar.prototype = {
 					//requestResponseItem.setProperty("X-ChangeKey",  tmpItem.changeKey);
 				}
 				else {
-					if (this.debug) this.logInfo("___________ NOT Found in meeting request cache. X-UID:"+aNewItem.uid);
+					if (this.debug) this.logInfo("___________ NOT Found in meeting request cache. X-UID:" + aNewItem.uid);
 
 					if (aNewItem.id == aNewItem.parentItem.id) {
 						if (this.debug) this.logInfo("_________ it is a master.");
@@ -1611,11 +1617,13 @@ calExchangeCalendar.prototype = {
 			}
 			else {
 
-				var input= { item: aNewItem, 
-					     response: "sendtonone"};
+				var input = {
+					item: aNewItem,
+					response: "sendtonone"
+				};
 
 				if (aNewItem.organizer) {
-					if (this.debug) this.logInfo("The organizer is:"+aNewItem.organizer.id);
+					if (this.debug) this.logInfo("The organizer is:" + aNewItem.organizer.id);
 				}
 				else {
 					if (this.debug) this.logInfo("We have no organizer!");
@@ -1628,7 +1636,7 @@ calExchangeCalendar.prototype = {
 					changes = changesObj.changes;
 				}
 				var weHaveChanges = (changes || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
-//				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
+				//				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
 
 				var iAmOrganizer = ((aNewItem.organizer) && (aNewItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
 				if (iAmOrganizer) {
@@ -1639,12 +1647,12 @@ calExchangeCalendar.prototype = {
 
 						// Get the eventsummarywindow to attach dialog to.
 						let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-						                  .getService(Ci.nsIWindowMediator);
-						let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane") ;
-	
+							.getService(Ci.nsIWindowMediator);
+						let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane");
+
 						var attendees = aNewItem.getAttendees({}).length + aOldItem.getAttendees({}).length;
-						if (this.debug) this.logInfo("  -- aOldItem.getAttendees({}).length="+aOldItem.getAttendees({}).length);
-						if (this.debug) this.logInfo("  -- aNewItem.getAttendees({}).length="+aNewItem.getAttendees({}).length);
+						if (this.debug) this.logInfo("  -- aOldItem.getAttendees({}).length=" + aOldItem.getAttendees({}).length);
+						if (this.debug) this.logInfo("  -- aNewItem.getAttendees({}).length=" + aNewItem.getAttendees({}).length);
 						if (this.getInvitedAttendee(aOldItem)) {
 							attendees--;
 						}
@@ -1656,7 +1664,7 @@ calExchangeCalendar.prototype = {
 							calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
 								"sendUpdateTo",
 								"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-								input); 
+								input);
 						}
 
 						if ((attendees == 0) || (!weHaveChanges)) {
@@ -1670,37 +1678,42 @@ calExchangeCalendar.prototype = {
 					}
 				}
 
-				if (this.debug) this.logInfo("modifyItem: it is a event. aOldItem.CalendarItemType=:"+aOldItem.calendarItemType);
+				if (this.debug) this.logInfo("modifyItem: it is a event. aOldItem.CalendarItemType=:" + aOldItem.calendarItemType);
 
 				// We have a Single or master
 				if (aOldItem.calendarItemType == "RecurringMaster") {
-					if (this.debug) this.logInfo(" Master changed:"+aNewItem.title);
+					if (this.debug) this.logInfo(" Master changed:" + aNewItem.title);
 					// See if the aNewItem is also the master record.
 					var masterChanged = (aNewItem.parentItem.id == aNewItem.id);
 
 					// We need to find out wat has changed;
-					if (this.debug) this.logInfo(" ==1 invite="+aOldItem.isInvitation);
+					if (this.debug) this.logInfo(" ==1 invite=" + aOldItem.isInvitation);
 
 					if (changes) {
-						if (this.debug) this.logInfo("modifyItem: changed:"+String(changes));
+						if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
 
 						var self = this;
-						this.addToQueue( erUpdateItemRequest,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 item: aOldItem,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 updateReq: changes,
-							 newItem: aNewItem,
-					 		 actionStart: Date.now(),
-							 attachmentsUpdates: attachmentsUpdates,
-							 onlySnoozeChanges:changesObj.onlySnoozeChanged,
-							 sendto: input.response}, 
-							function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-							function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+						this.addToQueue(erUpdateItemRequest, {
+								user: this.user,
+								mailbox: this.mailbox,
+								folderBase: this.folderBase,
+								serverUrl: this.serverUrl,
+								item: aOldItem,
+								folderID: this.folderID,
+								changeKey: this.changeKey,
+								updateReq: changes,
+								newItem: aNewItem,
+								actionStart: Date.now(),
+								attachmentsUpdates: attachmentsUpdates,
+								onlySnoozeChanges: changesObj.onlySnoozeChanged,
+								sendto: input.response
+							},
+							function (erUpdateItemRequest, aId, aChangeKey) {
+								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+							},
+							function (erUpdateItemRequest, aCode, aMsg) {
+								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+							},
 							aListener);
 						return;
 					}
@@ -1724,30 +1737,35 @@ calExchangeCalendar.prototype = {
 					}
 				}
 				else {
-					if (this.debug) this.logInfo("modifyItem: '"+aOldItem.calendarItemType+"' event modification");
+					if (this.debug) this.logInfo("modifyItem: '" + aOldItem.calendarItemType + "' event modification");
 					// We need to find out wat has changed;
-					if (this.debug) this.logInfo(" ==1 invite="+aOldItem.isInvitation);
+					if (this.debug) this.logInfo(" ==1 invite=" + aOldItem.isInvitation);
 
 					if (changes) {
-						if (this.debug) this.logInfo("modifyItem: changed:"+String(changes));
+						if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
 
 						var self = this;
-						this.addToQueue( erUpdateItemRequest,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 item: aOldItem,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 updateReq: changes,
-							 newItem: aNewItem,
-					 		 actionStart: Date.now(),
-							 attachmentsUpdates: attachmentsUpdates,
-							 onlySnoozeChanges:changesObj.onlySnoozeChanged,
-							 sendto: input.response}, 
-							function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-							function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+						this.addToQueue(erUpdateItemRequest, {
+								user: this.user,
+								mailbox: this.mailbox,
+								folderBase: this.folderBase,
+								serverUrl: this.serverUrl,
+								item: aOldItem,
+								folderID: this.folderID,
+								changeKey: this.changeKey,
+								updateReq: changes,
+								newItem: aNewItem,
+								actionStart: Date.now(),
+								attachmentsUpdates: attachmentsUpdates,
+								onlySnoozeChanges: changesObj.onlySnoozeChanged,
+								sendto: input.response
+							},
+							function (erUpdateItemRequest, aId, aChangeKey) {
+								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+							},
+							function (erUpdateItemRequest, aCode, aMsg) {
+								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+							},
 							aListener);
 						this.singleModified(aNewItem, true, true);
 						return;
@@ -1780,22 +1798,27 @@ calExchangeCalendar.prototype = {
 					changes = changesObj.changes;
 				}
 				if (changes) {
-					if (this.debug) this.logInfo("modifyItem: changed:"+String(changes));
+					if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
 					var self = this;
-					this.addToQueue( erUpdateItemRequest,
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 item: aOldItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 updateReq: changes,
-						 newItem: aNewItem,
-						 attachmentsUpdates: attachmentsUpdates,
-					 	 actionStart: Date.now()}, 
-						function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-						function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+					this.addToQueue(erUpdateItemRequest, {
+							user: this.user,
+							mailbox: this.mailbox,
+							folderBase: this.folderBase,
+							serverUrl: this.serverUrl,
+							item: aOldItem,
+							folderID: this.folderID,
+							changeKey: this.changeKey,
+							updateReq: changes,
+							newItem: aNewItem,
+							attachmentsUpdates: attachmentsUpdates,
+							actionStart: Date.now()
+						},
+						function (erUpdateItemRequest, aId, aChangeKey) {
+							self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+						},
+						function (erUpdateItemRequest, aCode, aMsg) {
+							self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+						},
 						aListener);
 					this.singleModified(aNewItem, true, true);
 					return;
@@ -1821,185 +1844,199 @@ calExchangeCalendar.prototype = {
 
 		//this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
 
-        	this.notifyOperationComplete(aListener,
-        	                             result,
-        	                             Ci.calIOperationListener.MODIFY,
-        	                             aNewItem.id,
-        	                             aNewItem);
+		this.notifyOperationComplete(aListener,
+			result,
+			Ci.calIOperationListener.MODIFY,
+			aNewItem.id,
+			aNewItem);
 
-        	return null;
+		return null;
 	},
 
-	getChildByUIDandNativeTime: function _getChildByUIDandNativeTime(aUID, aNativeTime)
-	{
+	getChildByUIDandNativeTime: function _getChildByUIDandNativeTime(aUID, aNativeTime) {
 		for (var index in this.itemCacheById) {
 			if ((this.itemCacheById[index]) && (this.itemCacheById[index].uid == aUID)) {
 				// We found a child with the specified UID.
 				if ((this.itemCacheById[index].recurrenceId) && (this.itemCacheById[index].recurrenceId.nativeTime == aNativeTime)) {
 					return this.itemCacheById[index];
-				} 
+				}
 			}
 		}
 
 		return null;
 	},
-	
-	deleteItemCancelled: function _deleteItemCancelled(aItem,aListener) {
-		if (this.debug) this.logInfo("deleteItemCancelled: "+aItem.title);
+
+	deleteItemCancelled: function _deleteItemCancelled(aItem, aListener) {
+		if (this.debug) this.logInfo("deleteItemCancelled: " + aItem.title);
 		if ((aItem.className) && (!aItem.canDelete)) {
 			if (this.debug) this.logInfo("User is not allowed to delete this item.");
-	        	this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.OPERATION_CANCELLED,
-                        	             Ci.calIOperationListener.DELETE,
-                        	             aItem.id,
-                        	             aItem);
+			this.notifyOperationComplete(aListener,
+				Ci.calIErrors.OPERATION_CANCELLED,
+				Ci.calIOperationListener.DELETE,
+				aItem.id,
+				aItem);
 			return null;
 		}
 
 		if (aItem.id == null) {
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
-		                                 Ci.calIErrors.MODIFICATION_FAILED,
-		                                 Ci.calIOperationListener.DELETE,
-		                                 null,
-		                                 "ID is null for deleteItem");
+					Ci.calIErrors.MODIFICATION_FAILED,
+					Ci.calIOperationListener.DELETE,
+					null,
+					"ID is null for deleteItem");
 			}
 			return;
 		}
 
 		// Check if this item is still in cache
-		if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid]))	 {
+		if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid])) {
 			if (this.debug) this.logInfo("Item is not in itemCache anymore. Probably not removed from view by Lightning..");
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
-		                                 Cr.NS_OK,
-		                                 Ci.calIOperationListener.DELETE,
-		                                 aItem.id,
-		                                 aItem);
+					Cr.NS_OK,
+					Ci.calIOperationListener.DELETE,
+					aItem.id,
+					aItem);
 			}
 			return;
 		}
-		
+
 		switch (aItem.calendarItemType) {
-				case "Single" :
-					if (this.debug) this.logInfo("-- Single CalendarItemType");
-					this.removeItemFromCache(aItem);
+		case "Single":
+			if (this.debug) this.logInfo("-- Single CalendarItemType");
+			this.removeItemFromCache(aItem);
 
-					var self = this;
-					this.addToQueue( erDeleteItemRequest, 
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 item: aItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 actionStart: Date.now(),
-						 itemType: "single"}, 
-						function(erDeleteItemRequest) { self.deleteItemOk(erDeleteItemRequest);}, 
-						function(erDeleteItemRequest, aCode, aMsg) { self.deleteItemError(erDeleteItemRequest, aCode, aMsg);},
-						aListener);
+			var self = this;
+			this.addToQueue(erDeleteItemRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					item: aItem,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					actionStart: Date.now(),
+					itemType: "single"
+				},
+				function (erDeleteItemRequest) {
+					self.deleteItemOk(erDeleteItemRequest);
+				},
+				function (erDeleteItemRequest, aCode, aMsg) {
+					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+				},
+				aListener);
 
-					break;
-				case "Occurrence" :
-				case "Exception" :
-					if (this.debug) this.logInfo("-- "+aItem.calendarItemType+" CalendarItemType");
-					this.removeItemFromCache(aItem);
+			break;
+		case "Occurrence":
+		case "Exception":
+			if (this.debug) this.logInfo("-- " + aItem.calendarItemType + " CalendarItemType");
+			this.removeItemFromCache(aItem);
 
-					var self = this;
-					this.addToQueue( erGetOccurrenceIndexRequest,
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 masterItem: aItem,
-						 item: aItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 action: "deleteItem",
-						 itemType: "occurrence",
-						 whichOccurrence: "occurrence" },//dialogArg.answer}, 
-						function(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) { self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);}, 
-						function(erGetOccurrenceIndexRequest, aCode, aMsg) { self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);},
-						aListener);
+			var self = this;
+			this.addToQueue(erGetOccurrenceIndexRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					masterItem: aItem,
+					item: aItem,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					action: "deleteItem",
+					itemType: "occurrence",
+					whichOccurrence: "occurrence"
+				}, //dialogArg.answer}, 
+				function (erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+					self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);
+				},
+				function (erGetOccurrenceIndexRequest, aCode, aMsg) {
+					self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);
+				},
+				aListener);
+
+			break;
+		case "RecurringMaster":
+			if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
+			this.removeItemFromCache(aItem);
+
+			var self = this;
+			this.addToQueue(erDeleteItemRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					item: aItem,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					itemType: "master",
+					actionStart: Date.now(),
+					whichOccurrence: "all_occurrences"
+				},
+				function (erDeleteItemRequest) {
+					self.deleteItemOk(erDeleteItemRequest);
+				},
+				function (erDeleteItemRequest, aCode, aMsg) {
+					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+				},
+				aListener);
+			break;
+		default:
+			// TODO: This will happen when the sync to/from EWS has not yet happened.
+			if (this.debug) this.logInfo("WARNING: unknown CalendarItemType=" + aItem.calendarItemType);
+		}
 
-					break;
-				case "RecurringMaster" :
-					if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
-					this.removeItemFromCache(aItem); 
-					
-					var self = this;
-					this.addToQueue( erDeleteItemRequest,
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 item: aItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 itemType: "master",
-						 actionStart: Date.now(),
-						 whichOccurrence: "all_occurrences"}, 
-						function(erDeleteItemRequest) { self.deleteItemOk(erDeleteItemRequest);}, 
-						function(erDeleteItemRequest, aCode, aMsg) { self.deleteItemError(erDeleteItemRequest, aCode, aMsg);},
-						aListener);
-					break;
-				default :
-					// TODO: This will happen when the sync to/from EWS has not yet happened.
-					if (this.debug) this.logInfo("WARNING: unknown CalendarItemType="+aItem.calendarItemType);
-			}
-			
 	},
 	//  calIOperation deleteItem(in calIItemBase aItem,
-        //                   in calIOperationListener aListener);
+	//                   in calIOperationListener aListener);
 	deleteItem: function _deleteItem(aItem, aListener) {
 		if (this.debug) this.logInfo("deleteItem");
 
-	        if (this.OnlyShowAvailability) {
+		if (this.OnlyShowAvailability) {
 			this.readOnlyInternal = true;
 			this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.OPERATION_CANCELLED,
-                        	             Ci.calIOperationListener.DELETE,
-                        	             aItem.id,
-                        	             aItem);
-/*	            this.notifyOperationComplete(aListener,
-	                                         Ci.calIErrors.CAL_IS_READONLY,
-	                                         Ci.calIOperationListener.DELETE,
-	                                         null,
-	                                         "Calendar is readonly");*/
+				Ci.calIErrors.OPERATION_CANCELLED,
+				Ci.calIOperationListener.DELETE,
+				aItem.id,
+				aItem);
+			/*	            this.notifyOperationComplete(aListener,
+				                                         Ci.calIErrors.CAL_IS_READONLY,
+				                                         Ci.calIOperationListener.DELETE,
+				                                         null,
+				                                         "Calendar is readonly");*/
 			return null;
-	        }
+		}
 
 		if ((aItem.className) && (!aItem.canDelete)) {
 			if (this.debug) this.logInfo("User is not allowed to delete this item.");
-	        	this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.OPERATION_CANCELLED,
-                        	             Ci.calIOperationListener.DELETE,
-                        	             aItem.id,
-                        	             aItem);
+			this.notifyOperationComplete(aListener,
+				Ci.calIErrors.OPERATION_CANCELLED,
+				Ci.calIOperationListener.DELETE,
+				aItem.id,
+				aItem);
 			return null;
 		}
 
 		if (aItem.id == null) {
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
-		                                 Ci.calIErrors.MODIFICATION_FAILED,
-		                                 Ci.calIOperationListener.DELETE,
-		                                 null,
-		                                 "ID is null for deleteItem");
+					Ci.calIErrors.MODIFICATION_FAILED,
+					Ci.calIOperationListener.DELETE,
+					null,
+					"ID is null for deleteItem");
 			}
 			return;
 		}
 
 		// Check if this item is still in cache
-		if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid]))	 {
+		if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid])) {
 			if (this.debug) this.logInfo("Item is not in itemCache anymore. Probably not removed from view by Lightning..");
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
-		                                 Cr.NS_OK,
-		                                 Ci.calIOperationListener.DELETE,
-		                                 aItem.id,
-		                                 aItem);
+					Cr.NS_OK,
+					Ci.calIOperationListener.DELETE,
+					aItem.id,
+					aItem);
 			}
 			return;
 		}
@@ -2013,9 +2050,9 @@ calExchangeCalendar.prototype = {
 			var isInvitation = this.isInvitation(aItem, true);
 
 			if ((isInvitation) && (!isCancelled)) {
-//			if ((this.folderBase == "calendar") && (!this.folderID) && 
-//			    (!iAmOrganizer) && (aItem.getProperty("STATUS") != "DECLINED") &&
-//			    (aItem.getProperty("STATUS") != "NONE") && (!isCancelled)) {
+				//			if ((this.folderBase == "calendar") && (!this.folderID) && 
+				//			    (!iAmOrganizer) && (aItem.getProperty("STATUS") != "DECLINED") &&
+				//			    (aItem.getProperty("STATUS") != "NONE") && (!isCancelled)) {
 				//var aOldItem = aItem.clone();
 				var aOldItem = this.cloneItem(aItem);
 				aOldItem.setProperty("STATUS", "DECLINED");
@@ -2024,28 +2061,30 @@ calExchangeCalendar.prototype = {
 					if (this.debug) this.logInfo("deleteItem: canceled by user.");
 					if (aListener) {
 						this.notifyOperationComplete(aListener,
-						      Ci.calIErrors.OPERATION_CANCELLED,
-						      Ci.calIOperationListener.DELETE,
-						      aItem.id,
-						      aItem);
+							Ci.calIErrors.OPERATION_CANCELLED,
+							Ci.calIOperationListener.DELETE,
+							aItem.id,
+							aItem);
 					}
 					return;
 				}
 				else {
 					if (aListener) {
 						this.notifyOperationComplete(aListener,
-						      Cr.NS_OK,
-						      Ci.calIOperationListener.DELETE,
-						      aItem.id,
-						      aItem);
+							Cr.NS_OK,
+							Ci.calIOperationListener.DELETE,
+							aItem.id,
+							aItem);
 					}
 					return;
 				}
 
 			}
 
-			var input= { item: aItem, 
-				     response: "sendtonone"};
+			var input = {
+				item: aItem,
+				response: "sendtonone"
+			};
 
 			if (iAmOrganizer) {
 
@@ -2053,8 +2092,8 @@ calExchangeCalendar.prototype = {
 
 				// Get the eventsummarywindow to attach dialog to.
 				let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-			                          .getService(Ci.nsIWindowMediator);
-				let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane") ;
+					.getService(Ci.nsIWindowMediator);
+				let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane");
 
 				var attendees = aItem.getAttendees({}).length;
 				var meOld = this.getInvitedAttendee(aItem);
@@ -2067,7 +2106,7 @@ calExchangeCalendar.prototype = {
 					calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
 						"sendUpdateTo",
 						"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-						input); 
+						input);
 				}
 
 				if (attendees == 0) {
@@ -2079,113 +2118,133 @@ calExchangeCalendar.prototype = {
 
 			switch (aItem.calendarItemType) {
 
-				case "Single" :
-					if (this.debug) this.logInfo("-- Single CalendarItemType");
+			case "Single":
+				if (this.debug) this.logInfo("-- Single CalendarItemType");
 
-					var self = this;
-					this.addToQueue( erDeleteItemRequest, 
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 item: aItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 actionStart: Date.now(),
-						 itemType: "single"}, 
-						function(erDeleteItemRequest) { self.deleteItemOk(erDeleteItemRequest);}, 
-						function(erDeleteItemRequest, aCode, aMsg) { self.deleteItemError(erDeleteItemRequest, aCode, aMsg);},
-						aListener);
+				var self = this;
+				this.addToQueue(erDeleteItemRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						folderBase: this.folderBase,
+						serverUrl: this.serverUrl,
+						item: aItem,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						actionStart: Date.now(),
+						itemType: "single"
+					},
+					function (erDeleteItemRequest) {
+						self.deleteItemOk(erDeleteItemRequest);
+					},
+					function (erDeleteItemRequest, aCode, aMsg) {
+						self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+					},
+					aListener);
 
-					break;
-				case "Occurrence" :
-				case "Exception" :
-					if (this.debug) this.logInfo("-- "+aItem.calendarItemType+" CalendarItemType");
+				break;
+			case "Occurrence":
+			case "Exception":
+				if (this.debug) this.logInfo("-- " + aItem.calendarItemType + " CalendarItemType");
 
-					var self = this;
-					this.addToQueue( erGetOccurrenceIndexRequest,
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 masterItem: aItem,
-						 item: aItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 action: "deleteItem",
-						 itemType: "occurrence",
-						 whichOccurrence: "occurrence" },//dialogArg.answer}, 
-						function(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) { self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);}, 
-						function(erGetOccurrenceIndexRequest, aCode, aMsg) { self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);},
-						aListener);
+				var self = this;
+				this.addToQueue(erGetOccurrenceIndexRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						folderBase: this.folderBase,
+						serverUrl: this.serverUrl,
+						masterItem: aItem,
+						item: aItem,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						action: "deleteItem",
+						itemType: "occurrence",
+						whichOccurrence: "occurrence"
+					}, //dialogArg.answer}, 
+					function (erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+						self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);
+					},
+					function (erGetOccurrenceIndexRequest, aCode, aMsg) {
+						self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);
+					},
+					aListener);
 
-					break;
-				case "RecurringMaster" :
-					if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
+				break;
+			case "RecurringMaster":
+				if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
 
-					var self = this;
-					this.addToQueue( erDeleteItemRequest,
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 item: aItem,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 itemType: "master",
-						 actionStart: Date.now(),
-						 whichOccurrence: "all_occurrences"}, 
-						function(erDeleteItemRequest) { self.deleteItemOk(erDeleteItemRequest);}, 
-						function(erDeleteItemRequest, aCode, aMsg) { self.deleteItemError(erDeleteItemRequest, aCode, aMsg);},
-						aListener);
-					break;
-				default :
-					// TODO: This will happen when the sync to/from EWS has not yet happened.
-					if (this.debug) this.logInfo("WARNING: unknown CalendarItemType="+aItem.calendarItemType);
+				var self = this;
+				this.addToQueue(erDeleteItemRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						folderBase: this.folderBase,
+						serverUrl: this.serverUrl,
+						item: aItem,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						itemType: "master",
+						actionStart: Date.now(),
+						whichOccurrence: "all_occurrences"
+					},
+					function (erDeleteItemRequest) {
+						self.deleteItemOk(erDeleteItemRequest);
+					},
+					function (erDeleteItemRequest, aCode, aMsg) {
+						self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+					},
+					aListener);
+				break;
+			default:
+				// TODO: This will happen when the sync to/from EWS has not yet happened.
+				if (this.debug) this.logInfo("WARNING: unknown CalendarItemType=" + aItem.calendarItemType);
 			}
 		}
 
 		if (isToDo(aItem)) {
 			if (this.debug) this.logInfo("deleteItem is calITask");
 			var self = this;
-			this.addToQueue( erDeleteItemRequest,
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 folderBase: this.folderBase,
-				 serverUrl: this.serverUrl,
-				 item: aItem,
-				 actionStart: Date.now(),
-				 folderID: this.folderID,
-				 changeKey: this.changeKey,
-				 itemType: "single"}, 
-				function(erDeleteItemRequest) { self.deleteItemOk(erDeleteItemRequest);}, 
-				function(erDeleteItemRequest, aCode, aMsg) { self.deleteItemError(erDeleteItemRequest, aCode, aMsg);},
+			this.addToQueue(erDeleteItemRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					item: aItem,
+					actionStart: Date.now(),
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					itemType: "single"
+				},
+				function (erDeleteItemRequest) {
+					self.deleteItemOk(erDeleteItemRequest);
+				},
+				function (erDeleteItemRequest, aCode, aMsg) {
+					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+				},
 				aListener);
 		}
 	},
 
 	//  calIOperation getItem(in string aId, in calIOperationListener aListener);
 	getItem: function _getItem(aId, aListener, aRetry) {
- 		if (this.debug) this.logInfo("getItem: aId:"+aId);
+		if (this.debug) this.logInfo("getItem: aId:" + aId);
 
 		if (!aListener)
 			return;
 
 		var item = null;
- 
-        for (var index in this.itemCacheById) {
-				if (this.itemCacheById[index]) {
-					if (this.itemCacheById[index].uid == aId) {
-						var item = this.itemCacheById[index];
-						break;
-					}
+
+		for (var index in this.itemCacheById) {
+			if (this.itemCacheById[index]) {
+				if (this.itemCacheById[index].uid == aId) {
+					var item = this.itemCacheById[index];
+					break;
 				}
-		 }
-		 
+			}
+		}
+
 
 		if (!item) {
 			var cachedRequest = null;
-      			for (var index in this.meetingCancelationsCache) {
+			for (var index in this.meetingCancelationsCache) {
 				if (this.meetingCancelationsCache[index]) {
 					if (this.meetingCancelationsCache[index].uid == aId) {
 						cachedRequest = this.meetingCancelationsCache[index];
@@ -2203,18 +2262,18 @@ calExchangeCalendar.prototype = {
 
 		}
 
-	/*	if (!item) {
-			for (var index in this.meetingRequestsCache) {
-				if (this.meetingRequestsCache[index]) {
-					if (this.meetingRequestsCache[index].uid == aId) {
-						if (this.debug) this.logInfo("getItem is in meetingRequestsCache");
-						if (this.debug) this.logInfo("  id="+index);
-						var item = this.meetingRequestsCache[index];
-						break;
+		/*	if (!item) {
+				for (var index in this.meetingRequestsCache) {
+					if (this.meetingRequestsCache[index]) {
+						if (this.meetingRequestsCache[index].uid == aId) {
+							if (this.debug) this.logInfo("getItem is in meetingRequestsCache");
+							if (this.debug) this.logInfo("  id="+index);
+							var item = this.meetingRequestsCache[index];
+							break;
+						}
 					}
-				}
-			}  
-		}*/
+				}  
+			}*/
 
 		if (!item) {
 			// Wait with an answer until next sync. This could be an iTIP request
@@ -2226,13 +2285,15 @@ calExchangeCalendar.prototype = {
 			// After next sync we can do this check again.
 			if (!aRetry) {
 				if (this.debug) this.logInfo("Not found putting it in ItemSyncQue");
-				this.getItemSyncQueue.push( { id: aId,
-							      listener: aListener } );
+				this.getItemSyncQueue.push({
+					id: aId,
+					listener: aListener
+				});
 				this.notifyOperationComplete(aListener,
-                        Cr.NS_OK,
-                        Ci.calIOperationListener.GET,
-                        aId,
-                        null);
+					Cr.NS_OK,
+					Ci.calIOperationListener.GET,
+					aId,
+					null);
 				this.refresh();
 				return;
 			}
@@ -2240,10 +2301,10 @@ calExchangeCalendar.prototype = {
 				if (this.debug) this.logInfo("getItem not FOUND");
 				// querying by id is a valid use case, even if no item is returned:
 				this.notifyOperationComplete(aListener,
-	                                         Cr.NS_OK,
-	                                         Ci.calIOperationListener.GET,
-	                                         aId,
-	                                         null);
+					Cr.NS_OK,
+					Ci.calIOperationListener.GET,
+					aId,
+					null);
 				return;
 			}
 		}
@@ -2255,26 +2316,26 @@ calExchangeCalendar.prototype = {
 			item_iid = Ci.calITodo;
 		else {
 			this.notifyOperationComplete(aListener,
-                                         Cr.NS_ERROR_FAILURE,
-                                         Ci.calIOperationListener.GET,
-                                         aId,
-                                         "Can't deduce item type based on QI");
+				Cr.NS_ERROR_FAILURE,
+				Ci.calIOperationListener.GET,
+				aId,
+				"Can't deduce item type based on QI");
 			this.notifyOperationComplete(aListener,
-                    Cr.NS_OK,
-                    Ci.calIOperationListener.GET,
-                    aId,
-                    null);
+				Cr.NS_OK,
+				Ci.calIOperationListener.GET,
+				aId,
+				null);
 			return;
 		}
 
-		if (this.debug) this.logInfo("Found item in cache with Status:"+item.getProperty("STATUS"));
-		
+		if (this.debug) this.logInfo("Found item in cache with Status:" + item.getProperty("STATUS"));
+
 		this.notifyOperationComplete(aListener,
-                                     Cr.NS_OK,
-                                     Ci.calIOperationListener.GET,
-                                     aId,
-                                     null);
-	 	/*
+			Cr.NS_OK,
+			Ci.calIOperationListener.GET,
+			aId,
+			null);
+		/*
 		aListener.onGetResult (this, 
 		                       Cr.NS_OK,
 		                       item_iid, null,
@@ -2288,48 +2349,47 @@ calExchangeCalendar.prototype = {
 
 		if (o === null)
 			return "null";
-	  //object, array, function, date, regexp, string, number, boolean, error
+		//object, array, function, date, regexp, string, number, boolean, error
 		var internalClass = Object.prototype.toString.call(o)
-		                                       .match(/\[object\s(\w+)\]/)[1];
+			.match(/\[object\s(\w+)\]/)[1];
 		return internalClass.toLowerCase();
 	},
 
 	//  calIOperation getItems(in unsigned long aItemFilter,
-        //                 in unsigned long aCount,
-        //                 in calIDateTime aRangeStart,
-        //                 in calIDateTime aRangeEndEx,
-        //                 in calIOperationListener aListener);
+	//                 in unsigned long aCount,
+	//                 in calIDateTime aRangeStart,
+	//                 in calIDateTime aRangeEndEx,
+	//                 in calIOperationListener aListener);
 	getItems: function _getItems(aItemFilter, aCount,
-                                    aRangeStart, aRangeEnd, aListener) 
-	{
-		if (this.debug) this.logInfo("getItems 0: " + "  aItemFilter, " + aItemFilter + "  aCount, " + aCount 
-                                   								 + " aRangeStart,  " + aRangeStart + " aRangeEnd, "+  aRangeEnd 
-                                   								 +  " aListener , " + aListener ); 
+		aRangeStart, aRangeEnd, aListener) {
+		if (this.debug) this.logInfo("getItems 0: " + "  aItemFilter, " + aItemFilter + "  aCount, " + aCount
+			+ " aRangeStart,  " + aRangeStart + " aRangeEnd, " + aRangeEnd
+			+ " aListener , " + aListener);
 
-	    //Start poller if not already runnning  this may resolve suspend issue
-		this.startCalendarPoller(); 
+		//Start poller if not already runnning  this may resolve suspend issue
+		this.startCalendarPoller();
 
-		if (aRangeStart)  { 
-			if (this.debug) this.logInfo("getItems 2: aRangeStart:"+aRangeStart.toString()); 
+		if (aRangeStart) {
+			if (this.debug) this.logInfo("getItems 2: aRangeStart:" + aRangeStart.toString());
 			//dump(", aRangeStart:"+aRangeStart.toString());
 		}
-		else { 
+		else {
 			if (this.debug) this.logInfo("getItems 2: aRangeStart:null");
 			//dump(", aRangeStart:null");
 		}
-		if (aRangeEnd) { 
-			if (this.debug) this.logInfo("getItems 3: aRangeEnd:"+aRangeEnd.toString()); 
+		if (aRangeEnd) {
+			if (this.debug) this.logInfo("getItems 3: aRangeEnd:" + aRangeEnd.toString());
 			//dump(", aRangeEnd:"+aRangeEnd.toString()); 
 		}
-		else { 
+		else {
 			if (this.debug) this.logInfo("getItems 3: aRangeEnd:null");
 			//dump(", aRangeEnd:null");
 		}
 		//dump("\n");
 
 		//dump(" typeString(aListener):"+this.typeString(aListener)+"\n");
-		if (this.typeString(aListener) == "object") { 
-			if (this.debug) this.logInfo("We received a getItems from repeatingInvitationsTimer function. Because this request if always for a full year it will consume a lot of memory when we have a lot of recurring events with no end date. So for now we only request the period we have in memory cache. startDate:"+this.startDate+", endDate:"+this.endDate);
+		if (this.typeString(aListener) == "object") {
+			if (this.debug) this.logInfo("We received a getItems from repeatingInvitationsTimer function. Because this request if always for a full year it will consume a lot of memory when we have a lot of recurring events with no end date. So for now we only request the period we have in memory cache. startDate:" + this.startDate + ", endDate:" + this.endDate);
 			//dump(this.globalFunctions.STACK(10)+"\n");
 			if (this.startDate) {
 				aRangeStart = this.startDate.clone();
@@ -2354,8 +2414,10 @@ calExchangeCalendar.prototype = {
 		//if (wantEvents) dump("Events are requested by calendar.\n");
 		//if (wantTodos) dump("Tasks are requested by calendar.\n");
 
-		if (wantEvents) if (this.debug) this.logInfo("Events are requested by calendar.");
-		if (wantTodos) if (this.debug) this.logInfo("Tasks are requested by calendar.");
+		if (wantEvents)
+			if (this.debug) this.logInfo("Events are requested by calendar.");
+		if (wantTodos)
+			if (this.debug) this.logInfo("Tasks are requested by calendar.");
 
 		if (this.newCalendar) {
 			if (this.debug) this.logInfo("We are still creating this calendar. Ignore getItems for now.");
@@ -2381,7 +2443,7 @@ calExchangeCalendar.prototype = {
 					}
 				}
 			}
-		
+
 			if (aRangeEnd) {
 				if (wantEvents) {
 					if (this.newCalRangeEndEvents) {
@@ -2404,24 +2466,26 @@ calExchangeCalendar.prototype = {
 					}
 				}
 			}
-		
+
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
-				      Cr.NS_OK,
-				      Ci.calIOperationListener.GET,
-				      null,
-				      null);
+					Cr.NS_OK,
+					Ci.calIOperationListener.GET,
+					null,
+					null);
 			}
 			return;
 		}
 
 		if (!this.firstSyncDone) {
 			//dump("!this.firstSyncDone\n");
-			this.getItemsSyncQueue.push({itemFilter: aItemFilter, 
-						count: aCount,
-                		rangeStart: aRangeStart, 
-						rangeEnd: aRangeEnd,
-						listener: aListener});
+			this.getItemsSyncQueue.push({
+				itemFilter: aItemFilter,
+				count: aCount,
+				rangeStart: aRangeStart,
+				rangeEnd: aRangeEnd,
+				listener: aListener
+			});
 			return;
 		}
 
@@ -2429,10 +2493,10 @@ calExchangeCalendar.prototype = {
 			//dump("!this.isInitialized\n");
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
-				      Cr.NS_OK,
-				      Ci.calIOperationListener.GET,
-				      null,
-				      null);
+					Cr.NS_OK,
+					Ci.calIOperationListener.GET,
+					null,
+					null);
 			}
 			return;
 		}
@@ -2445,10 +2509,10 @@ calExchangeCalendar.prototype = {
 		}
 
 		this.exporting = false;
-		if ((aItemFilter == Ci.calICalendar.ITEM_FILTER_ALL_ITEMS) &&
-		    (aCount == 0) &&
-		    (aRangeStart === null) &&
-		    (aRangeEnd === null)) {
+		if ((aItemFilter == Ci.calICalendar.ITEM_FILTER_ALL_ITEMS)
+			&& (aCount == 0)
+			&& (aRangeStart === null)
+			&& (aRangeEnd === null)) {
 			if (this.debug) this.logInfo("getItems: Request to get all Items in Calendar. Probably an export");
 			this.exporting = true;
 		}
@@ -2456,8 +2520,8 @@ calExchangeCalendar.prototype = {
 		var asOccurrences = ((aItemFilter & Ci.calICalendar
 			.ITEM_FILTER_CLASS_OCCURRENCES) != 0);
 
-		var wantInvitations =  ((aItemFilter & Ci.calICalendar
-	  		.ITEM_FILTER_REQUEST_NEEDS_ACTION) != 0);
+		var wantInvitations = ((aItemFilter & Ci.calICalendar
+			.ITEM_FILTER_REQUEST_NEEDS_ACTION) != 0);
 
 		if (!wantEvents && !wantInvitations && !wantTodos) {
 			this.notifyOperationComplete(aListener,
@@ -2467,7 +2531,8 @@ calExchangeCalendar.prototype = {
 			return;
 		}
 
-		if (wantInvitations) if (this.debug) this.logInfo("Invitations are requested by calendar.");
+		if (wantInvitations)
+			if (this.debug) this.logInfo("Invitations are requested by calendar.");
 
 		if ((!this.supportsEvents) && (!this.supportsTasks) && (!this.OnlyShowAvailability)) {
 			// Something requested we cannot fullfill.
@@ -2482,15 +2547,17 @@ calExchangeCalendar.prototype = {
 		var eventsRequestedAndPossible = (((wantEvents) && (this.supportsEvents)) || (this.OnlyShowAvailability));
 		var tasksRequestedAndPossible = ((wantTodos) && (this.supportsTasks));
 		if ((!eventsRequestedAndPossible) && (!tasksRequestedAndPossible)) {
-			if (this.debug) this.logInfo("This folder is not able to support requested items. this.OnlyShowAvailability:"+this.OnlyShowAvailability);
+			if (this.debug) this.logInfo("This folder is not able to support requested items. this.OnlyShowAvailability:" + this.OnlyShowAvailability);
 			this.notifyOperationComplete(aListener,
 				Cr.NS_OK,
 				Ci.calIOperationListener.GET,
 				null, null);
 			return;
 		}
-		if (eventsRequestedAndPossible) if (this.debug) this.logInfo("Events are requested and this is possible for this folder");
-		if (tasksRequestedAndPossible) if (this.debug) this.logInfo("Tasks are requested and this is possible for this folder");
+		if (eventsRequestedAndPossible)
+			if (this.debug) this.logInfo("Events are requested and this is possible for this folder");
+		if (tasksRequestedAndPossible)
+			if (this.debug) this.logInfo("Tasks are requested and this is possible for this folder");
 
 		if (!aRangeStart) {
 			/*if (this.startDate) {
@@ -2532,7 +2599,7 @@ calExchangeCalendar.prototype = {
 				aRangeEnd = this.endDate.clone();
 			}
 
-		} 
+		}
 
 		var dateChanged = false;
 		var startChanged = false;
@@ -2545,8 +2612,7 @@ calExchangeCalendar.prototype = {
 		var periodMatch = false;
 		var i = 0;
 		while ((!periodMatch) && (i < this.periods.length)) {
-			if (this.periods[i].startDate.compare(aRangeStart) > 0) {
-			}
+			if (this.periods[i].startDate.compare(aRangeStart) > 0) {}
 			i++;
 		}
 
@@ -2557,7 +2623,7 @@ calExchangeCalendar.prototype = {
 		}
 		else {
 			if (this.startDate.compare(aRangeStart) > 0) {
-				if (this.debug) this.logInfo("aRangeStart ("+aRangeStart.toString()+") is before current startDate ("+this.startDate.toString()+")");
+				if (this.debug) this.logInfo("aRangeStart (" + aRangeStart.toString() + ") is before current startDate (" + this.startDate.toString() + ")");
 				// New start date is before old startdate. Period has grown.
 				var oldStartDate = this.startDate.clone();
 				this.startDate = aRangeStart.clone();
@@ -2573,17 +2639,21 @@ calExchangeCalendar.prototype = {
 		}
 		else {
 			if (this.endDate.compare(aRangeEnd) < 0) {
-				if (this.debug) this.logInfo("aRangeEnd ("+aRangeEnd.toString()+") is after current endDate ("+this.endDate.toString()+")");
+				if (this.debug) this.logInfo("aRangeEnd (" + aRangeEnd.toString() + ") is after current endDate (" + this.endDate.toString() + ")");
 				// New end date is after old enddate. Period has grown.
 				var oldEndDate = this.endDate.clone();
 				this.endDate = aRangeEnd.clone();
 				dateChanged = true;
 				endChanged = true;
 			}
-		} 
-		
-		if (aRangeStart)  { if (this.debug) this.logInfo("getItems 5a: aRangeStart:"+aRangeStart.toString()); }
-		if (aRangeEnd) { if (this.debug) this.logInfo("getItems 5b: aRangeEnd:"+aRangeEnd.toString()); }
+		}
+
+		if (aRangeStart) {
+			if (this.debug) this.logInfo("getItems 5a: aRangeStart:" + aRangeStart.toString());
+		}
+		if (aRangeEnd) {
+			if (this.debug) this.logInfo("getItems 5b: aRangeEnd:" + aRangeEnd.toString());
+		}
 
 		if (!this.lastValidRangeStart) this.lastValidRangeStart = aRangeStart.clone();
 		if (!this.lastValidRangeEnd) this.lastValidRangeEnd = aRangeEnd.clone();
@@ -2624,7 +2694,7 @@ calExchangeCalendar.prototype = {
 				else {
 					startChanged = true;
 				}
-			} 
+			}
 
 			if ((this.offlineEndDate) && (aRangeEnd.compare(this.offlineEndDate) > 0)) {
 				if (this.debug) this.logInfo("RangeEnd is after offlineCache end.");
@@ -2641,12 +2711,12 @@ calExchangeCalendar.prototype = {
 				}
 			}
 
-		}  
-		
+		}
+
 		//Update calendar/task view 
 		this.getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, this.exporting);
 
- 		if (this.OnlyShowAvailability) {
+		if (this.OnlyShowAvailability) {
 			if ((startChanged) || (endChanged)) {
 				if (startChanged) {
 					this.getOnlyFreeBusyInformation(aRangeStart, oldStartDate);
@@ -2662,15 +2732,15 @@ calExchangeCalendar.prototype = {
 			return;
 		}
 
-/* We started the inbox poller again in the normal place
-		if ((this.syncInboxState) && (!this.weAreInboxSyncing)) {
-			if ((this.folderBase == "calendar") && (!this.folderID)) {
+		/* We started the inbox poller again in the normal place
+				if ((this.syncInboxState) && (!this.weAreInboxSyncing)) {
+					if ((this.folderBase == "calendar") && (!this.folderID)) {
 
-				// Start the inbox poller to check for meetinginvitations or cancelations.
-				this.checkInbox();
-			}
-		}
-*/ 
+						// Start the inbox poller to check for meetinginvitations or cancelations.
+						this.checkInbox();
+					}
+				}
+		*/
 		// 2013-11-19 Going to request getitems period from exchange.
 		if (!dateChanged) {
 			if (this.debug) this.logInfo("No dateChanged. Not going to request items from server.");
@@ -2681,11 +2751,11 @@ calExchangeCalendar.prototype = {
 			if (this.debug) this.logInfo("We are offline. Not going to request items from server.");
 			return;
 		}
- 
+
 		// 2013-11-19 Going to request getitems period from exchange.
-/*		if ((wantEvents) && (this.supportsEvents)) {
-			this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
-		}*/
+		/*		if ((wantEvents) && (this.supportsEvents)) {
+					this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
+				}*/
 
 		if ((wantEvents) && (this.supportsEvents)) {
 			if (this.debug) this.logInfo("Requesting events from exchange server.");
@@ -2709,45 +2779,54 @@ calExchangeCalendar.prototype = {
 				this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
 			}
 		}
-	
+
 		//Request server when calendar date changed  .
-		if ((wantTodos) && (this.supportsTasks) && (startChanged || endChanged )) {
+		if ((wantTodos) && (this.supportsTasks) && (startChanged || endChanged)) {
 			if (this.debug) this.logInfo("Requesting tasks from exchange server.");
-    			var self = this;
-    			this.addToQueue( erFindTaskItemsRequest, 
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 serverUrl: this.serverUrl,
-					 folderBase: this.folderBase,
-					 itemFilter: aItemFilter,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 actionStart: Date.now() }, 
-					function(erFindTaskItemsRequest, aIds) { self.findTaskItemsOK(erFindTaskItemsRequest, aIds);}, 
-					function(erFindTaskItemsRequest, aCode, aMsg) { self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);},
+			var self = this;
+			this.addToQueue(erFindTaskItemsRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					serverUrl: this.serverUrl,
+					folderBase: this.folderBase,
+					itemFilter: aItemFilter,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					actionStart: Date.now()
+				},
+				function (erFindTaskItemsRequest, aIds) {
+					self.findTaskItemsOK(erFindTaskItemsRequest, aIds);
+				},
+				function (erFindTaskItemsRequest, aCode, aMsg) {
+					self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);
+				},
+				null);
+
+			if (!this.deactivateTaskFollowup) {
+				if (this.debug) this.logInfo("Requesting followup tasks from exchange server.");
+				this.addToQueue(erFindFollowupItemsRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						serverUrl: this.serverUrl,
+						folderBase: "inbox",
+						itemFilter: aItemFilter,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						actionStart: Date.now()
+					},
+					function (erFindFollowupItemsRequest, aIds) {
+						self.findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds);
+					},
+					function (erFindFollowupItemsRequest, aCode, aMsg) {
+						self.findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg);
+					},
 					null);
-    	    		
-  	    	if	(!this.deactivateTaskFollowup) {
-  				if (this.debug) this.logInfo("Requesting followup tasks from exchange server."); 
-  	    		this.addToQueue( erFindFollowupItemsRequest, 
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 serverUrl: this.serverUrl,
-					 folderBase: "inbox",
-					 itemFilter: aItemFilter,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 actionStart: Date.now() }, 
-					function(erFindFollowupItemsRequest, aIds) { self.findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds);}, 
-					function(erFindFollowupItemsRequest, aCode, aMsg) { self.findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg);},
-					null); 
-  	    	}
-		} 
-    },
-
-	getItemsFromMemoryCache: function _getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, aExporting)
-	{
-		if (this.debug) this.logInfo("getItemsFromMemoryCache startDate:"+aRangeStart+", endDate:"+aRangeEnd+", aListener:"+aListener+", aExporting:"+aExporting);
+			}
+		}
+	},
+
+	getItemsFromMemoryCache: function _getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, aExporting) {
+		if (this.debug) this.logInfo("getItemsFromMemoryCache startDate:" + aRangeStart + ", endDate:" + aRangeEnd + ", aListener:" + aListener + ", aExporting:" + aExporting);
 		var events = [];
 		var tasks = [];
 
@@ -2768,7 +2847,9 @@ calExchangeCalendar.prototype = {
 			var doStop = false;
 			var ids = {};
 			while (!doStop) {
-				if ((startYear == endYear) && (startYearday == endYearday)) {doStop = true;}
+				if ((startYear == endYear) && (startYearday == endYearday)) {
+					doStop = true;
+				}
 
 				if ((this.itemCacheByStartDate) && (this.itemCacheByStartDate[startYear]) && (this.itemCacheByStartDate[startYear][startYearday])) {
 					for (var itemid in this.itemCacheByStartDate[startYear][startYearday]) {
@@ -2782,19 +2863,17 @@ calExchangeCalendar.prototype = {
 					startYearday = 1;
 				}
 			}
-	 
+
 			for (var itemid in ids) {
 				if (this.itemCacheById[itemid]) {
-					if (isEvent(this.itemCacheById[itemid])) {			 
-						if ( this.deleteCancelledInvitation && this.itemCacheById[itemid].isCancelled )  
-						{ 	 
-							events.push(this.itemCacheById[itemid]);  
+					if (isEvent(this.itemCacheById[itemid])) {
+						if (this.deleteCancelledInvitation && this.itemCacheById[itemid].isCancelled) {
+							events.push(this.itemCacheById[itemid]);
 							this.deleteItemCancelled(this.itemCacheById[itemid]);
-					 
+
 						}
-						else
-						{						
-							events.push(this.itemCacheById[itemid]); 
+						else {
+							events.push(this.itemCacheById[itemid]);
 						}
 					}
 				}
@@ -2803,76 +2882,75 @@ calExchangeCalendar.prototype = {
 		else {
 			if (wantTodos) {
 				for (var index in this.itemCacheById) {
-					if (isToDo(this.itemCacheById[index])) {  
-						if ((this.deactivateTaskFollowup) && (this.itemCacheById[index].itemClass == "IPM.Note")){  
+					if (isToDo(this.itemCacheById[index])) {
+						if ((this.deactivateTaskFollowup) && (this.itemCacheById[index].itemClass == "IPM.Note")) {
 							//Do not change order or removing from local or it will throw db error
 							//remove from offlinecache 
 							this.removeFromOfflineCache(this.itemCacheById[index]);
- 							//remove from lighting GUI  
-							this.removeItemFromCache(this.itemCacheById[index]); 
+							//remove from lighting GUI  
+							this.removeItemFromCache(this.itemCacheById[index]);
 						}
-						else	{						
-							if ( ((this.itemCacheById[index].isCompleted) && (aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_YES)) ||
-							     ((!this.itemCacheById[index].isCompleted) && (aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_NO)) ) {
+						else {
+							if (((this.itemCacheById[index].isCompleted) && (aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_YES))
+								|| ((!this.itemCacheById[index].isCompleted) && (aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_NO))) {
 								tasks.push(this.itemCacheById[index]);
 							}
 						}
 					}
 				}
 			}
-		} 
+		}
 
-		if (this.debug) this.logInfo("We got '"+events.length+"' events and  '"+tasks.length+"'  tasks from memory cache.");
+		if (this.debug) this.logInfo("We got '" + events.length + "' events and  '" + tasks.length + "'  tasks from memory cache.");
 		if (aListener) {
 			if (this.debug) this.logInfo("We have a listener so going to inform it.(2)");
 			if ((events.length > 0) && (wantEvents)) {
 				aListener.onGetResult(this,
-					     Cr.NS_OK,
-					     Ci.calIEvent,
-					     null,
-					     events.length,
-					     events);
+					Cr.NS_OK,
+					Ci.calIEvent,
+					null,
+					events.length,
+					events);
 			}
-			
+
 			if ((tasks.length > 0) && (wantTodos)) {
 				aListener.onGetResult(this,
-					     Cr.NS_OK,
-					     Ci.calITodo,
-					     null,
-					     tasks.length,
-					     tasks);
+					Cr.NS_OK,
+					Ci.calITodo,
+					null,
+					tasks.length,
+					tasks);
 			}
 
 			this.notifyOperationComplete(aListener,
-			Cr.NS_OK,
-			Ci.calIOperationListener.GET,
-			null, null);
-		}  
+				Cr.NS_OK,
+				Ci.calIOperationListener.GET,
+				null, null);
+		}
 	},
 
-	requestPeriod: function _requestPeriod(aStartDate, aEndDate, aItemFilter, aCount, findReverse, aUID)
-	{
-		if (this.debug) this.logInfo("Getting period from: "+aStartDate+" until "+aEndDate);
+	requestPeriod: function _requestPeriod(aStartDate, aEndDate, aItemFilter, aCount, findReverse, aUID) {
+		if (this.debug) this.logInfo("Getting period from: " + aStartDate + " until " + aEndDate);
 		//dump(this.name+": Getting period from: "+aStartDate+" until "+aEndDate+"\n");
 
-/*      		var self = this;
-		this.addToQueue( erFindCalendarItemsRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 serverUrl: this.serverUrl,
-			 count: aCount,
-			 rangeStart: aStartDate.clone(),
-			 rangeEnd: aEndDate.clone(),
-			 folderBase: this.folderBase,
-			 itemFilter: aItemFilter,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 actionStart: Date.now() }, 
-			function(erFindCalendarItemsRequest, aIds, aOccurrences) { self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);}, 
-			function(erFindCalendarItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);},
-			null);
+		/*      		var self = this;
+				this.addToQueue( erFindCalendarItemsRequest, 
+					{user: this.user, 
+					 mailbox: this.mailbox,
+					 serverUrl: this.serverUrl,
+					 count: aCount,
+					 rangeStart: aStartDate.clone(),
+					 rangeEnd: aEndDate.clone(),
+					 folderBase: this.folderBase,
+					 itemFilter: aItemFilter,
+					 folderID: this.folderID,
+					 changeKey: this.changeKey,
+					 actionStart: Date.now() }, 
+					function(erFindCalendarItemsRequest, aIds, aOccurrences) { self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);}, 
+					function(erFindCalendarItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);},
+					null);
 
-		return;*/
+				return;*/
 
 		if (findReverse) {
 			var endDate = aEndDate.clone();
@@ -2903,23 +2981,28 @@ calExchangeCalendar.prototype = {
 
 		while (!doStop) {
 			if (startDate.compare(endDate) != 0) {
-				if (this.debug) this.logInfo("Getting period part of: "+startDate.toString()+" until "+endDate.toString());
+				if (this.debug) this.logInfo("Getting period part of: " + startDate.toString() + " until " + endDate.toString());
 				//dump(this.name+": Getting period part of: "+startDate.toString()+" until "+endDate.toString()+"\n");
-				this.addToQueue( erFindCalendarItemsRequest, 
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 serverUrl: this.serverUrl,
-					 count: aCount,
-					 rangeStart: startDate.clone(),
-					 rangeEnd: endDate.clone(),
-					 folderBase: this.folderBase,
-					 itemFilter: aItemFilter,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 actionStart: Date.now(),
-					 uid: aUID }, 
-					function(erFindCalendarItemsRequest, aIds, aOccurrences) { self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);}, 
-					function(erFindCalendarItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);},
+				this.addToQueue(erFindCalendarItemsRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						serverUrl: this.serverUrl,
+						count: aCount,
+						rangeStart: startDate.clone(),
+						rangeEnd: endDate.clone(),
+						folderBase: this.folderBase,
+						itemFilter: aItemFilter,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						actionStart: Date.now(),
+						uid: aUID
+					},
+					function (erFindCalendarItemsRequest, aIds, aOccurrences) {
+						self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);
+					},
+					function (erFindCalendarItemsRequest, aCode, aMsg) {
+						self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);
+					},
 					null);
 			}
 
@@ -2949,7 +3032,7 @@ calExchangeCalendar.prototype = {
 			}
 			else {
 				doStop = true;
-			}			
+			}
 		}
 		if (this.debug) this.logInfo("Getting period done.");
 	},
@@ -2966,16 +3049,16 @@ calExchangeCalendar.prototype = {
 		if (((!this.syncState) && (!this.OnlyShowAvailability)) || (this.weAreSyncing)) {
 			if (this.weAreSyncing) {
 				if (this.debug) this.logInfo("weAreSyncing. So no refresh.");
-			}	
-	
-	
-	
+			}
+
+
+
 			else {
 				if (this.debug) this.logInfo("No syncState yet. So no refresh.");
 			}
 			return;
-		} 
-	
+		}
+
 		if (this.isOffline) {
 			if (this.debug) this.logInfo("We are offline. So no refresh.");
 			return;
@@ -2985,19 +3068,19 @@ calExchangeCalendar.prototype = {
 			if (this.debug) this.logInfo("We are disabled. So no refresh.");
 			return;
 		}
-		
-		if (!this.isInitialized) {	
+
+		if (!this.isInitialized) {
 			if (this.debug) this.logInfo("Not initialized yet. So no refresh.");
 			return;
-		} 
+		}
 
 		//if (this.debug) this.logInfo("Refresh. We start a sync.");
 		//var self = this;
 
 		if (this.OnlyShowAvailability) {
-			if (!this.lastValidRangeStart) this.lastValidRangeStart = aRangeStart.clone(); 
+			if (!this.lastValidRangeStart) this.lastValidRangeStart = aRangeStart.clone();
 			this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
-		}		
+		}
 		else {
 			this.getSyncState();
 		}
@@ -3007,51 +3090,45 @@ calExchangeCalendar.prototype = {
 	},
 
 	//  void startBatch();
-	startBatch: function _startBatch()
-	{
+	startBatch: function _startBatch() {
 		dump("Start batch\n");
 	},
 
 	//  void endBatch();
-	endBatch: function _endBatch()
-	{
+	endBatch: function _endBatch() {
 		dump("End batch\n");
 	},
 
-// End calICalendar
+	// End calICalendar
 
-// Begin calISchedulingSupport
+	// Begin calISchedulingSupport
 	//  boolean isInvitation(in calIItemBase aItem);
-	isInvitation: function _isInvitation(aItem, ignoreStatus)
-	{
+	isInvitation: function _isInvitation(aItem, ignoreStatus) {
 		try {
 			var exchangeItem = aItem.QueryInterface(Ci.mivExchangeEvent);
 
 			if (exchangeItem) {
 				if (aItem.canModify) {
-//dump("X-exchangeITIP1:"+aItem.getProperty("X-exchangeITIP1")+"\n");
-//dump("X-exchangeITIP2:"+aItem.getProperty("X-exchangeITIP2")+"\n");
+					//dump("X-exchangeITIP1:"+aItem.getProperty("X-exchangeITIP1")+"\n");
+					//dump("X-exchangeITIP2:"+aItem.getProperty("X-exchangeITIP2")+"\n");
 					return aItem.isInvitation;
 				}
 			}
 		}
-		catch(err){
-		}
+		catch (err) {}
 
 		return false;
 	},
 
 	// boolean canNotify(in AUTF8String aMethod, in calIItemBase aItem);
-	canNotify: function _canNotify(aMethod, aItem)
-	{
-		if (this.debug) this.logInfo("canNotify: aMethod="+aMethod+":"+aItem.title);
+	canNotify: function _canNotify(aMethod, aItem) {
+		if (this.debug) this.logInfo("canNotify: aMethod=" + aMethod + ":" + aItem.title);
 
 		return true;
 	},
 
 	// calIAttendee getInvitedAttendee(in calIItemBase aItem);
-	getInvitedAttendee: function _getInvitedAttendee(aItem)
-	{
+	getInvitedAttendee: function _getInvitedAttendee(aItem) {
 		//if (this.debug) this.logInfo("getInvitedAttendee 1:"+aItem.title);
 		if (!aItem) {
 			return;
@@ -3059,23 +3136,23 @@ calExchangeCalendar.prototype = {
 
 		// Parse through the attendees
 		var attendees = aItem.getAttendees({});
-		for each (var attendee in attendees) {
-			if (this.debug) this.logInfo("getInvitedAttendee 2:"+attendee.id);
-			if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) ||
-				(attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase()) ) {
-				if (this.debug) this.logInfo("getInvitedAttendee FOUND myself:"+aItem.title+", attendee.participationStatus:"+attendee.participationStatus+", aItem.myResponseType:"+aItem.myResponseType);
-//				attendee.participationStatus = participationMap[aItem.myResponseType];
+		for each(var attendee in attendees) {
+			if (this.debug) this.logInfo("getInvitedAttendee 2:" + attendee.id);
+			if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase())
+				|| (attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase())) {
+				if (this.debug) this.logInfo("getInvitedAttendee FOUND myself:" + aItem.title + ", attendee.participationStatus:" + attendee.participationStatus + ", aItem.myResponseType:" + aItem.myResponseType);
+				//				attendee.participationStatus = participationMap[aItem.myResponseType];
 				return attendee; //.clone();
 			}
 			else {
-				if (this.debug) this.logInfo("getInvitedAttendee FOUND someonelse:"+aItem.title+", attendee.id:"+attendee.id+", attendee.participationStatus:"+attendee.participationStatus);
+				if (this.debug) this.logInfo("getInvitedAttendee FOUND someonelse:" + aItem.title + ", attendee.id:" + attendee.id + ", attendee.participationStatus:" + attendee.participationStatus);
 			}
 		}
 
 		if (aItem.isInvitation) {
 			if (this.debug) this.logInfo("getInvitedAttendee  X-IsInvitation = true");
 			var tmpAttendee = cal.createAttendee();
-			tmpAttendee.id = "mailto:"+this.mailbox;
+			tmpAttendee.id = "mailto:" + this.mailbox;
 			tmpAttendee.commonName = this.userDisplayName;
 			tmpAttendee.rsvp = "FALSE";
 			tmpAttendee.userType = "INDIVIDUAL";
@@ -3083,26 +3160,25 @@ calExchangeCalendar.prototype = {
 			tmpAttendee.participationStatus = aItem.participationStatus;
 			return tmpAttendee;
 		}
-		
+
 		//dump("Did not find an attendee.!\n");
 
 	},
-// End calISchedulingSupport
+	// End calISchedulingSupport
 
-// Begin calIFreeBusyProvider
+	// Begin calIFreeBusyProvider
 	//    calIOperation getFreeBusyIntervals(in AUTF8String aCalId,
-        //                               in calIDateTime aRangeStart,
-        //                               in calIDateTime aRangeEnd,
-        //                               in unsigned long aBusyTypes,
-        //                               in calIGenericOperationListener aListener);
+	//                               in calIDateTime aRangeStart,
+	//                               in calIDateTime aRangeEnd,
+	//                               in unsigned long aBusyTypes,
+	//                               in calIGenericOperationListener aListener);
 
-	getFreeBusyIntervals: function(aCalId, aRangeStart, aRangeEnd,
-				       aBusyTypes, aListener)
-	{
-		if (this.debug) this.logInfo("getFreeBusyIntervals: " + aCalId + ", aBusyTypes:"+aBusyTypes+", aRangeStart:"+aRangeStart+", aRangeEnd:"+aRangeEnd);
+	getFreeBusyIntervals: function (aCalId, aRangeStart, aRangeEnd,
+		aBusyTypes, aListener) {
+		if (this.debug) this.logInfo("getFreeBusyIntervals: " + aCalId + ", aBusyTypes:" + aBusyTypes + ", aRangeStart:" + aRangeStart + ", aRangeEnd:" + aRangeEnd);
 
 		if (aCalId.indexOf("@") < 0 || aCalId.indexOf(".") < 0) {
-            		// No valid email, screw it
+			// No valid email, screw it
 			if (aListener) {
 				aListener.onResult(null, null);
 			}
@@ -3115,74 +3191,74 @@ calExchangeCalendar.prototype = {
 		tmpEndDate.isDate = false;
 
 		var self = this;
-		this.addToQueue( erGetUserAvailabilityRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 email: aCalId.replace(/^mailto:/i, ""),
-			 attendeeType: 'Required',
-			 start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
-			 end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
-			 calId: aCalId,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey }, 
-			function(erGetUserAvailabilityRequest, aEvents) { self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);}, 
-			function(erGetUserAvailabilityRequest, aCode, aMsg) { self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);},
+		this.addToQueue(erGetUserAvailabilityRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: this.folderBase,
+				serverUrl: this.serverUrl,
+				email: aCalId.replace(/^mailto:/i, ""),
+				attendeeType: 'Required',
+				start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
+				end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
+				calId: aCalId,
+				folderID: this.folderID,
+				changeKey: this.changeKey
+			},
+			function (erGetUserAvailabilityRequest, aEvents) {
+				self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);
+			},
+			function (erGetUserAvailabilityRequest, aCode, aMsg) {
+				self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);
+			},
 			aListener);
 
 	},
-// End calIFreeBusyProvider
+	// End calIFreeBusyProvider
 
-// Begin calIItipTransport
+	// Begin calIItipTransport
 	//    readonly attribute AUTF8String scheme;
-	get scheme()
-	{
+	get scheme() {
 		if (this.debug) this.logInfo("get scheme");
 		return "";
 	},
 
 	//    attribute AUTF8String senderAddress;
-	get senderAddress()
-	{
+	get senderAddress() {
 		if (this.debug) this.logInfo("get senderAddress");
 		return "hihi";
 	},
 
-	set senderAddress(aValue)
-	{
-		if (this.debug) this.logInfo("set senderAddress("+aValue+")");
+	set senderAddress(aValue) {
+		if (this.debug) this.logInfo("set senderAddress(" + aValue + ")");
 	},
 
 	//    readonly attribute AUTF8String type;
 	//* IS DEFINED EARLIER AS PART OF calICalendar
 
-    /**
-     * Sends a calIItipItem to the recipients using the specified title and
-     * alternative representation. If a calIItipItem is attached, then an ICS
-     * representation of those objects are generated and attached to the email.
-     * If the calIItipItem is null, then the item(s) is sent without any
-     * text/calendar mime part.
-     * @param count             size of recipient array
-     * @param recipientArray    array of recipients
-     * @param calIItipItem      set of calIItems encapsulated as calIItipItems
-     */
+	/**
+	 * Sends a calIItipItem to the recipients using the specified title and
+	 * alternative representation. If a calIItipItem is attached, then an ICS
+	 * representation of those objects are generated and attached to the email.
+	 * If the calIItipItem is null, then the item(s) is sent without any
+	 * text/calendar mime part.
+	 * @param count             size of recipient array
+	 * @param recipientArray    array of recipients
+	 * @param calIItipItem      set of calIItems encapsulated as calIItipItems
+	 */
 	//    void sendItems(in PRUint32 count,
 	//                   [array, size_is(count)] in calIAttendee recipientArray,
 	//                   in calIItipItem item);
-	sendItems: function _sendItems(count, recipientArray, item)
-	{
+	sendItems: function _sendItems(count, recipientArray, item) {
 		if (this.debug) this.logInfo("sendItems");
 	},
-// End calIItipTransport
+	// End calIItipTransport
 
-	isRemoved: function _isRemoved(aItem)
-	{
+	isRemoved: function _isRemoved(aItem) {
 		if (!aItem) {
 			return null;
 		}
 
-		if (this.debug) this.logInfo("isRemoved title:"+aItem.title+", status="+aItem.status);
+		if (this.debug) this.logInfo("isRemoved title:" + aItem.title + ", status=" + aItem.status);
 
 		if (aItem.status == "") {
 			return true;
@@ -3191,27 +3267,25 @@ calExchangeCalendar.prototype = {
 		return false;
 	},
 
-	getExceptions: function _getExceptions(aRecurrenceItems)
-	{
+	getExceptions: function _getExceptions(aRecurrenceItems) {
 		var tmpCount = 0;
 		var exceptions = {};
 		for each(var recurrenceItem in aRecurrenceItems) {
 			tmpCount++;
-			if (this.debug) this.logInfo("getExceptions: nr:"+tmpCount+", isNegative:"+recurrenceItem.isNegative);
+			if (this.debug) this.logInfo("getExceptions: nr:" + tmpCount + ", isNegative:" + recurrenceItem.isNegative);
 			if (recurrenceItem.isNegative) {
 				// A deletion is an exception and therefore isNegative === true
-				var occurrences = recurrenceItem.getOccurrences(this.startDate, this.startDate, this.endDate, 0,  {});
-				if (this.debug) this.logInfo("getExceptions: we have occurrences.length="+occurrences.length);
+				var occurrences = recurrenceItem.getOccurrences(this.startDate, this.startDate, this.endDate, 0, {});
+				if (this.debug) this.logInfo("getExceptions: we have occurrences.length=" + occurrences.length);
 				for each(var occurrence in occurrences) {
 					exceptions[occurrence.toString()] = occurrence;
-				}				
+				}
 			}
 		}
 		return exceptions;
 	},
 
-	getRemovedOccurrence: function _getRemovedOccurrence(aOldItem, aNewItem)
-	{
+	getRemovedOccurrence: function _getRemovedOccurrence(aOldItem, aNewItem) {
 		if (this.debug) this.logInfo("getRemovedOccurrence");
 
 		// We first check if an occurrence was removed.
@@ -3221,8 +3295,8 @@ calExchangeCalendar.prototype = {
 		var newCount = {};
 		var newOccurrences = aNewItem.getOccurrences(newCount);
 
-		if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value="+oldCount.value);
-		if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value="+newCount.value);
+		if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value=" + oldCount.value);
+		if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value=" + newCount.value);
 		if (newCount.value > oldCount.value) {
 			if (this.debug) this.logInfo("getRemovedOccurrence: We have less occurrences than before.");
 
@@ -3235,7 +3309,7 @@ calExchangeCalendar.prototype = {
 					}
 				}
 				if (foundOld == false) {
-					if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed occurrence: startdate:"+newOccurrence.startDate.toString());
+					if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed occurrence: startdate:" + newOccurrence.startDate.toString());
 					return newOccurrence;
 				}
 			}
@@ -3248,8 +3322,8 @@ calExchangeCalendar.prototype = {
 		var newCount = {};
 		var newExceptions = aNewItem.getExceptions(newCount);
 
-		if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value="+oldCount.value);
-		if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value="+newCount.value);
+		if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value=" + oldCount.value);
+		if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value=" + newCount.value);
 
 		if (newCount.value > oldCount.value) {
 			if (this.debug) this.logInfo("getRemovedOccurrence: We have less exceptions than before.");
@@ -3263,7 +3337,7 @@ calExchangeCalendar.prototype = {
 					}
 				}
 				if (foundOld == false) {
-					if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed exception: startdate:"+newException.startDate.toString());
+					if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed exception: startdate:" + newException.startDate.toString());
 					return newException;
 				}
 			}
@@ -3273,18 +3347,15 @@ calExchangeCalendar.prototype = {
 		return null;
 	},
 
-	get prefs()
-	{
+	get prefs() {
 		return this.mPrefs;
 	},
 
-	get exchangePrefVersion()
-	{
-		return this.globalFunctions.safeGetIntPref( this.prefs, "exchangePrefVersion", 0);
+	get exchangePrefVersion() {
+		return this.globalFunctions.safeGetIntPref(this.prefs, "exchangePrefVersion", 0);
 	},
 
-	get isInitialized()
-	{
+	get isInitialized() {
 		if (!this.id) {
 			return false;
 		}
@@ -3299,31 +3370,31 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (this.firstrun) {
-			this.firstrun = false; 
-			
+			this.firstrun = false;
+
 			//Add Prvider for busy free information for  invite attendees etc.
 			getFreeBusyService().addProvider(this);
-			
+
 			// The first thing we want to do is check the folderbase and folderpath for their id & changekey.
 			// It might have changed between restarts.
 			this.checkFolderPath();
- 		 
-/* Disabled as on startup we do not wish to use old syncstate until we get some offline caching implemented for this (2013-12-20)
-			this.syncInboxState = this.globalFunctions.safeGetCharPref(this.prefs,"syncInboxState", "");
-			if (this.syncInboxState != "") {
-				this.saveToFile("syncInboxState.txt", this.syncInboxState);
-				this.prefs.deleteBranch("syncInboxState");
-			}
-*/ 
+
+			/* Disabled as on startup we do not wish to use old syncstate until we get some offline caching implemented for this (2013-12-20)
+						this.syncInboxState = this.globalFunctions.safeGetCharPref(this.prefs,"syncInboxState", "");
+						if (this.syncInboxState != "") {
+							this.saveToFile("syncInboxState.txt", this.syncInboxState);
+							this.prefs.deleteBranch("syncInboxState");
+						}
+			*/
 			if (this.useOfflineCache) {
-  					this.syncStateInbox = this.loadFromFile("syncStateInbox.txt"); 
-  					this.prefs.deleteBranch("syncStateInbox");
+				this.syncStateInbox = this.loadFromFile("syncStateInbox.txt");
+				this.prefs.deleteBranch("syncStateInbox");
 
- 					this.syncState = this.loadFromFile("syncState.txt"); 
- 					this.prefs.deleteBranch("syncState");  
+				this.syncState = this.loadFromFile("syncState.txt");
+				this.prefs.deleteBranch("syncState");
 			}
-			
-//			this.syncInboxState = this.loadFromFile("syncInboxState.txt");
+
+			//			this.syncInboxState = this.loadFromFile("syncInboxState.txt");
 
 			this.getSyncState();
 
@@ -3339,26 +3410,26 @@ calExchangeCalendar.prototype = {
 			}
 
 			//dump(this.name+": Going to load testdata ("+this.id+")\n");
-//			var testData = this.loadFromFile("testitem");
-//			if (testData) {
-//				var testJSON = xml2json.newJSON();
-//				xml2json.parseXML(testJSON, testData);
-//				var tmpItems = [testJSON[telements][0]];
-//try{
-//				this.updateCalendar(null, tmpItems, true, false);
-//}catch(err){dump(this.name+": Testdata error:"+err+"\n");}
-//				dump("Loaded testdata\n");
-//			}
+			//			var testData = this.loadFromFile("testitem");
+			//			if (testData) {
+			//				var testJSON = xml2json.newJSON();
+			//				xml2json.parseXML(testJSON, testData);
+			//				var tmpItems = [testJSON[telements][0]];
+			//try{
+			//				this.updateCalendar(null, tmpItems, true, false);
+			//}catch(err){dump(this.name+": Testdata error:"+err+"\n");}
+			//				dump("Loaded testdata\n");
+			//			}
 		}
 		return true;
 
 	},
 
-	getCharPref: function(aName) {
+	getCharPref: function (aName) {
 		return this.globalFunctions.safeGetCharPref(this.prefs, aName, null);
 	},
 
-	setCharPref: function(aName, aValue) {
+	setCharPref: function (aName, aValue) {
 		if (this.prefs) {
 			return this.prefs.setCharPref(aName, aValue);
 		}
@@ -3374,15 +3445,15 @@ calExchangeCalendar.prototype = {
 				return this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
 			}
 			else {
-				return this.domain+"\\"+this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
+				return this.domain + "\\" + this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
 			}
 		}
 	},
 
 	set user(value) {
 		if ((value.indexOf("\\") > -1) && (value.indexOf("@") == -1)) {
-			this.domain = value.substr(0,value.indexOf("\\"));
-			this.setCharPref("ecUser", value.substr(value.indexOf("\\")+1));
+			this.domain = value.substr(0, value.indexOf("\\"));
+			this.setCharPref("ecUser", value.substr(value.indexOf("\\") + 1));
 		}
 		else {
 			this.setCharPref("ecUser", value);
@@ -3437,8 +3508,7 @@ calExchangeCalendar.prototype = {
 		return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderIDOfShare", "");
 	},
 
-	get isPublicFolder()
-	{
+	get isPublicFolder() {
 		if (publicFoldersMap[this.folderBase]) {
 			return true;
 		}
@@ -3500,34 +3570,32 @@ calExchangeCalendar.prototype = {
 		var tmpDur = cal.createDuration();
 		tmpDur.hours = -1 * 24 * this.cacheStartupBefore;
 		aDate.addDuration(tmpDur);
-		if (this.debug) this.logInfo("startCacheDate:"+aDate.toString());
+		if (this.debug) this.logInfo("startCacheDate:" + aDate.toString());
 		return aDate
 	},
 
-	get endCacheDate() 
-	{
+	get endCacheDate() {
 		var aDate = cal.now();
 		var tmpDur = cal.createDuration();
 		tmpDur.hours = 1 * 24 * this.cacheStartupAfter;
 		aDate.addDuration(tmpDur);
-		if (this.debug) this.logInfo("endCacheDate:"+aDate.toString());
+		if (this.debug) this.logInfo("endCacheDate:" + aDate.toString());
 		return aDate
 	},
-	
+
 	get deleteCancelledInvitation() {
 		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingdeletecancelleditems", true);
 	},
-	
+
 	get deactivateTaskFollowup() {
 		return this.globalFunctions.safeGetBoolPref(this.prefs, "followup.task.deactivate", false);
 	},
-	
+
 	get markEventasTentative() {
 		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingmarkeventtentative", false);
 	},
 
-	checkInbox: function _checkInbox()
-	{
+	checkInbox: function _checkInbox() {
 		if (this.debug) this.logInfo("checkInbox 1.");
 
 		if (this.isOffline) return;
@@ -3540,22 +3608,26 @@ calExchangeCalendar.prototype = {
 		var self = this;
 
 		//if (this.debug) this.logInfo("checkInbox 2.");
-		this.addToQueue( erSyncInboxRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 serverUrl: this.serverUrl,
-			 folderBase: 'inbox',
-			 folderID: null,
-			 changeKey: null,
-			 syncState: this.syncInboxState,
-			 actionStart: Date.now() }, 
-			function(erSyncInboxRequest, creations, updates, deletions, syncState) { self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);}, 
-			function(erSyncInboxRequest, aCode, aMsg) { self.syncInboxError(erSyncInboxRequest, aCode, aMsg);},
+		this.addToQueue(erSyncInboxRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				serverUrl: this.serverUrl,
+				folderBase: 'inbox',
+				folderID: null,
+				changeKey: null,
+				syncState: this.syncInboxState,
+				actionStart: Date.now()
+			},
+			function (erSyncInboxRequest, creations, updates, deletions, syncState) {
+				self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);
+			},
+			function (erSyncInboxRequest, aCode, aMsg) {
+				self.syncInboxError(erSyncInboxRequest, aCode, aMsg);
+			},
 			null);
 	},
 
-	syncInbox: function _syncInbox()
-	{
+	syncInbox: function _syncInbox() {
 		if (this.debug) this.logInfo("syncInbox 1.");
 
 		if (this.isOffline) return;
@@ -3576,78 +3648,88 @@ calExchangeCalendar.prototype = {
 		this.weAreInboxSyncing = true;
 
 		//if (this.debug) this.logInfo("syncInbox 2.");
-		this.addToQueue( erSyncInboxRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 serverUrl: this.serverUrl,
-			 folderBase: 'inbox',
-			 folderID: null,
-			 changeKey: null,
-			 syncState: this.syncInboxState,
-			 actionStart: Date.now() }, 
-			function(erSyncInboxRequest, creations, updates, deletions, syncState) { self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);}, 
-			function(erSyncInboxRequest, aCode, aMsg) { self.syncInboxError(erSyncInboxRequest, aCode, aMsg);},
+		this.addToQueue(erSyncInboxRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				serverUrl: this.serverUrl,
+				folderBase: 'inbox',
+				folderID: null,
+				changeKey: null,
+				syncState: this.syncInboxState,
+				actionStart: Date.now()
+			},
+			function (erSyncInboxRequest, creations, updates, deletions, syncState) {
+				self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);
+			},
+			function (erSyncInboxRequest, aCode, aMsg) {
+				self.syncInboxError(erSyncInboxRequest, aCode, aMsg);
+			},
 			null);
 	},
 
-	removeMeetingItem: function _removeMeetingItem(aRequestItem)
-	{
+	removeMeetingItem: function _removeMeetingItem(aRequestItem) {
 		var self = this;
 
-		if (this.debug) this.logInfo("Going to remove meetingItem:"+aRequestItem.title);
-		this.addToQueue( erDeleteItemRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: 'inbox',
-			 serverUrl: this.serverUrl,
-			 item: null,
-			 folderID: null,
-			 id: aRequestItem.id,
-			 changeKey: aRequestItem.changeKey,
-			 itemType: "meeting"}, 
-			function(erDeleteItemRequest) { self.removeMeetingItemOk(erDeleteItemRequest);}, 
-			function(erDeleteItemRequest, aCode, aMsg) { self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);},
+		if (this.debug) this.logInfo("Going to remove meetingItem:" + aRequestItem.title);
+		this.addToQueue(erDeleteItemRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: 'inbox',
+				serverUrl: this.serverUrl,
+				item: null,
+				folderID: null,
+				id: aRequestItem.id,
+				changeKey: aRequestItem.changeKey,
+				itemType: "meeting"
+			},
+			function (erDeleteItemRequest) {
+				self.removeMeetingItemOk(erDeleteItemRequest);
+			},
+			function (erDeleteItemRequest, aCode, aMsg) {
+				self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);
+			},
 			null);
 	},
 
-	removeResponseItem: function _removeResponseItem(aResponse)
-	{
+	removeResponseItem: function _removeResponseItem(aResponse) {
 		var self = this;
 
-//		if (this.debug) this.logInfo("Going to remove responseItem:"+xml2json.getAttributeByTag(aResponse, "t:Subject")+" from:"+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:Name")+" ("+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:EmailAddress")+")");
-		if (this.debug) this.logInfo("Going to remove responseItem:"+xml2json.getAttributeByTag(aResponse, "t:Subject"));
-		this.addToQueue( erDeleteItemRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: 'inbox',
-			 serverUrl: this.serverUrl,
-			 item: null,
-			 folderID: null,
-			 id: xml2json.getAttributeByTag(aResponse, "t:ItemId", "Id"),
-			 changeKey: xml2json.getAttributeByTag(aResponse, "t:ItemId", "ChangeKey"),
-			 itemType: "response"}, 
-			function(erDeleteItemRequest) { self.removeMeetingItemOk(erDeleteItemRequest);}, 
-			function(erDeleteItemRequest, aCode, aMsg) { self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);},
+		//		if (this.debug) this.logInfo("Going to remove responseItem:"+xml2json.getAttributeByTag(aResponse, "t:Subject")+" from:"+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:Name")+" ("+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:EmailAddress")+")");
+		if (this.debug) this.logInfo("Going to remove responseItem:" + xml2json.getAttributeByTag(aResponse, "t:Subject"));
+		this.addToQueue(erDeleteItemRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: 'inbox',
+				serverUrl: this.serverUrl,
+				item: null,
+				folderID: null,
+				id: xml2json.getAttributeByTag(aResponse, "t:ItemId", "Id"),
+				changeKey: xml2json.getAttributeByTag(aResponse, "t:ItemId", "ChangeKey"),
+				itemType: "response"
+			},
+			function (erDeleteItemRequest) {
+				self.removeMeetingItemOk(erDeleteItemRequest);
+			},
+			function (erDeleteItemRequest, aCode, aMsg) {
+				self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);
+			},
 			null);
 	},
 
-	removeMeetingItemOk: function _removeMeetingItemOk(erDeleteItemRequest)
-	{
+	removeMeetingItemOk: function _removeMeetingItemOk(erDeleteItemRequest) {
 		this.notConnected = false;
 		this.saveCredentials(erDeleteItemRequest.argument);
-		if (this.debug) this.logInfo("removeItemOk: "+erDeleteItemRequest.argument.itemType);
+		if (this.debug) this.logInfo("removeItemOk: " + erDeleteItemRequest.argument.itemType);
 
 	},
 
-	removeMeetingItemError: function _removeMeetingItemError(erDeleteItemRequest, aCode, aMsg)
-	{
+	removeMeetingItemError: function _removeMeetingItemError(erDeleteItemRequest, aCode, aMsg) {
 		this.saveCredentials(erDeleteItemRequest.argument);
 		this.notConnected = true;
-		if (this.debug) this.logInfo("removeItemError: "+erDeleteItemRequest.argument.itemType+" msg:"+String(aMsg));
+		if (this.debug) this.logInfo("removeItemError: " + erDeleteItemRequest.argument.itemType + " msg:" + String(aMsg));
 	},
 
-	syncInboxOK: function _syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState)
-	{
+	syncInboxOK: function _syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState) {
 		if (this.debug) this.logInfo("syncInboxOk.");
 		this.notConnected = false;
 		this.saveCredentials(erSyncFolderItemsRequest.argument);
@@ -3676,9 +3758,9 @@ calExchangeCalendar.prototype = {
 		//this.prefs.setCharPref("syncInboxState", syncState);
 		this.saveToFile("syncInboxState.txt", syncState);
 
-		if ((creations.meetingrequests.length == 0) && (updates.meetingrequests.length == 0) && (deletions.meetingrequests.length == 0) && 
-			(creations.meetingCancellations.length == 0) && (updates.meetingCancellations.length == 0) && (deletions.meetingCancellations.length == 0) && 
-			(creations.meetingResponses.length == 0) && (updates.meetingResponses.length == 0) && (deletions.meetingResponses.length == 0)) {
+		if ((creations.meetingrequests.length == 0) && (updates.meetingrequests.length == 0) && (deletions.meetingrequests.length == 0)
+			&& (creations.meetingCancellations.length == 0) && (updates.meetingCancellations.length == 0) && (deletions.meetingCancellations.length == 0)
+			&& (creations.meetingResponses.length == 0) && (updates.meetingResponses.length == 0) && (deletions.meetingResponses.length == 0)) {
 			if (this.debug) this.logInfo("syncInboxOk: No new, changed or deleted meetingrequests, meetingCancellations and meetingresponses.");
 			this.weAreInboxSyncing = false;
 			this.startSyncInboxPoller();
@@ -3687,15 +3769,15 @@ calExchangeCalendar.prototype = {
 		}
 
 		// Do something with the results.
-//		if (this.debug) this.logInfo("syncInboxOK meetingrequests: Creation:"+creations.meetingrequests.length+", Updates:"+updates.meetingrequests.length+", Deletions:"+deletions.meetingrequests.length);
-//		if (this.debug) this.logInfo("syncInboxOK meetingCancellations: Creation:"+creations.meetingCancellations.length+", Updates:"+updates.meetingCancellations.length+", Deletions:"+deletions.meetingCancellations.length);
+		//		if (this.debug) this.logInfo("syncInboxOK meetingrequests: Creation:"+creations.meetingrequests.length+", Updates:"+updates.meetingrequests.length+", Deletions:"+deletions.meetingrequests.length);
+		//		if (this.debug) this.logInfo("syncInboxOK meetingCancellations: Creation:"+creations.meetingCancellations.length+", Updates:"+updates.meetingCancellations.length+", Deletions:"+deletions.meetingCancellations.length);
 
 		// Save requests into cache.
 		if (creations.meetingrequests.length > 0) {
-			for each (var request in creations.meetingrequests) {
+			for each(var request in creations.meetingrequests) {
 				var meetingItem = this.convertExchangeAppointmentToCalAppointment(request, true);
 				if (meetingItem) {
-					if (this.debug) this.logInfo(" -- MeetingRequest creation:"+ meetingItem.title+", UID:"+meetingItem.uid+",id:"+meetingItem.id+",changeKey:"+meetingItem.changeKey);
+					if (this.debug) this.logInfo(" -- MeetingRequest creation:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
 					meetingItem.setProperty("X-MEETINGREQUEST", true);
 					meetingItem.setProperty("STATUS", "NONE")
 					//this.meetingRequestsCache[request.getTagValue("t:UID")] = meetingItem;
@@ -3705,15 +3787,15 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (updates.meetingrequests.length > 0) {
-			for each (var update in updates.meetingrequests) {
+			for each(var update in updates.meetingrequests) {
 				var meetingItem = this.convertExchangeAppointmentToCalAppointment(update, true);
 				if (meetingItem) {
-					if (this.debug) this.logInfo(" -- MeetingRequest update:"+ meetingItem.title+", UID:"+meetingItem.uid+",id:"+meetingItem.id+",changeKey:"+meetingItem.changeKey);
+					if (this.debug) this.logInfo(" -- MeetingRequest update:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
 					meetingItem.setProperty("X-MEETINGREQUEST", true);
-				
+
 					if ((this.meetingRequestsCache[update.id]) && (this.meetingRequestsCache[update.id].uid == meetingItem.uid)) {
-						if (this.debug) this.logInfo("2 modifing  meeting request:"+update.id);
-	//					this.meetingRequestsCache[update.getTagValue("t:UID")] = meetingItem;
+						if (this.debug) this.logInfo("2 modifing  meeting request:" + update.id);
+						//					this.meetingRequestsCache[update.getTagValue("t:UID")] = meetingItem;
 						this.meetingRequestsCache[meetingItem.id] = meetingItem;
 					}
 					else {
@@ -3724,12 +3806,12 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (deletions.meetingrequests.length > 0) {
-			for each (var deletion in deletions.meetingrequests) {
+			for each(var deletion in deletions.meetingrequests) {
 				var meetingItem = this.convertExchangeAppointmentToCalAppointment(deletion, true);
 				if (meetingItem) {
-					if (this.debug) this.logInfo(" -- MeetingRequest deletion:"+ meetingItem.title+", UID:"+meetingItem.uid+",id:"+meetingItem.id+",changeKey:"+meetingItem.changeKey);
+					if (this.debug) this.logInfo(" -- MeetingRequest deletion:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
 					meetingItem.setProperty("X-MEETINGREQUEST", true);
-					this.removeFromMeetingRequestCache(deletion.id);			
+					this.removeFromMeetingRequestCache(deletion.id);
 					this.meetingrequestAnswered[deletion.id] = false;
 				}
 			}
@@ -3737,10 +3819,10 @@ calExchangeCalendar.prototype = {
 
 		// Save cancelations into cache and remove request for which we received a cancelation.
 		if (creations.meetingCancellations.length > 0) {
-			for each (var request in creations.meetingCancellations) {
+			for each(var request in creations.meetingCancellations) {
 				var cancelItem = this.convertExchangeAppointmentToCalAppointment(request, true);
 				if (cancelItem) {
-					if (this.debug) this.logInfo(" -- MeetingCancelation creation:"+ cancelItem.title+", UID:"+cancelItem.uid+",id:"+cancelItem.id+",changeKey:"+cancelItem.changeKey);
+					if (this.debug) this.logInfo(" -- MeetingCancelation creation:" + cancelItem.title + ", UID:" + cancelItem.uid + ",id:" + cancelItem.id + ",changeKey:" + cancelItem.changeKey);
 					cancelItem.setProperty("X-MEETINGCANCELATION", true);
 					this.meetingCancelationsCache[request.id] = cancelItem;
 				}
@@ -3748,7 +3830,7 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (updates.meetingCancellations.length > 0) {
-			for each (var update in updates.meetingCancellations) {
+			for each(var update in updates.meetingCancellations) {
 				var cancelItem = this.convertExchangeAppointmentToCalAppointment(update, true);
 				if (cancelItem) {
 					cancelItem.setProperty("X-MEETINGCANCELATION", true);
@@ -3763,7 +3845,7 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (deletions.meetingCancellations.length > 0) {
-			for each (var deletion in deletions.meetingCancellations) {
+			for each(var deletion in deletions.meetingCancellations) {
 				delete this.meetingCancelationsCache[deletion.id];
 			}
 		}
@@ -3771,7 +3853,7 @@ calExchangeCalendar.prototype = {
 		var requestCount = 0;
 		var cancelationCount = 0;
 		var tmpInCalendarCache = {};
-		for each (var index in this.meetingRequestsCache) {
+		for each(var index in this.meetingRequestsCache) {
 			if (index) {
 				// Remove request for which we have an calendaritem which is confirmed
 				var tmpID = index.id;
@@ -3785,14 +3867,14 @@ calExchangeCalendar.prototype = {
 
 				// Check single items
 				if (!inCalendar) {
-					for each (var item in this.itemCacheById) {
+					for each(var item in this.itemCacheById) {
 						if ((item) && (item.uid == tmpUID)) {
 							inCalendar = item;
 							break;
 						}
 					}
-				}				
-				
+				}
+
 				var confirmed = false;
 
 				// We turn this off for now (10-12-2011) This so meeting update items in mailbox are not removed.
@@ -3803,7 +3885,7 @@ calExchangeCalendar.prototype = {
 					tmpInCalendarCache[tmpUID] = inCalendar;
 				}*/
 
-				if (confirmed) {	
+				if (confirmed) {
 					// Remove request. Meeting is in calendar and confirmed.
 					this.removeMeetingItem(index);
 					this.removeFromMeetingRequestCache(tmpID);
@@ -3844,17 +3926,17 @@ calExchangeCalendar.prototype = {
 				}
 
 				// We turn this off for now (10-12-2011) This so meeting update items in mailbox are not removed.
-/*				if (inCalendar) {
-					// remove our cached request from calendar otherwise it will appear twice.
-					this.notifyTheObservers("onDeleteItem", [index]);
-					this.removeFromMeetingRequestCache(tmpUID);
-					//this.meetingRequestsCache[tmpUID] == null;
-					this.meetingrequestAnswered[tmpUID] = false;
-				}*/
+				/*				if (inCalendar) {
+									// remove our cached request from calendar otherwise it will appear twice.
+									this.notifyTheObservers("onDeleteItem", [index]);
+									this.removeFromMeetingRequestCache(tmpUID);
+									//this.meetingRequestsCache[tmpUID] == null;
+									this.meetingrequestAnswered[tmpUID] = false;
+								}*/
 			}
 		}
-		
-		for each (var index in this.meetingCancelationsCache) {
+
+		for each(var index in this.meetingCancelationsCache) {
 			if (index) {
 				// Remove cancelation for which we do not have an calendaritem.
 				var tmpID = index.id;
@@ -3868,16 +3950,16 @@ calExchangeCalendar.prototype = {
 
 				// Check single items
 				if (!inCalendar) {
-					for each (var item in this.itemCacheById) {
+					for each(var item in this.itemCacheById) {
 						if ((item) && (item.uid == tmpUID)) {
 							inCalendar = item;
 							break;
 						}
 					}
-				}				
+				}
 
 				// Check meetingrequest cache
-				var inCache = false;					
+				var inCache = false;
 				if (!inCalendar) {
 					inCalendar = this.meetingRequestsCache[tmpID];
 					if (inCalendar) {
@@ -3885,11 +3967,11 @@ calExchangeCalendar.prototype = {
 						inCache = true;
 					}
 				}
-	
-				if (inCalendar) {	
+
+				if (inCalendar) {
 					// Keep this cancelation if it is allready confirmed. Or remove it when we we have it only in cache.
-					if (((inCalendar.getProperty("STATUS") == "NONE") && (this.doAutoRemoveInvitationCancelation1)) ||
-						(inCache)) {
+					if (((inCalendar.getProperty("STATUS") == "NONE") && (this.doAutoRemoveInvitationCancelation1))
+						|| (inCache)) {
 						// We have an calendaritem for this cancelation but it is not yet confirmed.
 						// We remove the cancelation and the meetingitem if it is not in cache
 						// and user specified this in the EWS settings.
@@ -3914,7 +3996,7 @@ calExchangeCalendar.prototype = {
 						}
 					}
 					else {
-						if (! inCalendar.isCancelled) {
+						if (!inCalendar.isCancelled) {
 							if (!this.doAutoRemoveInvitationCancelation2) {
 								// It is in calendar and allready confirmed. We update the current calendaritem.
 								// Change title of current calendaritem.
@@ -3946,7 +4028,7 @@ calExchangeCalendar.prototype = {
 							}
 						}
 						delete this.meetingCancelationsCache[tmpID];
-						if (this.debug) this.logInfo("meetingCancelation:"+index.title);
+						if (this.debug) this.logInfo("meetingCancelation:" + index.title);
 					}
 				}
 				else {
@@ -3967,22 +4049,22 @@ calExchangeCalendar.prototype = {
 
 		// Process Meetingresponses
 		// Save responses into cache and remove request for which we received a cancelation.
-		for each (var response in creations.meetingResponses) {
-			this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId","Id")] = response;
+		for each(var response in creations.meetingResponses) {
+			this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")] = response;
 		}
 
-		for each (var response in updates.meetingResponses) {
-			if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId","Id")]) {
-				this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId","Id")] = response;
+		for each(var response in updates.meetingResponses) {
+			if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")]) {
+				this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")] = response;
 			}
 			else {
 				if (this.debug) this.logInfo("WE DO NOT HAVE A RESPONSE IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
 			}
 		}
 
-		for each (var response in deletions.meetingResponses) {
-			if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId","Id")]) {
-				delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId","Id")];
+		for each(var response in deletions.meetingResponses) {
+			if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")]) {
+				delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")];
 			}
 		}
 
@@ -4000,7 +4082,7 @@ calExchangeCalendar.prototype = {
 
 				// Check single items
 				if (!inCalendar) {
-					for each (var item in this.itemCacheById) {
+					for each(var item in this.itemCacheById) {
 						if ((item) && (item.uid == tmpUID)) {
 							inCalendar = item;
 							break;
@@ -4014,9 +4096,9 @@ calExchangeCalendar.prototype = {
 					if (!iAmOrganizer) {
 						// Remove the response in the inbox. Do not update calendar.
 						this.removeResponseItem(response);
-						delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId","Id")];
+						delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")];
 					}
-				}				
+				}
 			}
 		}
 
@@ -4026,43 +4108,44 @@ calExchangeCalendar.prototype = {
 			this.refresh();
 		}
 
-		if (this.debug) this.logInfo("syncInboxOK: left with meetingRequests:"+requestCount+", meetingCancelations:"+cancelationCount);
+		if (this.debug) this.logInfo("syncInboxOK: left with meetingRequests:" + requestCount + ", meetingCancelations:" + cancelationCount);
 
 		this.startSyncInboxPoller();
 	},
 
-	startSyncInboxPoller: function _startSyncInboxPoller()
-	{
+	startSyncInboxPoller: function _startSyncInboxPoller() {
 		if (!this.doPollInbox) {
 			return;
 		}
 
 		this.inboxPoller.cancel();
-	        let self = this;
-		this.inboxPoller.initWithCallback({ notify: function setTimeout_notify() {self.syncInbox();	}}, this.pollInboxInterval * 1000, this.inboxPoller.TYPE_REPEATING_SLACK);
+		let self = this;
+		this.inboxPoller.initWithCallback({
+			notify: function setTimeout_notify() {
+				self.syncInbox();
+			}
+		}, this.pollInboxInterval * 1000, this.inboxPoller.TYPE_REPEATING_SLACK);
 	},
 
-	syncInboxError: function _syncInboxError(erSyncFolderItemsRequest, aCode, aMsg)
-	{
+	syncInboxError: function _syncInboxError(erSyncFolderItemsRequest, aCode, aMsg) {
 		if (this.debug) this.logInfo("syncInboxError");
 		this.saveCredentials(erSyncFolderItemsRequest.argument);
 		this.notConnected = true;
 		this.weAreInboxSyncing = false;
 		//this.processItemSyncQueue();
-		
+
 		this.startSyncInboxPoller();
 	},
 
-	doAvailability: function _doAvailability(aCalId, aCi)
-	{
+	doAvailability: function _doAvailability(aCalId, aCi) {
 		const x = Ci.calIFreeBusyInterval;
 
 		const types = {
-			"Free" 		: x.FREE,
-			"Tentative"	: x.BUSY_TENTATIVE,
-			"Busy"		: x.BUSY,
-			"OOF"		: x.BUSY_UNAVAILABLE,
-			"NoData"	: x.UNKNOWN
+			"Free": x.FREE,
+			"Tentative": x.BUSY_TENTATIVE,
+			"Busy": x.BUSY,
+			"OOF": x.BUSY_UNAVAILABLE,
+			"NoData": x.UNKNOWN
 		};
 
 		var start = null;
@@ -4085,23 +4168,22 @@ calExchangeCalendar.prototype = {
 			}
 		}
 
-//		var start = this.tryToSetDateValue(aCi.getTagValue("t:StartTime"));
-//		var end   = this.tryToSetDateValue(aCi.getTagValue("t:EndTime"));
-		var type  = types[xml2json.getTagValue(aCi, "t:BusyType")];
+		//		var start = this.tryToSetDateValue(aCi.getTagValue("t:StartTime"));
+		//		var end   = this.tryToSetDateValue(aCi.getTagValue("t:EndTime"));
+		var type = types[xml2json.getTagValue(aCi, "t:BusyType")];
 		return new cal.FreeBusyInterval(aCalId, type,
-					       	  start, end);
+			start, end);
 	},
 
-	md5: function _md5(aString)
-	{
+	md5: function _md5(aString) {
 
 		if (!aString) {
 			return "";
 		}
 
 		var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-		    createInstance(Ci.nsIScriptableUnicodeConverter);
-		 
+		createInstance(Ci.nsIScriptableUnicodeConverter);
+
 		// we use UTF-8 here, you can choose other encodings.
 		converter.charset = "UTF-8";
 		// result is an out parameter,
@@ -4110,16 +4192,15 @@ calExchangeCalendar.prototype = {
 		// data is an array of bytes
 		var data = converter.convertToByteArray(aString, result);
 		var ch = Cc["@mozilla.org/security/hash;1"]
-				   .createInstance(Ci.nsICryptoHash);
+			.createInstance(Ci.nsICryptoHash);
 		ch.init(ch.MD5);
 		ch.update(data, data.length);
 		return ch.finish(true);
 	},
 
-	getUserAvailabilityRequestOK: function _getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents)
-	{
+	getUserAvailabilityRequestOK: function _getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents) {
 		this.notConnected = false;
-		if (this.debug) this.logInfo("getUserAvailabilityRequestOK: aEvents.length:"+aEvents.length+", this.folderIsNotAvailable:"+this.folderIsNotAvailable);
+		if (this.debug) this.logInfo("getUserAvailabilityRequestOK: aEvents.length:" + aEvents.length + ", this.folderIsNotAvailable:" + this.folderIsNotAvailable);
 		this.saveCredentials(erGetUserAvailabilityRequest.argument);
 
 		var items = new Array();
@@ -4133,15 +4214,14 @@ calExchangeCalendar.prototype = {
 				var item = this.doAvailability(erGetUserAvailabilityRequest.argument.calId, aEvents[index]);
 				items.push(item);
 			}
-		
+
 			if (erGetUserAvailabilityRequest.listener) {
 				erGetUserAvailabilityRequest.listener.onResult(null, items);
 			}
 		}
 	},
-	
-	getUserAvailabilityRequestError: function _getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg)
-	{
+
+	getUserAvailabilityRequestError: function _getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg) {
 		this.saveCredentials(erGetUserAvailabilityRequest.argument);
 
 		if (aCode != -7) {
@@ -4149,7 +4229,7 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (this.OnlyShowAvailability) {
-			if (this.debug) this.logInfo("getUserAvailabilityRequestError: this.OnlyShowAvailability:"+this.OnlyShowAvailability);
+			if (this.debug) this.logInfo("getUserAvailabilityRequestError: this.OnlyShowAvailability:" + this.OnlyShowAvailability);
 			this.OnlyShowAvailability = false;
 		}
 		else {
@@ -4159,37 +4239,39 @@ calExchangeCalendar.prototype = {
 		}
 	},
 
-	resetCalendar: function _resetCalendar()
-	{
+	resetCalendar: function _resetCalendar() {
 		if (this.debug) this.logInfo(" resetCalendar 1a");
 
 		try {
 
-		// Clean the job queue.
-		this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
-		this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
+			// Clean the job queue.
+			this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
+			this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
 
-		this.offlineQueue = [];
+			this.offlineQueue = [];
 
-		this.doReset = true;
+			this.doReset = true;
 
-		this.resetStart = Date.now();
+			this.resetStart = Date.now();
 
-		this.inboxPoller.cancel();
+			this.inboxPoller.cancel();
 
-		if (this.offlineTimer) {
-			this.offlineTimer.cancel();
-		}
-		this.offlineTimer = null;
+			if (this.offlineTimer) {
+				this.offlineTimer.cancel();
+			}
+			this.offlineTimer = null;
 
-		if (this.calendarPoller) {
-			this.calendarPoller.cancel();
-		}
+			if (this.calendarPoller) {
+				this.calendarPoller.cancel();
+			}
 
-//dump("\resetCalendar\n");
+			//dump("\resetCalendar\n");
 			var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
 			myAuthPrompt2.removeUserCanceled(this.serverUrl);
-		}catch(err) { dump("\n EROROR:"+err+"\n"); }
+		}
+		catch (err) {
+			dump("\n EROROR:" + err + "\n");
+		}
 
 		if (this.getProperty("disabled")) {
 			// Remove all items in cache from calendar.
@@ -4206,8 +4288,7 @@ calExchangeCalendar.prototype = {
 		}
 	},
 
-	performReset: function _performReset()
-	{
+	performReset: function _performReset() {
 		if (this.debug) this.logInfo(" performReset 1");
 
 		if (!this.doReset) {
@@ -4227,13 +4308,13 @@ calExchangeCalendar.prototype = {
 		this.syncState = null;
 		//this.prefs.deleteBranch("syncState");
 		this.removeFile("syncState.txt");
-		if(this.folderBase=="tasks"){
-			this.syncStateInbox = null;  
-			this.removeFile("syncStateInbox.txt"); 
+		if (this.folderBase == "tasks") {
+			this.syncStateInbox = null;
+			this.removeFile("syncStateInbox.txt");
 		}
 		this.weAreSyncing = false;
 		this.firstSyncDone = false;
-		
+
 		// Remove all items in cache from calendar.
 		//this.observers.notify("onStartBatch");
 		for (var index in this.itemCacheById) {
@@ -4282,7 +4363,7 @@ calExchangeCalendar.prototype = {
 
 		this.startDate = null;
 		this.endDate = null;
-	
+
 		// Reload calendar on currently known dateRanges.
 		for (var index in this.meetingRequestsCache) {
 			if (this.meetingRequestsCache[index]) {
@@ -4310,35 +4391,32 @@ calExchangeCalendar.prototype = {
 
 		this.performStartup();
 
-		if (this.debug) this.logInfo("oldBeginDate:"+oldBeginDate.toString()+", oldEndDate:"+oldEndDate.toString());
-		this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO +
-				Ci.calICalendar.ITEM_FILTER_TYPE_EVENT
-				, 0, oldBeginDate, oldEndDate, null);
+		if (this.debug) this.logInfo("oldBeginDate:" + oldBeginDate.toString() + ", oldEndDate:" + oldEndDate.toString());
+		this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO
+			+ Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, oldBeginDate, oldEndDate, null);
 
 		// Make an event for thistory.
 		this.addActivity(calGetString("calExchangeCalendar", "resetEventMessage", [this.name], "exchangecalendar"), "", this.resetStart, Date.now());
 		if (this.debug) this.logInfo(" performReset 2");
 	},
 
-	addActivity: function _addActivity(aTitle, aText, aStartDate, aEndDate)
-	{
+	addActivity: function _addActivity(aTitle, aText, aStartDate, aEndDate) {
 		if (!gActivityManager) {
 			return;
 		}
 
-		let event = Cc["@mozilla.org/activity-event;1"].createInstance(nsIAE);  
-  
-		event.init(aTitle,  
-		           null,   
-		           aText,   
-		           aStartDate,     
-		           aEndDate);          
-  
+		let event = Cc["@mozilla.org/activity-event;1"].createInstance(nsIAE);
+
+		event.init(aTitle,
+			null,
+			aText,
+			aStartDate,
+			aEndDate);
+
 		gActivityManager.addActivity(event);
 	},
 
-	makeRecurrenceRule: function _makeRecurrenceRule(aItem, e)
-	{
+	makeRecurrenceRule: function _makeRecurrenceRule(aItem, e) {
 		if (!aItem.parentItem) {
 			return;
 		}
@@ -4354,10 +4432,10 @@ calExchangeCalendar.prototype = {
 		}
 
 		var rrule = null;
-		for each (var ritem in aItem.recurrenceInfo.getRecurrenceItems({})) {
+		for each(var ritem in aItem.recurrenceInfo.getRecurrenceItems({})) {
 			if (calInstanceOf(ritem, Ci.calIRecurrenceRule)) {
 				rrule = ritem;
-if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
+				if (this.debug) this.logInfo(" ;;;; rrule:" + rrule.icalProperty.icalString);
 				//break;
 			}
 		}
@@ -4372,7 +4450,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		/* can't get parameters of RRULEs... have to do it manually :/ */
 		var prop = {};
-		for each (let ps in rrule.icalProperty.value.split(';')) {
+		for each(let ps in rrule.icalProperty.value.split(';')) {
 			let m = ps.split('=');
 			prop[m[0]] = m[1];
 		}
@@ -4398,7 +4476,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			var startDate = cal.now();
 		}
 		startDate.isDate = true;
-	
+
 		prop["BYMONTHDAY"] = prop["BYMONTHDAY"] || startDate.day;
 		prop["BYMONTH"] = prop["BYMONTH"] || (startDate.month + 1);
 
@@ -4410,7 +4488,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				ryr.addChildTag("DaysOfWeek", "nsTypes", dayRevMap[m[2]]);
 				ryr.addChildTag("DayOfWeekIndex", "nsTypes", dayRevMap[m[1]]);
 				ryr.addChildTag("Month", "nsTypes", monthIdxMap[prop["BYMONTH"] - 1]);
-			} else {
+			}
+			else {
 				var ayr = r.addChildTag("AbsoluteYearlyRecurrence", "nsTypes", null);
 				ayr.addChildTag("DayOfMonth", "nsTypes", prop["BYMONTHDAY"]);
 				ayr.addChildTag("Month", "nsTypes", monthIdxMap[prop["BYMONTH"] - 1]);
@@ -4418,12 +4497,13 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			break;
 		case 'MONTHLY':
 			if (prop["BYDAY"]) {
-				var rmr = r.addChildTag("RelativeMonthlyRecurrence", "nsTypes", null);				
+				var rmr = r.addChildTag("RelativeMonthlyRecurrence", "nsTypes", null);
 				rmr.addChildTag("Interval", "nsTypes", rrule.interval);
 				var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
 				rmr.addChildTag("DaysOfWeek", "nsTypes", dayRevMap[m[2]]);
 				rmr.addChildTag("DayOfWeekIndex", "nsTypes", weekRevMap[m[1]]);
-			} else {
+			}
+			else {
 				var amr = r.addChildTag("AbsoluteMonthlyRecurrence", "nsTypes", null);
 				amr.addChildTag("Interval", "nsTypes", rrule.interval);
 				amr.addChildTag("DayOfMonth", "nsTypes", prop["BYMONTHDAY"]);
@@ -4434,7 +4514,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			wr.addChildTag("Interval", "nsTypes", rrule.interval);
 			var days = [];
 			var daystr = prop["BYDAY"] || dayIdxMap[startDate.weekday];
-			for each (let day in daystr.split(",")) {
+			for each(let day in daystr.split(",")) {
 				days.push(dayRevMap[day]);
 			}
 			wr.addChildTag("DaysOfWeek", "nsTypes", days.join(' '));
@@ -4445,7 +4525,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				wr.addChildTag("Interval", "nsTypes", rrule.interval);
 				var days = [];
 				var daystr = prop["BYDAY"];
-				for each (let day in daystr.split(",")) {
+				for each(let day in daystr.split(",")) {
 					days.push(dayRevMap[day]);
 				}
 				wr.addChildTag("DaysOfWeek", "nsTypes", days.join(' '));
@@ -4459,7 +4539,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		if (isEvent(aItem)) {
 			var startDateStr = cal.toRFC3339(startDate.getInTimezone(this.globalFunctions.ecUTC()));
-//			var startDateStr = cal.toRFC3339(originalDate.getInTimezone(this.globalFunctions.ecUTC()));
+			//			var startDateStr = cal.toRFC3339(originalDate.getInTimezone(this.globalFunctions.ecUTC()));
 		}
 		else {
 			// We make a non-UTC datetime value for this.globalFunctions.
@@ -4472,7 +4552,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			var nr = r.addChildTag("NumberedRecurrence", "nsTypes", null);
 			nr.addChildTag("StartDate", "nsTypes", startDateStr);
 			nr.addChildTag("NumberOfOccurrences", "nsTypes", rrule.count);
-		} else if (!rrule.isByCount && rrule.untilDate) {
+		}
+		else if (!rrule.isByCount && rrule.untilDate) {
 
 			var endDate = rrule.untilDate.clone();
 			if (isEvent(aItem)) {
@@ -4494,7 +4575,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			var edr = r.addChildTag("EndDateRecurrence", "nsTypes", null);
 			edr.addChildTag("StartDate", "nsTypes", startDateStr);
 			edr.addChildTag("EndDate", "nsTypes", endDateStr);
-		} else {
+		}
+		else {
 			var ner = r.addChildTag("NoEndRecurrence", "nsTypes", null);
 			ner.addChildTag("StartDate", "nsTypes", startDateStr);
 		}
@@ -4502,14 +4584,13 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		/* We won't write WKST/FirstDayOfWeek for now because it is Exchange 2010 and up */
 	},
 
-	getAlarmTime: function _getAlarmTime(aItem)
-	{
+	getAlarmTime: function _getAlarmTime(aItem) {
 		if (!aItem) {
 			return null;
 		}
 
-		var alarms = aItem.getAlarms({});		
-		var alarm = alarms[0];		
+		var alarms = aItem.getAlarms({});
+		var alarm = alarms[0];
 		if (!alarm) {
 			return null;
 		}
@@ -4543,8 +4624,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return alarmTime;
 	},
 
-	getSingleSnoozeState: function _getSingleSnoozeState(e, aSingle)
-	{
+	getSingleSnoozeState: function _getSingleSnoozeState(e, aSingle) {
 		if (this.debug) this.logInfo("getSingleSnoozeState");
 		var tmpStr = null;
 		var mozSnooze = aSingle.getProperty("X-MOZ-SNOOZE-TIME");
@@ -4592,7 +4672,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 		if (tmpStr) {
-			if (this.debug) this.logInfo("We have a new PidLidReminderSignalTime:"+tmpStr);
+			if (this.debug) this.logInfo("We have a new PidLidReminderSignalTime:" + tmpStr);
 			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
 			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
 			extField.setAttribute("DistinguishedPropertySetId", "Common");
@@ -4608,21 +4688,20 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return tmpStr;
 	},
 
-	getMasterSnoozeStates: function _getMasterSnoozeStates(e, aMaster, aItem)
-	{
+	getMasterSnoozeStates: function _getMasterSnoozeStates(e, aMaster, aItem) {
 		if (this.debug) this.logInfo("getMasterSnoozeStates");
 		var tmpStr = "";
 
 		if ((aItem) && (aMaster)) {
 			if (this.debug) this.logInfo("getMasterSnoozeStates: We have an item (occurrence/exception) and a master.");
-			if (aMaster.hasProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime)) {
-				tmpStr = aMaster.getProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime);
-				if (this.debug) this.logInfo("getMasterSnoozeStates: Master has a X-MOZ-SNOOZE-TIME value for this occurrence. startDate:"+aItem.startDate.icalString+", X-MOZ-SNOOZE-TIME:"+tmpStr);
-				
+			if (aMaster.hasProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime)) {
+				tmpStr = aMaster.getProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime);
+				if (this.debug) this.logInfo("getMasterSnoozeStates: Master has a X-MOZ-SNOOZE-TIME value for this occurrence. startDate:" + aItem.startDate.icalString + ", X-MOZ-SNOOZE-TIME:" + tmpStr);
+
 				// What value does alarmLastAck has?? This will determine what to send to 
 			}
 			else {
-				if (this.debug) this.logInfo("getMasterSnoozeStates: Master has NO X-MOZ-SNOOZE-TIME value for this occurrence. startDate:"+aItem.startDate.icalString);
+				if (this.debug) this.logInfo("getMasterSnoozeStates: Master has NO X-MOZ-SNOOZE-TIME value for this occurrence. startDate:" + aItem.startDate.icalString);
 
 				// If alarmLastAck for this item is null then the item was dismissed.
 				tmpStr = "";
@@ -4637,9 +4716,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				while (props.hasMoreElements()) {
 					var prop = props.getNext().QueryInterface(Components.interfaces.nsIProperty);
 					if (prop.name.indexOf("X-MOZ-SNOOZE-TIME-") == 0) {
-						if (this.debug) this.logInfo("getMasterSnoozeStates: "+prop.name+"="+prop.value);
+						if (this.debug) this.logInfo("getMasterSnoozeStates: " + prop.name + "=" + prop.value);
 						tmpStr = prop.value;
-						if (this.debug) this.logInfo("getMasterSnoozeStates2: Master has a X-MOZ-SNOOZE-TIME- value. "+prop.name+":"+tmpStr);
+						if (this.debug) this.logInfo("getMasterSnoozeStates2: Master has a X-MOZ-SNOOZE-TIME- value. " + prop.name + ":" + tmpStr);
 						break;
 					}
 				}
@@ -4648,7 +4727,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 					if (this.debug) this.logInfo("We did not find a X-MOZ-SNOOZE-TIME- for one of the children.");
 
 					// Nothing smoozed we are going to set it to the next alarm.
-					if (this.debug) this.logInfo("We did not find a childEvent by using the X-MOZ-SNOOZE-TIME-. We are going to find the child by the alarmLastAck of the Master. alarmLastAck:"+aMaster.alarmLastAck);
+					if (this.debug) this.logInfo("We did not find a childEvent by using the X-MOZ-SNOOZE-TIME-. We are going to find the child by the alarmLastAck of the Master. alarmLastAck:" + aMaster.alarmLastAck);
 					if (aMaster.alarmLastAck) {
 						if (this.debug) this.logInfo("Master has an alarmLastAck. We set the alarm to the first child with an alarm after alarmLastAck.");
 						var prevTime = aMaster.alarmLastAck.clone();
@@ -4660,7 +4739,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 					var childEvent = null;
 
-					if (this.debug) this.logInfo("Trying to find a child event with an alarmdate after '"+prevTime.icalString+"'");
+					if (this.debug) this.logInfo("Trying to find a child event with an alarmdate after '" + prevTime.icalString + "'");
 					var childAlarm = cal.createDateTime("4501-01-01T00:00:00Z");
 					for (var index in this.itemCacheById) {
 						if ((this.itemCacheById[index]) && (this.itemCacheById[index].uid == aMaster.uid)) {
@@ -4669,7 +4748,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 								if (childAlarm.compare(newChildAlarm) == 1) {
 									childAlarm = newChildAlarm.clone();
 									childEvent = this.itemCacheById[index];
-									if (this.debug) this.logInfo("Found child event for which the alarmdate ("+childAlarm.icalString+") is set after '"+prevTime.icalString+"'");
+									if (this.debug) this.logInfo("Found child event for which the alarmdate (" + childAlarm.icalString + ") is set after '" + prevTime.icalString + "'");
 								}
 							}
 						}
@@ -4679,7 +4758,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 						tmpStr = this.getAlarmTime(childEvent);
 						if (tmpStr) {
 							tmpStr = tmpStr.icalString;
-							if (this.debug) this.logInfo("This child has the following alarm:"+tmpStr);
+							if (this.debug) this.logInfo("This child has the following alarm:" + tmpStr);
 						}
 						else {
 							tmpStr = "";
@@ -4706,7 +4785,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			extField.setAttribute("DistinguishedPropertySetId", "Common");
 			extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
 			extField.setAttribute("PropertyType", "SystemTime");
-			
+
 			var newSnoozeTime = cal.createDateTime(tmpStr);
 			newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
 			eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
@@ -4715,15 +4794,13 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return tmpStr;
 	},
 
-	getAlarmLastAck: function _getAlarmLastAck(e, aItem)
-	{
+	getAlarmLastAck: function _getAlarmLastAck(e, aItem) {
 		if (this.debug) this.logInfo("getAlarmLastAck");
 		var tmpStr = "";
 		return tmpStr;
 	},
 
-	addSnoozeDismissState: function _addSnoozeDismissState(e, aItem, aAlarmTime)
-	{
+	addSnoozeDismissState: function _addSnoozeDismissState(e, aItem, aAlarmTime) {
 		// Check if we have a single item or not
 		var tmpStr = this.getAlarmLastAck(e, aItem);
 
@@ -4759,19 +4836,19 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			extField.setAttribute("DistinguishedPropertySetId", "Common");
 			extField.setAttribute("PropertyId", MAPI_PidLidReminderSet);
 			extField.setAttribute("PropertyType", "Boolean");
-		//	if (nextReminder.indexOf("4501-01-01T00:00:00Z") > -1) {
-				// Reminder is turned off.
-		//		eprop.nsTypes::Value = "false";
-		//	}
-		//	else {
-				eprop.addChildTag("Value", "nsTypes", "true");
-		//	}
+			//	if (nextReminder.indexOf("4501-01-01T00:00:00Z") > -1) {
+			// Reminder is turned off.
+			//		eprop.nsTypes::Value = "false";
+			//	}
+			//	else {
+			eprop.addChildTag("Value", "nsTypes", "true");
+			//	}
 		}
 		else {
 			if (this.debug) this.logInfo("addSnoozeDismissState: item has no alarms");
 
 			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			
+
 			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
 			extField.setAttribute("DistinguishedPropertySetId", "Common");
 			extField.setAttribute("PropertyId", MAPI_PidLidReminderSet);
@@ -4779,13 +4856,12 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			eprop.addChildTag("Value", "nsTypes", "false");
 		}
 
-		if (this.debug) this.logInfo("addSnoozeDismissState: End:"+tmpStr);
+		if (this.debug) this.logInfo("addSnoozeDismissState: End:" + tmpStr);
 
 		return tmpStr;
 	},
 
-	convertCalAppointmentToExchangeAppointment: function _convertCalAppointmentToExchangeAppointment(aItem, aAction, isNew)
-	{
+	convertCalAppointmentToExchangeAppointment: function _convertCalAppointmentToExchangeAppointment(aItem, aAction, isNew) {
 		if (!aAction) {
 			aAction = "modify";
 		}
@@ -4793,15 +4869,17 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		// The order in which create items are specified is important.
 		// EWS expects the right order.
 
-		var e = this.globalFunctions.xmlToJxon('<nsTypes:CalendarItem xmlns:nsTypes="'+nsTypesStr+'" xmlns:nsMessages="'+nsMessagesStr+'"/>');
+		var e = this.globalFunctions.xmlToJxon('<nsTypes:CalendarItem xmlns:nsTypes="' + nsTypesStr + '" xmlns:nsMessages="' + nsMessagesStr + '"/>');
 
 		e.addChildTag("Subject", "nsTypes", aItem.title);
 
-		const privacies = { "PUBLIC": "Normal",
-				"CONFIDENTIAL": "Confidential", 
-				"PRIVATE" : "Private",
-				null: "Normal" };
-		
+		const privacies = {
+			"PUBLIC": "Normal",
+			"CONFIDENTIAL": "Confidential",
+			"PRIVATE": "Private",
+			null: "Normal"
+		};
+
 		if (privacies[aItem.privacy] == undefined) {
 			e.addChildTag("Sensitivity", "nsTypes", "Normal");
 		}
@@ -4810,8 +4888,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 		//var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
-		if (aItem.bodyType == "HTML" ) {
-			var body = e.addChildTag("Body", "nsTypes", "<html>"+aItem.body+"</html>" || "");
+		if (aItem.bodyType == "HTML") {
+			var body = e.addChildTag("Body", "nsTypes", "<html>" + aItem.body + "</html>" || "");
 			body.setAttribute("BodyType", "HTML");
 		}
 		else {
@@ -4821,10 +4899,10 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		var categories = aItem.getCategories({});
 		var categoriesTag = e.addChildTag("Categories", "nsTypes", null);
-		for each (var category in categories) {
+		for each(var category in categories) {
 			categoriesTag.addChildTag("String", "nsTypes", category);
 		}
-	
+
 		var importance = "Normal";
 		if (aItem.priority > 5) {
 			importance = "Low";
@@ -4842,12 +4920,12 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		// Precalculate right start and end time for exchange.
 		// If not timezone specified set them to the lightning preference.
-//		if ((aItem.startDate.timezone.isFloating) && (!aItem.startDate.isDate)) {
+		//		if ((aItem.startDate.timezone.isFloating) && (!aItem.startDate.isDate)) {
 		if (aItem.startDate.timezone.isFloating) {
 			aItem.startDate = aItem.startDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
 		}
 
-//		if ((aItem.endDate.timezone.isFloating) && (!aItem.endDate.isDate)) {
+		//		if ((aItem.endDate.timezone.isFloating) && (!aItem.endDate.isDate)) {
 		if (aItem.endDate.timezone.isFloating) {
 			aItem.endDate = aItem.endDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
 		}
@@ -4864,8 +4942,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 			// We make a non-UTC datetime value for this.globalFunctions.
 			// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-			var exchStart = cal.toRFC3339(tmpStart.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19)+"Z"; //cal.toRFC3339(tmpStart).length-6);
-			var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
+			var exchStart = cal.toRFC3339(tmpStart.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19) + "Z"; //cal.toRFC3339(tmpStart).length-6);
+			var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19) + "Z"; //cal.toRFC3339(tmpEnd).length-6);
 		}
 		else {
 			// We set in bias advanced to UCT datetime values for this.globalFunctions.
@@ -4874,7 +4952,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 		var alarms = aItem.getAlarms({});
-		if (this.debug) this.logInfo("We have '"+alarms.length+"' alarms.");
+		if (this.debug) this.logInfo("We have '" + alarms.length + "' alarms.");
 		if (alarms.length > 0) {
 
 			// Exchange alarm is always an offset to the start.
@@ -4899,7 +4977,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				var offset = newAlarmTime.subtractDate(aItem.startDate);
 				break;
 			}
-	
+
 			e.addChildTag("ReminderIsSet", "nsTypes", "true");
 			if (offset.inSeconds != 0) {
 				e.addChildTag("ReminderMinutesBeforeStart", "nsTypes", String((offset.inSeconds / 60) * -1));
@@ -4933,7 +5011,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			e.addChildTag("UID", "nsTypes", aItem.uid);
 		}
 		else {
-// TODO: Check if this is still valid..
+			// TODO: Check if this is still valid..
 			if (aItem.id) {
 				// This is when we accept and an iTIP
 				e.addChildTag("UID", "nsTypes", aItem.id);
@@ -4950,16 +5028,18 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			}
 		}
 
-		const freeBusy = { "TRANSPARENT": "Free",
-				  "OPAQUE": "Busy",
-				  null: "Busy" };
+		const freeBusy = {
+			"TRANSPARENT": "Free",
+			"OPAQUE": "Busy",
+			null: "Busy"
+		};
 
 		const attendeeStatus = {
-			"NEEDS-ACTION"	: "Unknown",
-			"TENTATIVE"	: "Tentative",
-			"ACCEPTED"	: "Accept",
-			"DECLINED"	: "Decline",
-			null		: "Unknown"
+			"NEEDS-ACTION": "Unknown",
+			"TENTATIVE": "Tentative",
+			"ACCEPTED": "Accept",
+			"DECLINED": "Decline",
+			null: "Unknown"
 		};
 
 		if (!this.isInvitation(aItem, true)) {
@@ -4968,16 +5048,16 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			e.addChildTag("End", "nsTypes", exchEnd);
 
 			e.addChildTag("IsAllDayEvent", "nsTypes", aItem.startDate.isDate);
-	
+
 			e.addChildTag("LegacyFreeBusyStatus", "nsTypes", freeBusy[aItem.getProperty("TRANSP")]);
-	
+
 			e.addChildTag("Location", "nsTypes", aItem.getProperty("LOCATION") || "");
 
 			var attendees = aItem.getAttendees({});
 			var ae;
-			
-			for each (var attendee in attendees) {
-//dump("attendee.role:"+attendee.role+"\n");
+
+			for each(var attendee in attendees) {
+				//dump("attendee.role:"+attendee.role+"\n");
 				switch (attendee.role) {
 				case "REQ-PARTICIPANT":
 					if (!reqAttendees) {
@@ -4992,11 +5072,11 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 					ae = optAttendees.addChildTag("Attendee", "nsTypes", null);
 					break;
 				case "CHAIR":
-/*					if (!tmpOrganizer) {
-						var tmpOrganizer = e.addChildTag("Organizer", "nsTypes", null);
-					}
-					ae = tmpOrganizer;
-					break;*/ // Sadly this is not posible when we create a new item.
+					/*					if (!tmpOrganizer) {
+											var tmpOrganizer = e.addChildTag("Organizer", "nsTypes", null);
+										}
+										ae = tmpOrganizer;
+										break;*/ // Sadly this is not posible when we create a new item.
 				default:
 					ae = null;
 				}
@@ -5019,7 +5099,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			}
 
 			this.makeRecurrenceRule(aItem, e);
-	
+
 			if (this.isVersion2007) {
 				e.addChildTag("MeetingTimeZone", "nsTypes", null).setAttribute("TimeZoneName", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
 			}
@@ -5033,7 +5113,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: Item is an invitation.\n");
 
 			//return e;
-			
+
 			if ((aItem.hasProperty("X-exchangeITIP1")) && (aItem.getProperty("X-exchangeITIP1") == "true")) {
 				if (this.debug) this.logInfo("This is a message which came from an import or an copy/paste operation or is an invitation from an external party outside our Exchange.");
 
@@ -5041,9 +5121,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				e.addChildTag("End", "nsTypes", exchEnd);
 
 				e.addChildTag("IsAllDayEvent", "nsTypes", aItem.startDate.isDate);
-	
+
 				e.addChildTag("LegacyFreeBusyStatus", "nsTypes", freeBusy[aItem.getProperty("TRANSP")]);
-					
+
 				e.addChildTag("Location", "nsTypes", aItem.getProperty("LOCATION") || "");
 
 				// Set if the item is from the user itself or not.
@@ -5052,16 +5132,16 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 						if (this.debug) this.logInfo(" ## I am the organizer of this meeting.");
 					}
 					else {
-						if (this.debug) this.logInfo(" ## I am NOT the organizer of this meeting.'"+aItem.organizer.id.replace(/^mailto:/i, '')+"' is the organizer.");
+						if (this.debug) this.logInfo(" ## I am NOT the organizer of this meeting.'" + aItem.organizer.id.replace(/^mailto:/i, '') + "' is the organizer.");
 					}
 				}
 				else {
 					if (this.debug) this.logInfo(" ## There is not organizer for this meeting.");
 				}
-		
+
 
 				this.makeRecurrenceRule(aItem, e);
-	
+
 				if (this.isVersion2007) {
 					e.addChildTag("MeetingTimeZone", "nsTypes", null).setAttribute("TimeZoneName", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
 				}
@@ -5073,25 +5153,26 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			}
 		}
 
-		if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: "+String(e));
+		if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: " + String(e));
 
 		return e;
 	},
 
-	convertCalTaskToExchangeTask: function _convertCalTaskToExchangeTask(aItem, aAction)
-	{
+	convertCalTaskToExchangeTask: function _convertCalTaskToExchangeTask(aItem, aAction) {
 		if (!aAction) {
 			aAction = "modify";
 		}
 
-		var e = this.globalFunctions.xmlToJxon('<nsTypes:Task xmlns:nsTypes="'+nsTypesStr+'" xmlns:nsMessages="'+nsMessagesStr+'"/>');
+		var e = this.globalFunctions.xmlToJxon('<nsTypes:Task xmlns:nsTypes="' + nsTypesStr + '" xmlns:nsMessages="' + nsMessagesStr + '"/>');
 
 		e.addChildTag("Subject", "nsTypes", aItem.title);
 
-		const privacies = { "PUBLIC": "Normal",
-				"CONFIDENTIAL": "Confidential", 
-				"PRIVATE" : "Private",
-				null: "Normal" };
+		const privacies = {
+			"PUBLIC": "Normal",
+			"CONFIDENTIAL": "Confidential",
+			"PRIVATE": "Private",
+			null: "Normal"
+		};
 		if (!aItem.privacy) {
 			e.addChildTag("Sensitivity", "nsTypes", "Normal");
 		}
@@ -5100,8 +5181,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 		//var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
-		if (aItem.bodyType == "HTML" ) {
-			var body = e.addChildTag("Body", "nsTypes", "<html>"+aItem.body+"</html>" || "");
+		if (aItem.bodyType == "HTML") {
+			var body = e.addChildTag("Body", "nsTypes", "<html>" + aItem.body + "</html>" || "");
 			body.setAttribute("BodyType", "HTML");
 		}
 		else {
@@ -5112,13 +5193,13 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		var categories = aItem.getCategories({});
 		var categoriesTag = null;
-		for each (var category in categories) {
+		for each(var category in categories) {
 			if (categoriesTag == null) {
 				categoriesTag = e.addChildTag("Categories", "nsTypes", null);
 			}
 			categoriesTag.addChildTag("String", "nsTypes", category);
 		}
-	
+
 		var importance = "Normal";
 		if (aItem.priority > 5) {
 			importance = "Low";
@@ -5133,9 +5214,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			importance = "Normal";
 		}
 		e.addChildTag("Importance", "nsTypes", importance);
-		 
+
 		var alarms = aItem.getAlarms({});
-		if (this.debug) this.logInfo("We have '"+alarms.length+"' alarms.");
+		if (this.debug) this.logInfo("We have '" + alarms.length + "' alarms.");
 		if (alarms.length > 0) {
 
 			// Exchange alarm for task is always an absolute date and time.
@@ -5155,7 +5236,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				newAlarmTime.addDuration(alarms[0].offset);
 				break;
 			}
-	
+
 			e.addChildTag("ReminderDueBy", "nsTypes", cal.toRFC3339(newAlarmTime));
 			e.addChildTag("ReminderIsSet", "nsTypes", "true");
 		}
@@ -5164,34 +5245,34 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 
-/*		// Delegation changes
-		if (aItem.hasProperty("X-exchWebService-PidLidTaskLastUpdate")) {
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Task");
-			extField.setAttribute("PropertyId", "33045");
-			extField.setAttribute("PropertyType", "SystemTime");
-			eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskLastUpdate"));
-		}
+		/*		// Delegation changes
+				if (aItem.hasProperty("X-exchWebService-PidLidTaskLastUpdate")) {
+					var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+					var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+					extField.setAttribute("DistinguishedPropertySetId", "Task");
+					extField.setAttribute("PropertyId", "33045");
+					extField.setAttribute("PropertyType", "SystemTime");
+					eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskLastUpdate"));
+				}
 
-		if (aItem.hasProperty("X-exchWebService-PidLidTaskHistory")) {
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Task");
-			extField.setAttribute("PropertyId", "33050");
-			extField.setAttribute("PropertyType", "Integer");
-			eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskHistory"));
-		}
+				if (aItem.hasProperty("X-exchWebService-PidLidTaskHistory")) {
+					var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+					var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+					extField.setAttribute("DistinguishedPropertySetId", "Task");
+					extField.setAttribute("PropertyId", "33050");
+					extField.setAttribute("PropertyType", "Integer");
+					eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskHistory"));
+				}
 
-		if (aItem.hasProperty("X-exchWebService-PidLidTaskAccepted")) {
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Task");
-			extField.setAttribute("PropertyId", "33032");
-			extField.setAttribute("PropertyType", "Boolean");
-			eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskAccepted"));
-		}
-*/
+				if (aItem.hasProperty("X-exchWebService-PidLidTaskAccepted")) {
+					var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+					var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+					extField.setAttribute("DistinguishedPropertySetId", "Task");
+					extField.setAttribute("PropertyId", "33032");
+					extField.setAttribute("PropertyType", "Boolean");
+					eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskAccepted"));
+				}
+		*/
 
 		// An imported item alreay could have a snooze time set.
 		if (aItem.hasProperty("X-MOZ-SNOOZE-TIME")) {
@@ -5237,16 +5318,16 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 			tmpStart.isDate = true;
 			tmpStart.isDate = false;
-		/*	var tmpDuration = cal.createDuration();
-			tmpDuration.minutes = -1;
-			tmpStart.addDuration(tmpDuration);*/
+			/*	var tmpDuration = cal.createDuration();
+				tmpDuration.minutes = -1;
+				tmpStart.addDuration(tmpDuration);*/
 
 			e.addChildTag("CompleteDate", "nsTypes", cal.toRFC3339(tmpStart));
 		}
 
 
-//		if ((!aItem.parentItem.id) ||
-//		    (!aItem.recurrenceInfo)) {
+		//		if ((!aItem.parentItem.id) ||
+		//		    (!aItem.recurrenceInfo)) {
 		if (aItem.dueDate) {
 			if (aItem.dueDate.timezone.isFloating) {
 				aItem.dueDate = aItem.dueDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
@@ -5262,28 +5343,30 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		if (aItem.percentComplete) {
 			e.addChildTag("PercentComplete", "nsTypes", aItem.percentComplete);
 		}
-//}
+		//}
 
 		this.makeRecurrenceRule(aItem, e);
 
-//		if ((!aItem.parentItem.id) ||
-//		    (!aItem.recurrenceInfo)) {
+		//		if ((!aItem.parentItem.id) ||
+		//		    (!aItem.recurrenceInfo)) {
 
-			if (aItem.entryDate) {
-				if (aItem.entryDate.timezone.isFloating) {
-					aItem.entryDate = aItem.entryDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-				}
-
-				e.addChildTag("StartDate", "nsTypes", cal.toRFC3339(aItem.entryDate));
+		if (aItem.entryDate) {
+			if (aItem.entryDate.timezone.isFloating) {
+				aItem.entryDate = aItem.entryDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
 			}
-//		}
 
-		const statuses = { "NONE": "NotStarted",
-				"IN-PROCESS": "InProgress", 
-				"COMPLETED" : "Completed",
-				"NEEDS-ACTION" : "WaitingOnOthers",
-				"CANCELLED" : "Deferred",
-				null: "NotStarted" };
+			e.addChildTag("StartDate", "nsTypes", cal.toRFC3339(aItem.entryDate));
+		}
+		//		}
+
+		const statuses = {
+			"NONE": "NotStarted",
+			"IN-PROCESS": "InProgress",
+			"COMPLETED": "Completed",
+			"NEEDS-ACTION": "WaitingOnOthers",
+			"CANCELLED": "Deferred",
+			null: "NotStarted"
+		};
 		if (!statuses[aItem.status]) {
 			e.addChildTag("Status", "nsTypes", "NotStarted");
 		}
@@ -5295,33 +5378,37 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			e.addChildTag("TotalWork", "nsTypes", aItem.totalWork);
 		}
 
-		if (this.debug) this.logInfo("!!CHANGED:"+String(e));
+		if (this.debug) this.logInfo("!!CHANGED:" + String(e));
 
 		return e;
 	},
 
 
-	createItemOk: function _createItemOk(erCreateItemRequest, aId, aChangeKey)
-	{
+	createItemOk: function _createItemOk(erCreateItemRequest, aId, aChangeKey) {
 		this.notConnected = false;
 		this.saveCredentials(erCreateItemRequest.argument);
 		if (this.debug) this.logInfo("createItemOk 1");
 
 		// Check if we have attachmentsUpdates
 		if ((erCreateItemRequest.argument.attachmentsUpdates) && (erCreateItemRequest.argument.attachmentsUpdates.create.length > 0)) {
-			if (this.debug) this.logInfo("createItemOk We have "+erCreateItemRequest.argument.attachmentsUpdates.create.length+" attachments to create.");
+			if (this.debug) this.logInfo("createItemOk We have " + erCreateItemRequest.argument.attachmentsUpdates.create.length + " attachments to create.");
 			var self = this;
-			this.addToQueue( erCreateAttachmentRequest,
-				{user: this.user, 
-				 serverUrl: this.serverUrl,
-				 item: erCreateItemRequest.argument.item,
-				 parentItemId: aId,
-				 parentItemChangeKey: aChangeKey, 
-				 attachmentsUpdates: erCreateItemRequest.argument.attachmentsUpdates,
-				 actionStart: Date.now(),
-				 sendto: erCreateItemRequest.argument.sendto}, 
-				function(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) { self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);}, 
-				function(erCreateAttachmentRequest, aCode, aMsg) { self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);},
+			this.addToQueue(erCreateAttachmentRequest, {
+					user: this.user,
+					serverUrl: this.serverUrl,
+					item: erCreateItemRequest.argument.item,
+					parentItemId: aId,
+					parentItemChangeKey: aChangeKey,
+					attachmentsUpdates: erCreateItemRequest.argument.attachmentsUpdates,
+					actionStart: Date.now(),
+					sendto: erCreateItemRequest.argument.sendto
+				},
+				function (erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
+					self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);
+				},
+				function (erCreateAttachmentRequest, aCode, aMsg) {
+					self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);
+				},
 				erCreateItemRequest.listener);
 		}
 		else {
@@ -5329,10 +5416,10 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 			if (erCreateItemRequest.listener) {
 				this.notifyOperationComplete(erCreateItemRequest.listener,
-				      Cr.NS_OK,
-				      Ci.calIOperationListener.ADD,
-				      erCreateItemRequest.argument.item.id,
-				      erCreateItemRequest.argument.item);
+					Cr.NS_OK,
+					Ci.calIOperationListener.ADD,
+					erCreateItemRequest.argument.item.id,
+					erCreateItemRequest.argument.item);
 			}
 
 		}
@@ -5348,30 +5435,34 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 
 		// We do a refresh to get all details of the new item which EWS added.
-		if ((! erCreateItemRequest.argument.attachmentsUpdates) || (erCreateItemRequest.argument.attachmentsUpdates.create.length == 0)) {
+		if ((!erCreateItemRequest.argument.attachmentsUpdates) || (erCreateItemRequest.argument.attachmentsUpdates.create.length == 0)) {
 			this.refresh();
 		}
 	},
 
-	createAttachmentOk: function _createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey)
-	{
+	createAttachmentOk: function _createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
 		if (this.debug) this.logInfo("createAttachmentOk");
 		this.notConnected = false;
 
 		if (erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length > 0) {
-			if (this.debug) this.logInfo("We also need to delete some attachments: count="+erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length);
+			if (this.debug) this.logInfo("We also need to delete some attachments: count=" + erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length);
 			var self = this;
-			this.addToQueue( erDeleteAttachmentRequest,
-				{user: this.user, 
-				 serverUrl: this.serverUrl,
-				 item: erCreateAttachmentRequest.argument.item,
-				 parentItemId: RootItemId,
-				 parentItemChangeKey: RootItemChangeKey, 
-				 attachmentsUpdates: erCreateAttachmentRequest.argument.attachmentsUpdates,
-				 sendto: erCreateAttachmentRequest.argument.sendto,
-				 actionStart: Date.now()}, 
-				function(erDeleteAttachmentRequest, aId, aChangeKey) { self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);}, 
-				function(erDeleteAttachmentRequest, aCode, aMsg) { self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);},
+			this.addToQueue(erDeleteAttachmentRequest, {
+					user: this.user,
+					serverUrl: this.serverUrl,
+					item: erCreateAttachmentRequest.argument.item,
+					parentItemId: RootItemId,
+					parentItemChangeKey: RootItemChangeKey,
+					attachmentsUpdates: erCreateAttachmentRequest.argument.attachmentsUpdates,
+					sendto: erCreateAttachmentRequest.argument.sendto,
+					actionStart: Date.now()
+				},
+				function (erDeleteAttachmentRequest, aId, aChangeKey) {
+					self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);
+				},
+				function (erDeleteAttachmentRequest, aCode, aMsg) {
+					self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);
+				},
 				erCreateAttachmentRequest.listener);
 			return;
 		}
@@ -5380,7 +5471,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			if ((erCreateAttachmentRequest.argument.sendto) && ((erCreateAttachmentRequest.argument.sendto != "sendtonone"))) {
 				// The item we processed was a meeting of which I'm the organiser.
 				// It contained new attachments and we need to send an item update to get it to the invited.
-				if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:"+erCreateAttachmentRequest.argument.sendto);
+				if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:" + erCreateAttachmentRequest.argument.sendto);
 				this.doAttachmentUpdatesFinalize(erCreateAttachmentRequest.argument.attachmentsUpdates, erCreateAttachmentRequest.argument.item, RootItemId, RootItemChangeKey, erCreateAttachmentRequest.argument.sendto, erCreateAttachmentRequest.listener);
 				return;
 			}
@@ -5388,10 +5479,10 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				if (this.debug) this.logInfo("createAttachmentOk erCreateAttachmentRequest.argument.sendto is not set.");
 				if (erCreateAttachmentRequest.listener) {
 					this.notifyOperationComplete(erCreateAttachmentRequest.listener,
-					      Cr.NS_OK,
-					      Ci.calIOperationListener.MODIFY,
-					      erCreateAttachmentRequest.argument.item.id,
-					      erCreateAttachmentRequest.argument.item);
+						Cr.NS_OK,
+						Ci.calIOperationListener.MODIFY,
+						erCreateAttachmentRequest.argument.item.id,
+						erCreateAttachmentRequest.argument.item);
 				}
 
 				this.refresh();
@@ -5399,56 +5490,56 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 	},
 
-	createAttachmentError: function _createAttachmentError(erDeleteAttachmentRequest, aCode, aMsg)
-	{
-		if (this.debug) this.logInfo("createAttachmentError: aCode:"+aCode+", aMsg:"+aMsg);
+	createAttachmentError: function _createAttachmentError(erDeleteAttachmentRequest, aCode, aMsg) {
+		if (this.debug) this.logInfo("createAttachmentError: aCode:" + aCode + ", aMsg:" + aMsg);
 		this.notConnected = true;
 
 	},
 
-	deleteAttachmentOk: function _deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey)
-	{
+	deleteAttachmentOk: function _deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey) {
 		if (this.debug) this.logInfo("deleteAttachmentOk");
 		this.notConnected = false;
 
 		// See if we need to update the item when it is an invitation to others
 		// This to get the invitation uncluding the attachments send out.
-		this.addAttachmentsToOfflineCache({ man: {calItem:erDeleteAttachmentRequest.argument.item}});
+		this.addAttachmentsToOfflineCache({
+			man: {
+				calItem: erDeleteAttachmentRequest.argument.item
+			}
+		});
 
 		if ((erDeleteAttachmentRequest.argument.sendto) && ((erDeleteAttachmentRequest.argument.sendto != "sendtonone"))) {
 			// The item we processed was a meeting of which I'm the organiser.
 			// It contained new attachments and we need to send an item update to get it to the invited.
-			if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:"+erDeleteAttachmentRequest.argument.sendto);
+			if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:" + erDeleteAttachmentRequest.argument.sendto);
 			this.doAttachmentUpdatesFinalize(erDeleteAttachmentRequest.argument.attachmentsUpdates, erDeleteAttachmentRequest.argument.item, aId, aChangeKey, erDeleteAttachmentRequest.argument.sendto, erDeleteAttachmentRequest.listener);
 			return;
 		}
 		else {
 			if (erDeleteAttachmentRequest.listener) {
 				this.notifyOperationComplete(erDeleteAttachmentRequest.listener,
-				      Cr.NS_OK,
-				      Ci.calIOperationListener.MODIFY,
-				      erDeleteAttachmentRequest.argument.item.id,
-				      erDeleteAttachmentRequest.argument.item);
+					Cr.NS_OK,
+					Ci.calIOperationListener.MODIFY,
+					erDeleteAttachmentRequest.argument.item.id,
+					erDeleteAttachmentRequest.argument.item);
 			}
 
 			this.refresh();
 		}
 	},
 
-	deleteAttachmentError: function _deleteAttachmentError(erCreateAttachmentRequest, aCode, aMsg)
-	{
+	deleteAttachmentError: function _deleteAttachmentError(erCreateAttachmentRequest, aCode, aMsg) {
 		if (this.debug) this.logInfo("deleteAttachmentError");
 		this.notConnected = true;
 	},
 
-	makeUpdateOneItem: function _makeUpdateOneItem(aNewItem, aOldItem, aIndex, aMasterId, aMasterChangeKey, aInvitation)
-	{
-		var upd = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="'+nsTypesStr+'"/>');
+	makeUpdateOneItem: function _makeUpdateOneItem(aNewItem, aOldItem, aIndex, aMasterId, aMasterChangeKey, aInvitation) {
+		var upd = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="' + nsTypesStr + '"/>');
 
 		if (!aIndex) {
 			var itemId = upd.addChildTag("ItemId", "nsTypes", null);
 			itemId.setAttribute("Id", aOldItem.id);
-			itemId.setAttribute("ChangeKey", aOldItem.changeKey);			
+			itemId.setAttribute("ChangeKey", aOldItem.changeKey);
 		}
 		else {
 			var oItemId = upd.addChildTag("OccurrenceItemId", "nsTypes", null);
@@ -5456,9 +5547,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			oItemId.setAttribute("ChangeKey", aMasterChangeKey);
 			oItemId.setAttribute("InstanceIndex", aIndex);
 		}
-	
+
 		var isInvitation = aInvitation;
-		if (! aInvitation) {
+		if (!aInvitation) {
 			isInvitation = false;
 		}
 
@@ -5468,7 +5559,10 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		if (updateObject.toString() == '<t:Updates xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"/>') {
 			// Nothing changed
-			return {changes: null, onlySnoozeChanged: false};
+			return {
+				changes: null,
+				onlySnoozeChanged: false
+			};
 		}
 
 		upd.addChildTagObject(updateObject);
@@ -5481,11 +5575,13 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			if (this.debug) this.logInfo("onlySnoozeChanged Or reminder time before start.");
 		}
 
-		return {changes: upd, onlySnoozeChanged: onlySnoozeChanged};
+		return {
+			changes: upd,
+			onlySnoozeChanged: onlySnoozeChanged
+		};
 	},
 
-	sendMeetingRespons: function _sendMeetingRespons(aItem, aListener, aItemType, aResponse, aBodyText)
-	{
+	sendMeetingRespons: function _sendMeetingRespons(aItem, aListener, aItemType, aResponse, aBodyText) {
 		// Check if I'm the organiser. Do not send to myself.
 		if (aItem.organizer) {
 			if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
@@ -5509,18 +5605,20 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		// First ask the user if he wants to send a response.
 		// Get the eventsummarywindow to attach dialog to.
 		let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-	                          .getService(Ci.nsIWindowMediator);
+			.getService(Ci.nsIWindowMediator);
 		let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow();
 
-		var preInput= { item: aItem, 
-			     response: tmpResponse,
-			     answer: ""};
+		var preInput = {
+			item: aItem,
+			response: tmpResponse,
+			answer: ""
+		};
 
 		if (calWindow) {
 			calWindow.openDialog("chrome://exchangecalendar/content/preInvitationResponse.xul",
 				"preInvitationResponseId",
 				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-				preInput); 
+				preInput);
 		}
 
 		if (preInput.answer != "send") {
@@ -5528,13 +5626,15 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			return false;
 		}
 
-		var input= { item: aItem, 
-			     response: tmpResponse,
-			     answer: "",
-				 proposeStart: "",
-				 proposeEnd: "",
-				 serverUrl: this.serverUrl,
-			     bodyText: ""};
+		var input = {
+			item: aItem,
+			response: tmpResponse,
+			answer: "",
+			proposeStart: "",
+			proposeEnd: "",
+			serverUrl: this.serverUrl,
+			bodyText: ""
+		};
 
 		if (preInput.response == "edit") {
 			// If the user would like to edit his response we show him the window for it.
@@ -5548,9 +5648,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				calWindow.openDialog("chrome://exchangecalendar/content/invitationResponse.xul",
 					"invitationResponseId",
 					"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-					input); 
+					input);
 			}
-						
+
 			if (input.answer != "send") {
 				if (this.debug) this.logInfo("User canceled invitationDialog.");
 				return false;
@@ -5564,60 +5664,64 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				messageDisposition = "SaveOnly";
 			}
 		}
-		if (this.debug) this.logInfo("  -------------- messageDisposition="+messageDisposition); 
-	
-		var proposeStart = this.tryToSetDateValue(input.proposeStart,"");
-		var proposeEnd   = this.tryToSetDateValue(input.proposeEnd,""); 
-	 	var proposeNewTime = false;
-		
-		if (proposeStart) 
-                        input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
+		if (this.debug) this.logInfo("  -------------- messageDisposition=" + messageDisposition);
+
+		var proposeStart = this.tryToSetDateValue(input.proposeStart, "");
+		var proposeEnd = this.tryToSetDateValue(input.proposeEnd, "");
+		var proposeNewTime = false;
+
+		if (proposeStart)
+			input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
 		if (proposeEnd)
-                        input.proposeEnd   = cal.toRFC3339(proposeEnd.getInTimezone(  this.globalFunctions.ecUTC())); 
-		
-		if( input.proposeStart && input.proposeEnd ){
+			input.proposeEnd = cal.toRFC3339(proposeEnd.getInTimezone(this.globalFunctions.ecUTC()));
+
+		if (input.proposeStart && input.proposeEnd) {
 			proposeNewTime = true;
 		}
-	 
+
 		var self = this;
-		this.addToQueue( erSendMeetingResponsRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 item: aItem,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 response: input.response,
-			 bodyText: input.bodyText,
-			 proposeStart: input.proposeStart,
-			 proposeEnd: input.proposeEnd,
-			 proposeNewTime: proposeNewTime,
-			 senderMailbox: this.mailbox,
-	 		 actionStart: Date.now(),
-			 itemType: aItemType,
-			 messageDisposition: messageDisposition}, 
-			function(erSendMeetingResponsRequest) { self.sendMeetingResponsOk(erSendMeetingResponsRequest);}, 
-			function(erSendMeetingResponsRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);},
+		this.addToQueue(erSendMeetingResponsRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: this.folderBase,
+				serverUrl: this.serverUrl,
+				item: aItem,
+				folderID: this.folderID,
+				changeKey: this.changeKey,
+				response: input.response,
+				bodyText: input.bodyText,
+				proposeStart: input.proposeStart,
+				proposeEnd: input.proposeEnd,
+				proposeNewTime: proposeNewTime,
+				senderMailbox: this.mailbox,
+				actionStart: Date.now(),
+				itemType: aItemType,
+				messageDisposition: messageDisposition
+			},
+			function (erSendMeetingResponsRequest) {
+				self.sendMeetingResponsOk(erSendMeetingResponsRequest);
+			},
+			function (erSendMeetingResponsRequest, aCode, aMsg) {
+				self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);
+			},
 			aListener);
 		return true;
 	},
 
-	sendMeetingResponsOk: function _sendMeetingResponsOk(erSendMeetingResponsRequest)
-	{
+	sendMeetingResponsOk: function _sendMeetingResponsOk(erSendMeetingResponsRequest) {
 		if (this.debug) this.logInfo("sendMeetingResponsOk");
 		this.saveCredentials(erSendMeetingResponsRequest.argument);
 		this.notConnected = false;
 
 		if (erSendMeetingResponsRequest.listener) {
-		        this.notifyOperationComplete(erSendMeetingResponsRequest.listener,
-		                                     Cr.NS_OK,
-		                                     Ci.calIOperationListener.MODIFY,
-		                                     erSendMeetingResponsRequest.argument.item.id,
-		                                     erSendMeetingResponsRequest.argument.item);
-		}
-		
-		if ( !erSendMeetingResponsRequest.argument.item.getProperty("X-MEETINGREQUEST")) {
+			this.notifyOperationComplete(erSendMeetingResponsRequest.listener,
+				Cr.NS_OK,
+				Ci.calIOperationListener.MODIFY,
+				erSendMeetingResponsRequest.argument.item.id,
+				erSendMeetingResponsRequest.argument.item);
+		}
+
+		if (!erSendMeetingResponsRequest.argument.item.getProperty("X-MEETINGREQUEST")) {
 			//this.notifyTheObservers("onModifyItem", [erSendMeetingResponsRequest.argument.item, this.itemCacheById[erSendMeetingResponsRequest.argument.item.id]]);
 			//this.itemCacheById[erSendMeetingResponsRequest.argument.item.id] = erSendMeetingResponsRequest.argument.item;
 			this.addItemToCache(erSendMeetingResponsRequest.argument.item);
@@ -5632,8 +5736,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		this.refresh();
 	},
 
-	modifyItemgetOccurrenceIndexOk: function _modifyItemgetOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey)
-	{
+	modifyItemgetOccurrenceIndexOk: function _modifyItemgetOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
 		if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk");
 		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
 		this.notConnected = false;
@@ -5649,33 +5752,38 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			// it again.
 
 			// bug 13.o when we change an occurrence it will send an updated master
-		//	this.notifyTheObservers("onDeleteItem", [this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
-		//	delete this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id];
+			//	this.notifyTheObservers("onDeleteItem", [this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
+			//	delete this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id];
 			this.notifyTheObservers("onModifyItem", [erGetOccurrenceIndexRequest.argument.newItem, this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
 			//this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id] = erGetOccurrenceIndexRequest.argument.newItem;
 			this.addItemToCache(erGetOccurrenceIndexRequest.argument.newItem);
 
 
 			var self = this;
-			if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: changed:"+String(changes));
-			this.addToQueue( erUpdateItemRequest,
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 folderBase: this.folderBase,
-				 serverUrl: this.serverUrl,
-				 item: erGetOccurrenceIndexRequest.argument.masterItem,
-				 folderID: this.folderID,
-				 changeKey: this.changeKey,
-				 updateReq: changes,
-				 newItem: erGetOccurrenceIndexRequest.argument.newItem,
-				 actionStart: Date.now(),
-				 attachmentsUpdates: erGetOccurrenceIndexRequest.argument.attachmentsUpdates,
-			         sendto: erGetOccurrenceIndexRequest.argument.sendto}, 
-				function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-				function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+			if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: changed:" + String(changes));
+			this.addToQueue(erUpdateItemRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					item: erGetOccurrenceIndexRequest.argument.masterItem,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					updateReq: changes,
+					newItem: erGetOccurrenceIndexRequest.argument.newItem,
+					actionStart: Date.now(),
+					attachmentsUpdates: erGetOccurrenceIndexRequest.argument.attachmentsUpdates,
+					sendto: erGetOccurrenceIndexRequest.argument.sendto
+				},
+				function (erUpdateItemRequest, aId, aChangeKey) {
+					self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+				},
+				function (erUpdateItemRequest, aCode, aMsg) {
+					self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+				},
 				erGetOccurrenceIndexRequest.listener);
 			return;
-			
+
 		}
 		else {
 			if (this.doAttachmentUpdates(erGetOccurrenceIndexRequest.argument.attachmentsUpdates, erGetOccurrenceIndexRequest.argument.masterItem, erGetOccurrenceIndexRequest.argument.sendto, erGetOccurrenceIndexRequest.listener)) {
@@ -5691,33 +5799,32 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 		if (erGetOccurrenceIndexRequest.listener) {
-		        this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-		                                     Cr.NS_OK,
-		                                     Ci.calIOperationListener.MODIFY,
-		                                     erGetOccurrenceIndexRequest.argument.newItem.id,
-		                                     erGetOccurrenceIndexRequest.argument.newItem);
+			this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+				Cr.NS_OK,
+				Ci.calIOperationListener.MODIFY,
+				erGetOccurrenceIndexRequest.argument.newItem.id,
+				erGetOccurrenceIndexRequest.argument.newItem);
 		}
 	},
 
-	whichOccurrencegetOccurrenceIndexError: function _whichOccurrencegetOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg)
-	{
-		if (this.debug) this.logInfo("whichOccurrencegetOccurrenceIndexError:("+aCode+")"+aMsg);
+	whichOccurrencegetOccurrenceIndexError: function _whichOccurrencegetOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg) {
+		if (this.debug) this.logInfo("whichOccurrencegetOccurrenceIndexError:(" + aCode + ")" + aMsg);
 		this.notConnected = true;
 		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
 
-		if ((aCode == -8) && (aMsg="ErrorCalendarIsCancelledForDecline")) {
+		if ((aCode == -8) && (aMsg = "ErrorCalendarIsCancelledForDecline")) {
 			if (erGetOccurrenceIndexRequest.listener) {
-			        this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-			                                     Cr.NS_OK,
-			                                     Ci.calIOperationListener.MODIFY,
-			                                     erGetOccurrenceIndexRequest.argument.newItem.id,
-			                                     erGetOccurrenceIndexRequest.argument.newItem);
+				this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+					Cr.NS_OK,
+					Ci.calIOperationListener.MODIFY,
+					erGetOccurrenceIndexRequest.argument.newItem.id,
+					erGetOccurrenceIndexRequest.argument.newItem);
 			}
 			return;
 		}
 
 		// TODO: We need to retry when we get here from adoptItem.
-//		if ((aCode == -8) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
+		//		if ((aCode == -8) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
 		if ((aCode == erGetOccurrenceIndexRequest.ER_ERROR_ER_ERROR_SOAP_ERROR) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
 			// Probably the item on the EWS server was changed and that
 			// update was not received by us yet.
@@ -5729,13 +5836,13 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			//var oldItem = this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id].clone();
 			var oldItem = this.cloneItem(this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id]);
 			if (erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount")) {
-				oldItem.setProperty("X-RetryCount", erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount")+1);
+				oldItem.setProperty("X-RetryCount", erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount") + 1);
 			}
 			else {
 				oldItem.setProperty("X-RetryCount", 1);
 			}
 
-			if (this.debug) this.logInfo("X-RetryCount="+oldItem.getProperty("X-RetryCount"));
+			if (this.debug) this.logInfo("X-RetryCount=" + oldItem.getProperty("X-RetryCount"));
 
 			if (oldItem.getProperty("X-RetryCount") < 25) {
 				this.modifyItem(newItem, oldItem, erGetOccurrenceIndexRequest.listener);
@@ -5743,11 +5850,11 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			else {
 				if (this.debug) this.logInfo("To many update retries. Giving up.");
 				if (erGetOccurrenceIndexRequest.listener) {
-				        this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-				                                     Ci.calIErrors.READ_FAILED,
-				                                     Ci.calIOperationListener.MODIFY,
-				                                     erGetOccurrenceIndexRequest.argument.newItem.id,
-				                                     erGetOccurrenceIndexRequest.argument.newItem);
+					this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+						Ci.calIErrors.READ_FAILED,
+						Ci.calIOperationListener.MODIFY,
+						erGetOccurrenceIndexRequest.argument.newItem.id,
+						erGetOccurrenceIndexRequest.argument.newItem);
 				}
 			}
 		}
@@ -5755,16 +5862,16 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			this.addActivity(calGetString("calExchangeCalendar", "ewsErrorEventMessage", [this.name, aMsg, aCode], "exchangecalendar"), aMsg, erGetOccurrenceIndexRequest.argument.actionStart, Date.now());
 
 			var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-						.getService(Components.interfaces.nsIPromptService);
+				.getService(Components.interfaces.nsIPromptService);
 			if (aMsg.indexOf(":") > -1) {
-				var msgStr = aMsg.substr(aMsg.indexOf(":")+1);
+				var msgStr = aMsg.substr(aMsg.indexOf(":") + 1);
 				switch (msgStr) {
-					case "ErrorCalendarMeetingRequestIsOutOfDate" :
-						msgStr = "Meeting request is Out Of Date. You cannot use it anymore. ("+msgStr+")";
-						break;
-					case "ErrorItemNotFound" :
-						msgStr = "Calendar item is not available anymore in the exchange database. ("+msgStr+")";
-						break;
+				case "ErrorCalendarMeetingRequestIsOutOfDate":
+					msgStr = "Meeting request is Out Of Date. You cannot use it anymore. (" + msgStr + ")";
+					break;
+				case "ErrorItemNotFound":
+					msgStr = "Calendar item is not available anymore in the exchange database. (" + msgStr + ")";
+					break;
 				}
 				promptService.alert(null, "Info", msgStr);
 			}
@@ -5773,59 +5880,67 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			}
 
 			if (erGetOccurrenceIndexRequest.listener) {
-			        this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-			                                     Ci.calIErrors.MODIFICATION_FAILED,
-			                                     Ci.calIOperationListener.MODIFY,
-			                                     erGetOccurrenceIndexRequest.argument.newItem.id,
-			                                     erGetOccurrenceIndexRequest.argument.newItem);
+				this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+					Ci.calIErrors.MODIFICATION_FAILED,
+					Ci.calIOperationListener.MODIFY,
+					erGetOccurrenceIndexRequest.argument.newItem.id,
+					erGetOccurrenceIndexRequest.argument.newItem);
 			}
 		}
 	},
 
-	doAttachmentUpdates: function _doAttachmentUpdates(aAttachmentsUpdates, aItem, aSendTo, aListener)
-	{
+	doAttachmentUpdates: function _doAttachmentUpdates(aAttachmentsUpdates, aItem, aSendTo, aListener) {
 		var result = false;
-		if ((aAttachmentsUpdates) && ( (aAttachmentsUpdates.create.length > 0) || (aAttachmentsUpdates.delete.length > 0) )) {
+		if ((aAttachmentsUpdates) && ((aAttachmentsUpdates.create.length > 0) || (aAttachmentsUpdates.delete.length > 0))) {
 			result = true;
 			if (aAttachmentsUpdates.create.length > 0) {
-				if (this.debug) this.logInfo("doAttachmentUpdates We have "+aAttachmentsUpdates.create.length+" attachments to create.");
+				if (this.debug) this.logInfo("doAttachmentUpdates We have " + aAttachmentsUpdates.create.length + " attachments to create.");
 				var self = this;
-				this.addToQueue( erCreateAttachmentRequest,
-					{user: this.user, 
-					 serverUrl: this.serverUrl,
-					 item: aItem,
-					 parentItemId: aItem.id,
-					 parentItemChangeKey: aItem.changeKey, 
-					 attachmentsUpdates: aAttachmentsUpdates,
-					 sendto: aSendTo,
-					 actionStart: Date.now()}, 
-					function(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) { self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);}, 
-					function(erCreateAttachmentRequest, aCode, aMsg) { self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);},
+				this.addToQueue(erCreateAttachmentRequest, {
+						user: this.user,
+						serverUrl: this.serverUrl,
+						item: aItem,
+						parentItemId: aItem.id,
+						parentItemChangeKey: aItem.changeKey,
+						attachmentsUpdates: aAttachmentsUpdates,
+						sendto: aSendTo,
+						actionStart: Date.now()
+					},
+					function (erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
+						self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);
+					},
+					function (erCreateAttachmentRequest, aCode, aMsg) {
+						self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);
+					},
 					aListener);
 			}
 			else {
-				if (this.debug) this.logInfo("updateItemOk We have "+aAttachmentsUpdates.delete.length+" attachments to delete.");
+				if (this.debug) this.logInfo("updateItemOk We have " + aAttachmentsUpdates.delete.length + " attachments to delete.");
 				var self = this;
-				this.addToQueue( erDeleteAttachmentRequest,
-					{user: this.user, 
-					 serverUrl: this.serverUrl,
-					 item: aItem,
-					 parentItemId: aItem.id,
-					 parentItemChangeKey: aItem.changeKey, 
-					 attachmentsUpdates: aAttachmentsUpdates,
-					 sendto: aSendTo,
-					 actionStart: Date.now()}, 
-					function(erDeleteAttachmentRequest, aId, aChangeKey) { self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);}, 
-					function(erDeleteAttachmentRequest, aCode, aMsg) { self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);},
+				this.addToQueue(erDeleteAttachmentRequest, {
+						user: this.user,
+						serverUrl: this.serverUrl,
+						item: aItem,
+						parentItemId: aItem.id,
+						parentItemChangeKey: aItem.changeKey,
+						attachmentsUpdates: aAttachmentsUpdates,
+						sendto: aSendTo,
+						actionStart: Date.now()
+					},
+					function (erDeleteAttachmentRequest, aId, aChangeKey) {
+						self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);
+					},
+					function (erDeleteAttachmentRequest, aCode, aMsg) {
+						self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);
+					},
 					aListener);
 			}
 		}
 		return result;
 	},
 
-	doAttachmentUpdatesFinalize: function _doAttachmentUpdatesFinalize(aAttachmentsUpdates, aItem, aId, aChangeKey, aSendTo, aListener)
-	{
-		if (this.debug) this.logInfo("doAttachmentUpdatesFinalize: item:"+aItem.title+", aSendTo:"+aSendTo);
+	doAttachmentUpdatesFinalize: function _doAttachmentUpdatesFinalize(aAttachmentsUpdates, aItem, aId, aChangeKey, aSendTo, aListener) {
+		if (this.debug) this.logInfo("doAttachmentUpdatesFinalize: item:" + aItem.title + ", aSendTo:" + aSendTo);
 
 		/*var req = <nsTypes:ItemChange xmlns:nsTypes="http://schemas.microsoft.com/exchange/services/2006/types">
 			  <nsTypes:ItemId Id={aId} ChangeKey={aChangeKey}/>
@@ -5839,7 +5954,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			  </nsTypes:Updates>
 			</nsTypes:ItemChange>;*/
 
-		var req = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="'+nsTypesStr+'"/>');
+		var req = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="' + nsTypesStr + '"/>');
 		var itemId = req.addChildTag("ItemId", "nsTypes", null);
 		itemId.setAttribute("Id", aId);
 		itemId.setAttribute("ChangeKey", aChangeKey);
@@ -5848,28 +5963,32 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		setItemField.addChildTag("CalendarItem", "nsTypes", null).addChildTag("Subject", "nsTypes", aItem.title);
 
 		var self = this;
-		this.addToQueue( erUpdateItemRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 item: aItem,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 updateReq: req,
-			 newItem: aItem,
-			 actionStart: Date.now(),
-			 attachmentsUpdates: null,
-		         sendto: aSendTo}, 
-			function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-			function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+		this.addToQueue(erUpdateItemRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: this.folderBase,
+				serverUrl: this.serverUrl,
+				item: aItem,
+				folderID: this.folderID,
+				changeKey: this.changeKey,
+				updateReq: req,
+				newItem: aItem,
+				actionStart: Date.now(),
+				attachmentsUpdates: null,
+				sendto: aSendTo
+			},
+			function (erUpdateItemRequest, aId, aChangeKey) {
+				self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+			},
+			function (erUpdateItemRequest, aCode, aMsg) {
+				self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+			},
 			aListener);
-		
+
 	},
 
-	updateItemOk: function _updateItemOk(erUpdateItemRequest, aId, aChangeKey)
-	{
-		if (this.debug) this.logInfo("updateItemOk: aId"+aId);
+	updateItemOk: function _updateItemOk(erUpdateItemRequest, aId, aChangeKey) {
+		if (this.debug) this.logInfo("updateItemOk: aId" + aId);
 
 		this.saveCredentials(erUpdateItemRequest.argument);
 		this.notConnected = false;
@@ -5882,22 +6001,21 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			this.addActivity(calGetString("calExchangeCalendar", "updateTaskEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
 		}
 
-		if (! this.doAttachmentUpdates(erUpdateItemRequest.argument.attachmentsUpdates, erUpdateItemRequest.argument.item, erUpdateItemRequest.argument.sendto, erUpdateItemRequest.listener)) {
+		if (!this.doAttachmentUpdates(erUpdateItemRequest.argument.attachmentsUpdates, erUpdateItemRequest.argument.item, erUpdateItemRequest.argument.sendto, erUpdateItemRequest.listener)) {
 			if (erUpdateItemRequest.listener) {
 				this.notifyOperationComplete(erUpdateItemRequest.listener,
-				                             Cr.NS_OK,
-				                             Ci.calIOperationListener.MODIFY,
-				                             erUpdateItemRequest.argument.newItem.id,
-				                             erUpdateItemRequest.argument.newItem);
+					Cr.NS_OK,
+					Ci.calIOperationListener.MODIFY,
+					erUpdateItemRequest.argument.newItem.id,
+					erUpdateItemRequest.argument.newItem);
 			}
-		
+
 			this.refresh();
 		}
 	},
 
-	getOccurrenceIndexOk: function _getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey)
-	{
-		if (this.debug) this.logInfo("getOccurrenceIndexOk index="+aIndex);
+	getOccurrenceIndexOk: function _getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+		if (this.debug) this.logInfo("getOccurrenceIndexOk index=" + aIndex);
 		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
 
 		this.notifyTheObservers("onDeleteItem", [erGetOccurrenceIndexRequest.argument.masterItem]);
@@ -5907,74 +6025,77 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		this.notConnected = false;
 		var self = this;
 		switch (erGetOccurrenceIndexRequest.argument.action) {
-			case "deleteItem":
-				this.addToQueue( erDeleteItemRequest,
-					{user: erGetOccurrenceIndexRequest.argument.user, 
-					 mailbox: this.mailbox,
-					 folderBase: this.folderBase,
-					 serverUrl: erGetOccurrenceIndexRequest.argument.serverUrl,
-					 item: erGetOccurrenceIndexRequest.argument.item,
-					 folderID: erGetOccurrenceIndexRequest.argument.folderID,
-					 masterID: aMasterId,
-					 masterChangeKey: aMasterChangeKey,
-					 itemIndex: aIndex,
-					 actionStart: Date.now(),
-					 itemType: erGetOccurrenceIndexRequest.argument.itemType,
-					 whichOccurrence: erGetOccurrenceIndexRequest.argument.whichOccurrence}, 
-					function(erDeleteItemRequest) { self.deleteItemOk(erDeleteItemRequest);},
-					function(erDeleteItemRequest, aCode, aMsg) { self.deleteItemError(erDeleteItemRequest, aCode, aMsg);},
-					erGetOccurrenceIndexRequest.listener);
-				break;
+		case "deleteItem":
+			this.addToQueue(erDeleteItemRequest, {
+					user: erGetOccurrenceIndexRequest.argument.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: erGetOccurrenceIndexRequest.argument.serverUrl,
+					item: erGetOccurrenceIndexRequest.argument.item,
+					folderID: erGetOccurrenceIndexRequest.argument.folderID,
+					masterID: aMasterId,
+					masterChangeKey: aMasterChangeKey,
+					itemIndex: aIndex,
+					actionStart: Date.now(),
+					itemType: erGetOccurrenceIndexRequest.argument.itemType,
+					whichOccurrence: erGetOccurrenceIndexRequest.argument.whichOccurrence
+				},
+				function (erDeleteItemRequest) {
+					self.deleteItemOk(erDeleteItemRequest);
+				},
+				function (erDeleteItemRequest, aCode, aMsg) {
+					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+				},
+				erGetOccurrenceIndexRequest.listener);
+			break;
 		}
 	},
 
-	getOccurrenceIndexError: function _getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg)
-	{
-//		if (this.debug) this.logInfo("getOccurrenceIndexError");
+	getOccurrenceIndexError: function _getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg) {
+		//		if (this.debug) this.logInfo("getOccurrenceIndexError");
 		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
 		this.notConnected = true;
 		switch (erGetOccurrenceIndexRequest.argument.action) {
-			case "deleteItem":
-				if (erGetOccurrenceIndexRequest.listener) {
-					this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-					      Ci.calIErrors.MODIFICATION_FAILED,
-					      Ci.calIOperationListener.DELETE,
-					      null,
-					      aMsg);
-				}
-				break;
+		case "deleteItem":
+			if (erGetOccurrenceIndexRequest.listener) {
+				this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+					Ci.calIErrors.MODIFICATION_FAILED,
+					Ci.calIOperationListener.DELETE,
+					null,
+					aMsg);
+			}
+			break;
 		}
 	},
 
-	deleteItemOk: function _deleteItemOk(erDeleteItemRequest)
-	{
+	deleteItemOk: function _deleteItemOk(erDeleteItemRequest) {
 		this.saveCredentials(erDeleteItemRequest.argument);
 		if (this.debug) this.logInfo("deleteItemOK");
 		this.notConnected = false;
 
 		if (erDeleteItemRequest.listener) {
 			this.notifyOperationComplete(erDeleteItemRequest.listener,
-			      Cr.NS_OK,
-			      Ci.calIOperationListener.DELETE,
-			      erDeleteItemRequest.argument.item.id,
-			      erDeleteItemRequest.argument.item);
+				Cr.NS_OK,
+				Ci.calIOperationListener.DELETE,
+				erDeleteItemRequest.argument.item.id,
+				erDeleteItemRequest.argument.item);
 		}
 
-		if (this.debug) this.logInfo("itemType:"+erDeleteItemRequest.itemType+", Subject:"+erDeleteItemRequest.argument.item.title);
+		if (this.debug) this.logInfo("itemType:" + erDeleteItemRequest.itemType + ", Subject:" + erDeleteItemRequest.argument.item.title);
 		switch (erDeleteItemRequest.itemType) {
-			case "master" :
-				// Also remove the children.
-				// 12-12-2011 Turned this of because this is done when we receive the update from the exchange server.
-				//this.removeChildrenFromMaster(erDeleteItemRequest.argument.item);
-				//delete this.recurringMasterCache[erDeleteItemRequest.argument.item.uid];
-				break;
-			case "single":
-			case "occurrence":
+		case "master":
+			// Also remove the children.
+			// 12-12-2011 Turned this of because this is done when we receive the update from the exchange server.
+			//this.removeChildrenFromMaster(erDeleteItemRequest.argument.item);
+			//delete this.recurringMasterCache[erDeleteItemRequest.argument.item.uid];
+			break;
+		case "single":
+		case "occurrence":
 
 			// This will be done on receiving the update from this.globalFunctions.
-				//this.notifyTheObservers("onDeleteItem", [erDeleteItemRequest.argument.item]);
-				//delete this.itemCacheById[erDeleteItemRequest.argument.item.id];
-				break;
+			//this.notifyTheObservers("onDeleteItem", [erDeleteItemRequest.argument.item]);
+			//delete this.itemCacheById[erDeleteItemRequest.argument.item.id];
+			break;
 		}
 
 
@@ -5989,22 +6110,20 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		this.refresh();
 	},
 
-	deleteItemError: function _deleteItemError(erDeleteItemRequest, aCode, aMsg)
-	{
+	deleteItemError: function _deleteItemError(erDeleteItemRequest, aCode, aMsg) {
 		this.saveCredentials(erDeleteItemRequest.argument);
 		this.notConnected = true;
-		if (this.debug) this.logInfo("deleteItemError msg:"+String(aMsg));
+		if (this.debug) this.logInfo("deleteItemError msg:" + String(aMsg));
 		if (erDeleteItemRequest.listener) {
 			this.notifyOperationComplete(erDeleteItemRequest.listener,
-			      Ci.calIErrors.MODIFICATION_FAILED,
-			      Ci.calIOperationListener.DELETE,
-			      null,
-			      aMsg);
+				Ci.calIErrors.MODIFICATION_FAILED,
+				Ci.calIOperationListener.DELETE,
+				null,
+				aMsg);
 		}
 	},
 
-	saveCredentials: function _saveCredentials(aCredentials)
-	{
+	saveCredentials: function _saveCredentials(aCredentials) {
 		if (aCredentials) {
 			if ((aCredentials.user != "") && (aCredentials.user != "\\") && (aCredentials.user != "/")) {
 				this.user = aCredentials.user;
@@ -6012,26 +6131,26 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 	},
 
-	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	{
+	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
 		if (this.getProperty("disabled")) {
 			if (this.debug) this.logInfo("Not adding to queue because we are disabled.");
 			return;
 		}
-		 
+
 		//if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
 
-		this.loadBalancer.addToQueue({ calendar: this,
-				 ecRequest:aRequest,
-				 arguments: aArgument,
-				 cbOk: aCbOk,
-				 cbError: aCbError,
-				 listener: aListener});
+		this.loadBalancer.addToQueue({
+			calendar: this,
+			ecRequest: aRequest,
+			arguments: aArgument,
+			cbOk: aCbOk,
+			cbError: aCbError,
+			listener: aListener
+		});
 	},
 
-	findCalendarItemsOK: function _findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences, doNotCheckCache)
-	{
-		if (this.debug) this.logInfo("findCalendarItemsOK: aIds.length="+aIds.length+", aOccurrences.length="+aOccurrences.length);
+	findCalendarItemsOK: function _findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences, doNotCheckCache) {
+		if (this.debug) this.logInfo("findCalendarItemsOK: aIds.length=" + aIds.length + ", aOccurrences.length=" + aOccurrences.length);
 
 		if (erFindCalendarItemsRequest) this.saveCredentials(erFindCalendarItemsRequest.argument);
 		this.notConnected = false;
@@ -6040,18 +6159,18 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			return;
 		}
 
-		if( doNotCheckCache === undefined ){
-			if( this.useOfflineCache ){
+		if (doNotCheckCache === undefined) {
+			if (this.useOfflineCache) {
 				doNotCheckCache = false;
 			}
-			else{
+			else {
 				doNotCheckCache = true;
 			}
 		}
-		
+
 		// Removed Single/Master items in the lists which we already have in memory
 		var newIdList = new Array();
-//dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
+		//dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
 		for each(var item in aIds) {
 			if (!doNotCheckCache) {
 				var inItemCache = ((this.itemCacheById[item.Id]) && (this.itemCacheById[item.Id].changeKey == item.ChangeKey));
@@ -6068,57 +6187,61 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 				newIdList.push(item);
 			}
 		}
- 
+
 		// Remove Occurrence/Exception items in the lists which we already have in memory
 		var newOccurrenceList = new Array();
-//dump("     findCalendarItemsOK: aOccurrences.length:"+aOccurrences.length+"\n");
+		//dump("     findCalendarItemsOK: aOccurrences.length:"+aOccurrences.length+"\n");
 		for each(var item in aOccurrences) {
 			if (!this.recurringMasterCache[item.uid]) {
 				newOccurrenceList.push(item);
 			}
 		}
-//dump("     findCalendarItemsOK: newOccurrenceList.length:"+newOccurrenceList.length+"\n");
+		//dump("     findCalendarItemsOK: newOccurrenceList.length:"+newOccurrenceList.length+"\n");
 
-       		var self = this;
+		var self = this;
 
 		// We have single and/or master items. Get full details and cache them.
 		if (newIdList.length > 0) {
-			this.addToQueue( erGetItemsRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 ids: newIdList,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 occurrences: newOccurrenceList,
-			 folderClass: this.folderClass,
-			 GUID: calExchangeCalendarGUID}, 
-			function(erGetItemsRequest, aIds, aItemErrors) { self.getCalendarItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
-			function(erGetItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);},
-			null);
+			this.addToQueue(erGetItemsRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					folderBase: this.folderBase,
+					serverUrl: this.serverUrl,
+					ids: newIdList,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					occurrences: newOccurrenceList,
+					folderClass: this.folderClass,
+					GUID: calExchangeCalendarGUID
+				},
+				function (erGetItemsRequest, aIds, aItemErrors) {
+					self.getCalendarItemsOK(erGetItemsRequest, aIds, aItemErrors);
+				},
+				function (erGetItemsRequest, aCode, aMsg) {
+					self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);
+				},
+				null);
 		}
 
 		this.startCalendarPoller();
 	},
 
-	startCalendarPoller: function _startCalendarPoller()
-	{
-	        var self = this;
-	        var timerCallback = {
+	startCalendarPoller: function _startCalendarPoller() {
+		var self = this;
+		var timerCallback = {
 			notify: function setTimeout_notify() {
-						self.refresh();
-	        		}
-	        };
-		
-		if( 60 > this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval",0) ){  
-			this.prefs.setIntPref("ecCalendarPollInterval",60);
-		}
-		
- 		if (!this.calendarPoller) { 
+				self.refresh();
+			}
+		};
+
+		if (60 > this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 0)) {
+			this.prefs.setIntPref("ecCalendarPollInterval", 60);
+		}
+
+		if (!this.calendarPoller) {
 			// start the calendar poller
 			this.calendarPoller = Cc["@mozilla.org/timer;1"]
-					.createInstance(Ci.nsITimer);
+				.createInstance(Ci.nsITimer);
 			this.calendarPoller.initWithCallback(timerCallback, this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 60) * 1000, this.calendarPoller.TYPE_REPEATING_SLACK);
 		}
 		else {
@@ -6126,9 +6249,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 	},
 
-	findCalendarItemsError: function _findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg) 
-	{
-		if (this.debug) this.logInfo("findCalendarItemsError aCode:"+aCode+", aMsg:"+aMsg);
+	findCalendarItemsError: function _findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg) {
+		if (this.debug) this.logInfo("findCalendarItemsError aCode:" + aCode + ", aMsg:" + aMsg);
 		if ((aCode == -8) && (aMsg == "ErrorCalendarFolderIsInvalidForCalendarView")) {
 			this.supportsEvents = false;
 		}
@@ -6138,134 +6260,138 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		this.saveCredentials(erFindCalendarItemsRequest.argument);
 	},
 
-/*	findMasterOccurrencesOk: function _findMasterOccurrencesOk(erGetItemsRequest, aIds)
-	{
-		if (this.debug) this.logInfo("findMasterOccurrencesOk:Start: aIds.length="+aIds.length);
+	/*	findMasterOccurrencesOk: function _findMasterOccurrencesOk(erGetItemsRequest, aIds)
+		{
+			if (this.debug) this.logInfo("findMasterOccurrencesOk:Start: aIds.length="+aIds.length);
 
-		this.saveCredentials(erFindCalendarItemsRequest.argument);
-		this.notConnected = false;
+			this.saveCredentials(erFindCalendarItemsRequest.argument);
+			this.notConnected = false;
 
-		if (aIds.length == 0) {
-			return;
-		}
+			if (aIds.length == 0) {
+				return;
+			}
 
-		// Cache full master details.
-		this.updateCalendar(erGetItemsRequest, aIds, true);
-		if (this.debug) this.logInfo("findMasterOccurrencesOk:End: aIds.length="+aIds.length);
-		erGetItemsRequest= null;
-		aIds = null;
+			// Cache full master details.
+			this.updateCalendar(erGetItemsRequest, aIds, true);
+			if (this.debug) this.logInfo("findMasterOccurrencesOk:End: aIds.length="+aIds.length);
+			erGetItemsRequest= null;
+			aIds = null;
 
-	},*/
+		},*/
 
-	findOccurrencesOK: function _findOccurrencesOK(erFindOccurrencesRequest, aIds)
-	{
-		if (this.debug) this.logInfo("findOccurrencesOK: aIds.length="+aIds.length);
+	findOccurrencesOK: function _findOccurrencesOK(erFindOccurrencesRequest, aIds) {
+		if (this.debug) this.logInfo("findOccurrencesOK: aIds.length=" + aIds.length);
 		//dump("findOccurrencesOK: aIds.length="+aIds.length+"\n");
 		// Get full details of occurrences and exceptions and cache them.
 		this.notConnected = false;
 		this.findCalendarItemsOK(erFindOccurrencesRequest, aIds, []);
 	},
 
-	findFollowupTaskItemsOK: function _findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds)
-	{
- 	if (this.debug) this.logInfo("findFollowupTaskItemsOK: aIds.length:"+aIds.length);
+	findFollowupTaskItemsOK: function _findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds) {
+		if (this.debug) this.logInfo("findFollowupTaskItemsOK: aIds.length:" + aIds.length);
 		this.saveCredentials(erFindFollowupItemsRequest.argument);
 		this.notConnected = false;
 
 		if (aIds.length == 0) {
 			return;
 		}
- 
-       		var self = this;
 
-	 	this.addToQueue( erGetItemsRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 ids: aIds,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 folderClass: "IPF.Note",
-			 GUID: calExchangeCalendarGUID }, 
-			function(erGetItemsRequest, aIds, aItemErrors) { self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
-			function(erGetItemsRequest, aCode, aMsg) { self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);},
-			null); 
+		var self = this;
+
+		this.addToQueue(erGetItemsRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: this.folderBase,
+				serverUrl: this.serverUrl,
+				ids: aIds,
+				folderID: this.folderID,
+				changeKey: this.changeKey,
+				folderClass: "IPF.Note",
+				GUID: calExchangeCalendarGUID
+			},
+			function (erGetItemsRequest, aIds, aItemErrors) {
+				self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);
+			},
+			function (erGetItemsRequest, aCode, aMsg) {
+				self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);
+			},
+			null);
 
-	 	this.startCalendarPoller();
+		this.startCalendarPoller();
 	},
 
-	findFollowupTaskItemsError: function _findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg)
-	{
+	findFollowupTaskItemsError: function _findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg) {
 		this.saveCredentials(erFindFollowupItemsRequest.argument);
 		this.notConnected = true;
 
 	},
-	
-	findTaskItemsOK: function _findTaskItemsOK(erFindTaskItemsRequest, aIds, doNotCheckCache)
-	{
- 		if (this.debug) this.logInfo("findTaskItemsOK: aIds.length:"+aIds.length);
+
+	findTaskItemsOK: function _findTaskItemsOK(erFindTaskItemsRequest, aIds, doNotCheckCache) {
+		if (this.debug) this.logInfo("findTaskItemsOK: aIds.length:" + aIds.length);
 		this.saveCredentials(erFindTaskItemsRequest.argument);
 		this.notConnected = false;
 
 		if (aIds.length == 0) {
 			return;
 		}
-		
-		if( doNotCheckCache === undefined ){
-			if( this.useOfflineCache ){
+
+		if (doNotCheckCache === undefined) {
+			if (this.useOfflineCache) {
 				doNotCheckCache = false;
 			}
-			else{
+			else {
 				doNotCheckCache = true;
 			}
 		}
-		
+
 		// Removed Single/Master items in the lists which we already have in memory
 		var newIdList = new Array();
-//dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
+		//dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
 		for each(var item in aIds) {
 			if (!doNotCheckCache) {
 				var inItemCache = ((this.itemCacheById[item.Id]) && (this.itemCacheById[item.Id].changeKey == item.ChangeKey));
 				if ((!inItemCache) && (this.useOfflineCache)) {
 					inItemCache = (this.itemIsInOfflineCache(item.Id) == item.ChangeKey);
 				}
- 			}
+			}
 			else {
 				var inItemCache = false;
- 			}
- 			if ((!inItemCache)) {
+			}
+			if ((!inItemCache)) {
 				newIdList.push(item);
 			}
 		}
- 
-   		var self = this; 
-		this.addToQueue( erGetItemsRequest, 
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 ids: newIdList,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 folderClass: this.folderClass,
-			 GUID: calExchangeCalendarGUID }, 
-			function(erGetItemsRequest, aIds, aItemErrors) { self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
-			function(erGetItemsRequest, aCode, aMsg) { self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);},
+
+		var self = this;
+		this.addToQueue(erGetItemsRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: this.folderBase,
+				serverUrl: this.serverUrl,
+				ids: newIdList,
+				folderID: this.folderID,
+				changeKey: this.changeKey,
+				folderClass: this.folderClass,
+				GUID: calExchangeCalendarGUID
+			},
+			function (erGetItemsRequest, aIds, aItemErrors) {
+				self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);
+			},
+			function (erGetItemsRequest, aCode, aMsg) {
+				self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);
+			},
 			null);
 
 		this.startCalendarPoller();
 	},
 
-	findTaskItemsError: function _findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg)
-	{
+	findTaskItemsError: function _findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg) {
 		this.saveCredentials(erFindTaskItemsRequest.argument);
 		this.notConnected = true;
 
 	},
-	
-	tryToSetDateValue: function _TryToSetDateValue(ewsvalue, aDefault)
-	{
+
+	tryToSetDateValue: function _TryToSetDateValue(ewsvalue, aDefault) {
 		if ((ewsvalue) && (ewsvalue.toString().length)) {
 			return cal.fromRFC3339(ewsvalue, this.globalFunctions.ecTZService().UTC).getInTimezone(this.globalFunctions.ecDefaultTimeZone());
 		}
@@ -6273,8 +6399,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return aDefault;
 	},
 
-	tryToSetValue: function _tryToSetValue(ewsvalue, aDefault)
-	{
+	tryToSetValue: function _tryToSetValue(ewsvalue, aDefault) {
 		if (ewsvalue) {
 			return ewsvalue;
 		}
@@ -6282,8 +6407,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return aDefault;
 	},
 
-	processItemSyncQueue: function _processItemSyncQueue()
-	{
+	processItemSyncQueue: function _processItemSyncQueue() {
 		if (this.processItemSyncQueueBusy) {
 			return;
 		}
@@ -6292,7 +6416,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 		// Process this.getItemSyncQueue
 		while (this.getItemSyncQueue.length > 0) {
- 			if (this.debug) this.logInfo("processItemSyncQueue: id:"+this.getItemSyncQueue[0].id);
+			if (this.debug) this.logInfo("processItemSyncQueue: id:" + this.getItemSyncQueue[0].id);
 			this.getItem(this.getItemSyncQueue[0].id, this.getItemSyncQueue[0].listener, true);
 			this.getItemSyncQueue.shift();
 		}
@@ -6301,10 +6425,9 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 	},
 
-	getTaskItemsOK: function _getTaskItemsOK(erGetItemsRequest, aItems, aItemErrors)
-	{
-		if (this.debug) this.logInfo("getTaskItemsOK: aItems.length:"+aItems.length);
-		
+	getTaskItemsOK: function _getTaskItemsOK(erGetItemsRequest, aItems, aItemErrors) {
+		if (this.debug) this.logInfo("getTaskItemsOK: aItems.length:" + aItems.length);
+
 		this.saveCredentials(erGetItemsRequest.argument);
 		this.notConnected = false;
 
@@ -6320,14 +6443,17 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 					this.removeItemFromCache(this.itemCacheById[aItemErrors[i]]);
 				}
 				else {
-					this.removeFromOfflineCache({ id: aItemErrors[i], title:"from offline"});
+					this.removeFromOfflineCache({
+						id: aItemErrors[i],
+						title: "from offline"
+					});
 				}
 				i++;
-			} 
+			}
 		}
 
 		if (aItems.length == 0) {
-			this.processItemSyncQueue(); 
+			this.processItemSyncQueue();
 			return;
 		}
 
@@ -6335,23 +6461,23 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		this.updateCalendar(erGetItemsRequest, aItems, true);
 
 		if ((erGetItemsRequest.argument) && (erGetItemsRequest.argument.syncState)) {
-				if (this.debug) this.logInfo("getTaskItemsOK: We have a syncState to save.");
-				//this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
-				
-				switch(erGetItemsRequest.argument.folderBase){
-				case "inbox":
-					this.syncStateInbox = erGetItemsRequest.argument.syncState;
-					this.saveToFile("syncStateInbox.txt", erGetItemsRequest.argument.syncState);
-					this.prefs.setCharPref("syncStateInbox", erGetItemsRequest.argument.syncState); 
-					break;
-				default:
-					this.syncState = erGetItemsRequest.argument.syncState;
-					this.saveToFile("syncState.txt", erGetItemsRequest.argument.syncState);  
-					this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState); 
-				}		 
+			if (this.debug) this.logInfo("getTaskItemsOK: We have a syncState to save.");
+			//this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
+
+			switch (erGetItemsRequest.argument.folderBase) {
+			case "inbox":
+				this.syncStateInbox = erGetItemsRequest.argument.syncState;
+				this.saveToFile("syncStateInbox.txt", erGetItemsRequest.argument.syncState);
+				this.prefs.setCharPref("syncStateInbox", erGetItemsRequest.argument.syncState);
+				break;
+			default:
+				this.syncState = erGetItemsRequest.argument.syncState;
+				this.saveToFile("syncState.txt", erGetItemsRequest.argument.syncState);
+				this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
+			}
 		}
 
-		aItems  = null;
+		aItems = null;
 		erGetItemsRequest = null;
 
 		if (this.debug) this.logInfo("getTaskItemsOK 4");
@@ -6360,9 +6486,8 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 	},
 
-	getTaskItemsError: function _getTaskItemsError(erGetItemsRequest, aCode, aMsg) 
-	{
-//		if (this.debug) this.logInfo("getTaskItemsError: aMsg:"+ aMsg);
+	getTaskItemsError: function _getTaskItemsError(erGetItemsRequest, aCode, aMsg) {
+		//		if (this.debug) this.logInfo("getTaskItemsError: aMsg:"+ aMsg);
 		this.saveCredentials(erGetItemsRequest.argument);
 		this.notConnected = true;
 
@@ -6370,60 +6495,63 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 
 	},
 
-	getMeetingRequestFromServer: function _getMeetingRequestFromServer(aItem, aUID, aOperation, aListener)
-	{
-		if (this.debug) this.logInfo("aUID="+aUID);
+	getMeetingRequestFromServer: function _getMeetingRequestFromServer(aItem, aUID, aOperation, aListener) {
+		if (this.debug) this.logInfo("aUID=" + aUID);
 
 		// We do not have a meetingrequest in cache but it is an iTIP.
 		// Is inbox polling off? Or did the inbox polling not yet happen interval to long.
-// bug 59		if (!this.doPollInbox) {
-			// We are not polling the inbox so treat it as a meetingrespons.
-			if (this.debug) this.logInfo("We get a new calendar item. It looks like an iTIP respons because aItem.id is set. Going to check if we can find it in the users inbox.");
-			// We mis the exchange id and changekey which we need for responding.
-			// We can get these by polling or searching the inbox but this is async. We can do this
-			// because we received a listener. So search inbox for this uid and then use the full exchange message.
-			// We could have multiple meetingrequest with the same uid but different id and changekey. How do we handle those??
-						
-			var self = this;
-			this.addToQueue( erGetMeetingRequestByUIDRequest,
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 folderBase: "inbox",
-				 serverUrl: this.serverUrl,
-				 item: aItem,
-				 uid: aUID,
-				 actionStart: Date.now(),
-				 operation: aOperation,
-				 GUID: calExchangeCalendarGUID}, 
-				function(erGetMeetingRequestByUIDRequest, aMeetingRequests) { self.getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests);}, 
-				function(erGetMeetingRequestByUIDRequest, aCode, aMsg) { self.getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg);},
-				aListener);
+		// bug 59		if (!this.doPollInbox) {
+		// We are not polling the inbox so treat it as a meetingrespons.
+		if (this.debug) this.logInfo("We get a new calendar item. It looks like an iTIP respons because aItem.id is set. Going to check if we can find it in the users inbox.");
+		// We mis the exchange id and changekey which we need for responding.
+		// We can get these by polling or searching the inbox but this is async. We can do this
+		// because we received a listener. So search inbox for this uid and then use the full exchange message.
+		// We could have multiple meetingrequest with the same uid but different id and changekey. How do we handle those??
 
-			return;
-// bug 59		}
-/* bug 59		else {
-			if (this.debug) this.logInfo("!! THIS IS A SITUATION WHICH NEVER SHOULD HAPPEN !!");
-			if (this.debug) this.logInfo("We have an iTIP respons and are polling the inbox but the item is not in the meetingrequestcache.");
-			if (this.debug) this.logInfo("We see this when someone imports an ICS file or imports a meeting request into another calendar.");
-			// If it is an ICS we would like it to be added to the calendar as new item
-			// If is a meeting request then we want it accepted and not added. This must produce an error
-			// Problem is we cannot identify it as a ICS import or a acceptation of a meeting request.
-			aItem.id = undefined;
-			this.adoptItem(aItem, aListener);
-		/*	// We could do the same as we are not polling inbox..
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-	        	                             Ci.calIErrors.MODIFICATION_FAILED,
-	                        	             aOperation,
-	                        	             aUID,
-	                        	             aItem);
-			} */
-/* bug 59			return;
-		} */ // bug 59
+		var self = this;
+		this.addToQueue(erGetMeetingRequestByUIDRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: "inbox",
+				serverUrl: this.serverUrl,
+				item: aItem,
+				uid: aUID,
+				actionStart: Date.now(),
+				operation: aOperation,
+				GUID: calExchangeCalendarGUID
+			},
+			function (erGetMeetingRequestByUIDRequest, aMeetingRequests) {
+				self.getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests);
+			},
+			function (erGetMeetingRequestByUIDRequest, aCode, aMsg) {
+				self.getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg);
+			},
+			aListener);
+
+		return;
+		// bug 59		}
+		/* bug 59		else {
+					if (this.debug) this.logInfo("!! THIS IS A SITUATION WHICH NEVER SHOULD HAPPEN !!");
+					if (this.debug) this.logInfo("We have an iTIP respons and are polling the inbox but the item is not in the meetingrequestcache.");
+					if (this.debug) this.logInfo("We see this when someone imports an ICS file or imports a meeting request into another calendar.");
+					// If it is an ICS we would like it to be added to the calendar as new item
+					// If is a meeting request then we want it accepted and not added. This must produce an error
+					// Problem is we cannot identify it as a ICS import or a acceptation of a meeting request.
+					aItem.id = undefined;
+					this.adoptItem(aItem, aListener);
+				/*	// We could do the same as we are not polling inbox..
+					if (aListener) {
+						this.notifyOperationComplete(aListener,
+			        	                             Ci.calIErrors.MODIFICATION_FAILED,
+			                        	             aOperation,
+			                        	             aUID,
+			                        	             aItem);
+					} */
+		/* bug 59			return;
+				} */ // bug 59
 	},
 
-	createAttendee: function _createAttendee(aElement, aType, aMyResponseType) 
-	{
+	createAttendee: function _createAttendee(aElement, aType, aMyResponseType) {
 		let mbox = aElement.getTag("t:Mailbox");
 		let attendee = cal.createAttendee();
 
@@ -6431,17 +6559,17 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			aType = "REQ-PARTICIPANT";
 		}
 
-		switch (mbox.getTagValue("t:RoutingType","unknown")) {
-			case "SMTP" :
-				attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress","unknown");
-				break;
-			case "EX" :
-				attendee.id = 'ldap:' + mbox.getTagValue("t:EmailAddress","unknown");
-				break;
-			default:
-				this.logInfo("createAttendee: Unknown RoutingType:'"+mbox.getTagValue("t:RoutingType")+"'");
-				attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress","unknown");
-				break;
+		switch (mbox.getTagValue("t:RoutingType", "unknown")) {
+		case "SMTP":
+			attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress", "unknown");
+			break;
+		case "EX":
+			attendee.id = 'ldap:' + mbox.getTagValue("t:EmailAddress", "unknown");
+			break;
+		default:
+			this.logInfo("createAttendee: Unknown RoutingType:'" + mbox.getTagValue("t:RoutingType") + "'");
+			attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress", "unknown");
+			break;
 		}
 		attendee.commonName = mbox.getTagValue("t:Name");
 		attendee.rsvp = "FALSE";
@@ -6452,7 +6580,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 			attendee.participationStatus = participationMap[aElement.getTagValue("t:ResponseType")];
 
 			// check if we specified a myResponseType for the complete item and the specified mailbox is equal to the mailbox for the calendar.
-			if ((aMyResponseType) && (mbox.getTagValue("t:EmailAddress","unknown").toLowerCase() == this.mailbox.toLowerCase())) {
+			if ((aMyResponseType) && (mbox.getTagValue("t:EmailAddress", "unknown").toLowerCase() == this.mailbox.toLowerCase())) {
 				attendee.participationStatus = participationMap[aMyResponseType];
 				//if (this.debug) this.logInfo("Setting my response type from the global myresponsetype for the item.");
 			}
@@ -6461,8 +6589,7 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return attendee;
 	},
 
-	createMeAsAttendee: function _createMeAsAttendee(aMyResponseType) 
-	{
+	createMeAsAttendee: function _createMeAsAttendee(aMyResponseType) {
 		var attendee = cal.createAttendee();
 
 		attendee.id = 'mailto:' + this.mailbox;
@@ -6476,13 +6603,11 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		return attendee;
 	},
 
-	get notifyObservers()
-	{
+	get notifyObservers() {
 		return this.observers;
 	},
 
-	notifyTheObservers: function _notifyTheObservers(aCommand, aArray, aFastNotify)
-	{
+	notifyTheObservers: function _notifyTheObservers(aCommand, aArray, aFastNotify) {
 		if (aFastNotify) {
 			this.observers.notify(aCommand, aArray);
 		}
@@ -6491,17 +6616,16 @@ if (this.debug) this.logInfo(" ;;;; rrule:"+rrule.icalProperty.icalString);
 		}
 
 		switch (aCommand) {
-			case "onDeleteItem": 
-				if (!this.notConnected) {
-					this.removeFromOfflineCache(aArray[0]);
-				}
-				break;
+		case "onDeleteItem":
+			if (!this.notConnected) {
+				this.removeFromOfflineCache(aArray[0]);
+			}
+			break;
 		}
 	},
 
-	removeChildrenFromMaster: function _removeChildrenFromMaster(aMaster)
-	{
-		if (this.debug) this.logInfo("removeChildrenFromMaster start. Title:"+aMaster.title);
+	removeChildrenFromMaster: function _removeChildrenFromMaster(aMaster) {
+		if (this.debug) this.logInfo("removeChildrenFromMaster start. Title:" + aMaster.title);
 		// Remove children of this master. They will be added later.
 		for each(var child in aMaster.getExceptions({})) {
 			this.notifyTheObservers("onDeleteItem", [child]);
@@ -6528,67 +6652,64 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			this.removeItemFromCache(child);
 		}
 
-		if (this.debug) this.logInfo("removeChildrenFromMaster end.:"+aMaster.title);
+		if (this.debug) this.logInfo("removeChildrenFromMaster end.:" + aMaster.title);
 	},
 
-	setStatus: function _setStatus(aItem, aStatus)
-	{
+	setStatus: function _setStatus(aItem, aStatus) {
 		switch (aStatus) {
-			case "Unknown" : 
-				aItem.setProperty("STATUS", "NONE");
-				break;
-			case "Organizer" : 
-				aItem.setProperty("STATUS", "CONFIRMED");
-				break;
-			case "Tentative" : 
-				aItem.setProperty("STATUS", "TENTATIVE");
-				break;
-			case "Accept" : 
-				aItem.setProperty("STATUS", "CONFIRMED");
-				break;
-			case "Decline" : 
-				aItem.setProperty("STATUS", "CANCELLED");
-				break;
-			case "NoResponseReceived" : 
-				aItem.setProperty("STATUS", "NONE");
-				break;
-			default:
-				aItem.setProperty("STATUS", "NONE");
-				break;
+		case "Unknown":
+			aItem.setProperty("STATUS", "NONE");
+			break;
+		case "Organizer":
+			aItem.setProperty("STATUS", "CONFIRMED");
+			break;
+		case "Tentative":
+			aItem.setProperty("STATUS", "TENTATIVE");
+			break;
+		case "Accept":
+			aItem.setProperty("STATUS", "CONFIRMED");
+			break;
+		case "Decline":
+			aItem.setProperty("STATUS", "CANCELLED");
+			break;
+		case "NoResponseReceived":
+			aItem.setProperty("STATUS", "NONE");
+			break;
+		default:
+			aItem.setProperty("STATUS", "NONE");
+			break;
 		}
 	},
 
 	cloneItem: function _cloneItem(aItem) {
 		var newItem = aItem.clone();
-/*		if (aItem.id != aItem.parentItem.id) {
-			newItem.parentItem = aItem.parentItem;
-		}*/
+		/*		if (aItem.id != aItem.parentItem.id) {
+					newItem.parentItem = aItem.parentItem;
+				}*/
 
 		return newItem;
 	},
 
-	addExchangeAttachmentToCal: function _addExchangeAttachmentToCal(aExchangeItem, aItem)
-	{
+	addExchangeAttachmentToCal: function _addExchangeAttachmentToCal(aExchangeItem, aItem) {
 		if (aExchangeItem.getTagValue("t:HasAttachments") == "true") {
-//			if (this.debug) this.logInfo("Title:"+aItem.title+"Attachments:"+aExchangeItem.getTagValue("Attachments"));
+			//			if (this.debug) this.logInfo("Title:"+aItem.title+"Attachments:"+aExchangeItem.getTagValue("Attachments"));
 			var fileAttachments = aExchangeItem.XPath("/t:Attachments/t:FileAttachment");
 			for each(var fileAttachment in fileAttachments) {
-//				if (this.debug) this.logInfo(" -- Attachment: name="+fileAttachment.getTagValue("t:Name"));
+				//				if (this.debug) this.logInfo(" -- Attachment: name="+fileAttachment.getTagValue("t:Name"));
 
 				var newAttachment = createAttachment();
-				newAttachment.setParameter("X-AttachmentId",fileAttachment.getAttributeByTag("t:AttachmentId","Id")); 
-				newAttachment.uri = makeURL(this.serverUrl+"/?id="+encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId","Id"))+"&name="+encodeURIComponent(fileAttachment.getTagValue("t:Name"))+"&size="+encodeURIComponent(fileAttachment.getTagValue("t:Size", ""))+"&user="+encodeURIComponent(this.user));
+				newAttachment.setParameter("X-AttachmentId", fileAttachment.getAttributeByTag("t:AttachmentId", "Id"));
+				newAttachment.uri = makeURL(this.serverUrl + "/?id=" + encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(fileAttachment.getTagValue("t:Name")) + "&size=" + encodeURIComponent(fileAttachment.getTagValue("t:Size", "")) + "&user=" + encodeURIComponent(this.user));
 
-				if (this.debug) this.logInfo("New attachment URI:"+this.serverUrl+"/?id="+encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId","Id"))+"&name="+encodeURIComponent(fileAttachment.getTagValue("t:Name"))+"&size="+encodeURIComponent(fileAttachment.getTagValue("t:Size", ""))+"&user="+encodeURIComponent(this.user));
+				if (this.debug) this.logInfo("New attachment URI:" + this.serverUrl + "/?id=" + encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(fileAttachment.getTagValue("t:Name")) + "&size=" + encodeURIComponent(fileAttachment.getTagValue("t:Size", "")) + "&user=" + encodeURIComponent(this.user));
 
 				aItem.addAttachment(newAttachment);
 			}
 			fileAttachments = null;
-		} 
+		}
 	},
 
-	clearXMozSnoozeTimes: function _clearXMozSnoozeTimes(aItem) 
-	{
+	clearXMozSnoozeTimes: function _clearXMozSnoozeTimes(aItem) {
 		if (!aItem) return;
 
 		if (aItem.propertyEnumerator) {
@@ -6596,7 +6717,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			while (props.hasMoreElements()) {
 				var prop = props.getNext().QueryInterface(Components.interfaces.nsIProperty);
 				if (prop.name.indexOf("X-MOZ-SNOOZE-TIME") > -1) {
-					if (this.debug) this.logInfo("deleting Property:"+prop.name+"="+prop.value);
+					if (this.debug) this.logInfo("deleting Property:" + prop.name + "=" + prop.value);
 
 					aItem.deleteProperty(prop.name);
 					var props = aItem.propertyEnumerator;
@@ -6605,8 +6726,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		}
 	},
 
-	setSnoozeTime: function _setSnoozeTime(aItem, aMaster)
-	{
+	setSnoozeTime: function _setSnoozeTime(aItem, aMaster) {
 
 		if (aMaster) {
 			var pidLidReminderSet = aMaster.reminderIsSet;
@@ -6617,7 +6737,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			var pidLidReminderSignalTime = aItem.reminderSignalTime;
 		}
 
-		if (this.debug) this.logInfo("-- pidLidReminderSet:"+pidLidReminderSet);
+		if (this.debug) this.logInfo("-- pidLidReminderSet:" + pidLidReminderSet);
 
 		if (pidLidReminderSet) {
 
@@ -6625,9 +6745,9 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 
 			if (aMaster) {
 				// Exchange only has the next reminderSignaltime. This is one value. Lightning can handle multiple.
-//				this.clearXMozSnoozeTimes(aMaster);
+				//				this.clearXMozSnoozeTimes(aMaster);
 
-//				var reminderTime = cal.createDateTime(pidLidReminderSignalTime);
+				//				var reminderTime = cal.createDateTime(pidLidReminderSignalTime);
 				var reminderTime = aMaster.reminderSignalTime;
 				if (reminderTime) {
 
@@ -6638,30 +6758,30 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 						var masterReminderDueBy = this.tryToSetDateValue(aMaster.getProperty("X-ReminderDueBy"), null);
 						if (masterReminderDueBy) {
 							switch (masterReminderDueBy.compare(aItem.startDate)) {
-								case -1:
-									if (this.debug) this.logInfo("The ReminderDueBy date of the master is before the item's startdate. This alarm has not been snoozed or dismissed.");
-									aItem.alarmLastAck = null;
-									break;
-								case 0: 
-									if (this.debug) this.logInfo("The ReminderDueBy date of the master is equal to the item's startdate. We found the occurrence for which the alarm is active or dismissed or snoozed.");
-									// We need to find out if it snoozed or dismissed.
-									this.clearXMozSnoozeTimes(aMaster);
-									if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime+"="+reminderTime.icalString);
-									aMaster.setProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime, reminderTime.icalString);
-
-									var lastAck = reminderTime.clone();
-									lastAck.addDuration(cal.createDuration('-PT1S'));
-									aItem.alarmLastAck = lastAck;
-									aMaster.alarmLastAck = lastAck;
-									if (this.debug) this.logInfo("Set alarmLastAck:"+lastAck.icalString);
-									break;
-								case 1:
-									if (this.debug) this.logInfo("The ReminderDueBy date of the master is after the item's startdate. This alarm has been dismissed.");
-									var lastAck = aItem.startDate.clone();
-									//lastAck.addDuration(cal.createDuration('-PT1S'));
-									aItem.alarmLastAck = lastAck;
-									if (this.debug) this.logInfo("Set alarmLastAck:"+lastAck.icalString);
-									break;
+							case -1:
+								if (this.debug) this.logInfo("The ReminderDueBy date of the master is before the item's startdate. This alarm has not been snoozed or dismissed.");
+								aItem.alarmLastAck = null;
+								break;
+							case 0:
+								if (this.debug) this.logInfo("The ReminderDueBy date of the master is equal to the item's startdate. We found the occurrence for which the alarm is active or dismissed or snoozed.");
+								// We need to find out if it snoozed or dismissed.
+								this.clearXMozSnoozeTimes(aMaster);
+								if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime + "=" + reminderTime.icalString);
+								aMaster.setProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime, reminderTime.icalString);
+
+								var lastAck = reminderTime.clone();
+								lastAck.addDuration(cal.createDuration('-PT1S'));
+								aItem.alarmLastAck = lastAck;
+								aMaster.alarmLastAck = lastAck;
+								if (this.debug) this.logInfo("Set alarmLastAck:" + lastAck.icalString);
+								break;
+							case 1:
+								if (this.debug) this.logInfo("The ReminderDueBy date of the master is after the item's startdate. This alarm has been dismissed.");
+								var lastAck = aItem.startDate.clone();
+								//lastAck.addDuration(cal.createDuration('-PT1S'));
+								aItem.alarmLastAck = lastAck;
+								if (this.debug) this.logInfo("Set alarmLastAck:" + lastAck.icalString);
+								break;
 							}
 						}
 						else {
@@ -6679,33 +6799,33 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 						if (this.debug) this.logInfo("A master. Will try to set snooze time on right occurrenceid");
 						for (var index in this.itemCacheById) {
 
-							if ( (this.itemCacheById[index]) &&
-							     (isEvent(this.itemCacheById[index])) &&
-							     ( (this.itemCacheById[index].calendarItemType == "Occurrence") ||
-							       (this.itemCacheById[index].calendarItemType == "Exception") ) &&
-							     (this.itemCacheById[index].uid == aMaster.uid) &&
-							     (this.itemCacheById[index].parentItem.id == aMaster.id) ) {
+							if ((this.itemCacheById[index])
+								&& (isEvent(this.itemCacheById[index]))
+								&& ((this.itemCacheById[index].calendarItemType == "Occurrence")
+									|| (this.itemCacheById[index].calendarItemType == "Exception"))
+								&& (this.itemCacheById[index].uid == aMaster.uid)
+								&& (this.itemCacheById[index].parentItem.id == aMaster.id)) {
 								this.setSnoozeTime(this.itemCacheById[index], aMaster);
 							}
 						}
 					}
 				}
 				else {
-					if (this.debug) this.logInfo("Received pidLidReminderSignalTime is invalid:"+pidLidReminderSignalTime);
+					if (this.debug) this.logInfo("Received pidLidReminderSignalTime is invalid:" + pidLidReminderSignalTime);
 				}
 			}
 			else {
 				// aItem is a Single
-/*				this.clearXMozSnoozeTimes(aItem);
-				var reminderTime = pidLidReminderSignalTime;
-				if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME="+reminderTime.icalString);
-				aItem.setProperty("X-MOZ-SNOOZE-TIME", reminderTime.icalString);
+				/*				this.clearXMozSnoozeTimes(aItem);
+								var reminderTime = pidLidReminderSignalTime;
+								if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME="+reminderTime.icalString);
+								aItem.setProperty("X-MOZ-SNOOZE-TIME", reminderTime.icalString);
 
-				var lastAck = reminderTime.clone();
-				lastAck.addDuration(cal.createDuration('-PT1S'));
-				aItem.alarmLastAck = lastAck;
-				if (this.debug) this.logInfo("Set alarmLastAck:"+lastAck.icalString);
- */
+								var lastAck = reminderTime.clone();
+								lastAck.addDuration(cal.createDuration('-PT1S'));
+								aItem.alarmLastAck = lastAck;
+								if (this.debug) this.logInfo("Set alarmLastAck:"+lastAck.icalString);
+				 */
 			}
 		}
 		else {
@@ -6715,8 +6835,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		}
 	},
 
-	setAlarm: function _setAlarm(aItem, aCalendarItem)
-	{
+	setAlarm: function _setAlarm(aItem, aCalendarItem) {
 		if ((aCalendarItem.getTagValue("t:ReminderIsSet") == "true")) {
 			var alarm = cal.createAlarm();
 			alarm.action = "DISPLAY";
@@ -6726,7 +6845,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			alarmOffset.minutes = -1 * aCalendarItem.getTagValue("t:ReminderMinutesBeforeStart");
 
 			// This is a bug fix for when the offset is more than a year)
-			if (alarmOffset.minutes < (-60*24*365)) {
+			if (alarmOffset.minutes < (-60 * 24 * 365)) {
 				alarmOffset.minutes = -5;
 			}
 			alarmOffset.normalize();
@@ -6734,58 +6853,61 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
 			alarm.offset = alarmOffset;
 
-			if (this.debug) this.logInfo("Alarm set with an offset of "+alarmOffset.minutes+" minutes from the start");
+			if (this.debug) this.logInfo("Alarm set with an offset of " + alarmOffset.minutes + " minutes from the start");
 			aItem.setProperty("X-ReminderDueBy", aCalendarItem.getTagValue("t:ReminderDueBy"));
 
 			aItem.addAlarm(alarm);
 		}
 	},
 
-	getMasterByItem: function _getMasterByItem(aItem)
-	{
-		if (this.debug) this.logInfo("getMasterByItem for item:"+aItem.title+", startdate:"+aItem.startDate+", uid:"+aItem.uid);
+	getMasterByItem: function _getMasterByItem(aItem) {
+		if (this.debug) this.logInfo("getMasterByItem for item:" + aItem.title + ", startdate:" + aItem.startDate + ", uid:" + aItem.uid);
 		var self = this;
-		this.addToQueue( erGetMasterOccurrenceIdRequest, 
-			{user: this.user, 
-			 serverUrl: this.serverUrl,
-			 item: aItem,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 getType: "lightning" }, 
-			function(erGetMasterOccurrenceIdRequest, aId, aChangeKey) { self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aItem.uid);}, 
-			function(erGetMasterOccurrenceIdRequest, aCode, aMsg) { self.getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg);},
+		this.addToQueue(erGetMasterOccurrenceIdRequest, {
+				user: this.user,
+				serverUrl: this.serverUrl,
+				item: aItem,
+				folderID: this.folderID,
+				changeKey: this.changeKey,
+				getType: "lightning"
+			},
+			function (erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
+				self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aItem.uid);
+			},
+			function (erGetMasterOccurrenceIdRequest, aCode, aMsg) {
+				self.getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg);
+			},
 			null);
 	},
 
-	getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aUID)
-	{
-		if (this.debug) this.logInfo("getMasterOk aId:"+aId+", aChangeKey:"+aChangeKey+", uid:"+aUID);
-		var ids = [{Id: aId,
-				  ChangeKey: aChangeKey,
-				  type: "RecurringMaster",
-				  uid: aUID,
-				  start: null,
-				  end: null}];
+	getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aUID) {
+		if (this.debug) this.logInfo("getMasterOk aId:" + aId + ", aChangeKey:" + aChangeKey + ", uid:" + aUID);
+		var ids = [{
+			Id: aId,
+			ChangeKey: aChangeKey,
+			type: "RecurringMaster",
+			uid: aUID,
+			start: null,
+			end: null
+		}];
 
 		this.findCalendarItemsOK(erGetMasterOccurrenceIdRequest, ids, [])
 	},
 
-	getMasterError: function _getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg)
-	{
-		if (this.debug) this.logInfo("getMasterError aCode:"+aCode+", aMsg:"+aMsg);
+	getMasterError: function _getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg) {
+		if (this.debug) this.logInfo("getMasterError aCode:" + aCode + ", aMsg:" + aMsg);
 		this.saveCredentials(erGetMasterOccurrenceIdRequest.argument);
 	},
 
-	convertExchangeItemtoCalItem: function _convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest)
-	{
+	convertExchangeItemtoCalItem: function _convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest) {
 		//dump("1. uid:"+item.uid+", it:"+item.calendarItemType+", t:"+item.title+", sd:"+item.startDate+"\n");
 		var uid = item.uid;
-//		if ((item.className == "mivExchangeEvent") && (!uid)) return null;
+		//		if ((item.className == "mivExchangeEvent") && (!uid)) return null;
 
 		if (this.itemCacheById[item.id]) {
 			if (this.itemCacheById[item.id].changeKey == item.changeKey) {
 				//if (this.debug) this.logInfo("Item is allready in cache and the id and changeKey are the same. Skipping it.");
-			//dump("convertExchangeAppointmentToCalAppointment. Item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", startDate"+item.startDate+"\n");
+				//dump("convertExchangeAppointmentToCalAppointment. Item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", startDate"+item.startDate+"\n");
 				this.itemCacheById[item.id].occurrenceIndex = item.occurrenceIndex
 				item.deleteItem();
 				item = null;
@@ -6794,306 +6916,330 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		}
 		else {
 			if ((uid) && (this.recurringMasterCache[uid])) {
-				if ( (this.recurringMasterCache[uid].changeKey == xml2json.getAttributeByTag(aCalendarItem, "t:ItemId", "ChangeKey")) && (this.recurringMasterCache[uid].id == item.id)) {
+				if ((this.recurringMasterCache[uid].changeKey == xml2json.getAttributeByTag(aCalendarItem, "t:ItemId", "ChangeKey")) && (this.recurringMasterCache[uid].id == item.id)) {
 					//if (this.debug) this.logInfo("Master item is allready in cache and the id and changeKey are the same. Skipping it.");
-			//dump("convertExchangeAppointmentToCalAppointment. Master item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", item.calendarItemType:"+item.calendarItemType+"\n");
+					//dump("convertExchangeAppointmentToCalAppointment. Master item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", item.calendarItemType:"+item.calendarItemType+"\n");
 					item.deleteItem();
 					item = null;
 					return null;
 				}
 			}
 		}
-		
+
 		item.setProperty("DTSTAMP", this.tryToSetDateValue(xml2json.getTagValue(aCalendarItem, "t:DateTimeReceived")));
-  		if (!isMeetingRequest) {
+		if (!isMeetingRequest) {
 			//if (this.debug) this.logInfo(" == item.title:"+item.title+", calendarItemType:"+aCalendarItem.getTagValue("t:CalendarItemType"));
 			switch (item.calendarItemType) {
-				case "Single" :
-					// Check if this item.id has existed as master. This could be a change from master to single.
-					var offlineMasterData = null;
-					if (!fromOfflineCache) {
-						offlineMasterData = this.masterIsInOfflineCache(item.id);
-					}
-
-					if ((this.recurringMasterCacheById[item.id]) || (offlineMasterData)) {
-						if (this.debug) this.logInfo("Item has changed from master into single. Going to remove it and it's children.");
-
-						let masterUID = null;						
-						if (offlineMasterData) {
-							masterUID = offlineMasterData.uid;
-						}
-						else {
-							masterUID = this.recurringMasterCacheById[item.id].uid;
-						}
+			case "Single":
+				// Check if this item.id has existed as master. This could be a change from master to single.
+				var offlineMasterData = null;
+				if (!fromOfflineCache) {
+					offlineMasterData = this.masterIsInOfflineCache(item.id);
+				}
 
-						this.removeChildrenFromMaster(this.recurringMasterCache[masterUID]);
+				if ((this.recurringMasterCacheById[item.id]) || (offlineMasterData)) {
+					if (this.debug) this.logInfo("Item has changed from master into single. Going to remove it and it's children.");
 
-						this.removeFromOfflineCache(this.recurringMasterCache[masterUID]);
-						delete this.recurringMasterCacheById[item.id];
-						delete this.recurringMasterCache[masterUID];
-					}
-					break;
-				case "Exception" :
-					if (this.debug) this.logInfo("@1:"+(item.startDate || item.entryDate)+":IsException");
-					item.setProperty("X-RecurringType", "RE");
-					var master = this.recurringMasterCache[uid];
-					if (master) {
-						// We allready have a master in Cache.
-						if (this.debug) this.logInfo("Found master for exception:"+master.title+", date:"+(master.startDate || master.entryDate));
-						master.addException(item);
+					let masterUID = null;
+					if (offlineMasterData) {
+						masterUID = offlineMasterData.uid;
 					}
 					else {
-						//if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Exception:"+item.title);
-						// We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
-						this.parentLessItems[item.id] = item;
-						if (!this.newMasters[item.uid]) {
-							this.newMasters[item.uid] = true;
-							this.getMasterByItem(item);
-						}
-						//this.itemCacheById[item.id] = item;
-						this.addItemToCache(item);
+						masterUID = this.recurringMasterCacheById[item.id].uid;
+					}
 
-						if ((this.useOfflineCache) && (!fromOfflineCache)) {
-							let cacheItem = {};
-							cacheItem[item.id] = {calItem: item,
-									exchangeItemXML: xml2json.toString(aCalendarItem)};
-							this.addToOfflineCache(cacheItem);
-						}
+					this.removeChildrenFromMaster(this.recurringMasterCache[masterUID]);
 
-						return null;
+					this.removeFromOfflineCache(this.recurringMasterCache[masterUID]);
+					delete this.recurringMasterCacheById[item.id];
+					delete this.recurringMasterCache[masterUID];
+				}
+				break;
+			case "Exception":
+				if (this.debug) this.logInfo("@1:" + (item.startDate || item.entryDate) + ":IsException");
+				item.setProperty("X-RecurringType", "RE");
+				var master = this.recurringMasterCache[uid];
+				if (master) {
+					// We allready have a master in Cache.
+					if (this.debug) this.logInfo("Found master for exception:" + master.title + ", date:" + (master.startDate || master.entryDate));
+					master.addException(item);
+				}
+				else {
+					//if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Exception:"+item.title);
+					// We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
+					this.parentLessItems[item.id] = item;
+					if (!this.newMasters[item.uid]) {
+						this.newMasters[item.uid] = true;
+						this.getMasterByItem(item);
 					}
+					//this.itemCacheById[item.id] = item;
+					this.addItemToCache(item);
 
-					break;
-				case "Occurrence" :
-					if (this.debug) this.logInfo("@1:"+(item.startDate || item.entryDate)+":IsOccurrence");
-					item.setProperty("X-RecurringType", "RO");
-					// This is a occurrence. Try to find the master and link recurrenceinfo.
-					var master = this.recurringMasterCache[uid];
-					if (master) {
-						// We allready have a master in Cache.
-						if (this.debug) this.logInfo("Found master for occurrence:"+master.title+", date:"+(master.startDate || master.entryDate));
-
-						master.addOccurrence(item);
+					if ((this.useOfflineCache) && (!fromOfflineCache)) {
+						let cacheItem = {};
+						cacheItem[item.id] = {
+							calItem: item,
+							exchangeItemXML: xml2json.toString(aCalendarItem)
+						};
+						this.addToOfflineCache(cacheItem);
 					}
-					else {
-						//if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Occurrence:"+item.title);
-						// We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
-						this.parentLessItems[item.id] = item;
-						if (!this.newMasters[item.uid]) {
-							this.newMasters[item.uid] = true;
-							this.getMasterByItem(item);
-						}
-						//this.itemCacheById[item.id] = item;
-						this.addItemToCache(item);
 
-						if ((this.useOfflineCache) && (!fromOfflineCache)) {
-							let cacheItem = {};
-							cacheItem[item.id] = {calItem: item,
-									exchangeItemXML: xml2json.toString(aCalendarItem)};
-							this.addToOfflineCache(cacheItem);
-						}
+					return null;
+				}
 
-						return null;
+				break;
+			case "Occurrence":
+				if (this.debug) this.logInfo("@1:" + (item.startDate || item.entryDate) + ":IsOccurrence");
+				item.setProperty("X-RecurringType", "RO");
+				// This is a occurrence. Try to find the master and link recurrenceinfo.
+				var master = this.recurringMasterCache[uid];
+				if (master) {
+					// We allready have a master in Cache.
+					if (this.debug) this.logInfo("Found master for occurrence:" + master.title + ", date:" + (master.startDate || master.entryDate));
+
+					master.addOccurrence(item);
+				}
+				else {
+					//if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Occurrence:"+item.title);
+					// We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
+					this.parentLessItems[item.id] = item;
+					if (!this.newMasters[item.uid]) {
+						this.newMasters[item.uid] = true;
+						this.getMasterByItem(item);
 					}
-					
-					break;
-				case "RecurringMaster" :
-	
-//					if (this.debug) this.logInfo(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache);
-					//dump(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache+"\n");
-
-					// Check if this item existed previously as a Single item and is not converted into a master.
-					if (this.itemCacheById[item.id]) {
-						if (this.debug) this.logInfo("We allready have this master in the single itemcache. single changed into master. Removing ");
-						this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
-						this.removeFromOfflineCache(item);
-						this.removeItemFromCache(this.itemCacheById[item.id]);
+					//this.itemCacheById[item.id] = item;
+					this.addItemToCache(item);
+
+					if ((this.useOfflineCache) && (!fromOfflineCache)) {
+						let cacheItem = {};
+						cacheItem[item.id] = {
+							calItem: item,
+							exchangeItemXML: xml2json.toString(aCalendarItem)
+						};
+						this.addToOfflineCache(cacheItem);
 					}
 
-//					if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].id == item.id) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
-					if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
-						if (this.debug) this.logInfo("We allready have this master in cache but the changeKey changed.");
-						if (this.recurringMasterCache[item.uid].id != item.id) {
-							dump(" @#@# THIS IS WEARD id do not match. @@@!!\n");
-							dump(" item.title:"+item.title+", startDate:"+item.startDate+", calendarItemType:"+item.calendarItemType+"\n");
-							dump(" this.recurringMasterCache[item.uid].title:"+this.recurringMasterCache[item.uid].title+", startDate:"+this.recurringMasterCache[item.uid].startDate+", calendarItemType:"+this.recurringMasterCache[item.uid].calendarItemType+"\n");
+					return null;
+				}
+
+				break;
+			case "RecurringMaster":
+
+				//					if (this.debug) this.logInfo(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache);
+				//dump(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache+"\n");
+
+				// Check if this item existed previously as a Single item and is not converted into a master.
+				if (this.itemCacheById[item.id]) {
+					if (this.debug) this.logInfo("We allready have this master in the single itemcache. single changed into master. Removing ");
+					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
+					this.removeFromOfflineCache(item);
+					this.removeItemFromCache(this.itemCacheById[item.id]);
+				}
+
+				//					if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].id == item.id) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
+				if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
+					if (this.debug) this.logInfo("We allready have this master in cache but the changeKey changed.");
+					if (this.recurringMasterCache[item.uid].id != item.id) {
+						dump(" @#@# THIS IS WEARD id do not match. @@@!!\n");
+						dump(" item.title:" + item.title + ", startDate:" + item.startDate + ", calendarItemType:" + item.calendarItemType + "\n");
+						dump(" this.recurringMasterCache[item.uid].title:" + this.recurringMasterCache[item.uid].title + ", startDate:" + this.recurringMasterCache[item.uid].startDate + ", calendarItemType:" + this.recurringMasterCache[item.uid].calendarItemType + "\n");
+					}
+					//dump("We allready have this master in cache but the changeKey changed.\n");
+
+					let ids = [];
+					let myExceptions = this.recurringMasterCache[item.uid].getExceptions({});
+					for each(var tmpException in myExceptions) {
+						ids.push({
+							Id: tmpException.id,
+							type: "Exception",
+							uid: item.uid,
+							start: null,
+							end: null
+						});
+					}
+					let myOccurrences = this.recurringMasterCache[item.uid].getOccurrences({});
+					for each(var tmpOccurrence in myOccurrences) {
+						ids.push({
+							Id: tmpOccurrence.id,
+							type: "Occurrence",
+							uid: item.uid,
+							start: null,
+							end: null
+						});
+					}
+
+					if (this.debug) this.logInfo("Going to request '" + ids.length + "' children to see if they are updated.");
+					//dump("Going to request '"+ids.length+"' memorycache children to see if they are updated.\n");
+
+					// Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
+					while (ids.length > 0) {
+						let req = [];
+						for (var counter = 0;
+							((counter < 10) && (ids.length > 0)); counter++) {
+							req.push(ids.pop());
 						}
-						//dump("We allready have this master in cache but the changeKey changed.\n");
+						this.findCalendarItemsOK(null, req, [], true);
+					}
+				}
 
+				if (!fromOfflineCache) {
+					let changeKey = this.itemIsInOfflineCache(item.id);
+					if ((changeKey) && (item.changeKey != changeKey)) {
+						//dump("Master is in offline cache and changeKey is different. Going to see if children have changed.\n");
+						let inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RO");
+						let i = 0;
 						let ids = [];
-						let myExceptions = this.recurringMasterCache[item.uid].getExceptions({});
-						for each(var tmpException in myExceptions) {
-							ids.push({Id: tmpException.id,
-									  type: "Exception",
-									  uid: item.uid,
-									  start: null,
-									  end: null});
+						while (i < inOfflineCache.length) {
+							ids.push({
+								Id: inOfflineCache[i],
+								type: "Occurrence",
+								uid: item.uid,
+								start: null,
+								end: null
+							});
+							i++;
 						}
-						let myOccurrences = this.recurringMasterCache[item.uid].getOccurrences({});
-						for each(var tmpOccurrence in myOccurrences) {
-							ids.push({Id: tmpOccurrence.id,
-									  type: "Occurrence",
-									  uid: item.uid,
-									  start: null,
-									  end: null});
+
+						inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RE");
+						i = 0;
+						while (i < inOfflineCache.length) {
+							ids.push({
+								Id: inOfflineCache[i],
+								type: "Exception",
+								uid: item.uid,
+								start: null,
+								end: null
+							});
+							i++;
 						}
 
-						if (this.debug) this.logInfo("Going to request '"+ids.length+"' children to see if they are updated.");
-						//dump("Going to request '"+ids.length+"' memorycache children to see if they are updated.\n");
+						if (this.debug) this.logInfo("Going to request '" + ids.length + "' offline children to see if they are updated.");
+						//dump("Going to request '"+ids.length+"' offline children to see if they are updated.\n");
 
 						// Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
 						while (ids.length > 0) {
 							let req = [];
-							for (var counter=0; ((counter < 10) && (ids.length > 0)); counter++) {
+							for (var counter = 0;
+								((counter < 10) && (ids.length > 0)); counter++) {
 								req.push(ids.pop());
 							}
 							this.findCalendarItemsOK(null, req, [], true);
 						}
 					}
+				}
 
-					if (!fromOfflineCache) {
-						let changeKey = this.itemIsInOfflineCache(item.id);
-						if ((changeKey) && (item.changeKey != changeKey)) {
-							//dump("Master is in offline cache and changeKey is different. Going to see if children have changed.\n");
-							let inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RO");
-							let i = 0;
-							let ids = [];
-							while (i < inOfflineCache.length) {
-								ids.push({Id: inOfflineCache[i],
-										  type: "Occurrence",
-										  uid: item.uid,
-										  start: null,
-										  end: null});
-								i++;
-							}
-
-							inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RE");
-							i = 0;
-							while (i < inOfflineCache.length) {
-								ids.push({Id: inOfflineCache[i],
-										  type: "Exception",
-										  uid: item.uid,
-										  start: null,
-										  end: null});
-								i++;
-							}
-
-							if (this.debug) this.logInfo("Going to request '"+ids.length+"' offline children to see if they are updated.");
-							//dump("Going to request '"+ids.length+"' offline children to see if they are updated.\n");
-
-							// Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
-							while (ids.length > 0) {
-								let req = [];
-								for (var counter=0; ((counter < 10) && (ids.length > 0)); counter++) {
-									req.push(ids.pop());
-								}
-								this.findCalendarItemsOK(null, req, [], true);
-							}
+				if (this.debug) this.logInfo("Trying to see if there are parentless items for this master:" + item.title + ".");
+				//this.observers.notify("onStartBatch");
+				var parentLessCounter = 0;
+				for (var itemId in this.parentLessItems) {
+					parentLessCounter++;
+					if ((this.parentLessItems[itemId])
+						&& (isEvent(this.parentLessItems[itemId]))
+						&& ((this.parentLessItems[itemId].calendarItemType == "Occurrence")
+							|| (this.parentLessItems[itemId].calendarItemType == "Exception"))
+						&& (this.parentLessItems[itemId].uid == item.uid)
+						&& (this.parentLessItems[itemId].parentItem.id != item.id)) {
+						if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment: Found item without parent:" + this.parentLessItems[itemId] + ", going to set parent.");
+						//this.itemCacheById[index].parentItem = item;
+						if (this.parentLessItems[itemId].calendarItemType == "Exception") {
+							item.addException(this.parentLessItems[itemId]);
 						}
-					}
-
-					if (this.debug) this.logInfo("Trying to see if there are parentless items for this master:"+item.title+".");
-					//this.observers.notify("onStartBatch");
-					var parentLessCounter = 0;
-					for (var itemId in this.parentLessItems) {
-						parentLessCounter++;
-						if ( (this.parentLessItems[itemId]) &&
-						     (isEvent(this.parentLessItems[itemId])) &&
-						     ( (this.parentLessItems[itemId].calendarItemType == "Occurrence") ||
-						       (this.parentLessItems[itemId].calendarItemType == "Exception") ) &&
-						     (this.parentLessItems[itemId].uid == item.uid) &&
-						     (this.parentLessItems[itemId].parentItem.id != item.id) ) {
-							if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment: Found item without parent:"+this.parentLessItems[itemId]+", going to set parent.");
-							//this.itemCacheById[index].parentItem = item;
-							if (this.parentLessItems[itemId].calendarItemType == "Exception") {
-								item.addException(this.parentLessItems[itemId]);
-							}
-							if (this.parentLessItems[itemId].calendarItemType == "Occurrence") {
-								item.addOccurrence(this.parentLessItems[itemId]);
-							}
-
-							this.notifyTheObservers("onAddItem", [this.parentLessItems[itemId]]);
-							this.parentLessItems[itemId] = null;
-							delete this.parentLessItems[itemId];
+						if (this.parentLessItems[itemId].calendarItemType == "Occurrence") {
+							item.addOccurrence(this.parentLessItems[itemId]);
 						}
 
+						this.notifyTheObservers("onAddItem", [this.parentLessItems[itemId]]);
+						this.parentLessItems[itemId] = null;
+						delete this.parentLessItems[itemId];
 					}
-					//this.observers.notify("onEndBatch");
 
-					if (!fromOfflineCache) {
-						let cacheItem = {};
-						cacheItem[item.id] = {calItem: item,
-								exchangeItemXML: xml2json.toString(aCalendarItem)};
-						this.addToOfflineCache(cacheItem);
-					}
+				}
+				//this.observers.notify("onEndBatch");
 
-					if (this.recurringMasterCache[uid]) {
-						if (this.recurringMasterCache[uid].recurrenceInfo.toString() != item.recurrenceInfo.toString()) {
-							// Recurrence info change. We are going to request all children in a known period.
-							if (this.debug) this.logInfo(this.name+": ("+item.title+") Recurrence info change for master. We are going to request all children in a known period..");
-							this.masterCount--;
-							//dump("   xx MasterCount:"+this.masterCount+"\n");
-							this.recurringMasterCache[uid].deleteItem();
-							this.recurringMasterCache[uid] = null;
-							this.recurringMasterCacheById[item.id] = null;
-							var self = this;
-							var tmpItem = { Id: item.id, ChangeKey: item.changeKey, type:"RecurringMaster"};
-							this.addToQueue( erFindOccurrencesRequest, 
-								{user: this.user, 
-								 mailbox: this.mailbox,
-								 folderBase: this.folderBase,
-								 serverUrl: this.serverUrl,
-								 masterItem: tmpItem,
-								 folderID: this.folderID,
-								 changeKey: this.changeKey,
-								 startDate: this.startDate || this.entryDate,
-								 endDate: this.endDate || this.dueDate,
-						 		 GUID: calExchangeCalendarGUID}, 
-								function(erGetItemsRequest, aIds) { self.findOccurrencesOK(erGetItemsRequest, aIds);}, 
-								function(erGetItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);},
-								null);	
-						}
-/*						this.masterCount--;
+				if (!fromOfflineCache) {
+					let cacheItem = {};
+					cacheItem[item.id] = {
+						calItem: item,
+						exchangeItemXML: xml2json.toString(aCalendarItem)
+					};
+					this.addToOfflineCache(cacheItem);
+				}
+
+				if (this.recurringMasterCache[uid]) {
+					if (this.recurringMasterCache[uid].recurrenceInfo.toString() != item.recurrenceInfo.toString()) {
+						// Recurrence info change. We are going to request all children in a known period.
+						if (this.debug) this.logInfo(this.name + ": (" + item.title + ") Recurrence info change for master. We are going to request all children in a known period..");
+						this.masterCount--;
 						//dump("   xx MasterCount:"+this.masterCount+"\n");
 						this.recurringMasterCache[uid].deleteItem();
-						this.recurringMasterCache[uid] = null;*/
-					}
-					else {
-						if ((parentLessCounter == 0) && (!fromOfflineCache) && (this.syncState)) {
-							if (this.debug) this.logInfo("We have a new master without children. Most of the times this means we nead to request the children separately.");
-							//dump(this.name+": ("+item.title+") We have a new master without children. Most of the times this means we nead to request the children separately.\n");
-							//dump("     -- this.startDate:"+this.startDate+", this.endDate:"+this.endDate+"\n");
+						this.recurringMasterCache[uid] = null;
+						this.recurringMasterCacheById[item.id] = null;
+						var self = this;
+						var tmpItem = {
+							Id: item.id,
+							ChangeKey: item.changeKey,
+							type: "RecurringMaster"
+						};
+						this.addToQueue(erFindOccurrencesRequest, {
+								user: this.user,
+								mailbox: this.mailbox,
+								folderBase: this.folderBase,
+								serverUrl: this.serverUrl,
+								masterItem: tmpItem,
+								folderID: this.folderID,
+								changeKey: this.changeKey,
+								startDate: this.startDate || this.entryDate,
+								endDate: this.endDate || this.dueDate,
+								GUID: calExchangeCalendarGUID
+							},
+							function (erGetItemsRequest, aIds) {
+								self.findOccurrencesOK(erGetItemsRequest, aIds);
+							},
+							function (erGetItemsRequest, aCode, aMsg) {
+								self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);
+							},
+							null);
+					}
+					/*						this.masterCount--;
+											//dump("   xx MasterCount:"+this.masterCount+"\n");
+											this.recurringMasterCache[uid].deleteItem();
+											this.recurringMasterCache[uid] = null;*/
+				}
+				else {
+					if ((parentLessCounter == 0) && (!fromOfflineCache) && (this.syncState)) {
+						if (this.debug) this.logInfo("We have a new master without children. Most of the times this means we nead to request the children separately.");
+						//dump(this.name+": ("+item.title+") We have a new master without children. Most of the times this means we nead to request the children separately.\n");
+						//dump("     -- this.startDate:"+this.startDate+", this.endDate:"+this.endDate+"\n");
 
-							this.requestPeriod(this.startDate || this.entryDate, this.endDate || this.dueDate, Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, false, item.uid);
-						} 
+						this.requestPeriod(this.startDate || this.entryDate, this.endDate || this.dueDate, Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, false, item.uid);
 					}
+				}
 
-					this.masterCount++;
-					this.recurringMasterCache[uid] = item;
-					//dump("** Add to this.recurringMasterCache: title:"+item.title+", item.startDate:"+item.startDate+"\n");
-					this.recurringMasterCacheById[item.id] = item;
-					//dump("   :: MasterCount:"+this.masterCount+"\n");
+				this.masterCount++;
+				this.recurringMasterCache[uid] = item;
+				//dump("** Add to this.recurringMasterCache: title:"+item.title+", item.startDate:"+item.startDate+"\n");
+				this.recurringMasterCacheById[item.id] = item;
+				//dump("   :: MasterCount:"+this.masterCount+"\n");
 
-					if (this.debug) this.logInfo("This is a master it will not be put into the normal items cache list.");
-			//dump("convertExchangeAppointmentToCalAppointment. The master will not be visible:"+item.title+"\n");
-					return null;  // The master will not be visible
+				if (this.debug) this.logInfo("This is a master it will not be put into the normal items cache list.");
+				//dump("convertExchangeAppointmentToCalAppointment. The master will not be visible:"+item.title+"\n");
+				return null; // The master will not be visible
 
-					break;
-				default:
-					//this.setSnoozeTime(item, null);
+				break;
+			default:
+				//this.setSnoozeTime(item, null);
 			}
 		}
 
 		return item;
 	},
 
-	convertExchangeAppointmentToCalAppointment: function _convertExchangeAppointmentToCalAppointment(aCalendarItem, isMeetingRequest, erGetItemsRequest, doNotify, fromOfflineCache)
-	{
-		if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment:"+xml2json.toString(aCalendarItem), 2);
+	convertExchangeAppointmentToCalAppointment: function _convertExchangeAppointmentToCalAppointment(aCalendarItem, isMeetingRequest, erGetItemsRequest, doNotify, fromOfflineCache) {
+		if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment:" + xml2json.toString(aCalendarItem), 2);
 
 		//var item = createEvent();
-//		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-//				.createInstance(Ci.mivExchangeEvent, this);
+		//		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+		//				.createInstance(Ci.mivExchangeEvent, this);
 
 		var item = new mivExchangeEvent();
 
@@ -7101,7 +7247,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		item.calendar = this.superCalendar;
 		item.exchangeData = aCalendarItem;
 
-//		item.calendar = this;
+		//		item.calendar = this;
 
 		//return item;
 
@@ -7110,7 +7256,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		}
 
 		//item.id = this.tryToSetValue(aCalendarItem.getAttributeByTag("t:ItemId", "Id"), item.id);
-		if (! item.id) {
+		if (!item.id) {
 			if (this.debug) this.logInfo("Item.id is missing. this is a required field.");
 			item.deleteItem();
 			item = null;
@@ -7119,12 +7265,12 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		}
 		//item.setProperty("X-ChangeKey", aCalendarItem.getAttributeByTag("t:ItemId", "ChangeKey"));
 		if ((erGetItemsRequest) && (erGetItemsRequest.argument.occurrenceIndexes) && (erGetItemsRequest.argument.occurrenceIndexes[item.id])) {
-			if (this.debug) this.logInfo(" Muriel:"+erGetItemsRequest.argument.occurrenceIndexes[item.id]+", title:"+item.title);
+			if (this.debug) this.logInfo(" Muriel:" + erGetItemsRequest.argument.occurrenceIndexes[item.id] + ", title:" + item.title);
 			item.occurrenceIndex = erGetItemsRequest.argument.occurrenceIndexes[item.id];
 			//setProperty("X-OccurrenceIndex", erGetItemsRequest.argument.occurrenceIndexes[item.id]+"");
 		}
-		
-		if (! item.startDate) {
+
+		if (!item.startDate) {
 			if (this.debug) this.logInfo("We have an empty startdate. Skipping this item.");
 			item.deleteItem();
 			item = null;
@@ -7132,7 +7278,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			return null;
 		}
 
-		if (! item.endDate) {
+		if (!item.endDate) {
 			if (this.debug) this.logInfo("We have an empty enddate. Skipping this item.");
 			item.deleteItem();
 			item = null;
@@ -7141,7 +7287,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		}
 
 		if (item.startDate.compare(item.endDate) > 0) {
-			if (this.debug) this.logInfo("Startdate ("+item.startDate+") is after enddate ("+item.endDate+")? Skipping this item.");
+			if (this.debug) this.logInfo("Startdate (" + item.startDate + ") is after enddate (" + item.endDate + ")? Skipping this item.");
 			item.deleteItem();
 			item = null;
 			//dump("convertExchangeAppointmentToCalAppointment. Startdate ("+item.startDate+") is after enddate ("+item.endDate+")? Skipping this item.\n");
@@ -7151,88 +7297,86 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 		return this.convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest);
 	},
 
-	convertExchangeTaskToCalTask: function _convertExchangeTaskToCalTask(aTask, erGetItemsRequest, fromOfflineCache)
-	{
+	convertExchangeTaskToCalTask: function _convertExchangeTaskToCalTask(aTask, erGetItemsRequest, fromOfflineCache) {
 		//if (this.debug) this.logInfo("convertExchangeTaskToCalTask:"+xml2json.toString(aTask), 2);
 		//var item = createTodo();
-//		var item = Cc["@1st-setup.nl/exchange/calendartodo;1"]
-//				.createInstance(Ci.mivExchangeTodo, this);
+		//		var item = Cc["@1st-setup.nl/exchange/calendartodo;1"]
+		//				.createInstance(Ci.mivExchangeTodo, this);
 
 		var item = new mivExchangeTodo();
 
 		item.addMailboxAlias(this.mailbox);
 		item.calendar = this.superCalendar;
-	 	item.exchangeData = aTask;
+		item.exchangeData = aTask;
 
 		return this.convertExchangeItemtoCalItem(aTask, item, fromOfflineCache, false);
 
 		// See if this is a delegated task.
-/*		var isNotAccepted = 0;
-
-		for each (var extendedProperty in aTask.getTagValue("t:ExtendedProperty")) {
-
-			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33032") {
-				item.setProperty("X-exchWebService-PidLidTaskAccepted",extendedProperty.getTagValue("t:Value"));
-				// TRUE means accepted or rejected.
-				if (extendedProperty.getTagValue("t:Value") == "false") isNotAccepted++;
-			}
-			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33045") {
-				item.setProperty("X-exchWebService-PidLidTaskLastUpdate",extendedProperty.getTagValue("t:Value"));
-				// Date of last update. 
-			}
-			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33066") {
-				item.setProperty("X-exchWebService-PidLidTaskAcceptanceState",extendedProperty.getTagValue("t:Value"));
-				// Only visible on the Owner task item. Otherwise value == NoMatch
-				//0x00000000 The task is not assigned.
-				//0x00000001 The task’s acceptance status is unknown.
-				//0x00000002 The task assignee accepted the task. This value is set when the client processes a task acceptance.
-				//0x00000003 The task assignee rejected the task. This value is set when the client processes a task rejection.
-				if (extendedProperty.getTagValue("t:Value") == "NoMatch") isNotAccepted++;
-			}
-			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33050") {
-				item.setProperty("X-exchWebService-PidLidTaskHistory",extendedProperty.getTagValue("t:Value"));
-				// Specifies last change to record. PidLidTaskLastUpdate shows date of this change.
-				//0x00000004 The dispidTaskDueDate (PidLidTaskDueDate) property changed.
-				//0x00000003 Another property was changed.
-				//0x00000001 The task assignee accepted this task.
-				//0x00000002 The task assignee rejected this task.
-				//0x00000005 The task was assigned to a task assignee.
-				//0x00000000 No changes were made.
-				if (extendedProperty.getTagValue("t:Value") == "5") isNotAccepted++;
-			}
-			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33065") {
-				item.setProperty("X-exchWebService-PidLidTaskOwnership",extendedProperty.getTagValue("t:Value"));
-			}
-		}
-		if (aTask.getTagValue("t:Delegator") != "") {
-			item.setProperty("X-exchWebService-Delegator",aTask.getTagValue("t:Delegator"));
-			item.setProperty("X-exchWebService-Owner",aTask.getTagValue("t:Owner"));
-			item.setProperty("X-exchWebService-IsTeamTask",aTask.getTagValue("t:IsTeamTask"));
-		}
-*/		
-	},
-
-	convertExchangeUserAvailabilityToCalAppointment: function _convertExchangeUserAvailabilityToCalAppointment(aCalendarEvent)
-	{
-//		if (aCalendarEvent.getTagValue("t:BusyType") == "Free") {
-/*			var startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
-			var endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
+		/*		var isNotAccepted = 0;
+
+				for each (var extendedProperty in aTask.getTagValue("t:ExtendedProperty")) {
+
+					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33032") {
+						item.setProperty("X-exchWebService-PidLidTaskAccepted",extendedProperty.getTagValue("t:Value"));
+						// TRUE means accepted or rejected.
+						if (extendedProperty.getTagValue("t:Value") == "false") isNotAccepted++;
+					}
+					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33045") {
+						item.setProperty("X-exchWebService-PidLidTaskLastUpdate",extendedProperty.getTagValue("t:Value"));
+						// Date of last update. 
+					}
+					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33066") {
+						item.setProperty("X-exchWebService-PidLidTaskAcceptanceState",extendedProperty.getTagValue("t:Value"));
+						// Only visible on the Owner task item. Otherwise value == NoMatch
+						//0x00000000 The task is not assigned.
+						//0x00000001 The task’s acceptance status is unknown.
+						//0x00000002 The task assignee accepted the task. This value is set when the client processes a task acceptance.
+						//0x00000003 The task assignee rejected the task. This value is set when the client processes a task rejection.
+						if (extendedProperty.getTagValue("t:Value") == "NoMatch") isNotAccepted++;
+					}
+					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33050") {
+						item.setProperty("X-exchWebService-PidLidTaskHistory",extendedProperty.getTagValue("t:Value"));
+						// Specifies last change to record. PidLidTaskLastUpdate shows date of this change.
+						//0x00000004 The dispidTaskDueDate (PidLidTaskDueDate) property changed.
+						//0x00000003 Another property was changed.
+						//0x00000001 The task assignee accepted this task.
+						//0x00000002 The task assignee rejected this task.
+						//0x00000005 The task was assigned to a task assignee.
+						//0x00000000 No changes were made.
+						if (extendedProperty.getTagValue("t:Value") == "5") isNotAccepted++;
+					}
+					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33065") {
+						item.setProperty("X-exchWebService-PidLidTaskOwnership",extendedProperty.getTagValue("t:Value"));
+					}
+				}
+				if (aTask.getTagValue("t:Delegator") != "") {
+					item.setProperty("X-exchWebService-Delegator",aTask.getTagValue("t:Delegator"));
+					item.setProperty("X-exchWebService-Owner",aTask.getTagValue("t:Owner"));
+					item.setProperty("X-exchWebService-IsTeamTask",aTask.getTagValue("t:IsTeamTask"));
+				}
+		*/
+	},
+
+	convertExchangeUserAvailabilityToCalAppointment: function _convertExchangeUserAvailabilityToCalAppointment(aCalendarEvent) {
+		//		if (aCalendarEvent.getTagValue("t:BusyType") == "Free") {
+		/*			var startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
+					var endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
+
+					// Cleanup items that were busy but are now free.
+		dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
+					for (var index in this.itemCacheById) {
+						if ((startDate.compare(this.itemCacheById[index].endDate) < 0) && (endDate.compare(this.itemCacheById[index].startDate) > 0)) {
+							this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
+							delete this.itemCacheById[index];
+						}
+					}*/
 
-			// Cleanup items that were busy but are now free.
-dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
-			for (var index in this.itemCacheById) {
-				if ((startDate.compare(this.itemCacheById[index].endDate) < 0) && (endDate.compare(this.itemCacheById[index].startDate) > 0)) {
-					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
-					delete this.itemCacheById[index];
-				}
-			}*/
-			
-//			return null;
-//		}
+		//			return null;
+		//		}
 
 		var item = createEvent();
-//		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-//				.createInstance(Ci.mivExchangeEvent);
+		//		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+		//				.createInstance(Ci.mivExchangeEvent);
 		item.calendar = this.superCalendar;
 
 		if (xml2json.getTagValue(aCalendarEvent, "t:BusyType") == "Free") {
@@ -7243,20 +7387,20 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 
 		item.title = this.tryToSetValue(xml2json.getTagValue(aCalendarEvent, "t:BusyType"), "");
-		if (! item.title) {
+		if (!item.title) {
 			item.title = "";
 		}
 
 		if (xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails")) {
-			item.title = this.tryToSetValue(xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Subject"), "")+" ("+item.title+")";
+			item.title = this.tryToSetValue(xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Subject"), "") + " (" + item.title + ")";
 
 			item.setProperty("LOCATION", xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Location"));
 		}
 		else {
-			item.title = " ("+item.title+")";
+			item.title = " (" + item.title + ")";
 		}
 
-//		item.setProperty("DESCRIPTION", aCalendarItem.getTagValue("t:Body"));
+		//		item.setProperty("DESCRIPTION", aCalendarItem.getTagValue("t:Body"));
 
 		item.startDate = null;
 		if (xml2json.getTagValue(aCalendarEvent, "t:StartTime", null)) {
@@ -7268,8 +7412,8 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			}
 		}
 
-//		item.startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
-		if (! item.startDate) {
+		//		item.startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
+		if (!item.startDate) {
 			if (this.debug) this.logInfo("We have an empty startdate. Skipping this item.");
 			item = null;
 			return null;
@@ -7286,7 +7430,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 
 		//item.endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
-		if (! item.endDate) {
+		if (!item.endDate) {
 			if (this.debug) this.logInfo("We have an empty enddate. Skipping this item.");
 			return null;
 		}
@@ -7294,28 +7438,27 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 
 		var startDateStr = xml2json.getTagValue(aCalendarEvent, "t:StartTime", "");
 		var endDateStr = xml2json.getTagValue(aCalendarEvent, "t:EndTime", "");
-		item.id = this.md5(startDateStr+endDateStr);
+		item.id = this.md5(startDateStr + endDateStr);
 		if (this.itemCacheById[item.id]) {
-//dump("\n-- we already know this one --:"+xml2json.toString(aCalendarEvent)+"\n");
+			//dump("\n-- we already know this one --:"+xml2json.toString(aCalendarEvent)+"\n");
 			//item = null;
 			return this.itemCacheById[item.id];
 		}
 
 		// Try to see if it is an all day event. Only to see if all hours, minutes and seconds are 0 (zero)
-		if ( (item.startDate.hour == 0) && (item.startDate.minute == 0) && (item.startDate.second == 0) &&
-		     (item.endDate.hour == 0) && (item.endDate.second == 0) && (item.endDate.second == 0) ) {
+		if ((item.startDate.hour == 0) && (item.startDate.minute == 0) && (item.startDate.second == 0)
+			&& (item.endDate.hour == 0) && (item.endDate.second == 0) && (item.endDate.second == 0)) {
 			item.startDate.isDate = true;
 			item.endDate.isDate = true;
 		}
 
-//dump("\n-- added --:"+xml2json.toString(aCalendarEvent)+"\n");
+		//dump("\n-- added --:"+xml2json.toString(aCalendarEvent)+"\n");
 		return item;
 	},
 
-	convertExchangeToCal: function _convertExchangeToCal(aExchangeItem, erGetItemsRequest, doNotify, fromOfflineCache)
-	{
-//		if (this.debug) this.logInfo("convertExchangeToCal:"+aExchangeItem, 2);
-		if (!aExchangeItem) { 
+	convertExchangeToCal: function _convertExchangeToCal(aExchangeItem, erGetItemsRequest, doNotify, fromOfflineCache) {
+		//		if (this.debug) this.logInfo("convertExchangeToCal:"+aExchangeItem, 2);
+		if (!aExchangeItem) {
 			if (this.debug) this.logInfo("convertExchangeToCal: !aExchangeItem", 2);
 			//dump("convertExchangeToCal. !aExchangeItem\n");
 			return;
@@ -7323,53 +7466,54 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 
 		var switchValue = xml2json.getTagValue(aExchangeItem, "t:ItemClass", "");
 		if (switchValue.indexOf(".{") > -1) {
-			switchValue = switchValue.substr(0,switchValue.indexOf(".{"));
+			switchValue = switchValue.substr(0, switchValue.indexOf(".{"));
 		}
 
 		if (switchValue.indexOf("IPM.Appointment") == 0) {
 
-			if (this.debug) this.logInfo("INFO: convertExchangeToCal: ItemClass = '"+switchValue+"'", 2);
+			if (this.debug) this.logInfo("INFO: convertExchangeToCal: ItemClass = '" + switchValue + "'", 2);
 			switchValue = "IPM.Appointment";
 		}
 
 		switch (switchValue) {
-			case "IPM.Appointment" :
-			case "IPM.Appointment.Occurrence" :
-			case "IPM.Appointment.MP" :
-			case "IPM.Appointment.Live Meeting Request" :
-			case "IPM.OLE.CLASS" :
-			case "IPM.Schedule.Meeting.Request":
-			case "IPM.Schedule.Meeting.Canceled":
-				return this.convertExchangeAppointmentToCalAppointment(aExchangeItem, false, erGetItemsRequest, doNotify, fromOfflineCache);
-				break;
-			case "IPM.Task" : 
-				return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
-				break;
-			case "IPM.Note" : 
- 				return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
-				break;	
-			default :
-				if (aExchangeItem.tagName == "CalendarEvent") {
-					return this.convertExchangeUserAvailabilityToCalAppointment(aExchangeItem);
-				}
-				if (this.debug) this.logInfo("WARNING: convertExchangeToCal: unknown ItemClass = '"+switchValue+"'");
+		case "IPM.Appointment":
+		case "IPM.Appointment.Occurrence":
+		case "IPM.Appointment.MP":
+		case "IPM.Appointment.Live Meeting Request":
+		case "IPM.OLE.CLASS":
+		case "IPM.Schedule.Meeting.Request":
+		case "IPM.Schedule.Meeting.Canceled":
+			return this.convertExchangeAppointmentToCalAppointment(aExchangeItem, false, erGetItemsRequest, doNotify, fromOfflineCache);
+			break;
+		case "IPM.Task":
+			return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
+			break;
+		case "IPM.Note":
+			return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
+			break;
+		default:
+			if (aExchangeItem.tagName == "CalendarEvent") {
+				return this.convertExchangeUserAvailabilityToCalAppointment(aExchangeItem);
+			}
+			if (this.debug) this.logInfo("WARNING: convertExchangeToCal: unknown ItemClass = '" + switchValue + "'");
 		}
 	},
 
-	updateCalendar: function _updateCalendar(erGetItemsRequest, aItems, doNotify, fromOfflineCache, processInParts)
-	{
+	updateCalendar: function _updateCalendar(erGetItemsRequest, aItems, doNotify, fromOfflineCache, processInParts) {
 		if (!processInParts) {
-			this.updateCalendar2(erGetItemsRequest, aItems,doNotify, fromOfflineCache);
+			this.updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache);
 			return;
 		}
 
-		if (this.debug) this.logInfo("updateCalendar: We have '"+aItems.length+"' items to update in calendar in parts. fromOfflineCache:"+fromOfflineCache);
+		if (this.debug) this.logInfo("updateCalendar: We have '" + aItems.length + "' items to update in calendar in parts. fromOfflineCache:" + fromOfflineCache);
 
 		for (var index in aItems) {
-			this.updateCalendarItems.push({ request: erGetItemsRequest,
-							item: aItems[index],
-							doNotify: doNotify,
-							fromOfflineCache: fromOfflineCache});
+			this.updateCalendarItems.push({
+				request: erGetItemsRequest,
+				item: aItems[index],
+				doNotify: doNotify,
+				fromOfflineCache: fromOfflineCache
+			});
 			aItems[index] = null;
 		}
 
@@ -7377,14 +7521,17 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 
 		if ((this.updateCalendarItems.length > 0) && (!this.updateCalendarTimerRunning)) {
 			this.updateCalendarTimerRunning = true;
-		        let self = this;
+			let self = this;
 			//this.observerService.notifyObservers(this, "onExchangeProgressChange", "2");
-			this.updateCalendarTimer.initWithCallback({ notify: function setTimeout_notify() {self.doUpdateCalendarItem();	}}, 20, this.updateCalendarTimer.TYPE_REPEATING_SLACK);
+			this.updateCalendarTimer.initWithCallback({
+				notify: function setTimeout_notify() {
+					self.doUpdateCalendarItem();
+				}
+			}, 20, this.updateCalendarTimer.TYPE_REPEATING_SLACK);
 		}
 	},
-	
-	doUpdateCalendarItem: function _doUpdateCalendarItem()
-	{
+
+	doUpdateCalendarItem: function _doUpdateCalendarItem() {
 		if (this.updateCalendarItems.length > 0) {
 			var tmpItems = [];
 
@@ -7409,9 +7556,8 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 	},
 
-	updateCalendar2: function _updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache)
-	{
-		if (this.debug) this.logInfo("updateCalendar2: We have '"+aItems.length+"' items to update in calendar. fromOfflineCache:"+fromOfflineCache);
+	updateCalendar2: function _updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache) {
+		if (this.debug) this.logInfo("updateCalendar2: We have '" + aItems.length + "' items to update in calendar. fromOfflineCache:" + fromOfflineCache);
 
 		let cacheItem = {};
 
@@ -7420,72 +7566,74 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			this.itemsFromExchange++;
 
 			var item = this.convertExchangeToCal(aItems[index], erGetItemsRequest, doNotify, fromOfflineCache);
-		
-			if (item) { 				
-				if ( item.isCancelled && item.reminderIsSet &&  isEvent(item) )
-				{
-				    var aNewItem = item.QueryInterface(Ci.mivExchangeEvent);				    
-					if (this.debug) this.logInfo("updateCalendar2: This item is Cancelled resetting reminder to false :  " + aNewItem.title );
- 					this.itemCount++; 
-					aNewItem._reminderIsSet=false;
-					aNewItem._newAlarm=null;					
-					this.modifyItem(aNewItem, item);					
-					if (this.debug) this.logInfo("updateCalendar2: hope! reminder is set  for item " +  aNewItem.title + " going to modify next item"  );
+
+			if (item) {
+				if (item.isCancelled && item.reminderIsSet && isEvent(item)) {
+					var aNewItem = item.QueryInterface(Ci.mivExchangeEvent);
+					if (this.debug) this.logInfo("updateCalendar2: This item is Cancelled resetting reminder to false :  " + aNewItem.title);
+					this.itemCount++;
+					aNewItem._reminderIsSet = false;
+					aNewItem._newAlarm = null;
+					this.modifyItem(aNewItem, item);
+					if (this.debug) this.logInfo("updateCalendar2: hope! reminder is set  for item " + aNewItem.title + " going to modify next item");
 				}
 				//convertedItems.push(item);
 				else if (!this.itemCacheById[item.id]) {
 					// This is a new unknown item
 					//this.itemCacheById[item.id] = item;  
-					if( ( this.isEmailTodo(item,aItems[index]) ===  false ) && ( this.isEmail(item) ===  true  ) ){
-					//We are not adding this item because its no longer email followup
- 					} 
-					else{
+					if ((this.isEmailTodo(item, aItems[index]) === false) && (this.isEmail(item) === true)) {
+						//We are not adding this item because its no longer email followup
+					}
+					else {
 						this.addItemToCache(item);
 						this.itemCount++;
-					
-						if ( isEvent(item) && this.markEventasTentative )
-						{
-							var isOldCacheItem=false;  
-							var aItem=item.QueryInterface(Ci.mivExchangeEvent);
-	
-							if (this.debug) this.logInfo("updateCalendar2: proceed setTentative:"+ item.title);  
-								this.setTentative(aItem,aItems[index],isOldCacheItem);
+
+						if (isEvent(item) && this.markEventasTentative) {
+							var isOldCacheItem = false;
+							var aItem = item.QueryInterface(Ci.mivExchangeEvent);
+
+							if (this.debug) this.logInfo("updateCalendar2: proceed setTentative:" + item.title);
+							this.setTentative(aItem, aItems[index], isOldCacheItem);
 						}
-						
-						if (this.debug) this.logInfo("updateCalendar2: onAddItem:"+ item.title);
+
+						if (this.debug) this.logInfo("updateCalendar2: onAddItem:" + item.title);
 						if (doNotify) {
 							this.notifyTheObservers("onAddItem", [item]);
 						}
-	
+
 						if ((this.useOfflineCache) && (!fromOfflineCache)) {
-							cacheItem[item.id] = {calItem: item,
-									exchangeItemXML: xml2json.toString(aItems[index])};
+							cacheItem[item.id] = {
+								calItem: item,
+								exchangeItemXML: xml2json.toString(aItems[index])
+							};
 							//this.addToOfflineCache(item, xml2json.toString(aItems[index]));
 						}
 					}
 				}
 				else {
 					// I Allready known this one.
-					if (this.debug) this.logInfo("updateCalendar2: onModifyItem:"+ item.title);
+					if (this.debug) this.logInfo("updateCalendar2: onModifyItem:" + item.title);
 					//dump("updateCalendar: onModifyItem:"+ item.title);
-					 
-					if(( this.isEmail(item) ===  true  ) && ( this.isEmailTodo(item,aItems[index]) ===  false ) ){
-  								//We are removing this item from cache because its no longer email followup  
-							this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
-							this.removeFromOfflineCache(item);
-							this.removeItemFromCache(this.itemCacheById[item.id]); 
- 					}
-					else{						
+
+					if ((this.isEmail(item) === true) && (this.isEmailTodo(item, aItems[index]) === false)) {
+						//We are removing this item from cache because its no longer email followup  
+						this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
+						this.removeFromOfflineCache(item);
+						this.removeItemFromCache(this.itemCacheById[item.id]);
+					}
+					else {
 						this.singleModified(item, doNotify);
-	
+
 						if ((this.useOfflineCache) && (!fromOfflineCache)) {
-							cacheItem[item.id] = {calItem: item,
-									exchangeItemXML: xml2json.toString(aItems[index])};
+							cacheItem[item.id] = {
+								calItem: item,
+								exchangeItemXML: xml2json.toString(aItems[index])
+							};
 							//this.addToOfflineCache(item, xml2json.toString(aItems[index]));
 						}
 					}
 				}
- 			}
+			}
 
 			aItems[index] = null;
 
@@ -7495,173 +7643,169 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			this.addToOfflineCache(cacheItem);
 		}
 	},
-	
-	isEmailTodo: function _isEmailTodo(item,exchangeData){ 
- 		if( this.isEmail(item) ){
-			var tmpObject = xml2json.XPath(exchangeData,"/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1090']");
-			
+
+	isEmailTodo: function _isEmailTodo(item, exchangeData) {
+		if (this.isEmail(item)) {
+			var tmpObject = xml2json.XPath(exchangeData, "/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1090']");
+
 			if (tmpObject.length > 0) {
-				 	let ext_val = xml2json.getTagValue(tmpObject[0], "t:Value", "0");
- 				 	if( (ext_val === "1") || (ext_val === "2") ){
- 				 		return true;	
-				 	}
-				 	else{
-				 		return false;
-				 	}
-				} 
-			else{
-		 		return false;
-			}
-		} 
- 		return false; 
-	},
-	
-	isEmail: function _isEmail(item){
-		if(item){
-			if( item.itemClass == "IPM.Note" ) return true;
+				let ext_val = xml2json.getTagValue(tmpObject[0], "t:Value", "0");
+				if ((ext_val === "1") || (ext_val === "2")) {
+					return true;
+				}
+				else {
+					return false;
+				}
+			}
+			else {
+				return false;
+			}
+		}
+		return false;
+	},
+
+	isEmail: function _isEmail(item) {
+		if (item) {
+			if (item.itemClass == "IPM.Note") return true;
 		}
 		return false;
 	},
-	
-	setTentative: function _setTentative(aItem, exchangeItem ,isOldCacheItem)
-	{ 
+
+	setTentative: function _setTentative(aItem, exchangeItem, isOldCacheItem) {
 		//Return when item already in cache
-		if ( !aItem  || !exchangeItem || !isEvent(aItem)   ) 
-		{
-			if (this.debug) this.logInfo("setTentative"); 
+		if (!aItem || !exchangeItem || !isEvent(aItem)) {
+			if (this.debug) this.logInfo("setTentative");
 			return;
-		} 
-		
-		if ( this.newCalendar )
-		{
-			if (this.debug) this.logInfo("setTentative : calendar is creating so no setTentative will not proceed"); 
+		}
+
+		if (this.newCalendar) {
+			if (this.debug) this.logInfo("setTentative : calendar is creating so no setTentative will not proceed");
 			return;
 		}
-		
-		if ( isOldCacheItem ) 
-		{
+
+		if (isOldCacheItem) {
 			//NoResponseReceived
 			//t:MyResponseType 
-			 if (this.debug) this.logInfo("setTentative 2: This item : " + aItem.title + " is Old and responded with - "  + xml2json.getTagValue(exchangeItem,"t:MyResponseType")  );
-			 return;
-		}  		
-		else
-		{
-		    var aNewItem = aItem.QueryInterface(Ci.mivExchangeEvent); 
-		    var aOldItem = aItem.QueryInterface(Ci.mivExchangeEvent); 
-		   
-		    var aNewItem = this.cloneItem(aItem);
-		    var aOldItem = this.cloneItem(aItem); 
-		    
-			var itemResponse =xml2json.getTagValue(exchangeItem,"t:MyResponseType");
-			if ( itemResponse == "NoResponseReceived" )
-			{
+			if (this.debug) this.logInfo("setTentative 2: This item : " + aItem.title + " is Old and responded with - " + xml2json.getTagValue(exchangeItem, "t:MyResponseType"));
+			return;
+		}
+		else {
+			var aNewItem = aItem.QueryInterface(Ci.mivExchangeEvent);
+			var aOldItem = aItem.QueryInterface(Ci.mivExchangeEvent);
+
+			var aNewItem = this.cloneItem(aItem);
+			var aOldItem = this.cloneItem(aItem);
+
+			var itemResponse = xml2json.getTagValue(exchangeItem, "t:MyResponseType");
+			if (itemResponse == "NoResponseReceived") {
 				var meNew = this.getInvitedAttendee(aNewItem);
-			 	var meOld = this.getInvitedAttendee(aOldItem);
+				var meOld = this.getInvitedAttendee(aOldItem);
 				//Assuming items already marked as tentaive in auto processing settings in ews server
-				if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + " stauts: "  + meNew.participationStatus + " :: "  + meOld.participationStatus+ " - " +  aItem.title + " Responded : " + itemResponse );
+				if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + " stauts: " + meNew.participationStatus + " :: " + meOld.participationStatus + " - " + aItem.title + " Responded : " + itemResponse);
 				//aNewItem.setProperty("STATUS", "TENTATIVE");
-		
-			 	meNew.participationStatus="TENTATIVE"; 
-			 	
-				if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + meNew.participationStatus + " :: "  + meOld.participationStatus) ;
-				this.modifyEventImmediate(aNewItem, aOldItem); 
-			}
-			else				
-			{
-				if (this.debug) this.logInfo("setTentative 2: This item is found in cache " + aItem.title + " Responded : " + itemResponse );
+
+				meNew.participationStatus = "TENTATIVE";
+
+				if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + meNew.participationStatus + " :: " + meOld.participationStatus);
+				this.modifyEventImmediate(aNewItem, aOldItem);
+			}
+			else {
+				if (this.debug) this.logInfo("setTentative 2: This item is found in cache " + aItem.title + " Responded : " + itemResponse);
 				return;
 			}
-		}  
-	},	
-	
-	modifyEventImmediate: function _modifyItemImmediate(aNewItem, aOldItem, aListener)
-	{
+		}
+	},
+
+	modifyEventImmediate: function _modifyItemImmediate(aNewItem, aOldItem, aListener) {
 
 		if (this.debug) this.logInfo("modifyEventImmediate");
 		var result = Ci.calIErrors.MODIFICATION_FAILED;
 
-	        if (this.OnlyShowAvailability) {
+		if (this.OnlyShowAvailability) {
 			this.readOnlyInternal = true;
 			this.notifyOperationComplete(aListener,
-        	                             Ci.calIErrors.OPERATION_CANCELLED,
-                        	             Ci.calIOperationListener.MODIFY,
-        	                             aNewItem.id,
-        	                             aNewItem);
+				Ci.calIErrors.OPERATION_CANCELLED,
+				Ci.calIOperationListener.MODIFY,
+				aNewItem.id,
+				aNewItem);
 			return null;
-	        }
+		}
 
-	        if (this.readOnly) {
+		if (this.readOnly) {
 			// When we hit this it probably is the change on a alarm. We will process this only in the local cache.
 			if (this.debug) this.logInfo("modifyEventImmediate: modifyItem and this calendar is ReadOnly");
 			this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
-	        	this.notifyOperationComplete(aListener,
-	        	                             Cr.NS_OK,
-	        	                             Ci.calIOperationListener.MODIFY,
-	        	                             aNewItem.id,
-	        	                             aNewItem);
+			this.notifyOperationComplete(aListener,
+				Cr.NS_OK,
+				Ci.calIOperationListener.MODIFY,
+				aNewItem.id,
+				aNewItem);
 			return null;
-	        }
+		}
 
 		if ((aOldItem.className) && (!aOldItem.canModify)) {
 			if (this.debug) this.logInfo("modifyEventImmediate: modifyItem and this item is ReadOnly for this user.");
-	        	this.notifyOperationComplete(aListener,
-	        	                             Cr.NS_OK,
-	        	                             Ci.calIOperationListener.MODIFY,
-	        	                             aOldItem.id,
-	        	                             aOldItem);
+			this.notifyOperationComplete(aListener,
+				Cr.NS_OK,
+				Ci.calIOperationListener.MODIFY,
+				aOldItem.id,
+				aOldItem);
 			return null;
 		}
 
-		if (this.debug) this.logInfo("modifyEventImmediate: 1 -- aOldItem.recurrenceInfo:"+aOldItem.recurrenceInfo+", aNewItem.recurrenceInfo:"+aNewItem.recurrenceInfo);
-		if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aOldItem.recurrenceInfo.toString():"+aOldItem.recurrenceInfo.toString());
-		if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aNewItem.recurrenceInfo.toString():"+aNewItem.recurrenceInfo.toString());
+		if (this.debug) this.logInfo("modifyEventImmediate: 1 -- aOldItem.recurrenceInfo:" + aOldItem.recurrenceInfo + ", aNewItem.recurrenceInfo:" + aNewItem.recurrenceInfo);
+		if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aOldItem.recurrenceInfo.toString():" + aOldItem.recurrenceInfo.toString());
+		if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aNewItem.recurrenceInfo.toString():" + aNewItem.recurrenceInfo.toString());
+
+		if (!aNewItem) {
+			throw Cr.NS_ERROR_INVALID_ARG;
+		}
 
-	        if (!aNewItem) {
-	            throw Cr.NS_ERROR_INVALID_ARG;
-	        }
+		var this_ = this;
 
-	        var this_ = this;
-	        function reportError(errStr, errId) {
-	            this_.notifyOperationComplete(aListener,
-	                                          errId ? errId : Cr.NS_ERROR_FAILURE,
-	                                          Ci.calIOperationListener.MODIFY,
-	                                          aNewItem.id,
-	                                          errStr);
-	            return null; 
-	        }
+		function reportError(errStr, errId) {
+			this_.notifyOperationComplete(aListener,
+				errId ? errId : Cr.NS_ERROR_FAILURE,
+				Ci.calIOperationListener.MODIFY,
+				aNewItem.id,
+				errStr);
+			return null;
+		}
 
-	        if (aNewItem.id == null) {
-	            // this is definitely an error
-	            return reportError("modifyEventImmediate: ID for modifyItem item is null");
-	        }
+		if (aNewItem.id == null) {
+			// this is definitely an error
+			return reportError("modifyEventImmediate: ID for modifyItem item is null");
+		}
 
 		// See if attachments changed.
 		var newAttachments = aNewItem.getAttachments({});
 		var attachments = {};
 
-		var attachmentsUpdates = { create: [], delete:[] };
+		var attachmentsUpdates = {
+			create: [],
+			delete: []
+		};
 		if (newAttachments.length > 0) {
-			if (this.debug) this.logInfo("modifyEventImmediate:   -- We have newAttachments:"+newAttachments.length);
+			if (this.debug) this.logInfo("modifyEventImmediate:   -- We have newAttachments:" + newAttachments.length);
 			for (var index in newAttachments) {
 				if (newAttachments[index].getParameter("X-AttachmentId")) {
 					attachments[newAttachments[index].getParameter("X-AttachmentId")] = newAttachments[index];
 				}
 				else {
 					attachmentsUpdates.create.push(newAttachments[index]);
-					if (this.debug) this.logInfo("modifyEventImmediate: newAttachment:"+newAttachments[index].uri.spec);
+					if (this.debug) this.logInfo("modifyEventImmediate: newAttachment:" + newAttachments[index].uri.spec);
 				}
 			}
 		}
 		// Check which have been removed.
 		var oldAttachments = aOldItem.getAttachments({});
 		for (var index in oldAttachments) {
-			if (! attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
+			if (!attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
 				attachmentsUpdates.delete.push(oldAttachments[index]);
-				if (this.debug) this.logInfo("modifyEventImmediate: removedAttachment:"+oldAttachments[index].uri.spec);
+				if (this.debug) this.logInfo("modifyEventImmediate: removedAttachment:" + oldAttachments[index].uri.spec);
 			}
-		}			
-		
+		}
+
 
 		if (isEvent(aNewItem)) {
 			if (this.debug) this.logInfo("modifyEventImmediate:  it is an event.");
@@ -7682,8 +7826,8 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 
 			if (aOldItem.isInvitation) {
 
-				if (this.debug) this.logInfo("modifyEventImmediate: 1 meOld.participationStatus="+meOld.participationStatus+", meNew.participationStatus="+meNew.participationStatus);
-				if (this.debug) this.logInfo("modifyEventImmediate: 1 aOldItem.status="+aOldItem.getProperty("STATUS")+", aNewItem.status="+aNewItem.getProperty("STATUS"));
+				if (this.debug) this.logInfo("modifyEventImmediate: 1 meOld.participationStatus=" + meOld.participationStatus + ", meNew.participationStatus=" + meNew.participationStatus);
+				if (this.debug) this.logInfo("modifyEventImmediate: 1 aOldItem.status=" + aOldItem.getProperty("STATUS") + ", aNewItem.status=" + aNewItem.getProperty("STATUS"));
 
 				if ((meOld) && (meNew) && (meOld.participationStatus != meNew.participationStatus)) {
 					doSendMeetingRespons = true;
@@ -7691,25 +7835,25 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 
 				if ((meNew) && (meNew.participationStatus == "NEEDS-ACTION") && (meOld.participationStatus != meNew.participationStatus)) {
 					// They choose to confirm at a later state. Do not change this item.
-			        	this.notifyOperationComplete(aListener,
-			        	                             Cr.NS_OK,
-			        	                             Ci.calIOperationListener.MODIFY,
-			        	                             aNewItem.id,
-			        	                             aNewItem);
+					this.notifyOperationComplete(aListener,
+						Cr.NS_OK,
+						Ci.calIOperationListener.MODIFY,
+						aNewItem.id,
+						aNewItem);
 
-			        	return null;
+					return null;
 				}
 
 				if ((meOld) && (meNew) && (aOldItem.getProperty("STATUS") != aNewItem.getProperty("STATUS")) && (!doSendMeetingRespons)) {
 					switch (aNewItem.getProperty("STATUS")) {
-					case "CONFIRMED": 
+					case "CONFIRMED":
 						meNew.participationStatus = "ACCEPTED";
 						break;
 					case null:
-					case "TENTATIVE": 
+					case "TENTATIVE":
 						meNew.participationStatus = "TENTATIVE";
 						break;
-					case "CANCELLED": 
+					case "CANCELLED":
 						meNew.participationStatus = "DECLINED";
 						break;
 					}
@@ -7717,15 +7861,15 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 				}
 
 			}
-			
-			if (this.debug) this.logInfo("modifyEventImmediate:  doSendMeetingRespons " + doSendMeetingRespons );
-			
+
+			if (this.debug) this.logInfo("modifyEventImmediate:  doSendMeetingRespons " + doSendMeetingRespons);
+
 			if (doSendMeetingRespons) {
 				// The item is an invitation.
 				// My status has changed. Send to this.globalFunctions.
-				if (this.debug) this.logInfo("modifyEventImmediate: 2 aOldItem.participationStatus="+meOld.participationStatus+", aNewItem.participationStatus="+(meNew ? meNew.participationStatus : ".."));
-				if (this.debug) this.logInfo("modifyEventImmediate: 3a aOldItem.id="+aOldItem.id);
-				if (this.debug) this.logInfo("modifyEventImmediate: 3b aNewItem.id="+aNewItem.id);
+				if (this.debug) this.logInfo("modifyEventImmediate: 2 aOldItem.participationStatus=" + meOld.participationStatus + ", aNewItem.participationStatus=" + (meNew ? meNew.participationStatus : ".."));
+				if (this.debug) this.logInfo("modifyEventImmediate: 3a aOldItem.id=" + aOldItem.id);
+				if (this.debug) this.logInfo("modifyEventImmediate: 3b aNewItem.id=" + aNewItem.id);
 
 				var requestResponseItem = aNewItem;
 				requestResponseItem.setProperty("X-MEETINGREQUEST", true);
@@ -7752,7 +7896,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					//requestResponseItem.setProperty("X-ChangeKey",  tmpItem.changeKey);
 				}
 				else {
-					if (this.debug) this.logInfo("modifyEventImmediate: ___________ NOT Found in meeting request cache. X-UID:"+aNewItem.uid);
+					if (this.debug) this.logInfo("modifyEventImmediate: ___________ NOT Found in meeting request cache. X-UID:" + aNewItem.uid);
 
 					if (aNewItem.id == aNewItem.parentItem.id) {
 						if (this.debug) this.logInfo("modifyEventImmediate: _________ it is a master.");
@@ -7776,11 +7920,13 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			}
 			else {
 
-				var input= { item: aNewItem, 
-					     response: "sendtonone"};
+				var input = {
+					item: aNewItem,
+					response: "sendtonone"
+				};
 
 				if (aNewItem.organizer) {
-					if (this.debug) this.logInfo("The organizer is:"+aNewItem.organizer.id);
+					if (this.debug) this.logInfo("The organizer is:" + aNewItem.organizer.id);
 				}
 				else {
 					if (this.debug) this.logInfo("We have no organizer!");
@@ -7793,41 +7939,46 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					changes = changesObj.changes;
 				}
 				var weHaveChanges = (changes || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
-//				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
+				//				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
 
 				var iAmOrganizer = ((aNewItem.organizer) && (aNewItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
 				//if (iAmOrganizer) {}
 
-				if (this.debug) this.logInfo("modifyEventImmediate:  it is a event. aOldItem.CalendarItemType=:"+aOldItem.calendarItemType);
+				if (this.debug) this.logInfo("modifyEventImmediate:  it is a event. aOldItem.CalendarItemType=:" + aOldItem.calendarItemType);
 
 				// We have a Single or master
 				if (aOldItem.calendarItemType == "RecurringMaster") {
-					if (this.debug) this.logInfo(" Master changed:"+aNewItem.title);
+					if (this.debug) this.logInfo(" Master changed:" + aNewItem.title);
 					// See if the aNewItem is also the master record.
 					var masterChanged = (aNewItem.parentItem.id == aNewItem.id);
 
 					// We need to find out wat has changed;
-					if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite="+aOldItem.isInvitation);
+					if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite=" + aOldItem.isInvitation);
 
 					if (changes) {
-						if (this.debug) this.logInfo("modifyEventImmediate: changed:"+String(changes));
+						if (this.debug) this.logInfo("modifyEventImmediate: changed:" + String(changes));
 
 						var self = this;
-						this.addToQueue( erUpdateItemRequest,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 item: aOldItem,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 updateReq: changes,
-							 newItem: aNewItem,
-					 		 actionStart: Date.now(),
-							 attachmentsUpdates: attachmentsUpdates,
-							 sendto: input.response}, 
-							function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-							function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+						this.addToQueue(erUpdateItemRequest, {
+								user: this.user,
+								mailbox: this.mailbox,
+								folderBase: this.folderBase,
+								serverUrl: this.serverUrl,
+								item: aOldItem,
+								folderID: this.folderID,
+								changeKey: this.changeKey,
+								updateReq: changes,
+								newItem: aNewItem,
+								actionStart: Date.now(),
+								attachmentsUpdates: attachmentsUpdates,
+								sendto: input.response
+							},
+							function (erUpdateItemRequest, aId, aChangeKey) {
+								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+							},
+							function (erUpdateItemRequest, aCode, aMsg) {
+								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+							},
 							aListener);
 						return;
 					}
@@ -7851,29 +8002,34 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					}
 				}
 				else {
-					if (this.debug) this.logInfo("modifyEventImmediate: '"+aOldItem.calendarItemType+"' event modification");
+					if (this.debug) this.logInfo("modifyEventImmediate: '" + aOldItem.calendarItemType + "' event modification");
 					// We need to find out wat has changed;
-					if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite="+aOldItem.isInvitation);
+					if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite=" + aOldItem.isInvitation);
 
 					if (changes) {
-						if (this.debug) this.logInfo("modifyEventImmediate:  changed:"+String(changes));
+						if (this.debug) this.logInfo("modifyEventImmediate:  changed:" + String(changes));
 
 						var self = this;
-						this.addToQueue( erUpdateItemRequest,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 item: aOldItem,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 updateReq: changes,
-							 newItem: aNewItem,
-					 		 actionStart: Date.now(),
-							 attachmentsUpdates: attachmentsUpdates,
-							 sendto: input.response}, 
-							function(erUpdateItemRequest, aId, aChangeKey) { self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);}, 
-							function(erUpdateItemRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);},
+						this.addToQueue(erUpdateItemRequest, {
+								user: this.user,
+								mailbox: this.mailbox,
+								folderBase: this.folderBase,
+								serverUrl: this.serverUrl,
+								item: aOldItem,
+								folderID: this.folderID,
+								changeKey: this.changeKey,
+								updateReq: changes,
+								newItem: aNewItem,
+								actionStart: Date.now(),
+								attachmentsUpdates: attachmentsUpdates,
+								sendto: input.response
+							},
+							function (erUpdateItemRequest, aId, aChangeKey) {
+								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+							},
+							function (erUpdateItemRequest, aCode, aMsg) {
+								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+							},
 							aListener);
 						this.singleModified(aNewItem, true, true);
 						return;
@@ -7895,19 +8051,18 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					}
 				}
 			}
-		} 
+		}
 		//this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]); 
-        	this.notifyOperationComplete(aListener,
-        	                             result,
-        	                             Ci.calIOperationListener.MODIFY,
-        	                             aNewItem.id,
-        	                             aNewItem);
+		this.notifyOperationComplete(aListener,
+			result,
+			Ci.calIOperationListener.MODIFY,
+			aNewItem.id,
+			aNewItem);
 
-        	return null;
+		return null;
 	},
-	
-	sendMeetingResponsImmediate: function _sendMeetingResponsImmediate(aItem, aListener, aItemType, aResponse, aBodyText)
-	{
+
+	sendMeetingResponsImmediate: function _sendMeetingResponsImmediate(aItem, aListener, aItemType, aResponse, aBodyText) {
 		if (this.debug) this.logInfo("sendMeetingResponsImmediate");
 
 		// Check if I'm the organiser. Do not send to myself.
@@ -7929,40 +8084,46 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 
 		var messageDisposition = "SendOnly";
-		
-		var input= { item: aItem, 
-			     response: tmpResponse,
-			     answer: "",
-			     bodyText: ""}; 
-	 
-		if (this.debug) this.logInfo("sendMeetingResponsImmediate:  -------------- messageDisposition="+messageDisposition);
+
+		var input = {
+			item: aItem,
+			response: tmpResponse,
+			answer: "",
+			bodyText: ""
+		};
+
+		if (this.debug) this.logInfo("sendMeetingResponsImmediate:  -------------- messageDisposition=" + messageDisposition);
 
 		var self = this;
-		this.addToQueue( erSendMeetingResponsRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 folderBase: this.folderBase,
-			 serverUrl: this.serverUrl,
-			 item: aItem,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 response: input.response,
-			 bodyText: input.bodyText,
-			 senderMailbox: this.mailbox,
-	 		 actionStart: Date.now(),
-			 itemType: aItemType,
-			 messageDisposition: messageDisposition}, 
-			function(erSendMeetingResponsRequest) { self.sendMeetingResponsOk(erSendMeetingResponsRequest);}, 
-			function(erSendMeetingResponsRequest, aCode, aMsg) { self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);},
+		this.addToQueue(erSendMeetingResponsRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				folderBase: this.folderBase,
+				serverUrl: this.serverUrl,
+				item: aItem,
+				folderID: this.folderID,
+				changeKey: this.changeKey,
+				response: input.response,
+				bodyText: input.bodyText,
+				senderMailbox: this.mailbox,
+				actionStart: Date.now(),
+				itemType: aItemType,
+				messageDisposition: messageDisposition
+			},
+			function (erSendMeetingResponsRequest) {
+				self.sendMeetingResponsOk(erSendMeetingResponsRequest);
+			},
+			function (erSendMeetingResponsRequest, aCode, aMsg) {
+				self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);
+			},
 			aListener);
 		return true;
 	},
-	
 
-	getCalendarItemsOK: function _getCalendarItemsOK(erGetItemsRequest, aItems, aItemErrors)
-	{
- 		if (this.debug) this.logInfo("getCalendarItemsOK: aItems.length="+aItems.length);
- 		this.saveCredentials(erGetItemsRequest.argument);
+
+	getCalendarItemsOK: function _getCalendarItemsOK(erGetItemsRequest, aItems, aItemErrors) {
+		if (this.debug) this.logInfo("getCalendarItemsOK: aItems.length=" + aItems.length);
+		this.saveCredentials(erGetItemsRequest.argument);
 		this.notConnected = false;
 
 		if ((aItemErrors) && (aItemErrors.length > 0)) {
@@ -7975,11 +8136,14 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					this.removeItemFromCache(this.itemCacheById[aItemErrors[i]]);
 				}
 				else {
-					this.removeFromOfflineCache({ id: aItemErrors[i], title:"from offline"});
+					this.removeFromOfflineCache({
+						id: aItemErrors[i],
+						title: "from offline"
+					});
 				}
 				i++;
 			}
-			
+
 		}
 
 		if (aItems.length == 0) {
@@ -7991,55 +8155,48 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		erGetItemsRequest = null;
 	},
 
-	getCalendarItemsError: function _getCalendarItemsError(erGetItemsRequest, aCode, aMsg)
-	{
+	getCalendarItemsError: function _getCalendarItemsError(erGetItemsRequest, aCode, aMsg) {
 		this.saveCredentials(erGetItemsRequest.argument);
 		this.notConnected = true;
 
 	},
 
-	get isVersion2013()
-	{
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2013") > -1 ) {
+	get isVersion2013() {
+		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2013") > -1) {
 			return true;
 		}
 
 		return false;
 	},
 
-	get isVersion2010()
-	{
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010") > -1 ) {
+	get isVersion2010() {
+		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010") > -1) {
 			return true;
 		}
 
 		return false;
 	},
 
-	get isVersion2007()
-	{
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") > -1 ) {
+	get isVersion2007() {
+		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") > -1) {
 			return true;
 		}
 
 		return false;
 	},
 
-	set weAreSyncing(aValue)
-	{
+	set weAreSyncing(aValue) {
 		if (aValue != this._weAreSyncing) {
-			if (this.debug) this.logInfo("this._weAreSyncing changed from '"+this._weAreSyncing+"' to '"+aValue+"'");
+			if (this.debug) this.logInfo("this._weAreSyncing changed from '" + this._weAreSyncing + "' to '" + aValue + "'");
 		}
 		this._weAreSyncing = aValue;
 	},
 
-	get weAreSyncing()
-	{
+	get weAreSyncing() {
 		return this._weAreSyncing;
 	},
 
-	getSyncState: function _getSyncState()
-	{ 
+	getSyncState: function _getSyncState() {
 		if (this.isOffline) return;
 
 		if (!this.weAreSyncing) {
@@ -8049,116 +8206,129 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			this.weAreSyncing = true;
 			switch (this.folderBase) {
 			case "tasks":
-			    if(!this.deactivateTaskFollowup){
-				    this.logInfo("getSyncState: this.syncStateInbox - " +  this.syncStateInbox );  
-					this.addToQueue(erSyncFolderItemsRequest,
-							{user: this.user, 
-						 mailbox: this.mailbox,
-						 serverUrl: this.serverUrl,
-						 folderBase: "inbox",
-  						 syncState: this.syncStateInbox,
-						 actionStart: Date.now() },
-						function(erSyncFolderItemsRequest, creations, updates, deletions, syncState) { self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);}, 
-						function(erSyncFolderItemsRequest, aCode, aMsg) { self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);},
-						null);  
-			    }
+				if (!this.deactivateTaskFollowup) {
+					this.logInfo("getSyncState: this.syncStateInbox - " + this.syncStateInbox);
+					this.addToQueue(erSyncFolderItemsRequest, {
+							user: this.user,
+							mailbox: this.mailbox,
+							serverUrl: this.serverUrl,
+							folderBase: "inbox",
+							syncState: this.syncStateInbox,
+							actionStart: Date.now()
+						},
+						function (erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
+							self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);
+						},
+						function (erSyncFolderItemsRequest, aCode, aMsg) {
+							self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);
+						},
+						null);
+				}
 				//Donot  break because we neet to call below section by default..
-				default:
-				    this.logInfo("getSyncState: this.syncState - "  + this.syncState); 
-
-					this.addToQueue(erSyncFolderItemsRequest,
-							{user: this.user, 
-						 mailbox: this.mailbox,
-						 serverUrl: this.serverUrl,
-						 folderBase: this.folderBase,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-						 syncState: this.syncState,
-						 actionStart: Date.now() },
-						function(erSyncFolderItemsRequest, creations, updates, deletions, syncState) { self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);}, 
-						function(erSyncFolderItemsRequest, aCode, aMsg) { self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);},
-						null);  
-			} 
+			default:
+				this.logInfo("getSyncState: this.syncState - " + this.syncState);
+
+				this.addToQueue(erSyncFolderItemsRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						serverUrl: this.serverUrl,
+						folderBase: this.folderBase,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						syncState: this.syncState,
+						actionStart: Date.now()
+					},
+					function (erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
+						self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);
+					},
+					function (erSyncFolderItemsRequest, aCode, aMsg) {
+						self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);
+					},
+					null);
+			}
 		}
 		else {
 			if (this.debug) this.logInfo("getSyncState: not creating erSyncFolderItemsRequest because we are allready syncing");
 		}
 	},
 
-	syncFolderItemsOK: function _syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState)
-	{
+	syncFolderItemsOK: function _syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
 		this.folderPathStatus = 0;
 		this.saveCredentials(erSyncFolderItemsRequest.argument);
 		this.notConnected = false;
-		if (this.debug) this.logInfo("syncFolderItemsOK: Folderbase: "+erSyncFolderItemsRequest.folderBase+", Creation:"+creations.length+", Updates:"+updates.length+", Deletions:"+deletions.length+", syncState:" + syncState);
+		if (this.debug) this.logInfo("syncFolderItemsOK: Folderbase: " + erSyncFolderItemsRequest.folderBase + ", Creation:" + creations.length + ", Updates:" + updates.length + ", Deletions:" + deletions.length + ", syncState:" + syncState);
 
 		if ((creations.length > 0) || (updates.length > 0) || (deletions.length > 0)) {
 			this.addActivity(calGetString("calExchangeCalendar", "syncFolderEventMessage", [creations.length, updates.length, deletions.length, this.name], "exchangecalendar"), "", erSyncFolderItemsRequest.argument.actionStart, Date.now());
-		} 
+		}
 
 		if (syncState) {
-			
-			if ((this.syncState) && (syncState == this.syncState || syncState == this.syncStateInbox )) {
+
+			if ((this.syncState) && (syncState == this.syncState || syncState == this.syncStateInbox)) {
 				this.logError("Same syncState received.");
 			}
-			
- 			// This was the first time. we now save the syncState;
-			if( erSyncFolderItemsRequest.folderBase == "inbox" )	{
-				this.syncStateInbox = syncState;  
+
+			// This was the first time. we now save the syncState;
+			if (erSyncFolderItemsRequest.folderBase == "inbox") {
+				this.syncStateInbox = syncState;
 				this.prefs.deleteBranch("syncStateInbox");
-				this.prefs.setCharPref("syncStateInbox",syncState);
+				this.prefs.setCharPref("syncStateInbox", syncState);
 				this.saveToFile("syncStateInbox.txt", syncState);
 			}
-			else{
-				this.syncState = syncState; 
-				this.prefs.deleteBranch("syncState"); 
-				this.prefs.setCharPref("syncState",syncState); 
-				this.saveToFile("syncState.txt", syncState); 
+			else {
+				this.syncState = syncState;
+				this.prefs.deleteBranch("syncState");
+				this.prefs.setCharPref("syncState", syncState);
+				this.saveToFile("syncState.txt", syncState);
 			}
-			this.weAreSyncing = false; 
+			this.weAreSyncing = false;
 		}
 
 		var self = this;
 
 		var changes = [];
-		for each(var creation in creations) { changes.push(creation); }
-		for each(var update in updates) { changes.push(update); }
+		for each(var creation in creations) {
+			changes.push(creation);
+		}
+		for each(var update in updates) {
+			changes.push(update);
+		}
 		if (changes.length > 0) {
-  			switch(erSyncFolderItemsRequest.folderBase){
-			case "tasks": 
-				this.findTaskItemsOK(erSyncFolderItemsRequest,changes);
+			switch (erSyncFolderItemsRequest.folderBase) {
+			case "tasks":
+				this.findTaskItemsOK(erSyncFolderItemsRequest, changes);
 				break;
 			case "calendar":
-				this.findCalendarItemsOK(erSyncFolderItemsRequest,changes,[]);
+				this.findCalendarItemsOK(erSyncFolderItemsRequest, changes, []);
 				break;
 			case "inbox":
-				this.findFollowupTaskItemsOK(erSyncFolderItemsRequest,changes);
+				this.findFollowupTaskItemsOK(erSyncFolderItemsRequest, changes);
 				break;
-			default: 
-				this.logError("Changes could not be made." + erSyncFolderItemsRequest.folderBase); 
-			}
-			
-/*			this.addToQueue( erGetItemsRequest, 
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 folderBase: this.folderBase,
-				 serverUrl: this.serverUrl,
-				 ids: changes,
-				 folderID: this.folderID,
-				 changeKey: this.changeKey,
-				 folderClass: this.folderClass,
-				 GUID: calExchangeCalendarGUID,
-				 syncState: syncState }, 
-				function(erGetItemsRequest, aIds, aItemErrors) { self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
-				function(erGetItemsRequest, aCode, aMsg) { self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);},
-				null);
-				*/
+			default:
+				this.logError("Changes could not be made." + erSyncFolderItemsRequest.folderBase);
+			}
+
+			/*			this.addToQueue( erGetItemsRequest, 
+							{user: this.user, 
+							 mailbox: this.mailbox,
+							 folderBase: this.folderBase,
+							 serverUrl: this.serverUrl,
+							 ids: changes,
+							 folderID: this.folderID,
+							 changeKey: this.changeKey,
+							 folderClass: this.folderClass,
+							 GUID: calExchangeCalendarGUID,
+							 syncState: syncState }, 
+							function(erGetItemsRequest, aIds, aItemErrors) { self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
+							function(erGetItemsRequest, aCode, aMsg) { self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);},
+							null);
+							*/
 		}
 
 		if (!syncState) return;
 
 		if (deletions.length > 0) {
-			for each (var deleted in deletions) {
+			for each(var deleted in deletions) {
 				var item = this.itemCacheById[deleted.Id];
 				if ((!item) && (this.useOfflineCache)) {
 					// It could be that the item is not yet loaded from offlineCache. We do this now.
@@ -8169,7 +8339,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					if (this.debug) this.logInfo("Going to remove an item");
 					// Single item or occurrence.
 					if (item.parentItem.id == item.id) {
-						if (this.debug) this.logInfo("This is a Single to delete. Title:"+item.title+", calendarItemType:"+item.calendarItemType);
+						if (this.debug) this.logInfo("This is a Single to delete. Title:" + item.title + ", calendarItemType:" + item.calendarItemType);
 					}
 					else {
 						if (this.debug) this.logInfo("This is a Occurrence or Exception to delete. THIS SHOULD NEVER HAPPEN.");
@@ -8179,7 +8349,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					this.itemCacheById[item.id] = null;
 					delete this.itemCacheById[item.id];*/
 					this.removeItemFromCache(item);
-					this.removeFromOfflineCache(item); 
+					this.removeFromOfflineCache(item);
 				}
 				else {
 					// Find matching master record.
@@ -8206,7 +8376,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			}
 		}
 
-		if (!this.firstSyncDone) { 
+		if (!this.firstSyncDone) {
 			this.firstSyncDone = true;
 			if (this.debug) this.logInfo("First sync is done. Normal operation is starting.");
 
@@ -8218,13 +8388,12 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 
 		if (this.getItemSyncQueue.length > 0) {
-			if (this.debug) this.logInfo("We have "+this.getItemSyncQueue.length+" items in this.getItemSyncQueue");
+			if (this.debug) this.logInfo("We have " + this.getItemSyncQueue.length + " items in this.getItemSyncQueue");
 			this.processItemSyncQueue();
-		} 
+		}
 	},
 
-	syncFolderItemsError: function _syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg)
-	{
+	syncFolderItemsError: function _syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg) {
 		if (this.debug) this.logInfo("syncFolderItemsError");
 		this.folderPathStatus = -1;
 		this.saveCredentials(erSyncFolderItemsRequest.argument);
@@ -8234,15 +8403,14 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 	},
 
 	// Check if specified folder still exists. If so get new id and changekey.
-	checkFolderPath: function _checkFolderPath()
-	{
+	checkFolderPath: function _checkFolderPath() {
 		// We first restore from prefs.js file from the last time.
-		var tmpFolderClass = this.globalFunctions.safeGetCharPref(this.prefs,"folderClass", null);
+		var tmpFolderClass = this.globalFunctions.safeGetCharPref(this.prefs, "folderClass", null);
 		if (tmpFolderClass) {
-			if (this.debug) this.logInfo("Restore folderClass from prefs.js:"+tmpFolderClass);
+			if (this.debug) this.logInfo("Restore folderClass from prefs.js:" + tmpFolderClass);
 			this.setSupportedItems(tmpFolderClass);
 
-			var tmpFolderProperties = this.globalFunctions.safeGetCharPref(this.prefs,"folderProperties", null);
+			var tmpFolderProperties = this.globalFunctions.safeGetCharPref(this.prefs, "folderProperties", null);
 			if (tmpFolderProperties) {
 				this.saveToFile("folderProperties.txt", tmpFolderProperties);
 				this.prefs.deleteBranch("folderProperties");
@@ -8269,15 +8437,20 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			this.folderPathStatus = 1;
 			var self = this;
 
-			this.addToQueue( erFindFolderRequest,
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 serverUrl: this.serverUrl,
-				 folderBase: this.folderBase,
-				 folderPath: this.folderPath,
-				 actionStart: Date.now()}, 
-				function(erFindFolderRequest, aId, aChangeKey, aFolderClass) { self.checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass);}, 
-				function(erFindFolderRequest, aCode, aMsg) { self.checkFolderPathError(erFindFolderRequest, aCode, aMsg);},
+			this.addToQueue(erFindFolderRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					serverUrl: this.serverUrl,
+					folderBase: this.folderBase,
+					folderPath: this.folderPath,
+					actionStart: Date.now()
+				},
+				function (erFindFolderRequest, aId, aChangeKey, aFolderClass) {
+					self.checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass);
+				},
+				function (erFindFolderRequest, aCode, aMsg) {
+					self.checkFolderPathError(erFindFolderRequest, aCode, aMsg);
+				},
 				null);
 		}
 		else {
@@ -8285,140 +8458,148 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 				// Get Folder Properties.
 				var self = this;
 
-				this.addToQueue( erGetFolderRequest,
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 serverUrl: this.serverUrl,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 actionStart: Date.now()}, 
-					function(erGetFolderRequest, aId, aChangeKey, aFolderClass) { self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);}, 
-					function(erGetFolderRequest, aCode, aMsg) { self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);},
+				this.addToQueue(erGetFolderRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						serverUrl: this.serverUrl,
+						folderID: this.folderID,
+						changeKey: this.changeKey,
+						actionStart: Date.now()
+					},
+					function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+						self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
+					},
+					function (erGetFolderRequest, aCode, aMsg) {
+						self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
+					},
 					null);
 			}
 			else {
 				if (this.debug) this.logInfo("checkFolderPath 2");
 				this.folderPathStatus = 1;
 				var self = this;
-	
-				this.addToQueue( erGetFolderRequest,
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 serverUrl: this.serverUrl,
-					 folderBase: this.folderBase,
-					 folderPath: this.folderPath,
-					 actionStart: Date.now()}, 
-					function(erGetFolderRequest, aId, aChangeKey, aFolderClass) { self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);}, 
-					function(erGetFolderRequest, aCode, aMsg) { self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);},
+
+				this.addToQueue(erGetFolderRequest, {
+						user: this.user,
+						mailbox: this.mailbox,
+						serverUrl: this.serverUrl,
+						folderBase: this.folderBase,
+						folderPath: this.folderPath,
+						actionStart: Date.now()
+					},
+					function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+						self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
+					},
+					function (erGetFolderRequest, aCode, aMsg) {
+						self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
+					},
 					null);
 			}
 		}
 	},
 
-	setSupportedItems: function _setSupportedItems(aFolderClass)
-	{
+	setSupportedItems: function _setSupportedItems(aFolderClass) {
 		this.folderClass = aFolderClass;
-		if (this.debug) this.logInfo("Set folderClass="+this.folderClass.toString());
+		if (this.debug) this.logInfo("Set folderClass=" + this.folderClass.toString());
 		this.prefs.setCharPref("folderClass", aFolderClass);
 		var itemType = Ci.calICalendar.ITEM_FILTER_TYPE_EVENT;
 
 		switch (aFolderClass.toString()) {
-			case "IPF.Appointment":
-				this.supportsEvents = true;
-				this.supportsTasks = false;
-				if (this.debug) this.logInfo("This folder supports only events.");
-				//this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, this.startCacheDate, this.endCacheDate, null);
-				break;
-			case "IPF.Task":
-				this.supportsEvents = false;
-				this.supportsTasks = true;
-				if (this.debug) this.logInfo("This folder supports only tasks.");
-				itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
-				// Get the tasks for the current know time frame
-				//this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO, 0, this.startCacheDate, this.endCacheDate, null);
-				break;
-			case "IPF.Note":
-				this.supportsEvents = false;
-				this.supportsTasks = true;
-				if (this.debug) this.logInfo("This folder supports only tasks.");
-				itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO; 
-				break;
-			default:
-				this.supportsEvents = false;
-				this.supportsTasks = false;
-				if (this.debug) this.logInfo("Unknown folderclass. We do not know if it supports events or tasks so turning it off.");
-				break;
-		}		
+		case "IPF.Appointment":
+			this.supportsEvents = true;
+			this.supportsTasks = false;
+			if (this.debug) this.logInfo("This folder supports only events.");
+			//this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, this.startCacheDate, this.endCacheDate, null);
+			break;
+		case "IPF.Task":
+			this.supportsEvents = false;
+			this.supportsTasks = true;
+			if (this.debug) this.logInfo("This folder supports only tasks.");
+			itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
+			// Get the tasks for the current know time frame
+			//this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO, 0, this.startCacheDate, this.endCacheDate, null);
+			break;
+		case "IPF.Note":
+			this.supportsEvents = false;
+			this.supportsTasks = true;
+			if (this.debug) this.logInfo("This folder supports only tasks.");
+			itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
+			break;
+		default:
+			this.supportsEvents = false;
+			this.supportsTasks = false;
+			if (this.debug) this.logInfo("Unknown folderclass. We do not know if it supports events or tasks so turning it off.");
+			break;
+		}
 
 	},
 
-	checkFolderPathOk: function _checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass)
-	{
+	checkFolderPathOk: function _checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass) {
 		this.saveCredentials(erFindFolderRequest.argument);
-		if (this.debug) this.logInfo("checkFolderPathOk: aId"+aId+", aChangeKey:"+aChangeKey+", aFolderClass:"+aFolderClass);
+		if (this.debug) this.logInfo("checkFolderPathOk: aId" + aId + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
 		this.notConnected = false;
-		
+
 		this.folderID = aId;
 		this.changeKey = aChangeKey;
-		
+
 		this.setSupportedItems(aFolderClass);
 
 		// Get Folder Properties.
 		var self = this;
 
-		this.addToQueue( erGetFolderRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 serverUrl: this.serverUrl,
-			 folderID: aId,
-			 changeKey: aChangeKey,
-			 actionStart: Date.now()}, 
-			function(erGetFolderRequest, aId, aChangeKey, aFolderClass) { self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);}, 
-			function(erGetFolderRequest, aCode, aMsg) { self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);},
+		this.addToQueue(erGetFolderRequest, {
+				user: this.user,
+				mailbox: this.mailbox,
+				serverUrl: this.serverUrl,
+				folderID: aId,
+				changeKey: aChangeKey,
+				actionStart: Date.now()
+			},
+			function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+				self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
+			},
+			function (erGetFolderRequest, aCode, aMsg) {
+				self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
+			},
 			null);
-		
+
 	},
 
-	get canCreateContent()
-	{
+	get canCreateContent() {
 		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
 			return false;
 		}
 		return this._canCreateContent;
 	},
- 
-	get canDelete()
-	{
+
+	get canDelete() {
 		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
 			return false;
 		}
 		return this._canDelete;
 	},
- 
-	get canRead()
-	{
+
+	get canRead() {
 		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
 			return true;
 		}
 		return this._canRead;
 	},
- 
-	get canModify()
-	{
+
+	get canModify() {
 		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
 			return false;
 		}
 		return this._canModify;
 	},
- 
-	setFolderProperties: function _setFolderProperties(aFolderProperties, aFolderClass)
-	{
+
+	setFolderProperties: function _setFolderProperties(aFolderProperties, aFolderClass) {
 		//BUG 111
 		// When the user only has permissions to see free/busy info and also permissions to read the folder
 		// properties we should activate OnlyShowAvailability variable.
 		// Problem is when is this condition true
 		// For now we will set OnlyShowAvailability = true when EffectiveRights.Read == false
-		if (this.debug) this.logInfo(" >>>>>>>>>>>>>>MIV>:"+aFolderClass.toString());
+		if (this.debug) this.logInfo(" >>>>>>>>>>>>>>MIV>:" + aFolderClass.toString());
 		var rm = aFolderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/*/t:EffectiveRights");
 		if (rm.length > 0) {
 			this._effectiveRights = rm[0];
@@ -8426,7 +8607,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 				this._canDelete = (this._effectiveRights.getTagValue("t:Delete", "false") == "true");
 				this._canModify = (this._effectiveRights.getTagValue("t:Modify", "false") == "true");
 				this._canRead = (this._effectiveRights.getTagValue("t:Read", "false") == "true");
-				this._canCreateContent = (this._effectiveRights.getTagValue("t:CreateContents", "false") == "true"); 
+				this._canCreateContent = (this._effectiveRights.getTagValue("t:CreateContents", "false") == "true");
 			}
 		}
 		else {
@@ -8449,13 +8630,13 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 				this.firstSyncDone = true;
 				this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
 				this.startCalendarPoller();
-			}		
+			}
 		}
 		else {
 			if (this.debug) this.logInfo("getFolderOk: but EffectiveRights.Read != false. Trying to get all event information.");
 			this.readOnlyInternal = false;
 
-			this.setSupportedItems(aFolderClass);		
+			this.setSupportedItems(aFolderClass);
 		}
 		rm = null;
 
@@ -8463,12 +8644,11 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 
 	},
 
-	getFolderOk: function _getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass)
-	{
+	getFolderOk: function _getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass) {
 		this.saveCredentials(erGetFolderRequest.argument);
-		if (this.debug) this.logInfo("getFolderOk: aId"+aId+", aChangeKey:"+aChangeKey+", aFolderClass:"+aFolderClass);
+		if (this.debug) this.logInfo("getFolderOk: aId" + aId + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
 		this.notConnected = false;
-		
+
 		this.folderProperties = erGetFolderRequest.properties;
 		this.saveToFile("folderProperties.txt", this.folderProperties.toString());
 		//this.prefs.setCharPref("folderProperties", this.folderProperties.toString());
@@ -8492,10 +8672,9 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 	},
 
-	checkFolderPathError: function _checkFolderPathError(erFindFolderRequest, aCode, aMsg)
-	{
+	checkFolderPathError: function _checkFolderPathError(erFindFolderRequest, aCode, aMsg) {
 		this.folderPathStatus = -1;
-		if (this.debug) this.logInfo("checkFolderPathError: Code:"+aCode+", Msg:"+aMsg);
+		if (this.debug) this.logInfo("checkFolderPathError: Code:" + aCode + ", Msg:" + aMsg);
 		// We could not get the specified folder anymore. Stop working.
 		// 21-03-2012 Try to get Free/Busy/Tentative information and show that.
 
@@ -8517,12 +8696,11 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 				this.readOnlyInternal = true;
 				this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
 				this.startCalendarPoller();
-			}		
+			}
 		}
 	},
 
-	getOnlyFreeBusyInformation: function _getOnlyFreeBusyInformation(aRangeStart, aRangeEnd)
-	{
+	getOnlyFreeBusyInformation: function _getOnlyFreeBusyInformation(aRangeStart, aRangeEnd) {
 		if ((!aRangeStart) && (!aRangeEnd)) {
 			if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart and aRangeEnd missing. Going to set start to 20 days before and end to 20 days after now.");
 			var offset = cal.createDuration();
@@ -8555,7 +8733,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 			aRangeStart.addDuration(offset);
 		}
 
-		if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart:"+aRangeStart+", aRangeEnd:"+aRangeEnd);
+		if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart:" + aRangeStart + ", aRangeEnd:" + aRangeEnd);
 
 		var tmpStartDate = aRangeStart.clone();
 		tmpStartDate.isDate = false;
@@ -8583,48 +8761,49 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 
 		var self = this;
-		this.addToQueue( erGetUserAvailabilityRequest, 
-			{user: this.user, 
-			 folderBase: "calendar",
-			 serverUrl: this.serverUrl,
-			 email: this.mailbox.replace(/^mailto:/i, ""),
-			 attendeeType: 'Required',
-			 start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
-			 end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
-			 folderID: this.folderID,
-			 changeKey: this.changeKey }, 
-			function(erGetUserAvailabilityRequest, aEvents) { self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);}, 
-			function(erGetUserAvailabilityRequest, aCode, aMsg) { self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);},
+		this.addToQueue(erGetUserAvailabilityRequest, {
+				user: this.user,
+				folderBase: "calendar",
+				serverUrl: this.serverUrl,
+				email: this.mailbox.replace(/^mailto:/i, ""),
+				attendeeType: 'Required',
+				start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
+				end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
+				folderID: this.folderID,
+				changeKey: this.changeKey
+			},
+			function (erGetUserAvailabilityRequest, aEvents) {
+				self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);
+			},
+			function (erGetUserAvailabilityRequest, aCode, aMsg) {
+				self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);
+			},
 			null);
 	},
 
-	setServerVersion: function _setServerVersion()
-	{
-		this.prefServerVersion = this.globalFunctions.safeGetCharPref(this.prefs,"lastServerVersion", null);
-		this.prefMajorVersion = this.globalFunctions.safeGetCharPref(this.prefs,"lastMajorVersion", null);
-		this.prefMinorVersion = this.globalFunctions.safeGetCharPref(this.prefs,"lastMinorVersion", null);
+	setServerVersion: function _setServerVersion() {
+		this.prefServerVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastServerVersion", null);
+		this.prefMajorVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastMajorVersion", null);
+		this.prefMinorVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastMinorVersion", null);
 		if (this.prefServerVersion) {
-			if (this.debug) this.logInfo("Restored prefServerVersion from prefs.js:"+this.prefServerVersion+" ("+this.prefMajorVersion+"."+this.prefMinorVersion+")");
+			if (this.debug) this.logInfo("Restored prefServerVersion from prefs.js:" + this.prefServerVersion + " (" + this.prefMajorVersion + "." + this.prefMinorVersion + ")");
 			this.exchangeStatistics.setServerVersion(this.serverUrl, this.prefServerVersion, this.prefMajorVersion, this.prefMinorVersion);
 		}
 	},
 
-	getTimeZones: function _getTimeZones()
-	{
+	getTimeZones: function _getTimeZones() {
 		this.setServerVersion();
 
 		this.timeZones.addURL(this.serverUrl, this.user, this);
 	},
 
-	getEWSTimeZoneId: function _getEWSTimeZoneId(aCalTimeZone, aDate)
-	{
-		if (this.debug) this.logInfo("getEWSTimeZoneId:"+aCalTimeZone.tzid);
+	getEWSTimeZoneId: function _getEWSTimeZoneId(aCalTimeZone, aDate) {
+		if (this.debug) this.logInfo("getEWSTimeZoneId:" + aCalTimeZone.tzid);
 
 		return this.timeZones.getExchangeTimeZoneIdByCalTimeZone(aCalTimeZone, this.serverUrl, aDate);
 	},
 
-	doDeleteCalendar: function _doDeleteCalendar()
-	{
+	doDeleteCalendar: function _doDeleteCalendar() {
 		this.doShutdown();
 
 		// Remove the offline cache database when we delete the calendar.
@@ -8634,8 +8813,7 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		}
 	},
 
-	addItemToCache: function _addItemToCache(item)
-	{
+	addItemToCache: function _addItemToCache(item) {
 		if (!item) {
 			//dump("addItemToCache: item is null.\n");
 			return;
@@ -8644,14 +8822,14 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 		var itemStartDate = item.startDate || item.entryDate;
 		var itemEndDate = item.endDate || item.dueDate;
 
-/*if (this.itemCacheById[item.id]) { 
-	dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+". IS AL READY IN CACHE.\n");
-}
-else {
-	dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
-}*/
-		if (this.debug) this.logInfo("addItemToCache ById: item.title:"+item.title+", startDate:"+itemStartDate+", endDate:"+itemEndDate+" | "+item.id+".");
-	//dump("addItemToCache ById: item.title:"+item.title+", startDate:"+itemStartDate+", endDate:"+itemEndDate+" | "+item.id+".\n");
+		/*if (this.itemCacheById[item.id]) { 
+			dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+". IS AL READY IN CACHE.\n");
+		}
+		else {
+			dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
+		}*/
+		if (this.debug) this.logInfo("addItemToCache ById: item.title:" + item.title + ", startDate:" + itemStartDate + ", endDate:" + itemEndDate + " | " + item.id + ".");
+		//dump("addItemToCache ById: item.title:"+item.title+", startDate:"+itemStartDate+", endDate:"+itemEndDate+" | "+item.id+".\n");
 
 		// Add to Id index.
 		this.itemCacheById[item.id] = item;
@@ -8669,13 +8847,13 @@ else {
 			while (!doStop) {
 
 				if ((startYear == endYear) && (startYearDay == endYearDay)) {
-					doStop= true;
+					doStop = true;
 				}
 				if (!this.itemCacheByStartDate) this.itemCacheByStartDate = {};
 				if (!this.itemCacheByStartDate[startYear]) this.itemCacheByStartDate[startYear] = {};
 				if (!this.itemCacheByStartDate[startYear][startYearDay]) this.itemCacheByStartDate[startYear][startYearDay] = [];
-		if (this.debug) this.logInfo(" -- addItemToCache ByStartDate: item.title:"+item.title+", startYear:"+startYear+", startYearDay:"+startYearDay+" | "+item.id+".",2);
-	//dump(" -- addItemToCache ByStartDate: item.title:"+item.title+", startYear:"+startYear+", startYearDay:"+startYearDay+" | "+item.id+".\n");
+				if (this.debug) this.logInfo(" -- addItemToCache ByStartDate: item.title:" + item.title + ", startYear:" + startYear + ", startYearDay:" + startYearDay + " | " + item.id + ".", 2);
+				//dump(" -- addItemToCache ByStartDate: item.title:"+item.title+", startYear:"+startYear+", startYearDay:"+startYearDay+" | "+item.id+".\n");
 				this.itemCacheByStartDate[startYear][startYearDay][item.id] = true;
 
 				startYearDay++;
@@ -8688,8 +8866,7 @@ else {
 
 	},
 
-	removeItemFromCache: function _removeItemFromCache(item)
-	{
+	removeItemFromCache: function _removeItemFromCache(item) {
 		if (!item) {
 			//dump("removeItemFromCache: item is null.\n");
 			return;
@@ -8708,7 +8885,7 @@ else {
 			while (!doStop) {
 
 				if ((startYear >= endYear) && (startYearDay >= endYearDay)) {
-					doStop= true;
+					doStop = true;
 				}
 
 				if ((this.itemCacheByStartDate[startYear]) && (this.itemCacheByStartDate[startYear][startYearDay])) {
@@ -8732,17 +8909,16 @@ else {
 			}
 			this.itemCacheById[item.id] = null;
 			delete this.itemCacheById[item.id];
-//			var itemDate = item.startDate || item.entryDate;
-//dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
+			//			var itemDate = item.startDate || item.entryDate;
+			//dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
 		}
 		else {
-//			var itemDate = item.startDate || item.entryDate;
+			//			var itemDate = item.startDate || item.entryDate;
 			//dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+". is not in itemCache. | "+item.id+"\n");
 		}
 	},
 
-	doShutdown: function _doShutdown()
-	{
+	doShutdown: function _doShutdown() {
 		if (this.shutdown) {
 			return;
 		}
@@ -8767,7 +8943,7 @@ else {
 		this.syncState = null;
 		this.syncStateInbox = null;
 		this.weAreSyncing = false;
-		
+
 		// Remove all items in cache from calendar.
 		for (var index in this.itemCacheById) {
 			if (this.itemCacheById[index]) {
@@ -8779,7 +8955,7 @@ else {
 				delete this.itemCacheById[index];*/
 				this.removeItemFromCache(this.itemCacheById[index]);
 			}
-		} 
+		}
 
 		// Reset caches.
 		this.itemCacheById = {};
@@ -8793,7 +8969,7 @@ else {
 				this.recurringMasterCache[index] = null;
 				delete this.recurringMasterCache[index];
 			}
-		} 
+		}
 		this.recurringMasterCache = {};
 		this.recurringMasterCacheById = {};
 
@@ -8806,23 +8982,23 @@ else {
 			try {
 				if (this.offlineCacheDB) this.offlineCacheDB.close();
 				this.offlineCacheDB = null;
-			} catch(exc) {}
+			}
+			catch (exc) {}
 		}
 	},
 
 	removeFromMeetingRequestCache: function _removeFromMeetingRequestCache(aID) {
 		//if (this.debug) this.logInfo("removeFromMeetingRequestCache:"+aUID);
-//		this.meetingRequestsCache[aUID] == null;
+		//		this.meetingRequestsCache[aUID] == null;
 		delete this.meetingRequestsCache[aID];
 	},
 
-	findItemInListByDatesAndID: function _findItemInListByDates(aList, aItem)
-	{
+	findItemInListByDatesAndID: function _findItemInListByDates(aList, aItem) {
 		var result = null;
 		for each(var listItem in aList) {
-			if ((aItem.getProperty("UID") == listItem.uid) &&
-				(listItem.startDate.compare(aItem.startDate) == 0) &&
-				(listItem.endDate.compare(aItem.endDate) == 0)) {
+			if ((aItem.getProperty("UID") == listItem.uid)
+				&& (listItem.startDate.compare(aItem.startDate) == 0)
+				&& (listItem.endDate.compare(aItem.endDate) == 0)) {
 				if (this.debug) this.logInfo("Found matching item in list.");
 				result = listItem;
 			}
@@ -8831,174 +9007,165 @@ else {
 		return result;
 	},
 
-	updateVersionInfoCache:function _updateVersionInfoCache(self, Addon)
-	{
- 		this.logInfo("updateVersionInfoCache  : ");
+	updateVersionInfoCache: function _updateVersionInfoCache(self, Addon) {
+		this.logInfo("updateVersionInfoCache  : ");
 
 		if (this.noDB) return;
 		if (!Addon) return;
-		var version=Addon.version;
-		
-		var sqlStr2 = "DELETE FROM version"; 
-		try{
-		if (!this.executeQuery(sqlStr2)) {
-			if (this.debug) this.logInfo("removeExchCalDbCache : Error removing attachment from offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
-		}
-		else {
-			if (this.debug) this.logInfo("removeExchCalDbCache: Removed version from offlineCacheDB. ");
-		}
-		 
-		var sqlStr = "INSERT INTO version VALUES ('"+version+"')";
- 		if (!this.executeQuery(sqlStr)) {
-			if (this.debug) this.logInfo("removeExchCalDbCache : Error inserting attachments_per_item into offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
-		}
-		else {
-			if (this.debug) this.logInfo("removeExchCalDbCache: Inserted attachments_per_item into offlineCacheDB. Name:"+ version );
-		} 
+		var version = Addon.version;
+
+		var sqlStr2 = "DELETE FROM version";
+		try {
+			if (!this.executeQuery(sqlStr2)) {
+				if (this.debug) this.logInfo("removeExchCalDbCache : Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+			}
+			else {
+				if (this.debug) this.logInfo("removeExchCalDbCache: Removed version from offlineCacheDB. ");
+			}
+
+			var sqlStr = "INSERT INTO version VALUES ('" + version + "')";
+			if (!this.executeQuery(sqlStr)) {
+				if (this.debug) this.logInfo("removeExchCalDbCache : Error inserting attachments_per_item into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+			}
+			else {
+				if (this.debug) this.logInfo("removeExchCalDbCache: Inserted attachments_per_item into offlineCacheDB. Name:" + version);
+			}
 		}
-		catch(ex)
-		{
-	 		this.logInfo("updateVersionInfoCache: excepetion occured ");
+		catch (ex) {
+			this.logInfo("updateVersionInfoCache: excepetion occured ");
 
 		}
- 		this.logInfo("updateVersionInfoCache 21 : Done");
+		this.logInfo("updateVersionInfoCache 21 : Done");
 
 		return true;
-		
+
+	},
+
+	checkExchCalAddonVerion: function _checkExchCalAddonVersion() {
+
+		try {
+			this.logInfo("checkExchCalAddonVerion: ");
+			Cu.import("resource://gre/modules/AddonManager.jsm");
+			var self = this;
+			AddonManager.getAddonByID("exchangecalendar@extensions.1st-setup.nl", function (Addon) {
+				self.removeExchCalDbCache(self, Addon);
+			});
+		}
+		catch (ex) {
+			this.logInfo("checkExchCalAddonVerion:  Exception occured ");
+		}
 	},
-	
-	checkExchCalAddonVerion: function _checkExchCalAddonVersion()
-	{
- 
-		try{
-		    this.logInfo("checkExchCalAddonVerion: ");
-		    Cu.import("resource://gre/modules/AddonManager.jsm");
-	 		var self=this; 
-		    AddonManager.getAddonByID("exchangecalendar@extensions.1st-setup.nl",function(Addon){  
-			    																self.removeExchCalDbCache(self,Addon); 
-	  	    																}); 
- 		}
-		catch(ex){
-		 	 this.logInfo("checkExchCalAddonVerion:  Exception occured ");
-		 	 }
-	}, 
-	
-	removeExchCalDbCache: function _removeExchCalDbCache(self,Addon){  
-  		var currentAddonVersion = Addon.version;
-  		var OldAddonversion = null; 
-  		var result = null;
-		
-  		this.logInfo("removeExchCalDbCache" );
+
+	removeExchCalDbCache: function _removeExchCalDbCache(self, Addon) {
+		var currentAddonVersion = Addon.version;
+		var OldAddonversion = null;
+		var result = null;
+
+		this.logInfo("removeExchCalDbCache");
 
 		var sqlStr = "SELECT name FROM version limit 1";
 
-		if (this.debug) this.logInfo("removeExchCalDbCache sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("removeExchCalDbCache sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("removeExchCalDbCache Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("removeExchCalDbCache Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return null;
 		}
-		
+
 		var doContinue = true;
 		try {
 			while (doContinue) {
 				doContinue = sqlStatement.executeStep();
 
 				if (doContinue) {
-					if (this.debug) this.logInfo("removeExchCalDbCache Found item in offline Cache."); 
-					OldAddonversion =  sqlStatement.row.name;
+					if (this.debug) this.logInfo("removeExchCalDbCache Found item in offline Cache.");
+					OldAddonversion = sqlStatement.row.name;
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.reset();
-		}			
-  		 
-		if ( OldAddonversion ){
-	  		if ( OldAddonversion != currentAddonVersion  ) {  
-			  			if(this.offlineCacheDB.connectionReady && this.offlineCacheDB.tableExists("items")){
-			  				 this.logInfo("removeExchCalDbCache clearCachedData - " + " NewVersion: " + currentAddonVersion + " OldVersion: " +   OldAddonversion  );
-			  					let statement = this.offlineCacheDB.createStatement("DELETE FROM items");
-			  					let statement1 = this.offlineCacheDB.createStatement("DELETE FROM attachments");
-			  					let statement2 = this.offlineCacheDB.createStatement("DELETE FROM attachments_per_item");
-			  									
-			  					try{	
-			  						statement.executeStep();
-			  						statement1.executeStep();
-			  						statement2.executeStep();					
-		
-			  						statement.finalize();
-			  						statement1.finalize();
-			  						statement2.finalize();
-			  					}
-			  					catch(e){
-			  						 this.logInfo("removeExchCalDbCache 41: unable to clear tables"+e);					
-			  					}
-			  				this.logInfo("removeExchCalDbCache cache cleared! current version : " + currentAddonVersion + " resetting calendar: " +  this.id );
-			  				var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-			  				observerService.notifyObservers(this, "onCalReset", this.id);			
-		 	  			}
-			  			
-			  			if(this.updateVersionInfoCache(self,Addon))
-						{
-							if (this.debug) this.logInfo("removeExchCalDbCache 21: new version updated in cache: " + currentAddonVersion);  
-						}
-						else
-						{
-							if (this.debug) this.logInfo("removeExchCalDbCache 22: failed! New version not updated in cache" );  
-						}
-			  			
-						if (this.debug) this.logInfo("removeExchCalDbCache 31: removing offlineCacheDB new/old wVersion found" );  
-	   		}  
-		}
-  		else
-  		{
-  			if (this.debug) this.logInfo("removeExchCalDbCache 26: not removing offlineCacheDB new/old Version not found: "+ currentAddonVersion ); 
-
-  			if(this.updateVersionInfoCache(self,Addon))
-			{
-				if (this.debug) this.logInfo("removeExchCalDbCache 32: new version updated in cache: " + currentAddonVersion);  
-			}
-			else
-			{
-				if (this.debug) this.logInfo("removeExchCalDbCache 35: failed! New version not updated in cache" );  
-			}
-  		}  
-		
- 	}, 
-		
-	createOfflineCacheDB: function _createOfflineCacheDB()
-	{ 
- 		
+		}
+
+		if (OldAddonversion) {
+			if (OldAddonversion != currentAddonVersion) {
+				if (this.offlineCacheDB.connectionReady && this.offlineCacheDB.tableExists("items")) {
+					this.logInfo("removeExchCalDbCache clearCachedData - " + " NewVersion: " + currentAddonVersion + " OldVersion: " + OldAddonversion);
+					let statement = this.offlineCacheDB.createStatement("DELETE FROM items");
+					let statement1 = this.offlineCacheDB.createStatement("DELETE FROM attachments");
+					let statement2 = this.offlineCacheDB.createStatement("DELETE FROM attachments_per_item");
+
+					try {
+						statement.executeStep();
+						statement1.executeStep();
+						statement2.executeStep();
+
+						statement.finalize();
+						statement1.finalize();
+						statement2.finalize();
+					}
+					catch (e) {
+						this.logInfo("removeExchCalDbCache 41: unable to clear tables" + e);
+					}
+					this.logInfo("removeExchCalDbCache cache cleared! current version : " + currentAddonVersion + " resetting calendar: " + this.id);
+					var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+					observerService.notifyObservers(this, "onCalReset", this.id);
+				}
+
+				if (this.updateVersionInfoCache(self, Addon)) {
+					if (this.debug) this.logInfo("removeExchCalDbCache 21: new version updated in cache: " + currentAddonVersion);
+				}
+				else {
+					if (this.debug) this.logInfo("removeExchCalDbCache 22: failed! New version not updated in cache");
+				}
+
+				if (this.debug) this.logInfo("removeExchCalDbCache 31: removing offlineCacheDB new/old wVersion found");
+			}
+		}
+		else {
+			if (this.debug) this.logInfo("removeExchCalDbCache 26: not removing offlineCacheDB new/old Version not found: " + currentAddonVersion);
+
+			if (this.updateVersionInfoCache(self, Addon)) {
+				if (this.debug) this.logInfo("removeExchCalDbCache 32: new version updated in cache: " + currentAddonVersion);
+			}
+			else {
+				if (this.debug) this.logInfo("removeExchCalDbCache 35: failed! New version not updated in cache");
+			}
+		}
+
+	},
+
+	createOfflineCacheDB: function _createOfflineCacheDB() {
+
 		if ((this.mUseOfflineCache) && (!this.offlineCacheDB)) {
 			this.noDB = true;
 			this.dbInit = true;
 			this.dbFile = Cc["@mozilla.org/file/directory_service;1"]
-					.getService(Components.interfaces.nsIProperties)
-					.get("ProfD", Components.interfaces.nsIFile);
+				.getService(Components.interfaces.nsIProperties)
+				.get("ProfD", Components.interfaces.nsIFile);
 			this.dbFile.append("exchange-data");
-			if ( !this.dbFile.exists() || !this.dbFile.isDirectory() ) {
-				this.dbFile.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));  
+			if (!this.dbFile.exists() || !this.dbFile.isDirectory()) {
+				this.dbFile.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
 			}
-			
-			this.dbFile.append(this.id+".offlineCache.sqlite");
+
+			this.dbFile.append(this.id + ".offlineCache.sqlite");
 
 			var dbExists = false;
 			if (this.dbFile.exists()) {
 				dbExists = true;
 			}
-			
+
 			try {
 				this.offlineCacheDB = Services.storage.openUnsharedDatabase(this.dbFile); // Will also create the file if it does not exist
 			}
-			catch(exc) {
+			catch (exc) {
 				this.offlineCacheDB = null;
 				if (this.debug) this.logInfo("Could not open offlineCache database.");
 				return;
 			}
-			
+
 			if (!this.offlineCacheDB.connectionReady) {
 				this.offlineCacheDB = null;
 				if (this.debug) this.logInfo("connectionReady for offlineCache database.");
@@ -9010,170 +9177,170 @@ else {
 			if (dbExists) {
 				dbVersion = this.globalFunctions.safeGetIntPref(this.prefs, "dbVersion", 0);
 			}
-	 		
+
 			//Check exchange calendar version clear cache
-			if(!this.mIsOffline) this.checkExchCalAddonVerion();
+			if (!this.mIsOffline) this.checkExchCalAddonVerion();
 
-//			if (dbVersion < latestDBVersion) {
-				if (!this.offlineCacheDB.tableExists("version")) {
-					if (this.debug) this.logInfo("Table 'version' does not yet exist. We are going to create it.");
-					try {
-						this.offlineCacheDB.createTable("version", "name STRING");
-					}
-					catch(exc) {
-						if (this.debug) this.logInfo("Could not create table 'version'. Error:"+exc);
-						return;
-					}
-	
-					var sqlStr = "CREATE UNIQUE INDEX idx_ver_id ON version (name)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_ver_id'");
-						this.offlineCacheDB = null;
-						return;
-					}   
+			//			if (dbVersion < latestDBVersion) {
+			if (!this.offlineCacheDB.tableExists("version")) {
+				if (this.debug) this.logInfo("Table 'version' does not yet exist. We are going to create it.");
+				try {
+					this.offlineCacheDB.createTable("version", "name STRING");
+				}
+				catch (exc) {
+					if (this.debug) this.logInfo("Could not create table 'version'. Error:" + exc);
+					return;
 				}
-				
-				if (!this.offlineCacheDB.tableExists("items")) {
-					if (this.debug) this.logInfo("Table 'items' does not yet exist. We are going to create it.");
-					try {
-						this.offlineCacheDB.createTable("items", "event STRING, id STRING, changeKey STRING, startDate STRING, endDate STRING, uid STRING, type STRING, parentItem STRING, item STRING");
-					}
-					catch(exc) {
-						if (this.debug) this.logInfo("Could not create table 'items'. Error:"+exc);
-						return;
-					}
 
-					var sqlStr = "CREATE INDEX idx_items_id ON items (id)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_id'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE UNIQUE INDEX idx_ver_id ON version (name)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_ver_id'");
+					this.offlineCacheDB = null;
+					return;
+				}
+			}
 
-					var sqlStr = "CREATE INDEX idx_items_type ON items (type)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_type'");
-						this.offlineCacheDB = null;
-						return;
-					}
+			if (!this.offlineCacheDB.tableExists("items")) {
+				if (this.debug) this.logInfo("Table 'items' does not yet exist. We are going to create it.");
+				try {
+					this.offlineCacheDB.createTable("items", "event STRING, id STRING, changeKey STRING, startDate STRING, endDate STRING, uid STRING, type STRING, parentItem STRING, item STRING");
+				}
+				catch (exc) {
+					if (this.debug) this.logInfo("Could not create table 'items'. Error:" + exc);
+					return;
+				}
 
-					var sqlStr = "CREATE UNIQUE INDEX idx_items_id_changekey ON items (id, changeKey)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_id_changekey'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_id ON items (id)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_id'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_items_type_uid ON items (type ASC, uid)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_type_uid'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_type ON items (type)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_type'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_items_uid ON items (uid)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_uid'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE UNIQUE INDEX idx_items_id_changekey ON items (id, changeKey)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_id_changekey'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_items_uid_startdate_enddate ON items (uid, startDate ASC, endDate)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_uid_startdate_enddate'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_type_uid ON items (type ASC, uid)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_type_uid'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_items_startdate_enddate ON items (startDate ASC, endDate)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_uid ON items (uid)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_uid'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_items_parentitem_startdate_enddate ON items (parentitem, startDate ASC, endDate)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_uid_startdate_enddate ON items (uid, startDate ASC, endDate)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_uid_startdate_enddate'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_items_type_startdate_enddate ON items (type, startDate ASC, endDate)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_items_type_startdate_enddate'");
-						this.offlineCacheDB = null;
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_startdate_enddate ON items (startDate ASC, endDate)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
+				var sqlStr = "CREATE INDEX idx_items_parentitem_startdate_enddate ON items (parentitem, startDate ASC, endDate)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
+					this.offlineCacheDB = null;
+					return;
 				}
 
-				if (!this.offlineCacheDB.tableExists("attachments")) {
-					if (this.debug) this.logInfo("Table 'attachments' does not yet exist. We are going to create it.");
-					try {
-						this.offlineCacheDB.createTable("attachments", "id STRING, name STRING, size INTEGER, cachePath STRING");
-					}
-					catch(exc) {
-						if (this.debug) this.logInfo("Could not create table 'attachments'. Error:"+exc);
-						return;
-					}
+				var sqlStr = "CREATE INDEX idx_items_type_startdate_enddate ON items (type, startDate ASC, endDate)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_items_type_startdate_enddate'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE UNIQUE INDEX idx_att_id ON attachments (id)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_att_id'");
-						this.offlineCacheDB = null;
-						return;
-					}
+			}
 
+			if (!this.offlineCacheDB.tableExists("attachments")) {
+				if (this.debug) this.logInfo("Table 'attachments' does not yet exist. We are going to create it.");
+				try {
+					this.offlineCacheDB.createTable("attachments", "id STRING, name STRING, size INTEGER, cachePath STRING");
+				}
+				catch (exc) {
+					if (this.debug) this.logInfo("Could not create table 'attachments'. Error:" + exc);
+					return;
 				}
 
-				if (!this.offlineCacheDB.tableExists("attachments_per_item")) {
-					if (this.debug) this.logInfo("Table 'attachments_per_item' does not yet exist. We are going to create it.");
-					try {
-						this.offlineCacheDB.createTable("attachments_per_item", "itemId STRING, attId STRING");
-					}
-					catch(exc) {
-						if (this.debug) this.logInfo("Could not create table 'attachments_per_item'. Error:"+exc);
-						return;
-					}
+				var sqlStr = "CREATE UNIQUE INDEX idx_att_id ON attachments (id)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_att_id'");
+					this.offlineCacheDB = null;
+					return;
+				}
 
-					var sqlStr = "CREATE INDEX idx_attitem_itemid ON attachments_per_item (itemId)";
-					if (!this.executeQuery(sqlStr)) {
-						if (this.debug) this.logInfo("Could not create index 'idx_attitem_itemid'");
-						this.offlineCacheDB = null;
-						return;
-					}
+			}
+
+			if (!this.offlineCacheDB.tableExists("attachments_per_item")) {
+				if (this.debug) this.logInfo("Table 'attachments_per_item' does not yet exist. We are going to create it.");
+				try {
+					this.offlineCacheDB.createTable("attachments_per_item", "itemId STRING, attId STRING");
+				}
+				catch (exc) {
+					if (this.debug) this.logInfo("Could not create table 'attachments_per_item'. Error:" + exc);
+					return;
+				}
+
+				var sqlStr = "CREATE INDEX idx_attitem_itemid ON attachments_per_item (itemId)";
+				if (!this.executeQuery(sqlStr)) {
+					if (this.debug) this.logInfo("Could not create index 'idx_attitem_itemid'");
+					this.offlineCacheDB = null;
+					return;
 				}
+			}
 
-				if (this.debug) this.logInfo("Created/opened offlineCache database.");
-				// Fix the database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4) 26-05-2012
+			if (this.debug) this.logInfo("Created/opened offlineCache database.");
+			// Fix the database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4) 26-05-2012
 			if (dbVersion < latestDBVersion) {
 				if (this.debug) this.logInfo("Running fix for database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4)");
-				var masters = this.executeQueryWithResults("SELECT uid FROM items WHERE type='M'",["uid"]);
+				var masters = this.executeQueryWithResults("SELECT uid FROM items WHERE type='M'", ["uid"]);
 				if ((masters) && (masters.length > 0)) {
 					for (var index in masters) {
-						var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='"+masters[index].uid+"'",["newEndDate"]);
+						var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='" + masters[index].uid + "'", ["newEndDate"]);
 						if ((newMasterEndDate) && (newMasterEndDate.length > 0)) {
-							if (this.debug) this.logInfo("newMasterEndDate:"+newMasterEndDate[0].newEndDate);
+							if (this.debug) this.logInfo("newMasterEndDate:" + newMasterEndDate[0].newEndDate);
 							var endDateStr = newMasterEndDate[0].newEndDate;
 							if (endDateStr) {
 								if (endDateStr.length == 10) {
 									endDateStr += "T23:59:59Z";
 								}
-								if (this.debug) this.logInfo("newEndDate for master setting it to:"+endDateStr);
-								this.executeQuery("UPDATE items set endDate='"+endDateStr+"' where type='M' AND uid='"+masters[index].uid+"'");
+								if (this.debug) this.logInfo("newEndDate for master setting it to:" + endDateStr);
+								this.executeQuery("UPDATE items set endDate='" + endDateStr + "' where type='M' AND uid='" + masters[index].uid + "'");
 							}
 							else {
 								if (this.debug) this.logInfo("newEndDate for master is null not going to use this. Strange!!");
 							}
 						}
 						else {
-							if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!"); 
-						} 
+							if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!");
+						}
 					}
-				} 
+				}
 				this.prefs.setIntPref("dbVersion", latestDBVersion);
- 			}
+			}
 			//this.executeQuery("UPDATE items set event='y' where event='y_'"); // Turned of 2013-11-19. Items will always be read from offline cache even if they have already been read
 			//this.executeQuery("UPDATE items set event='n' where event='n_'");
 
@@ -9184,22 +9351,21 @@ else {
 			this.noDB = true;
 			var tryCount = 0;
 			while ((this.offlineCacheDB) && (tryCount < 3)) {
-				try{
+				try {
 					if (this.offlineCacheDB) this.offlineCacheDB.close();
 					this.offlineCacheDB = null;
 				}
-				catch(exc){
-					dump("\nUnable to close offlineCache database connection:"+exc+"\n");
-//					if (this.debug) this.logInfo("Unable to close offlineCache database connection:"+exc);
-					tryCount++;	
+				catch (exc) {
+					dump("\nUnable to close offlineCache database connection:" + exc + "\n");
+					//					if (this.debug) this.logInfo("Unable to close offlineCache database connection:"+exc);
+					tryCount++;
 				}
 			}
 			this.offlineCacheDB = null;
-		}		
+		}
 	},
 
-	get useOfflineCache()
-	{
+	get useOfflineCache() {
 		if (this.mUseOfflineCache) {
 			return this.mUseOfflineCache;
 		}
@@ -9210,20 +9376,18 @@ else {
 		}
 	},
 
-	set useOfflineCache(aValue)
-	{
+	set useOfflineCache(aValue) {
 		var oldValue = this.mUseOfflineCache;
 		this.mUseOfflineCache = aValue;
 		this.prefs.setBoolPref("useOfflineCache", aValue);
 		this.createOfflineCacheDB();
 
 		if ((oldValue != aValue) && (aValue)) {
-			 //this.syncExchangeToOfflineCache();
+			//this.syncExchangeToOfflineCache();
 		}
 	},
 
-	getItemType: function _getItemType(aCalItem)
-	{
+	getItemType: function _getItemType(aCalItem) {
 		if (aCalItem.id == aCalItem.parentItem.id) {
 			// Master or Single
 			if (aCalItem.recurrenceInfo) {
@@ -9238,15 +9402,14 @@ else {
 		}
 	},
 
-	executeQuery: function _executeQuery(aQuery)
-	{
-		if (this.debug) this.logInfo("sql-query:"+aQuery, 2);
+	executeQuery: function _executeQuery(aQuery) {
+		if (this.debug) this.logInfo("sql-query:" + aQuery, 2);
 		if ((this.noDB) && (!this.dbInit)) return false;
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(aQuery);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+aQuery+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + aQuery + ")");
 			return false;
 		}
 
@@ -9254,10 +9417,10 @@ else {
 		try {
 			sqlStatement.executeStep();
 		}
-		catch(err) {
-			this.logInfo("executeQuery: Error:"+err);
+		catch (err) {
+			this.logInfo("executeQuery: Error:" + err);
 		}
-		finally {  
+		finally {
 			if ((this.noDB) && (!this.dbInit)) return false;
 			sqlStatement.finalize();
 		}
@@ -9266,24 +9429,23 @@ else {
 			return true;
 		}
 		else {
-			if (this.debug) this.logInfo("Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return false;
 		}
 	},
 
-	executeQueryWithResults: function _executeQueryWithResults(aQuery, aFieldArray)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	executeQueryWithResults: function _executeQueryWithResults(aQuery, aFieldArray) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return null;
 		}
 
-		if (this.debug) this.logInfo("sql-query:"+aQuery, 2);
+		if (this.debug) this.logInfo("sql-query:" + aQuery, 2);
 		if ((this.noDB) && (!this.dbInit)) return [];
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(aQuery);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+aQuery+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + aQuery + ")");
 			return null;
 		}
 
@@ -9296,15 +9458,15 @@ else {
 					try {
 						tmpResult[aFieldArray[index]] = sqlStatement.row[aFieldArray[index]];
 					}
-					catch(exc) {
-						if (this.debug) this.logInfo("Error on getting field '"+aFieldArray[index]+"' from query '"+aQuery+"' result.("+exc+")");
+					catch (exc) {
+						if (this.debug) this.logInfo("Error on getting field '" + aFieldArray[index] + "' from query '" + aQuery + "' result.(" + exc + ")");
 					}
 				}
 				results.push(tmpResult);
 				if ((this.noDB) && (!this.dbInit)) return [];
 			}
 		}
-		finally {  
+		finally {
 			if ((this.noDB) && (!this.dbInit)) return [];
 			sqlStatement.finalize();
 		}
@@ -9313,13 +9475,12 @@ else {
 			return results;
 		}
 		else {
-			if (this.debug) this.logInfo("Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return null;
 		}
 	},
 
-	addAttachmentsToOfflineCache: function _addAttachmentsToOfflineCache(aList)
-	{
+	addAttachmentsToOfflineCache: function _addAttachmentsToOfflineCache(aList) {
 		for each(var item in aList) {
 			var attachments = item.calItem.getAttachments({});
 			this.removeAttachmentsFromOfflineCache(item.calItem);
@@ -9329,9 +9490,8 @@ else {
 		}
 	},
 
-	addAttachmentToOfflineCache: function _addAttachmentToOfflineCache(aCalItem, aCalAttachment)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	addAttachmentToOfflineCache: function _addAttachmentToOfflineCache(aCalItem, aCalAttachment) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
@@ -9339,8 +9499,8 @@ else {
 
 		if (attParams) {
 
-			var sqlStr = "SELECT COUNT() as attcount from attachments WHERE id='"+attParams.id+"'";
-			if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+			var sqlStr = "SELECT COUNT() as attcount from attachments WHERE id='" + attParams.id + "'";
+			if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 			if (this.noDB) return;
 			sqlStatement.executeStep();
@@ -9351,31 +9511,30 @@ else {
 				return;
 			}
 			sqlStatement.finalize();
-		
-			var sqlStr = "INSERT INTO attachments VALUES ('"+attParams.id+"', '"+attParams.name.replace(/\x27/g, "''")+"', '"+attParams.size+"', '')";
+
+			var sqlStr = "INSERT INTO attachments VALUES ('" + attParams.id + "', '" + attParams.name.replace(/\x27/g, "''") + "', '" + attParams.size + "', '')";
 			if (this.noDB) return;
 			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error inserting attachment into offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+				if (this.debug) this.logInfo("Error inserting attachment into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 			}
 			else {
-				if (this.debug) this.logInfo("Inserted attachment into offlineCacheDB. Name:"+attParams.name+", Title:"+aCalItem.title);
+				if (this.debug) this.logInfo("Inserted attachment into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
 			}
 
-			var sqlStr = "INSERT INTO attachments_per_item VALUES ('"+aCalItem.id+"','"+attParams.id+"')";
+			var sqlStr = "INSERT INTO attachments_per_item VALUES ('" + aCalItem.id + "','" + attParams.id + "')";
 			if (this.noDB) return;
 			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error inserting attachments_per_item into offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+				if (this.debug) this.logInfo("Error inserting attachments_per_item into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 			}
 			else {
-				if (this.debug) this.logInfo("Inserted attachments_per_item into offlineCacheDB. Name:"+attParams.name+", Title:"+aCalItem.title);
+				if (this.debug) this.logInfo("Inserted attachments_per_item into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
 			}
 
 		}
 	},
 
-	updateAttachmentInOfflineCache: function _updateAttachmentInOfflineCache(aCalItem, aCalAttachment)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	updateAttachmentInOfflineCache: function _updateAttachmentInOfflineCache(aCalItem, aCalAttachment) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
@@ -9383,31 +9542,30 @@ else {
 
 		if (attParams) {
 
-			var sqlStr = "UPDATE attachments SET id='"+attParams.id+"', name='"+attParams.name.replace(/\x27/g, "''")+"', size='"+attParams.size+"', cachePath='' WHERE id='"+attParams.id+"'";
+			var sqlStr = "UPDATE attachments SET id='" + attParams.id + "', name='" + attParams.name.replace(/\x27/g, "''") + "', size='" + attParams.size + "', cachePath='' WHERE id='" + attParams.id + "'";
 			if (this.noDB) return;
 			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error updating attachment into offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+				if (this.debug) this.logInfo("Error updating attachment into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 			}
 			else {
-				if (this.debug) this.logInfo("Updated attachment into offlineCacheDB. Name:"+attParams.name+", Title:"+aCalItem.title);
+				if (this.debug) this.logInfo("Updated attachment into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
 			}
 		}
 	},
 
-	removeAttachmentsFromOfflineCache: function _removeAttachmentsFromOfflineCache(aCalItem)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	removeAttachmentsFromOfflineCache: function _removeAttachmentsFromOfflineCache(aCalItem) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
-		var sqlStr = "SELECT attId FROM attachments_per_item WHERE itemId='"+aCalItem.id+"'";
+		var sqlStr = "SELECT attId FROM attachments_per_item WHERE itemId='" + aCalItem.id + "'";
 
-		if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return false;
 		}
 
@@ -9418,41 +9576,40 @@ else {
 				doContinue = sqlStatement.executeStep();
 
 				if (doContinue) {
-					var sqlStr2 = "DELETE FROM attachments WHERE id='"+sqlStatement.row.attId+"'";
+					var sqlStr2 = "DELETE FROM attachments WHERE id='" + sqlStatement.row.attId + "'";
 					if (this.noDB) return;
 					if (!this.executeQuery(sqlStr2)) {
-						if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+						if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 					}
 					else {
-						if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Title:"+aCalItem.title);
+						if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Title:" + aCalItem.title);
 					}
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.finalize();
 		}
 
 		if ((this.offlineCacheDB.lastError != 0) && (this.offlineCacheDB.lastError != 100) && (this.offlineCacheDB.lastError != 101)) {
-			if (this.debug) this.logInfo("Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return false;
 		}
 
-		var sqlStr2 = "DELETE FROM attachments_per_item WHERE itemId='"+aCalItem.id+"'";
+		var sqlStr2 = "DELETE FROM attachments_per_item WHERE itemId='" + aCalItem.id + "'";
 		if (this.noDB) return;
 		if (!this.executeQuery(sqlStr2)) {
-			if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 		}
 		else {
-			if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Title:"+aCalItem.title);
+			if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Title:" + aCalItem.title);
 		}
 
 		return true;
 	},
 
-	removeAttachmentFromOfflineCache: function _removeAttachmentFromOfflineCache(aCalItem, aCalAttachment)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	removeAttachmentFromOfflineCache: function _removeAttachmentFromOfflineCache(aCalItem, aCalAttachment) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
@@ -9460,30 +9617,29 @@ else {
 
 		if (attParams) {
 
-			var sqlStr = "DELETE FROM attachments WHERE id='"+attParams.id+"'";
+			var sqlStr = "DELETE FROM attachments WHERE id='" + attParams.id + "'";
 			if (this.noDB) return;
 			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+				if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 			}
 			else {
-				if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Name:"+attParams.name+", Title:"+aCalItem.title);
+				if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
 			}
 
-			var sqlStr = "DELETE FROM attachments_per_item WHERE itemId='"+aCalItem.id+"' AND attId='"+attParams.id+"'";
+			var sqlStr = "DELETE FROM attachments_per_item WHERE itemId='" + aCalItem.id + "' AND attId='" + attParams.id + "'";
 			if (this.noDB) return;
 			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:("+this.offlineCacheDB.lastError+")"+this.offlineCacheDB.lastErrorString);
+				if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
 			}
 			else {
-				if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Name:"+attParams.name+", Title:"+aCalItem.title);
+				if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
 			}
 		}
 	},
 
-	addToOfflineCache: function _addToOfflineCache(aList)
-	{
+	addToOfflineCache: function _addToOfflineCache(aList) {
 
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
@@ -9519,9 +9675,9 @@ else {
 				var eventField = "n";
 			}
 
-			var sqlStr = "SELECT '"+item.calItem.id+"' as realid, id, changeKey, COUNT() as itemcount from items WHERE id='"+item.calItem.id+"'";
+			var sqlStr = "SELECT '" + item.calItem.id + "' as realid, id, changeKey, COUNT() as itemcount from items WHERE id='" + item.calItem.id + "'";
 			//dump(this.name+":addToOfflineCache: sqlStr:"+sqlStr+"\n");
-			if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+			if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 
 			sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
 		}
@@ -9534,147 +9690,146 @@ else {
 		//dump(this.name+":addToOfflineCache: Going to execute '"+sqlQueries.length+"' queries\n");
 
 		var self = this;
-		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length,{
-				toBeInserted: [],
-				toBeUpdated: [],
-				list: aList,
-				handleCompletion: function _handleCompletion(aReason) {
-					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
-						// Finished looking up items in offline cache. Now insert or update the items.
-						//dump(self.name+":Finished looking up items in offline cache. Now insert or update the items.\n");
-						if (this.toBeInserted.length > 0) {
-							self.insertToOfflineCache(this.toBeInserted);
-						}
-						if (this.toBeUpdated.length > 0) {
-							self.updateInOfflineCache(this.toBeUpdated);
-						}
+		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
+			toBeInserted: [],
+			toBeUpdated: [],
+			list: aList,
+			handleCompletion: function _handleCompletion(aReason) {
+				if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
+					// Finished looking up items in offline cache. Now insert or update the items.
+					//dump(self.name+":Finished looking up items in offline cache. Now insert or update the items.\n");
+					if (this.toBeInserted.length > 0) {
+						self.insertToOfflineCache(this.toBeInserted);
 					}
-					else {
-						//dump(self.name+":addToOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
-						/*if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_CANCELED) {
-							dump("  -- It was canceled.\n");
-						}
-						if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_ERROR) {
-							dump("  -- It was an error.\n");
-						}*/
+					if (this.toBeUpdated.length > 0) {
+						self.updateInOfflineCache(this.toBeUpdated);
 					}
-				},
+				}
+				else {
+					//dump(self.name+":addToOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
+					/*if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_CANCELED) {
+						dump("  -- It was canceled.\n");
+					}
+					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_ERROR) {
+						dump("  -- It was an error.\n");
+					}*/
+				}
+			},
 
-				handleError: function _handleError(aError) {
-					dump(self.name+":addToOfflineCache: handleError: aError:"+aError.message+" ("+aError.result+")\n");
-				},
+			handleError: function _handleError(aError) {
+				dump(self.name + ":addToOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
+			},
 
-				handleResult: function _handleResult(aResultSet) {
-					if (self.debug) self.logInfo("Found item in offline Cache.");
-					var row = aResultSet.getNextRow();
-					while (row) {
-
-						if (row) {
-							if (row.getResultByName('itemcount') > 0) {
-								if (row.getResultByName('changeKey') != this.list[row.getResultByName('id')].calItem.changeKey) {
-									//dump(self.name+":Item will be updated id:"+row.getResultByName('id')+"\n");
-									this.toBeUpdated.push(this.list[row.getResultByName('id')]);
-								}
-								else {
-									if (this.debug) 
-										this.logInfo("This item '"+this.list[row.getResultByName('id')]+"' is allready in offlineCache database. id and changeKey are the same. Not going to update it.");
-										//dump(self.name+":This item '"+this.list[row.getResultByName('id')]+"' is allready in offlineCache database. id and changeKey are the same. Not going to update it.\n");
-								}
+			handleResult: function _handleResult(aResultSet) {
+				if (self.debug) self.logInfo("Found item in offline Cache.");
+				var row = aResultSet.getNextRow();
+				while (row) {
+
+					if (row) {
+						if (row.getResultByName('itemcount') > 0) {
+							if (row.getResultByName('changeKey') != this.list[row.getResultByName('id')].calItem.changeKey) {
+								//dump(self.name+":Item will be updated id:"+row.getResultByName('id')+"\n");
+								this.toBeUpdated.push(this.list[row.getResultByName('id')]);
 							}
 							else {
-								//dump(self.name+":Item will be inserted id 1:"+row.getResultByName('realid')+"\n");
-								//dump("Item will be inserted id 2:"+row.getResultByName('id')+"\n");
-								//dump("Item will be inserted id 3:"+row.getResultByIndex(0)+"\n");
-								this.toBeInserted.push(this.list[row.getResultByName('realid')]);
+								if (this.debug)
+									this.logInfo("This item '" + this.list[row.getResultByName('id')] + "' is allready in offlineCache database. id and changeKey are the same. Not going to update it.");
+								//dump(self.name+":This item '"+this.list[row.getResultByName('id')]+"' is allready in offlineCache database. id and changeKey are the same. Not going to update it.\n");
 							}
 						}
-						row = aResultSet.getNextRow();
+						else {
+							//dump(self.name+":Item will be inserted id 1:"+row.getResultByName('realid')+"\n");
+							//dump("Item will be inserted id 2:"+row.getResultByName('id')+"\n");
+							//dump("Item will be inserted id 3:"+row.getResultByIndex(0)+"\n");
+							this.toBeInserted.push(this.list[row.getResultByName('realid')]);
+						}
 					}
+					row = aResultSet.getNextRow();
 				}
-			});
+			}
+		});
 
 	},
 
-	insertToOfflineCache: function _insertToOfflineCache(aList)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	insertToOfflineCache: function _insertToOfflineCache(aList) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			//dump(this.name+":NO Offline Cache DB: insertToOfflineCache 1\n");
 			return;
 		}
 
-try{
-		//dump(this.name+":insertToOfflineCache 1\n");
-		var sqlQueries = [];
-		var mastersToBeUpdated = [];
+		try {
+			//dump(this.name+":insertToOfflineCache 1\n");
+			var sqlQueries = [];
+			var mastersToBeUpdated = [];
 
-		for each(var item in aList) {
+			for each(var item in aList) {
 
-			if (isEvent(item.calItem)) {
-				var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
-				var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
-				var eventField = "y";
-			}
-			else {
-				if (item.calItem.entryDate) {
-					var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
+				if (isEvent(item.calItem)) {
+					var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
+					var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
+					var eventField = "y";
 				}
 				else {
-					var startDate = "";
-				};
+					if (item.calItem.entryDate) {
+						var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
+					}
+					else {
+						var startDate = "";
+					};
 
-				if (((item.calItem.completedDate) && (item.calItem.dueDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) || ((item.calItem.completedDate) && (!item.calItem.dueDate))) {
-					var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
-				}
-				else {
-					if (item.calItem.dueDate) {
-						var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
+					if (((item.calItem.completedDate) && (item.calItem.dueDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) || ((item.calItem.completedDate) && (!item.calItem.dueDate))) {
+						var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
 					}
 					else {
-						var endDate = "";
+						if (item.calItem.dueDate) {
+							var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
+						}
+						else {
+							var endDate = "";
+						}
 					}
+					var eventField = "n";
 				}
-				var eventField = "n";
-			}
 
-			if (isEvent(item.calItem)) {
-				if (this.getItemType(item.calItem) == "M") {
-					// Lets find the real end date.
-					for (var childIndex in this.itemCacheById) {
-						if ((this.itemCacheById[childIndex]) && (item.calItem.uid == this.itemCacheById[childIndex].uid)) {
-							var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
-							if (childEnd > endDate) {
-								endDate = childEnd;
+				if (isEvent(item.calItem)) {
+					if (this.getItemType(item.calItem) == "M") {
+						// Lets find the real end date.
+						for (var childIndex in this.itemCacheById) {
+							if ((this.itemCacheById[childIndex]) && (item.calItem.uid == this.itemCacheById[childIndex].uid)) {
+								var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
+								if (childEnd > endDate) {
+									endDate = childEnd;
+								}
 							}
 						}
 					}
-				}
-				else {
-					if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
-						mastersToBeUpdated.push(item.calItem.parentItem);
+					else {
+						if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
+							mastersToBeUpdated.push(item.calItem.parentItem);
+						}
 					}
 				}
-			}
-		
-			var sqlStr = "INSERT INTO items VALUES ('"+eventField+"','"+item.calItem.id+"', '"+item.calItem.changeKey+"', '"+startDate+"', '"+endDate+"', '"+item.calItem.uid+"', '"+this.getItemType(item.calItem)+"', '"+item.calItem.parentItem.id+"', '"+item.exchangeItemXML.replace(/\x27/g, "''")+"')";
 
-			sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
-		}
+				var sqlStr = "INSERT INTO items VALUES ('" + eventField + "','" + item.calItem.id + "', '" + item.calItem.changeKey + "', '" + startDate + "', '" + endDate + "', '" + item.calItem.uid + "', '" + this.getItemType(item.calItem) + "', '" + item.calItem.parentItem.id + "', '" + item.exchangeItemXML.replace(/\x27/g, "''") + "')";
 
-		//dump(this.name+":insertToOfflineCache 2\n");
-		if (mastersToBeUpdated.length > 0) {
-			this.updateMasterInOfflineCache(mastersToBeUpdated);
-		}
+				sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
+			}
 
-		//dump(this.name+":insertToOfflineCache 3\n");
-		if (sqlQueries.length == 0) {
-			//dump(this.name+":insertToOfflineCache: No items in aList to be inserted to offlinecache.\n");
-			return;
-		}
+			//dump(this.name+":insertToOfflineCache 2\n");
+			if (mastersToBeUpdated.length > 0) {
+				this.updateMasterInOfflineCache(mastersToBeUpdated);
+			}
 
-		//dump(this.name+":insertToOfflineCache: Going to insert '"+sqlQueries.length+"' items to offlinecache.\n");
+			//dump(this.name+":insertToOfflineCache 3\n");
+			if (sqlQueries.length == 0) {
+				//dump(this.name+":insertToOfflineCache: No items in aList to be inserted to offlinecache.\n");
+				return;
+			}
 
-		var self = this;
-		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length,{
+			//dump(this.name+":insertToOfflineCache: Going to insert '"+sqlQueries.length+"' items to offlinecache.\n");
+
+			var self = this;
+			var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
 				handleCompletion: function _handleCompletion(aReason) {
 					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
 						// Finished looking up items in offline cache. Now insert or update the items.
@@ -9687,22 +9842,22 @@ try{
 				},
 
 				handleError: function _handleError(aError) {
-					dump(self.name+":updateInOfflineCache: handleError: aError:"+aError.message+" ("+aError.result+")\n");
+					dump(self.name + ":updateInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
 				},
 
 				handleResult: function _handleResult(aResultSet) {
 					//dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
 				}
 			});
-}
-catch(err) {
-	dump(this.name+":insertToOfflineCache: err:"+err+"\n");
-}
+		}
+		catch (err) {
+			dump(this.name + ":insertToOfflineCache: err:" + err + "\n");
+		}
 	},
 
 	updateInOfflineCache: function _updateInOfflineCache(aList) //aCalItem, aExchangeItemXML)
 	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
@@ -9744,15 +9899,15 @@ catch(err) {
 				if (this.getItemType(item.calItem) == "M") {
 					// Lets find the real end date.
 					if (this.noDB) return;
-					var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='"+item.calItem.uid+"'",["newEndDate"]);
+					var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='" + item.calItem.uid + "'", ["newEndDate"]);
 					if ((newMasterEndDate) && (newMasterEndDate.length > 0)) {
-						if (this.debug) this.logInfo("newMasterEndDate:"+newMasterEndDate[0].newEndDate);
+						if (this.debug) this.logInfo("newMasterEndDate:" + newMasterEndDate[0].newEndDate);
 						var endDateStr = newMasterEndDate[0].newEndDate;
 						if (endDateStr) {
 							if (endDateStr.length == 10) {
 								endDateStr += "T23:59:59Z";
 							}
-							if (this.debug) this.logInfo("newEndDate for master setting it to:"+endDateStr);
+							if (this.debug) this.logInfo("newEndDate for master setting it to:" + endDateStr);
 							endDate = endDateStr;
 						}
 						else {
@@ -9760,18 +9915,18 @@ catch(err) {
 						}
 					}
 					else {
-						if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!"); 
-					} 
+						if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!");
+					}
 
 				}
 				else {
 					if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
-						mastersToBeUpdated.push(item.calItem.parentItem); 
+						mastersToBeUpdated.push(item.calItem.parentItem);
 					}
 				}
 			}
-		
-			let sqlStr = "UPDATE items SET event='"+eventField+"', id='"+item.calItem.id+"', changeKey='"+item.calItem.changeKey+"', startDate='"+startDate+"', endDate='"+endDate+"', uid='"+item.calItem.uid+"', type='"+this.getItemType(item.calItem)+"', parentItem='"+item.calItem.parentItem.id+"', item='"+item.exchangeItemXML.replace(/\x27/g, "''")+"' WHERE id='"+item.calItem.id+"'";
+
+			let sqlStr = "UPDATE items SET event='" + eventField + "', id='" + item.calItem.id + "', changeKey='" + item.calItem.changeKey + "', startDate='" + startDate + "', endDate='" + endDate + "', uid='" + item.calItem.uid + "', type='" + this.getItemType(item.calItem) + "', parentItem='" + item.calItem.parentItem.id + "', item='" + item.exchangeItemXML.replace(/\x27/g, "''") + "' WHERE id='" + item.calItem.id + "'";
 
 			sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
 		}
@@ -9788,80 +9943,79 @@ catch(err) {
 		//dump(this.name+":updateInOfflineCache: Going to update '"+sqlQueries.length+"' items to offlinecache.\n");
 
 		var self = this;
-		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length,{
-				handleCompletion: function _handleCompletion(aReason) {
-					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
-						// Finished looking up items in offline cache. Now insert or update the items.
-						//dump(self.name+":updateInOfflineCache: handleCompletion: items were updated ok.\n");
-						self.addAttachmentsToOfflineCache(aList);
-					}
-					else {
-						//dump(self.name+":updateInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
-					}
-				},
+		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
+			handleCompletion: function _handleCompletion(aReason) {
+				if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
+					// Finished looking up items in offline cache. Now insert or update the items.
+					//dump(self.name+":updateInOfflineCache: handleCompletion: items were updated ok.\n");
+					self.addAttachmentsToOfflineCache(aList);
+				}
+				else {
+					//dump(self.name+":updateInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
+				}
+			},
 
-				handleError: function _handleError(aError) {
-					dump(self.name+":updateInOfflineCache: handleError: aError:"+aError.message+" ("+aError.result+")\n");
-				},
+			handleError: function _handleError(aError) {
+				dump(self.name + ":updateInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
+			},
 
-				handleResult: function _handleResult(aResultSet) {
-					//dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
-				}
-			});
+			handleResult: function _handleResult(aResultSet) {
+				//dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
+			}
+		});
 
 	},
 
-	updateMasterInOfflineCache: function _updateMasterInOfflineCache(aList)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	updateMasterInOfflineCache: function _updateMasterInOfflineCache(aList) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
-try{
-		//dump(this.name+":updateMasterInOfflineCache:\n");
+		try {
+			//dump(this.name+":updateMasterInOfflineCache:\n");
 
-		var sqlQueries = [];
-		var mastersToBeUpdated = [];
+			var sqlQueries = [];
+			var mastersToBeUpdated = [];
 
-		for each(var item in aList) {
+			for each(var item in aList) {
 
 
-			var endDate = cal.toRFC3339(item.endDate.getInTimezone(this.globalFunctions.ecUTC()));
+				var endDate = cal.toRFC3339(item.endDate.getInTimezone(this.globalFunctions.ecUTC()));
 
-			if (this.getItemType(item) == "M") {
-				// Lets find the real end date.
-				for (var childIndex in this.itemCacheById) {
-					if ((this.itemCacheById[childIndex]) && (item.uid == this.itemCacheById[childIndex].uid)) {
-						var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
-						if (childEnd > endDate) {
-							endDate = childEnd;
+				if (this.getItemType(item) == "M") {
+					// Lets find the real end date.
+					for (var childIndex in this.itemCacheById) {
+						if ((this.itemCacheById[childIndex]) && (item.uid == this.itemCacheById[childIndex].uid)) {
+							var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
+							if (childEnd > endDate) {
+								endDate = childEnd;
+							}
 						}
 					}
 				}
-			}
-			else {
-				if ((this.getItemType(item) == "RO") || (this.getItemType(item) == "RE")) {
-					mastersToBeUpdated.push(item.parentItem);
+				else {
+					if ((this.getItemType(item) == "RO") || (this.getItemType(item) == "RE")) {
+						mastersToBeUpdated.push(item.parentItem);
+					}
 				}
+
+				let sqlStr = "UPDATE items SET endDate='" + endDate + "' WHERE id='" + item.id + "'";
+				sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
 			}
-		
-			let sqlStr = "UPDATE items SET endDate='"+endDate+"' WHERE id='"+item.id+"'";
-			sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
-		}
 
-		if (mastersToBeUpdated.length > 0) {
-			this.updateMasterInOfflineCache(mastersToBeUpdated);
-		}
+			if (mastersToBeUpdated.length > 0) {
+				this.updateMasterInOfflineCache(mastersToBeUpdated);
+			}
 
-		if (sqlQueries.length == 0) {
-			//dump(this.name+":updateMasterInOfflineCache: No masters in aList to be updated in offlinecache.\n");
-			return;
-		}
+			if (sqlQueries.length == 0) {
+				//dump(this.name+":updateMasterInOfflineCache: No masters in aList to be updated in offlinecache.\n");
+				return;
+			}
 
-		//dump(this.name+":updateMasterInOfflineCache: '"+sqlQueries.length+"' masters will be updated in offlinecache.\n");
+			//dump(this.name+":updateMasterInOfflineCache: '"+sqlQueries.length+"' masters will be updated in offlinecache.\n");
 
-		var self = this;
-		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length,{
+			var self = this;
+			var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
 				handleCompletion: function _handleCompletion(aReason) {
 					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
 						// Finished looking up items in offline cache. Now insert or update the items.
@@ -9873,7 +10027,7 @@ try{
 				},
 
 				handleError: function _handleError(aError) {
-					dump(self.name+":updateMasterInOfflineCache: handleError: aError:"+aError.message+" ("+aError.result+")\n");
+					dump(self.name + ":updateMasterInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
 				},
 
 				handleResult: function _handleResult(aResultSet) {
@@ -9881,42 +10035,40 @@ try{
 				}
 			});
 
-}
-catch(err) {
-	dump(this.name+":updateMasterInOfflineCache: err:"+err+"\n");
-}
+		}
+		catch (err) {
+			dump(this.name + ":updateMasterInOfflineCache: err:" + err + "\n");
+		}
 	},
 
-	removeFromOfflineCache: function _removeFromOfflineCache(aCalItem)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	removeFromOfflineCache: function _removeFromOfflineCache(aCalItem) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
-		var sqlStr = "DELETE FROM items WHERE id='"+aCalItem.id+"'";
+		var sqlStr = "DELETE FROM items WHERE id='" + aCalItem.id + "'";
 		if (this.noDB) return;
 		if (!this.executeQuery(sqlStr)) {
-			if (this.debug) this.logInfo("Error deleting item from offlineCacheDB. Error:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error deleting item from offlineCacheDB. Error:" + this.offlineCacheDB.lastErrorString);
 		}
 		else {
-			if (this.debug) this.logInfo("Removed item from offlineCacheDB. Title:"+aCalItem.title);
+			if (this.debug) this.logInfo("Removed item from offlineCacheDB. Title:" + aCalItem.title);
 		}
 		this.removeAttachmentsFromOfflineCache(aCalItem);
 	},
 
-	removeChildrenFromMasterInOfflineCache: function _removeChildrenFromMasterInOfflineCache(aMaster)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+	removeChildrenFromMasterInOfflineCache: function _removeChildrenFromMasterInOfflineCache(aMaster) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
-		var sqlStr = "DELETE FROM items WHERE uid='"+aMaster.uid+"' and type <> 'M'";
+		var sqlStr = "DELETE FROM items WHERE uid='" + aMaster.uid + "' and type <> 'M'";
 		if (this.noDB) return;
 		if (!this.executeQuery(sqlStr)) {
-			if (this.debug) this.logInfo("Error deleting children from offlineCacheDB. Error:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error deleting children from offlineCacheDB. Error:" + this.offlineCacheDB.lastErrorString);
 		}
 		else {
-			if (this.debug) this.logInfo("Removed children from offlineCacheDB. Title:"+aMaster.title);
+			if (this.debug) this.logInfo("Removed children from offlineCacheDB. Title:" + aMaster.title);
 		}
 
 		// We have to remove the attachments from offline cache for each child.
@@ -9924,19 +10076,18 @@ catch(err) {
 
 	},
 
-	syncExchangeToOfflineCache: function _syncExchangeToOfflineCache()
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) || (this.mIsOffline) || (this.weAreSyncing) ) {
-			if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are offline or already syncing or no cache enabled! " );
+	syncExchangeToOfflineCache: function _syncExchangeToOfflineCache() {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB) || (this.mIsOffline) || (this.weAreSyncing)) {
+			if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are offline or already syncing or no cache enabled! ");
 			return;
 		}
-		if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are online syncing  " );
+		if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are online syncing  ");
 		// This will sync the specified period from Exchange to offlineCache.
-		var monthsAfter = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsAfterToday", 1, true)*31;
-		var monthsBefore = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsBeforeToday", 1, true)*31;
+		var monthsAfter = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsAfterToday", 1, true) * 31;
+		var monthsBefore = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsBeforeToday", 1, true) * 31;
 
-		var monthAfterDurarion = cal.createDuration("P"+monthsAfter+"D");
-		var monthsBeforeDurarion = cal.createDuration("-P"+monthsBefore+"D");
+		var monthAfterDurarion = cal.createDuration("P" + monthsAfter + "D");
+		var monthsBeforeDurarion = cal.createDuration("-P" + monthsBefore + "D");
 
 		var startDate = cal.now();
 		var endDate = cal.now();
@@ -9957,22 +10108,22 @@ catch(err) {
 
 		if (this.supportsEvents) {
 			if ((!this.startDate) && (!this.endDate)) {
-				if (this.debug) this.logInfo("Going to request events in the period of '"+startDate.toString()+"' until '"+endDate.toString()+"' from the exchange server to fill offlinecache.");
+				if (this.debug) this.logInfo("Going to request events in the period of '" + startDate.toString() + "' until '" + endDate.toString() + "' from the exchange server to fill offlinecache.");
 				//this.getItems(filter, 0, startDate, endDate, null);
 				this.requestPeriod(startDate, endDate, filter, {}, false);
-	
+
 			}
 			else {
-				if (this.debug) this.logInfo("Going to request events in the period of '"+this.startDate+"' until '"+this.endDate+"' from the exchange server to fill offlinecache.");
+				if (this.debug) this.logInfo("Going to request events in the period of '" + this.startDate + "' until '" + this.endDate + "' from the exchange server to fill offlinecache.");
 				this.requestPeriod(this.startDate, this.endDate, filter, {}, false);
 
 				if ((this.startDate) && (startDate.compare(this.startDate)) < 0) {
-					if (this.debug) this.logInfo("Going to request events in the period of '"+startDate.toString()+"' until '"+this.startDate.toString()+"' from the exchange server to fill offlinecache.");
+					if (this.debug) this.logInfo("Going to request events in the period of '" + startDate.toString() + "' until '" + this.startDate.toString() + "' from the exchange server to fill offlinecache.");
 					//this.getItems(filter, 0, startDate, this.startDate, null);
 					this.requestPeriod(startDate, this.startDate, filter, {}, false);
 				}
 				if ((this.endDate) && (endDate.compare(this.endDate) > 0)) {
-					if (this.debug) this.logInfo("Going to request events in the period of '"+this.endDate.toString()+"' until '"+endDate.toString()+"' from the exchange server to fill offlinecache.");
+					if (this.debug) this.logInfo("Going to request events in the period of '" + this.endDate.toString() + "' until '" + endDate.toString() + "' from the exchange server to fill offlinecache.");
 					//this.getItems(filter, 0, this.endDate, endDate, null);
 					this.requestPeriod(this.endDate, endDate, filter, {}, false);
 				}
@@ -9982,40 +10133,45 @@ catch(err) {
 		var self = this;
 		if (this.supportsTasks) {
 			if (this.debug) this.logInfo("Requesting tasks from exchange server.");
-			this.addToQueue( erFindTaskItemsRequest, 
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 serverUrl: this.serverUrl,
-				 folderBase: this.folderBase,
-				 itemFilter: filter,
-				 folderID: this.folderID,
-				 changeKey: this.changeKey,
-				 actionStart: Date.now() }, 
-				function(erFindTaskItemsRequest, aIds) { self.findTaskItemsOK(erFindTaskItemsRequest, aIds);}, 
-				function(erFindTaskItemsRequest, aCode, aMsg) { self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);},
+			this.addToQueue(erFindTaskItemsRequest, {
+					user: this.user,
+					mailbox: this.mailbox,
+					serverUrl: this.serverUrl,
+					folderBase: this.folderBase,
+					itemFilter: filter,
+					folderID: this.folderID,
+					changeKey: this.changeKey,
+					actionStart: Date.now()
+				},
+				function (erFindTaskItemsRequest, aIds) {
+					self.findTaskItemsOK(erFindTaskItemsRequest, aIds);
+				},
+				function (erFindTaskItemsRequest, aCode, aMsg) {
+					self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);
+				},
 				null);
 		}
 
 	},
 
 	masterIsInOfflineCache: function _masterIsInOfflineCache(aId) {
-		if (this.debug) this.logInfo("masterIsInOfflineCache: aId:"+aId);
+		if (this.debug) this.logInfo("masterIsInOfflineCache: aId:" + aId);
 		if (!aId) return null;
 
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return null;
 		}
 
 		var result = null;
 
-		var sqlStr = "SELECT id, uid, changeKey FROM items WHERE id = '"+aId+"' AND type='M'";
+		var sqlStr = "SELECT id, uid, changeKey FROM items WHERE id = '" + aId + "' AND type='M'";
 
-		if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return null;
 		}
 
@@ -10028,24 +10184,27 @@ catch(err) {
 					if (this.debug) this.logInfo("Found item in offline Cache.");
 
 					// Check if this item is not in the itemCache already.
-					result = {changeKey: sqlStatement.row.changeKey, uid: sqlStatement.row.uid };
+					result = {
+						changeKey: sqlStatement.row.changeKey,
+						uid: sqlStatement.row.uid
+					};
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.reset();
 		}
 
-		if ((this.debug) && (result)) this.logInfo("masterIsInOfflineCache: Retreived uid:'"+result.uid+"', changeKey:'"+result.changeKey+"' from offline cache.");
+		if ((this.debug) && (result)) this.logInfo("masterIsInOfflineCache: Retreived uid:'" + result.uid + "', changeKey:'" + result.changeKey + "' from offline cache.");
 		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
 
 			if (result) {
-				if (this.debug) this.logInfo("masterIsInOfflineCache: found in offline cache aId:"+aId+", changeKey:"+result.changeKey);
+				if (this.debug) this.logInfo("masterIsInOfflineCache: found in offline cache aId:" + aId + ", changeKey:" + result.changeKey);
 				return result;
 			}
 		}
 		else {
-			if (this.debug) this.logInfo("masterIsInOfflineCache: Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("masterIsInOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return null;
 		}
 		return null;
@@ -10053,23 +10212,23 @@ catch(err) {
 
 
 	itemIsInOfflineCache: function _itemIsInOfflineCache(aId) {
-		if (this.debug) this.logInfo("itemIsInOfflineCache: aId:"+aId);
+		if (this.debug) this.logInfo("itemIsInOfflineCache: aId:" + aId);
 		if (!aId) return null;
 
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return null;
 		}
 
 		var result = null;
 
-		var sqlStr = "SELECT id, changeKey FROM items WHERE id = '"+aId+"'";
+		var sqlStr = "SELECT id, changeKey FROM items WHERE id = '" + aId + "'";
 
-		if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return null;
 		}
 
@@ -10086,30 +10245,30 @@ catch(err) {
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.reset();
 		}
 
-		if (this.debug) this.logInfo("itemIsInOfflineCache: Retreived changeKey:'"+result+"' from offline cache.");
+		if (this.debug) this.logInfo("itemIsInOfflineCache: Retreived changeKey:'" + result + "' from offline cache.");
 		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
 
 			if (result) {
-dump("itemIsInOfflineCache: found:"+result+"\n");
+				dump("itemIsInOfflineCache: found:" + result + "\n");
 				return result;
 			}
 		}
 		else {
-			if (this.debug) this.logInfo("itemIsInOfflineCache: Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("itemIsInOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return null;
 		}
 		return null;
 	},
 
 	getOccurrencesFromOfflineCache: function _getOccurrencesFromOfflineCache(aMaster, aType) {
-		if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: aMaster.title:"+aMaster.title);
+		if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: aMaster.title:" + aMaster.title);
 		if (!aMaster) return [];
 
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return [];
 		}
 
@@ -10118,22 +10277,22 @@ dump("itemIsInOfflineCache: found:"+result+"\n");
 		var sqlStr = "SELECT id FROM items";
 		var whereStr = "";
 		if ((this.supportsEvents) && (!this.supportsTasks)) {
-			whereStr = " WHERE event = 'y' AND type = '"+aType+"' AND uid = '"+aMaster.uid+"'";
+			whereStr = " WHERE event = 'y' AND type = '" + aType + "' AND uid = '" + aMaster.uid + "'";
 			sqlStr += whereStr;
 		}
 		else {
 			if ((!this.supportsEvents) && (this.supportsTasks)) {
-				whereStr = " WHERE event = 'n' AND type = '"+aType+"' AND uid = '"+aMaster.uid+"'";
+				whereStr = " WHERE event = 'n' AND type = '" + aType + "' AND uid = '" + aMaster.uid + "'";
 				sqlStr += whereStr;
 			}
 		}
 
-		if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return [];
 		}
 
@@ -10153,31 +10312,30 @@ dump("itemIsInOfflineCache: found:"+result+"\n");
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.reset();
 		}
 
-		if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Retreived '"+result.length+"' records from offline cache.");
+		if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Retreived '" + result.length + "' records from offline cache.");
 		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
 
 			if (result.length > 0) {
-dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
+				dump("getOccurrencesFromOfflineCache: found:" + result.length + "\n");
 				return result;
 			}
 		}
 		else {
-			if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return [];
 		}
 		return [];
 	},
 
-	getItemsFromOfflineCache: function _getItemsFromOfflineCache(aStartDate, aEndDate)
-	{
-		if (this.debug) this.logInfo("getItemsFromOfflineCache startDate:"+aStartDate+", endDate:"+aEndDate);
+	getItemsFromOfflineCache: function _getItemsFromOfflineCache(aStartDate, aEndDate) {
+		if (this.debug) this.logInfo("getItemsFromOfflineCache startDate:" + aStartDate + ", endDate:" + aEndDate);
 		//dump("getItemsFromOfflineCache: name:"+this.name+", startDate:"+aStartDate+", endDate:"+aEndDate+"\n");
 
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
@@ -10200,22 +10358,22 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		var sqlStr = "SELECT item FROM items";
 		var whereStr = "";
 		if ((this.supportsEvents) && (!this.supportsTasks)) {
-			whereStr = " WHERE event = 'y' AND startDate <= '"+endDate+"' AND endDate >= '"+startDate+"'";
-			sqlStr += whereStr+" ORDER BY type ASC";
+			whereStr = " WHERE event = 'y' AND startDate <= '" + endDate + "' AND endDate >= '" + startDate + "'";
+			sqlStr += whereStr + " ORDER BY type ASC";
 		}
 		else {
 			if ((!this.supportsEvents) && (this.supportsTasks)) {
-				whereStr = " WHERE event = 'n' AND ((startDate = '' AND endDate >= '"+startDate+"' AND endDate <= '"+endDate+"') OR (endDate = '' AND startDate >= '"+startDate+"' AND startDate <= '"+endDate+"') OR (startDate <= '"+endDate+"' AND endDate >= '"+startDate+"') OR (startDate = '' AND endDate = ''))";
-				sqlStr += whereStr+" ORDER BY type ASC";
+				whereStr = " WHERE event = 'n' AND ((startDate = '' AND endDate >= '" + startDate + "' AND endDate <= '" + endDate + "') OR (endDate = '' AND startDate >= '" + startDate + "' AND startDate <= '" + endDate + "') OR (startDate <= '" + endDate + "' AND endDate >= '" + startDate + "') OR (startDate = '' AND endDate = ''))";
+				sqlStr += whereStr + " ORDER BY type ASC";
 			}
 		}
 
-		if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return false;
 		}
 
@@ -10237,51 +10395,51 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.reset();
 		}
 
-/*		var self = this;
-		sqlStatement.executeAsync({
-			handleResult: function(aResultSet) {
-				if (self.debug) self.logInfo("Found item in offline Cache.");
-				var row;
-				while (row = aResultSet.getNextRow()) {
-
-					if (row) {
-						var cachedItem = this.globalFunctions.xmlToJxon(row.getResultByName('item'));
-
-						//cachedItem.content = ;
-						//if (self.debug) self.logInfo(" --:"+cachedItem.toString());
-						//var result = [];
-						result.push(cachedItem);
-						//self.updateCalendar(null, result, false);
-					}
-				}
-			},
-
-			handleError: function(aError) {
-				self.logInfo("Error reading from offline cache:" + aError.message);
-			},
+		/*		var self = this;
+				sqlStatement.executeAsync({
+					handleResult: function(aResultSet) {
+						if (self.debug) self.logInfo("Found item in offline Cache.");
+						var row;
+						while (row = aResultSet.getNextRow()) {
 
-			handleCompletion: function(aReason) {
-				sqlStatement.finalize();
-				if (self.debug) self.logInfo("Retreived 1 '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
-				if (aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED) {
-					if (self.debug) self.logInfo("Retreived 2 '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
-					if (result.length > 0) {
-						if (self.noDB) return;
-						self.executeQuery("UPDATE items set event=(event || '_')"+whereStr);
+							if (row) {
+								var cachedItem = this.globalFunctions.xmlToJxon(row.getResultByName('item'));
 
-						self.updateCalendar(null, result, false);
+								//cachedItem.content = ;
+								//if (self.debug) self.logInfo(" --:"+cachedItem.toString());
+								//var result = [];
+								result.push(cachedItem);
+								//self.updateCalendar(null, result, false);
+							}
+						}
+					},
+
+					handleError: function(aError) {
+						self.logInfo("Error reading from offline cache:" + aError.message);
+					},
+
+					handleCompletion: function(aReason) {
+						sqlStatement.finalize();
+						if (self.debug) self.logInfo("Retreived 1 '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
+						if (aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED) {
+							if (self.debug) self.logInfo("Retreived 2 '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
+							if (result.length > 0) {
+								if (self.noDB) return;
+								self.executeQuery("UPDATE items set event=(event || '_')"+whereStr);
+
+								self.updateCalendar(null, result, false);
+							}
+						} else {
+							if (self.debug) self.logInfo("Error executing Query. Error:"+aReason);
+						}
 					}
-				} else {
-					if (self.debug) self.logInfo("Error executing Query. Error:"+aReason);
-				}
-			}
-		});*/
+				});*/
 
-		if (this.debug) this.logInfo("Retreived '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
+		if (this.debug) this.logInfo("Retreived '" + result.length + "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
 		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
 
 			if (result.length > 0) {
@@ -10289,35 +10447,35 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 
 				let updateResult = this.updateCalendar(null, result, false, true, false);
 
-				if (this.debug) this.logInfo("Updated calendar with '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
+				if (this.debug) this.logInfo("Updated calendar with '" + result.length + "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
 				return updateResult;
 			}
 		}
 		else {
-			if (this.debug) this.logInfo("Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return null;
 		}
 		return null;
 	},
 
 	getItemFromOfflineCache: function _getItemFromOfflineCache(aId) {
-		if (this.debug) this.logInfo("getItemFromOfflineCache: aId:"+aId);
+		if (this.debug) this.logInfo("getItemFromOfflineCache: aId:" + aId);
 		if (!aId) return null;
 
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) ) {
+		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return null;
 		}
 
 		var result = null;
 
-		var sqlStr = "SELECT item FROM items WHERE id = '"+aId+"'";
+		var sqlStr = "SELECT item FROM items WHERE id = '" + aId + "'";
 
-		if (this.debug) this.logInfo("sql-query:"+sqlStr, 2);
+		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
 		try {
 			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
-		catch(exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString+", Exception:"+exc+". ("+sqlStr+")");
+		catch (exc) {
+			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
 			return null;
 		}
 
@@ -10334,12 +10492,12 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 					xml2json.parseXML(root, sqlStatement.row.item);
 					result = this.convertExchangeToCal(root[telements][0], null, false, true);
 					if (!result) {
-						if (this.debug) this.logInfo("getItemFromOfflineCache: Could not convert exchange XML into Cal item.!! item:"+sqlStatement.row.item);
+						if (this.debug) this.logInfo("getItemFromOfflineCache: Could not convert exchange XML into Cal item.!! item:" + sqlStatement.row.item);
 					}
 				}
 			}
 		}
-		finally {  
+		finally {
 			sqlStatement.reset();
 		}
 
@@ -10351,23 +10509,22 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 			}
 		}
 		else {
-			if (this.debug) this.logInfo("getItemFromOfflineCache: Error executing Query. Error:"+this.offlineCacheDB.lastError+", Msg:"+this.offlineCacheDB.lastErrorString);
+			if (this.debug) this.logInfo("getItemFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
 			return null;
 		}
 		return null;
 	},
 
 
-	set isOffline(aValue)
-	{
-		if (this.debug) this.logInfo("setting mIsOffline="+aValue);
+	set isOffline(aValue) {
+		if (this.debug) this.logInfo("setting mIsOffline=" + aValue);
 
 		if (aValue != this.mIsOffline) {
 			this.notConnected = aValue;
 			this.mIsOffline = aValue;
 
 			if (!aValue) {
-				if (this.debug) this.logInfo("Initialized:"+this.isInitialized);
+				if (this.debug) this.logInfo("Initialized:" + this.isInitialized);
 				this.readOnlyInternal = false;
 				this.refresh();
 			}
@@ -10381,19 +10538,16 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		}
 	},
 
-	get isOffline()
-	{
+	get isOffline() {
 		return this.mIsOffline;
 	},
 
-	offlineStateChanged: function _offlineStateChanged(aStatus)
-	{
-		if (this.debug) this.logInfo("The offline state of TB changed to:"+aStatus);
+	offlineStateChanged: function _offlineStateChanged(aStatus) {
+		if (this.debug) this.logInfo("The offline state of TB changed to:" + aStatus);
 		this.isOffline = (aStatus == "offline");
 	},
 
-	get offlineStartDate()
-	{
+	get offlineStartDate() {
 		if (this.noDB) return null;
 		var tmpStartDate = this.executeQueryWithResults("SELECT min(endDate) as newStartDate FROM items where type <> 'M'", ["newStartDate"]);
 		if ((tmpStartDate) && (tmpStartDate.length > 0)) {
@@ -10402,7 +10556,7 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 				if (newStartDate.length == 10) {
 					newStartDate += "T00:00:00Z";
 				}
-				if (this.debug) this.logInfo("get offlineStartDate = '"+newStartDate+"'");
+				if (this.debug) this.logInfo("get offlineStartDate = '" + newStartDate + "'");
 				return cal.createDateTime(newStartDate);
 			}
 		}
@@ -10410,8 +10564,7 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		return null;
 	},
 
-	get offlineEndDate()
-	{
+	get offlineEndDate() {
 		if (this.noDB) return null;
 		var tmpEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items where type <> 'M'", ["newEndDate"]);
 		if ((tmpEndDate) && (tmpEndDate.length > 0)) {
@@ -10420,16 +10573,15 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 				if (newEndDate.length == 10) {
 					newEndDate += "T00:00:00Z";
 				}
-				if (this.debug) this.logInfo("get offlineEndDate = '"+newEndDate+"'");
+				if (this.debug) this.logInfo("get offlineEndDate = '" + newEndDate + "'");
 				return cal.createDateTime(newEndDate);
 			}
 		}
 
 		return null;
 	},
-	
-	get offlineEventItemCount()
-	{
+
+	get offlineEventItemCount() {
 		if (this.noDB) return "-";
 		var tmpEventCount = this.executeQueryWithResults("SELECT COUNT() as eventCount FROM items where event = 'y' or event = 'y_'", ["eventCount"]);
 		if ((tmpEventCount) && (tmpEventCount.length > 0)) {
@@ -10439,8 +10591,7 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		return "--";
 	},
 
-	get offlineToDoItemCount()
-	{
+	get offlineToDoItemCount() {
 		if (this.noDB) return "-";
 		var tmpToDoCount = this.executeQueryWithResults("SELECT COUNT() as toDoCount FROM items where event = 'n' or event = 'n_'", ["toDoCount"]);
 		if ((tmpToDoCount) && (tmpToDoCount.length > 0)) {
@@ -10450,8 +10601,7 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		return "--";
 	},
 
-	get memoryCacheItemCount()
-	{
+	get memoryCacheItemCount() {
 		var result = 0;
 		for (var index in this.itemCacheById) {
 			result++;
@@ -10459,16 +10609,16 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		return result;
 	},
 
-    /**
-     * Internal logging function that should be called on any database error,
-     * it will log as much info as possible about the database context and
-     * last statement so the problem can be investigated more easilly.
-     *
-     * @param message           Error message to log.
-     * @param exception         Exception that caused the error.
-     */
-	logError: function _logError(message,exception) {
-		let logMessage = "("+this.name+") " + message;
+	/**
+	 * Internal logging function that should be called on any database error,
+	 * it will log as much info as possible about the database context and
+	 * last statement so the problem can be investigated more easilly.
+	 *
+	 * @param message           Error message to log.
+	 * @param exception         Exception that caused the error.
+	 */
+	logError: function _logError(message, exception) {
+		let logMessage = "(" + this.name + ") " + message;
 
 		if (exception) {
 			logMessage += "\nException: " + exception;
@@ -10493,13 +10643,12 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		}
 
 		if (debugLevel <= this.storedDebugLevel) {
-			this.globalFunctions.LOG("["+this.name+"] "+message + " ("+this.globalFunctions.STACKshort()+")");
+			this.globalFunctions.LOG("[" + this.name + "] " + message + " (" + this.globalFunctions.STACKshort() + ")");
 		}
 	},
 
-	setDoDebug: function _setDoDebug()
-	{
-		
+	setDoDebug: function _setDoDebug() {
+
 		var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 		this.storedDebugLevel = this.globalFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true);
 
@@ -10510,44 +10659,41 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 		}
 	},
 
-	connectionIsNotOk: function _connectionIsNotOk(aUrl, aStatus)
-	{
+	connectionIsNotOk: function _connectionIsNotOk(aUrl, aStatus) {
 		switch (aStatus) {
-		case "2152398851": 
-			this._connectionStateDescription = "Error resolving hostname '"+aUrl+"'. Did you type the right hostname. (STATUS_RESOLVING)";
+		case "2152398851":
+			this._connectionStateDescription = "Error resolving hostname '" + aUrl + "'. Did you type the right hostname. (STATUS_RESOLVING)";
 			break;
 		case "2152398852":
-			this._connectionStateDescription = "Error during connection to hostname '"+aUrl+"'. (STATUS_CONNECTED_TO)";
+			this._connectionStateDescription = "Error during connection to hostname '" + aUrl + "'. (STATUS_CONNECTED_TO)";
 			break;
 		case "2152398853":
-			this._connectionStateDescription = "Error during sending data to hostname '"+aUrl+"'. (STATUS_SENDING_TO)";
+			this._connectionStateDescription = "Error during sending data to hostname '" + aUrl + "'. (STATUS_SENDING_TO)";
 			break;
-		case "2152398854": 
-			this._connectionStateDescription = "Error during receiving of data from hostname '"+aUrl+"'. (STATUS_RECEIVING_FROM)";
+		case "2152398854":
+			this._connectionStateDescription = "Error during receiving of data from hostname '" + aUrl + "'. (STATUS_RECEIVING_FROM)";
 			break;
 		case "2152398855":
-			this._connectionStateDescription = "Error during connecting to hostname '"+aUrl+"'. Is the host down?. (STATUS_CONNECTING_TO)";
+			this._connectionStateDescription = "Error during connecting to hostname '" + aUrl + "'. Is the host down?. (STATUS_CONNECTING_TO)";
 			break;
 		case "2152398858":
-			this._connectionStateDescription = "Error during waiting for data of hostname '"+aUrl+"'. (STATUS_WAITING_FOR)";
+			this._connectionStateDescription = "Error during waiting for data of hostname '" + aUrl + "'. (STATUS_WAITING_FOR)";
 			break;
-		case "2152398859": 
-			this._connectionStateDescription = "Error resolving hostname '"+aUrl+"'. Did you type the right hostname. (STATUS_RESOLVED)";
+		case "2152398859":
+			this._connectionStateDescription = "Error resolving hostname '" + aUrl + "'. Did you type the right hostname. (STATUS_RESOLVED)";
 			break;
 		default:
-			this._connectionStateDescription = "Unknown error during communication with hostname '"+aUrl+"'. ("+aStatus+")";
+			this._connectionStateDescription = "Unknown error during communication with hostname '" + aUrl + "'. (" + aStatus + ")";
 		}
 		this.setProperty("exchangeCurrentStatus", Cr.NS_ERROR_FAILURE);
 	},
 
-	connectionIsOk: function _connectionIsOk()
-	{
+	connectionIsOk: function _connectionIsOk() {
 		this._connectionStateDescription = "";
 		this.setProperty("exchangeCurrentStatus", Cr.NS_OK);
 	},
 
-	get connectionStateDescription()
-	{
+	get connectionStateDescription() {
 		if (this._disabled) {
 			this._connectionStateDescription = "Disabled";
 		}
@@ -10565,35 +10711,37 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 	// When the file exists the content will be read and returned as a string.
 	// When the file does not exists it will return null.
 	loadFromFile: function _loadFromFile(aFilename)
-	
+
 	{
 		var file = Cc["@mozilla.org/file/directory_service;1"]
-				.getService(Components.interfaces.nsIProperties)
-				.get("ProfD", Components.interfaces.nsIFile);
+			.getService(Components.interfaces.nsIProperties)
+			.get("ProfD", Components.interfaces.nsIFile);
 		file.append("exchange-data");
-		if ( !file.exists() || !file.isDirectory() ) {
-			return null;  
+		if (!file.exists() || !file.isDirectory()) {
+			return null;
 		}
 
-		file.append(this.id+"."+aFilename);
+		file.append(this.id + "." + aFilename);
 
 		if (!file.exists()) {
 			return null;
 		}
 
-		var istream = Components.classes["@mozilla.org/network/file-input-stream;1"].  
-				 createInstance(Components.interfaces.nsIFileInputStream);  
-		istream.init(file, -1, -1, 0);  
-		istream.QueryInterface(Components.interfaces.nsILineInputStream);  
-		  
+		var istream = Components.classes["@mozilla.org/network/file-input-stream;1"].
+		createInstance(Components.interfaces.nsIFileInputStream);
+		istream.init(file, -1, -1, 0);
+		istream.QueryInterface(Components.interfaces.nsILineInputStream);
+
 		// read lines into array  
-		var line = {}, lines = "", hasmore;  
-		do {  
+		var line = {},
+			lines = "",
+			hasmore;
+		do {
 			hasmore = istream.readLine(line);
-			if (lines != "") lines += "\n";  
-			lines += line.value;   
-		} while(hasmore);  
-		  
+			if (lines != "") lines += "\n";
+			lines += line.value;
+		} while (hasmore);
+
 		istream.close();
 
 		return lines;
@@ -10603,48 +10751,46 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 	// Real filename will be <calendar.id>.<aFilename>
 	// e.g: aFilename == 'syncState'  -> <ProfD>/exchange-data/<calendar.id>.syncState
 	// When the file exists the file will be overwritten.
-	saveToFile: function _saveToFile(aFilename, aContent)
-	{
+	saveToFile: function _saveToFile(aFilename, aContent) {
 		var file = Cc["@mozilla.org/file/directory_service;1"]
-				.getService(Components.interfaces.nsIProperties)
-				.get("ProfD", Components.interfaces.nsIFile);
+			.getService(Components.interfaces.nsIProperties)
+			.get("ProfD", Components.interfaces.nsIFile);
 		file.append("exchange-data");
-		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));  
+		if (!file.exists() || !file.isDirectory()) {
+			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
 		}
 
-		file.append(this.id+"."+aFilename);
+		file.append(this.id + "." + aFilename);
 
 		if (file.exists()) {
 			file.remove(false);
 		}
 
-//		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0777);  
+		//		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0777);  
 
-		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].  
-				 createInstance(Components.interfaces.nsIFileOutputStream);  
-		foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);  
+		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
+		createInstance(Components.interfaces.nsIFileOutputStream);
+		foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);
 
 		var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
-				createInstance(Components.interfaces.nsIConverterOutputStream);
+		createInstance(Components.interfaces.nsIConverterOutputStream);
 		converter.init(foStream, "UTF-8", 0, 0);
 		converter.writeString(aContent);
 		converter.close(); // this closes foStream
-		  
+
 		return 0;
 	},
 
-	removeFile: function _removeFile(aFilename)
-	{
+	removeFile: function _removeFile(aFilename) {
 		var file = Cc["@mozilla.org/file/directory_service;1"]
-				.getService(Components.interfaces.nsIProperties)
-				.get("ProfD", Components.interfaces.nsIFile);
+			.getService(Components.interfaces.nsIProperties)
+			.get("ProfD", Components.interfaces.nsIFile);
 		file.append("exchange-data");
-		if ( !file.exists() || !file.isDirectory() ) {
-			return;  
+		if (!file.exists() || !file.isDirectory()) {
+			return;
 		}
 
-		file.append(this.id+"."+aFilename);
+		file.append(this.id + "." + aFilename);
 
 		if (file.exists()) {
 			file.remove(false);
@@ -10652,29 +10798,29 @@ dump("getOccurrencesFromOfflineCache: found:"+result.length+"\n");
 	},
 };
 
-function ecObserver(inCalendar)  
-{  
+function ecObserver(inCalendar) {
 	this.calendar = inCalendar;
 
 	var self = this;
 	this.ecInvitationsCalendarManagerObserver = {
 		onCalendarRegistered: function cMO_onCalendarRegistered(aCalendar) {
-//			self.calendar.logInfo("onCalendarRegistered name="+aCalendar.name+", id="+aCalendar.id);
+			//			self.calendar.logInfo("onCalendarRegistered name="+aCalendar.name+", id="+aCalendar.id);
 		},
 
 		onCalendarUnregistering: function cMO_onCalendarUnregistering(aCalendar) {
-			self.calendar.logInfo("onCalendarUnregistering name="+aCalendar.name+", id="+aCalendar.id);
+			self.calendar.logInfo("onCalendarUnregistering name=" + aCalendar.name + ", id=" + aCalendar.id);
 			if (aCalendar.id == self.calendar.id) {
 
 				self.calendar.doDeleteCalendar();
 				self.calendar.logInfo("Removing calendar preference settings.");
-	
+
 				var rmPrefs = Cc["@mozilla.org/preferences-service;1"]
-			                    .getService(Ci.nsIPrefService)
-					    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.");
+					.getService(Ci.nsIPrefService)
+					.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.");
 				try {
 					rmPrefs.deleteBranch(aCalendar.id);
-				} catch(err) {}
+				}
+				catch (err) {}
 
 				aCalendar.removeFile("syncState.txt");
 				aCalendar.removeFile("syncInboxState.txt");
@@ -10685,61 +10831,59 @@ function ecObserver(inCalendar)
 		},
 
 		onCalendarDeleting: function cMO_onCalendarDeleting(aCalendar) {
-			self.calendar.logInfo("onCalendarDeleting name="+aCalendar.name+", id="+aCalendar.id);
+			self.calendar.logInfo("onCalendarDeleting name=" + aCalendar.name + ", id=" + aCalendar.id);
 
 		}
 	};
 
 
-	this.register();  
-}  
+	this.register();
+}
 
-ecObserver.prototype = {  
+ecObserver.prototype = {
 
-	observe: function(subject, topic, data) 
-	{  
+	observe: function (subject, topic, data) {
 		// Do your stuff here.
 		//LOG("ecObserver.observe. topic="+topic+",data="+data+"\n"); 
 		switch (topic) {
-			case "onCalReset":
-				if (data == this.calendar.id) {
-					this.calendar.resetCalendar();
-				}
-				break;
-			case "onExchangeConnectionError":
-				var parts = data.split("|");
-				if (this.calendar.serverUrl == parts[0]) {
-					this.calendar.connectionIsNotOk(parts[2], parts[1]);
-				}
-				break;
-			case "onExchangeConnectionOk":
-				// See if it is for us
-				if (data == this.calendar.serverUrl) {
-					this.calendar.connectionIsOk();
-				}
-				break;
-			case "quit-application":
-				this.unregister();
-				break;
-			case "nsPref:changed":
-				if ((data == "extensions.1st-setup.debug.log") || (data == "extensions.1st-setup.core.debuglevel")) {
-					this.calendar.setDoDebug();
-				}
-				break;
-			case "network:offline-status-changed":
-					this.calendar.offlineStateChanged(data);
-				break;
-		} 
-	},  
-
-	register: function()
-	{  
-		var observerService = Cc["@mozilla.org/observer-service;1"]  
-		                          .getService(Ci.nsIObserverService);  
-		observerService.addObserver(this, "onCalReset", false);  
-		observerService.addObserver(this, "onExchangeConnectionError", false);  
-		observerService.addObserver(this, "onExchangeConnectionOk", false);  
-		observerService.addObserver(this, "quit-application", false); 
+		case "onCalReset":
+			if (data == this.calendar.id) {
+				this.calendar.resetCalendar();
+			}
+			break;
+		case "onExchangeConnectionError":
+			var parts = data.split("|");
+			if (this.calendar.serverUrl == parts[0]) {
+				this.calendar.connectionIsNotOk(parts[2], parts[1]);
+			}
+			break;
+		case "onExchangeConnectionOk":
+			// See if it is for us
+			if (data == this.calendar.serverUrl) {
+				this.calendar.connectionIsOk();
+			}
+			break;
+		case "quit-application":
+			this.unregister();
+			break;
+		case "nsPref:changed":
+			if ((data == "extensions.1st-setup.debug.log") || (data == "extensions.1st-setup.core.debuglevel")) {
+				this.calendar.setDoDebug();
+			}
+			break;
+		case "network:offline-status-changed":
+			this.calendar.offlineStateChanged(data);
+			break;
+		}
+	},
+
+	register: function () {
+		var observerService = Cc["@mozilla.org/observer-service;1"]
+			.getService(Ci.nsIObserverService);
+		observerService.addObserver(this, "onCalReset", false);
+		observerService.addObserver(this, "onExchangeConnectionError", false);
+		observerService.addObserver(this, "onExchangeConnectionOk", false);
+		observerService.addObserver(this, "quit-application", false);
 		observerService.addObserver(this, "network:offline-status-changed", false);
 
 		Services.prefs.addObserver("extensions.1st-setup.debug.log", this, false);
@@ -10747,31 +10891,29 @@ ecObserver.prototype = {
 
 
 		getCalendarManager().addObserver(this.ecInvitationsCalendarManagerObserver);
-	},  
+	},
 
-	unregister: function()
-	{  
+	unregister: function () {
 		this.calendar.doShutdown();
 
-		var observerService = Cc["@mozilla.org/observer-service;1"]  
-		                            .getService(Ci.nsIObserverService);  
-		observerService.removeObserver(this, "onCalReset");  
-		observerService.removeObserver(this, "onExchangeConnectionError");  
-		observerService.removeObserver(this, "onExchangeConnectionOk");  
-		observerService.removeObserver(this, "quit-application");  
+		var observerService = Cc["@mozilla.org/observer-service;1"]
+			.getService(Ci.nsIObserverService);
+		observerService.removeObserver(this, "onCalReset");
+		observerService.removeObserver(this, "onExchangeConnectionError");
+		observerService.removeObserver(this, "onExchangeConnectionOk");
+		observerService.removeObserver(this, "quit-application");
 		observerService.removeObserver(this, "network:offline-status-changed");
 
 		getCalendarManager().removeObserver(this.ecInvitationsCalendarManagerObserver);
-	}  
+	}
 }
 
-function convertToVersion1()
-{
+function convertToVersion1() {
 	var tmpPrefService = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefService);
+		.getService(Ci.nsIPrefService);
 	var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefService)
-		    .getBranch("calendar.registry.");
+		.getService(Ci.nsIPrefService)
+		.getBranch("calendar.registry.");
 
 	var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
 
@@ -10786,32 +10928,32 @@ function convertToVersion1()
 
 			var pos = children[index].indexOf(".");
 			var tmpUUID = children[index].substr(0, pos);
-			var tmpField = children[index].substr(pos+1); 
+			var tmpField = children[index].substr(pos + 1);
 
 			if (tmpField == "uri") {
-				mivFunctions.LOG("Going to check calendar registry '"+tmpUUID+"' if it needs to be updated.");
+				mivFunctions.LOG("Going to check calendar registry '" + tmpUUID + "' if it needs to be updated.");
 
-				var tmpType = mivFunctions.safeGetCharPref(null, "calendar.registry."+tmpUUID+".type", null, false);
+				var tmpType = mivFunctions.safeGetCharPref(null, "calendar.registry." + tmpUUID + ".type", null, false);
 
-				var tmpURI = mivFunctions.safeGetCharPref(null, "calendar.registry."+children[index], null, false);
-				if ((tmpURI != "https://auto/"+tmpUUID) && (tmpType == "exchangecalendar")) {
+				var tmpURI = mivFunctions.safeGetCharPref(null, "calendar.registry." + children[index], null, false);
+				if ((tmpURI != "https://auto/" + tmpUUID) && (tmpType == "exchangecalendar")) {
 					// update uri preference
-					mivFunctions.LOG("Going to upgrade calendar registry '"+tmpUUID+"'");
-					
+					mivFunctions.LOG("Going to upgrade calendar registry '" + tmpUUID + "'");
+
 					var updatePrefs = Cc["@mozilla.org/preferences-service;1"]
-						    .getService(Ci.nsIPrefService)
-						    .getBranch("calendar.registry."+tmpUUID+".");
-					updatePrefs.setCharPref("uri", "https://auto/"+tmpUUID);
+						.getService(Ci.nsIPrefService)
+						.getBranch("calendar.registry." + tmpUUID + ".");
+					updatePrefs.setCharPref("uri", "https://auto/" + tmpUUID);
 
 					var updatePrefs = Cc["@mozilla.org/preferences-service;1"]
-						    .getService(Ci.nsIPrefService)
-						    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+tmpUUID+".");
+						.getService(Ci.nsIPrefService)
+						.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + tmpUUID + ".");
 					updatePrefs.setIntPref("exchangePrefVersion", 1);
 					tmpPrefService.savePrefFile(null);
 				}
 			}
 		}
-		
+
 	}
 
 }
@@ -10821,39 +10963,37 @@ const scriptLoadOrder = [
 	"calUtils.js"
 ];
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.check4addon = {
 
 	allReadyLogged: false,
 
-	checkAddOnIsInstalledCallback: function _checkAddOnIsInstalledCallback(aAddOn)
-	{
+	checkAddOnIsInstalledCallback: function _checkAddOnIsInstalledCallback(aAddOn) {
 		var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
 		if (!aAddOn) {
 			mivFunctions.LOG("Exchange Calendar and Tasks add-on is NOT installed.");
 		}
 		else {
-			mivFunctions.LOG(aAddOn.name +" is installed.");
+			mivFunctions.LOG(aAddOn.name + " is installed.");
 			try {
-				mivFunctions.LOG(aAddOn.name +" is installed from:"+aAddOn.sourceURI.prePath+aAddOn.sourceURI.path);
+				mivFunctions.LOG(aAddOn.name + " is installed from:" + aAddOn.sourceURI.prePath + aAddOn.sourceURI.path);
 			}
-			catch(err) {
-				mivFunctions.LOG(aAddOn.name +" unable to determine where installed from.");
+			catch (err) {
+				mivFunctions.LOG(aAddOn.name + " unable to determine where installed from.");
 			}
-			mivFunctions.LOG(aAddOn.name +" is version:"+aAddOn.version);
+			mivFunctions.LOG(aAddOn.name + " is version:" + aAddOn.version);
 			if (aAddOn.isActive) {
-				mivFunctions.LOG(aAddOn.name +" is active.");
+				mivFunctions.LOG(aAddOn.name + " is active.");
 			}
 			else {
-				mivFunctions.LOG(aAddOn.name +" is NOT active.");
+				mivFunctions.LOG(aAddOn.name + " is NOT active.");
 			}
 		}
 
 	},
 
-	logAddOnVersion: function _logAddOnVersion()
-	{
+	logAddOnVersion: function _logAddOnVersion() {
 		if (this.allReadyLogged) return;
 
 		this.allReadyLogged = true;
@@ -10871,17 +11011,18 @@ function NSGetFactory(cid) {
 
 			cal.loadScripts(scriptLoadOrder, Cu.getGlobalForObject(this));
 			NSGetFactory.mainEC = XPCOMUtils.generateNSGetFactory([calExchangeCalendar]);
-			
-	}
 
-	} catch(e) {
+		}
+
+	}
+	catch (e) {
 		Components.utils.reportError(e);
 		dump(e);
 		throw e;
 	}
 
 	return NSGetFactory.mainEC(cid);
-} 
+}
 
 /* Following is code for testing and debugging. 
 
@@ -10913,4 +11054,4 @@ else {
 }
 dump(">>>>>>>>>>> -----:"+tmpXML.toString()+"\n");
 
-*/
+*/
\ No newline at end of file

From f99529f05dd5105dfbd9029ce25976b9a124f83e Mon Sep 17 00:00:00 2001
From: Alexander-Lindberg
 <31187519+Alexander-Lindberg@users.noreply.github.com>
Date: Sun, 20 Aug 2017 22:37:50 +0300
Subject: [PATCH 101/222] Specify utf-8 in request header

Explicitly specifying utf-8 in the request header seems to be needed for proper handling of foreign characters when POSTing to (at least) Exchange Server 2007. Without it, any non-ascii characters are converted to "??".
---
 components/ecExchangeRequest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index b4bf7b55..9ae16595 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -374,7 +374,7 @@ ExchangeRequest.prototype = {
 
 		// Update HTTP Headers
 		this.xmlReq.overrideMimeType('text/xml');
-		this.xmlReq.setRequestHeader("Content-Type", "text/xml");
+		this.xmlReq.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
 		this.xmlReq.setRequestHeader("User-Agent", this.globalFunctions.safeGetCharPref(this.prefB, "extensions.1st-setup.others.userAgent", "exchangecalendar@extensions.1st-setup.nl", true));
 
 		// This is required for NTLM authenticated sessions. Which is default for a default EWS install.

From 423f4a4270018fea99627cbd3f54149edef2d228 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 17 Aug 2017 09:42:25 +0200
Subject: [PATCH 102/222] mivExchangeCalendar.js: cleanup getItems (wip)

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 123 +++++++++---------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 3c93c495..1ce76b0c 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2362,35 +2362,35 @@ calExchangeCalendar.prototype = {
 	//                 in calIOperationListener aListener);
 	getItems: function _getItems(aItemFilter, aCount,
 		aRangeStart, aRangeEnd, aListener) {
-		if (this.debug) this.logInfo("getItems 0: " + "  aItemFilter, " + aItemFilter + "  aCount, " + aCount
-			+ " aRangeStart,  " + aRangeStart + " aRangeEnd, " + aRangeEnd
-			+ " aListener , " + aListener);
+		if (this.debug) {
+			this.logInfo("getItems 0: " + "  aItemFilter, " + aItemFilter
+				+ "  aCount, " + aCount
+				+ " aRangeStart,  " + aRangeStart
+				+ " aRangeEnd, " + aRangeEnd
+				+ " aListener , " + aListener);
+		
+			if (aRangeStart) {
+				this.logInfo("getItems 2: aRangeStart:" + aRangeStart.toString());
+			}
+			else {
+				this.logInfo("getItems 2: aRangeStart:null");
+			}
+			if (aRangeEnd) {
+				this.logInfo("getItems 3: aRangeEnd:" + aRangeEnd.toString());
+			}
+			else {
+				this.logInfo("getItems 3: aRangeEnd:null");
+			}
+		}
 
 		//Start poller if not already runnning  this may resolve suspend issue
 		this.startCalendarPoller();
 
-		if (aRangeStart) {
-			if (this.debug) this.logInfo("getItems 2: aRangeStart:" + aRangeStart.toString());
-			//dump(", aRangeStart:"+aRangeStart.toString());
-		}
-		else {
-			if (this.debug) this.logInfo("getItems 2: aRangeStart:null");
-			//dump(", aRangeStart:null");
-		}
-		if (aRangeEnd) {
-			if (this.debug) this.logInfo("getItems 3: aRangeEnd:" + aRangeEnd.toString());
-			//dump(", aRangeEnd:"+aRangeEnd.toString()); 
-		}
-		else {
-			if (this.debug) this.logInfo("getItems 3: aRangeEnd:null");
-			//dump(", aRangeEnd:null");
-		}
-		//dump("\n");
+		if (this.typeString(aListener) === "object") {
+			if (this.debug) {
+				this.logInfo("getItems: We received a getItems from repeatingInvitationsTimer function. Because this request if always for a full year it will consume a lot of memory when we have a lot of recurring events with no end date. So for now we only request the period we have in memory cache. startDate:" + this.startDate + ", endDate:" + this.endDate);
+			}
 
-		//dump(" typeString(aListener):"+this.typeString(aListener)+"\n");
-		if (this.typeString(aListener) == "object") {
-			if (this.debug) this.logInfo("We received a getItems from repeatingInvitationsTimer function. Because this request if always for a full year it will consume a lot of memory when we have a lot of recurring events with no end date. So for now we only request the period we have in memory cache. startDate:" + this.startDate + ", endDate:" + this.endDate);
-			//dump(this.globalFunctions.STACK(10)+"\n");
 			if (this.startDate) {
 				aRangeStart = this.startDate.clone();
 			}
@@ -2405,24 +2405,27 @@ calExchangeCalendar.prototype = {
 			}
 		}
 
-		var wantEvents = ((aItemFilter & Ci.calICalendar
-			.ITEM_FILTER_TYPE_EVENT) != 0);
+		let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) != 0);
+		let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) != 0);
 
-		var wantTodos = ((aItemFilter & Ci.calICalendar
-			.ITEM_FILTER_TYPE_TODO) != 0);
-
-		//if (wantEvents) dump("Events are requested by calendar.\n");
-		//if (wantTodos) dump("Tasks are requested by calendar.\n");
-
-		if (wantEvents)
-			if (this.debug) this.logInfo("Events are requested by calendar.");
-		if (wantTodos)
-			if (this.debug) this.logInfo("Tasks are requested by calendar.");
+		if (this.debug) {
+			if (wantEvents) {
+				this.logInfo("getItems: Events are requested by calendar.");
+			}
+			if (wantTodos) {
+				this.logInfo("getItems: Tasks are requested by calendar.");
+			}
+		}
 
+		// Calendar is in creation, we just update calendar range selection and stop
 		if (this.newCalendar) {
-			if (this.debug) this.logInfo("We are still creating this calendar. Ignore getItems for now.");
-			if (aRangeStart) {
-				if (wantEvents) {
+			if (this.debug) {
+				this.logInfo("getItems: We are still creating this calendar. Ignore getItems for now.");
+			}
+
+			// Adjust start/end range for events
+			if (wantEvents) {
+				if (aRangeStart) {
 					if (this.newCalRangeStartEvents) {
 						if (aRangeStart.compare(this.newCalRangeStartEvents) < 0) {
 							this.newCalRangeStartEvents = aRangeStart.clone();
@@ -2431,31 +2434,35 @@ calExchangeCalendar.prototype = {
 					else {
 						this.newCalRangeStartEvents = aRangeStart.clone();
 					}
+					
 				}
-				if (wantTodos) {
-					if (this.newCalRangeStartTodos) {
-						if (aRangeStart.compare(this.newCalRangeStartTodos) < 0) {
-							this.newCalRangeStartTodos = aRangeStart.clone();
+
+				if (aRangeEnd) {
+					if (this.newCalRangeEndEvents) {
+						if (aRangeEnd.compare(this.newCalRangeEndEvents) > 0) {
+							this.newCalRangeEndEvents = aRangeEnd.clone();
 						}
 					}
 					else {
-						this.newCalRangeStartTodos = aRangeStart.clone();
+						this.newCalRangeEndEvents = aRangeEnd.clone();
 					}
 				}
 			}
 
-			if (aRangeEnd) {
-				if (wantEvents) {
-					if (this.newCalRangeEndEvents) {
-						if (aRangeEnd.compare(this.newCalRangeEndEvents) > 0) {
-							this.newCalRangeEndEvents = aRangeEnd.clone();
+			// Adjust start/end range for tasks
+			if (wantTodos) {
+				if (aRangeStart) {
+					if (this.newCalRangeStartTodos) {
+						if (aRangeStart.compare(this.newCalRangeStartTodos) < 0) {
+							this.newCalRangeStartTodos = aRangeStart.clone();
 						}
 					}
 					else {
-						this.newCalRangeEndEvents = aRangeEnd.clone();
+						this.newCalRangeStartTodos = aRangeStart.clone();
 					}
 				}
-				if (wantTodos) {
+
+				if (aRangeEnd) {
 					if (this.newCalRangeEndTodos) {
 						if (aRangeEnd.compare(this.newCalRangeEndTodos) > 0) {
 							this.newCalRangeEndTodos = aRangeEnd.clone();
@@ -2474,11 +2481,11 @@ calExchangeCalendar.prototype = {
 					null,
 					null);
 			}
+
 			return;
 		}
 
 		if (!this.firstSyncDone) {
-			//dump("!this.firstSyncDone\n");
 			this.getItemsSyncQueue.push({
 				itemFilter: aItemFilter,
 				count: aCount,
@@ -2490,7 +2497,6 @@ calExchangeCalendar.prototype = {
 		}
 
 		if (!this.isInitialized) {
-			//dump("!this.isInitialized\n");
 			if (aListener) {
 				this.notifyOperationComplete(aListener,
 					Cr.NS_OK,
@@ -2501,7 +2507,7 @@ calExchangeCalendar.prototype = {
 			return;
 		}
 
-		var validPeriod = false;
+		let validPeriod = false;
 		if ((aRangeStart) && (aRangeEnd) && (aRangeStart.isDate) && (aRangeEnd.isDate)) {
 			validPeriod = true;
 			this.lastValidRangeStart = aRangeStart.clone();
@@ -2517,11 +2523,8 @@ calExchangeCalendar.prototype = {
 			this.exporting = true;
 		}
 
-		var asOccurrences = ((aItemFilter & Ci.calICalendar
-			.ITEM_FILTER_CLASS_OCCURRENCES) != 0);
-
-		var wantInvitations = ((aItemFilter & Ci.calICalendar
-			.ITEM_FILTER_REQUEST_NEEDS_ACTION) != 0);
+		let asOccurrences = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) != 0);
+		let wantInvitations = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_REQUEST_NEEDS_ACTION) != 0);
 
 		if (!wantEvents && !wantInvitations && !wantTodos) {
 			this.notifyOperationComplete(aListener,
@@ -11054,4 +11057,4 @@ else {
 }
 dump(">>>>>>>>>>> -----:"+tmpXML.toString()+"\n");
 
-*/
\ No newline at end of file
+*/

From 2a15e0cd960968070bf0bb7f754eec13277bbf9c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 17 Aug 2017 14:30:05 +0200
Subject: [PATCH 103/222] mivExchangeCalendar.js: Rewrite getItems check (style
 and comments)

Note that logInfo already do itself debug param check before logging.
---
 .../exchangeCalendar/mivExchangeCalendar.js   | 163 +++++++++++-------
 1 file changed, 99 insertions(+), 64 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 1ce76b0c..28697b44 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -76,11 +76,8 @@ Cu.import("resource://exchangecalendar/erDeleteAttachment.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
-//Cu.import("resource://interfaces/xml.js");
-
 Cu.import("resource://interfaces/exchangeTodo/mivExchangeTodo.js");
 Cu.import("resource://interfaces/exchangeEvent/mivExchangeEvent.js");
-//Cu.import("resource://interfaces/exchangeBaseItem/mivExchangeBaseItem.js");
 
 var globalStart = new Date().getTime();
 
@@ -296,8 +293,6 @@ const MAPI_PidLidReminderSet = "34051";
 // calExchangeCalendar
 //
 
-//var EXPORTED_SYMBOLS = ["calExchangeCalendar"];
-
 function calExchangeCalendar() {
 
 	try {
@@ -2362,34 +2357,34 @@ calExchangeCalendar.prototype = {
 	//                 in calIOperationListener aListener);
 	getItems: function _getItems(aItemFilter, aCount,
 		aRangeStart, aRangeEnd, aListener) {
-		if (this.debug) {
-			this.logInfo("getItems 0: " + "  aItemFilter, " + aItemFilter
-				+ "  aCount, " + aCount
-				+ " aRangeStart,  " + aRangeStart
-				+ " aRangeEnd, " + aRangeEnd
-				+ " aListener , " + aListener);
-		
-			if (aRangeStart) {
-				this.logInfo("getItems 2: aRangeStart:" + aRangeStart.toString());
-			}
-			else {
-				this.logInfo("getItems 2: aRangeStart:null");
-			}
-			if (aRangeEnd) {
-				this.logInfo("getItems 3: aRangeEnd:" + aRangeEnd.toString());
-			}
-			else {
-				this.logInfo("getItems 3: aRangeEnd:null");
-			}
+
+		this.logInfo("getItems: aItemFilter, " + aItemFilter
+			+ " aCount, " + aCount
+			+ " aListener , " + aListener);
+
+		if (aRangeStart) {
+			this.logInfo("getItems: aRangeStart:" + aRangeStart.toString());
+		}
+		else {
+			this.logInfo("getItems: aRangeStart: null");
 		}
 
-		//Start poller if not already runnning  this may resolve suspend issue
+		if (aRangeEnd) {
+			this.logInfo("getItems: aRangeEnd:" + aRangeEnd.toString());
+		}
+		else {
+			this.logInfo("getItems: aRangeEnd: null");
+		}
+
+		// Start poller if not already runnning  this may resolve suspend issue
 		this.startCalendarPoller();
 
 		if (this.typeString(aListener) === "object") {
-			if (this.debug) {
-				this.logInfo("getItems: We received a getItems from repeatingInvitationsTimer function. Because this request if always for a full year it will consume a lot of memory when we have a lot of recurring events with no end date. So for now we only request the period we have in memory cache. startDate:" + this.startDate + ", endDate:" + this.endDate);
-			}
+			this.logInfo("getItems: We received a getItems from repeatingInvitationsTimer function.\
+			Because this request if always for a full year it will consume a lot of\
+			memory when we have a lot of recurring events with no end date.\
+			So for now we only request the period we have in memory cache.\
+			startDate:" + this.startDate + ", endDate:" + this.endDate);
 
 			if (this.startDate) {
 				aRangeStart = this.startDate.clone();
@@ -2397,6 +2392,7 @@ calExchangeCalendar.prototype = {
 			else {
 				aRangeStart = undefined;
 			}
+
 			if (this.endDate) {
 				aRangeEnd = this.endDate.clone();
 			}
@@ -2405,25 +2401,37 @@ calExchangeCalendar.prototype = {
 			}
 		}
 
-		let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) != 0);
-		let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) != 0);
+		/*
+		 * Check minimal assestements before looking for items:
+		 *  - calendar is not in creation
+		 *  - calendar is initialized
+		 *  - calendar support requested items
+		 *  - first synchronization is done
+		 */
+
+		// Unfold request filters to booleans
+		let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) !== 0);
+		let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) !== 0);
+		let asOccurrences = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) !== 0);
+		let wantInvitations = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_REQUEST_NEEDS_ACTION) !== 0);
 
-		if (this.debug) {
-			if (wantEvents) {
-				this.logInfo("getItems: Events are requested by calendar.");
-			}
-			if (wantTodos) {
-				this.logInfo("getItems: Tasks are requested by calendar.");
-			}
+		if (wantEvents) {
+			this.logInfo("getItems: Events are requested by calendar.");
+		}
+
+		if (wantTodos) {
+			this.logInfo("getItems: Tasks are requested by calendar.");
 		}
 
-		// Calendar is in creation, we just update calendar range selection and stop
+		if (wantInvitations) {
+			this.logInfo("getItems: Invitations are requested by calendar.");
+		}
+
+		// Calendar creation is not finished, we just update calendar range selection and stop
 		if (this.newCalendar) {
-			if (this.debug) {
-				this.logInfo("getItems: We are still creating this calendar. Ignore getItems for now.");
-			}
+			this.logInfo("getItems: We are still creating this calendar. Ignore getItems for now.");
 
-			// Adjust start/end range for events
+			// Update start/end range for events
 			if (wantEvents) {
 				if (aRangeStart) {
 					if (this.newCalRangeStartEvents) {
@@ -2449,7 +2457,7 @@ calExchangeCalendar.prototype = {
 				}
 			}
 
-			// Adjust start/end range for tasks
+			// Update start/end range for tasks
 			if (wantTodos) {
 				if (aRangeStart) {
 					if (this.newCalRangeStartTodos) {
@@ -2493,6 +2501,7 @@ calExchangeCalendar.prototype = {
 				rangeEnd: aRangeEnd,
 				listener: aListener
 			});
+
 			return;
 		}
 
@@ -2504,63 +2513,89 @@ calExchangeCalendar.prototype = {
 					null,
 					null);
 			}
+
 			return;
 		}
 
 		let validPeriod = false;
-		if ((aRangeStart) && (aRangeEnd) && (aRangeStart.isDate) && (aRangeEnd.isDate)) {
+		if (aRangeStart
+			&& aRangeStart.isDate
+			&& aRangeEnd
+			&& aRangeEnd.isDate) {
 			validPeriod = true;
 			this.lastValidRangeStart = aRangeStart.clone();
 			this.lastValidRangeEnd = aRangeEnd.clone();
 		}
 
 		this.exporting = false;
-		if ((aItemFilter == Ci.calICalendar.ITEM_FILTER_ALL_ITEMS)
-			&& (aCount == 0)
-			&& (aRangeStart === null)
-			&& (aRangeEnd === null)) {
-			if (this.debug) this.logInfo("getItems: Request to get all Items in Calendar. Probably an export");
+		if (aItemFilter === Ci.calICalendar.ITEM_FILTER_ALL_ITEMS
+			&& aCount == 0
+			&& aRangeStart === null
+			&& aRangeEnd === null) {
+
+			this.logInfo("getItems: Request to get all Items in Calendar. Probably an export");
+
 			this.exporting = true;
 		}
 
-		let asOccurrences = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) != 0);
-		let wantInvitations = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_REQUEST_NEEDS_ACTION) != 0);
+		if (!wantEvents
+			&& !wantInvitations
+			&& !wantTodos) {
 
-		if (!wantEvents && !wantInvitations && !wantTodos) {
 			this.notifyOperationComplete(aListener,
 				Cr.NS_OK,
 				Ci.calIOperationListener.GET,
 				null, null);
+
 			return;
 		}
 
-		if (wantInvitations)
-			if (this.debug) this.logInfo("Invitations are requested by calendar.");
+		// Calendar is not able to complete request (item type is not supported)
+		if (!this.supportsEvents
+			&& !this.supportsTasks
+			&& !this.OnlyShowAvailability) {
+
+			this.logInfo("getItems: This folder currently is not able yet to support events or tasks.");
 
-		if ((!this.supportsEvents) && (!this.supportsTasks) && (!this.OnlyShowAvailability)) {
-			// Something requested we cannot fullfill.
-			if (this.debug) this.logInfo("This folder currently is not able yet to support events or tasks.");
 			this.notifyOperationComplete(aListener,
 				Cr.NS_OK,
 				Ci.calIOperationListener.GET,
 				null, null);
+
 			return;
 		}
 
-		var eventsRequestedAndPossible = (((wantEvents) && (this.supportsEvents)) || (this.OnlyShowAvailability));
-		var tasksRequestedAndPossible = ((wantTodos) && (this.supportsTasks));
+		let eventsRequestedAndPossible = (wantEvents && this.supportsEvents);
+		let tasksRequestedAndPossible = (wantTodos && this.supportsTasks);
+
+		// When only availability is readable, we can also request events:
+		if (this.OnlyShowAvailability) {
+			eventsRequestedAndPossible = true;
+		}
+
+		if (eventsRequestedAndPossible) {
+			this.logInfo("getItems: Events are requested and this is possible for this folder");
+		}
+
+		if (tasksRequestedAndPossible) {
+			this.logInfo("getItems: Tasks are requested and this is possible for this folder");
+		}
+
 		if ((!eventsRequestedAndPossible) && (!tasksRequestedAndPossible)) {
-			if (this.debug) this.logInfo("This folder is not able to support requested items. this.OnlyShowAvailability:" + this.OnlyShowAvailability);
+			this.logInfo("getItems: This folder is not able to support requested items.");
+
 			this.notifyOperationComplete(aListener,
 				Cr.NS_OK,
 				Ci.calIOperationListener.GET,
 				null, null);
+
 			return;
 		}
-		if (eventsRequestedAndPossible)
-			if (this.debug) this.logInfo("Events are requested and this is possible for this folder");
-		if (tasksRequestedAndPossible)
-			if (this.debug) this.logInfo("Tasks are requested and this is possible for this folder");
+
+		/*
+		 * All checks passed, look for items to send
+		 *
+		 */
 
 		if (!aRangeStart) {
 			/*if (this.startDate) {

From 4b4d86f77b499ea4dc803279d958f156d38b6f83 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 17 Aug 2017 14:48:34 +0200
Subject: [PATCH 104/222] mivExchangeCalendar.js: getItems, remove duplicated
 check

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 28697b44..ee412f6a 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2550,21 +2550,6 @@ calExchangeCalendar.prototype = {
 			return;
 		}
 
-		// Calendar is not able to complete request (item type is not supported)
-		if (!this.supportsEvents
-			&& !this.supportsTasks
-			&& !this.OnlyShowAvailability) {
-
-			this.logInfo("getItems: This folder currently is not able yet to support events or tasks.");
-
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.GET,
-				null, null);
-
-			return;
-		}
-
 		let eventsRequestedAndPossible = (wantEvents && this.supportsEvents);
 		let tasksRequestedAndPossible = (wantTodos && this.supportsTasks);
 
@@ -2581,7 +2566,9 @@ calExchangeCalendar.prototype = {
 			this.logInfo("getItems: Tasks are requested and this is possible for this folder");
 		}
 
-		if ((!eventsRequestedAndPossible) && (!tasksRequestedAndPossible)) {
+		// Calendar is not able to complete request (item type is not supported)
+		if (!eventsRequestedAndPossible
+			&& !tasksRequestedAndPossible) {
 			this.logInfo("getItems: This folder is not able to support requested items.");
 
 			this.notifyOperationComplete(aListener,

From 8adef5bb340fbdf07c52ee21d1fbfa947eaff0a2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 17 Aug 2017 15:51:05 +0200
Subject: [PATCH 105/222] mivExchangeCalendar.js: getItems: set default values
 for aRangeStart and a aRangeEnd

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index ee412f6a..15707036 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2584,42 +2584,31 @@ calExchangeCalendar.prototype = {
 		 *
 		 */
 
+		// When range start is not defined,
+		// set it to five 5 before now.
 		if (!aRangeStart) {
-			/*if (this.startDate) {
-				aRangeStart = this.startDate.clone();
-			}
-			else {
-				aRangeStart = cal.fromRFC3339("1900-01-01T00:00:00Z");
-			}*/
-
-			// We are going to request a rangestart of 5 weeks before now.
-			aRangeStart = cal.now()
-			var offset = cal.createDuration();
+			let offset = cal.createDuration();
 			offset.weeks = -5;
-			aRangeStart.addDuration(offset);
-			//dump("aRangeStart == null. Setting to:"+aRangeStart+"\n");
 
-			if ((this.startDate) && (this.startDate.compare(aRangeStart) < 0)) {
+			aRangeStart = cal.now().addDuration(offset);
+
+			// If cache already contains a bigger range, use it
+			if (this.startDate
+				&& this.startDate.compare(aRangeStart) < 0) {
 				aRangeStart = this.startDate.clone();
 			}
 
 		}
 
+		// When range end is not defined,
+		// set it to five 5 after now.
 		if (!aRangeEnd) {
-			/*if (this.endDate) {
-				aRangeEnd = this.endDate.clone();
-			}
-			else {
-				aRangeEnd = cal.fromRFC3339("3500-01-01T00:00:00Z");
-			}*/
-
-			// We are going to request a rangeend of 5 weeks after now.
-			aRangeEnd = cal.now()
-			var offset = cal.createDuration();
+			let offset = cal.createDuration();
 			offset.weeks = 5;
-			aRangeEnd.addDuration(offset);
-			//dump("aRangeEnd == null. Setting to:"+aRangeEnd+"\n");
 
+			aRangeEnd = cal.now().addDuration(offset);
+
+			// If cache already contains a bigger range, use it
 			if ((this.endDate) && (this.endDate.compare(aRangeEnd) > 0)) {
 				aRangeEnd = this.endDate.clone();
 			}

From e87f29868d52c5cf562ed9f0bac53f2ea920c675 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 17 Aug 2017 15:52:51 +0200
Subject: [PATCH 106/222] mivExchangeCalendar.js: getItems: remove unused
 variables and code

---
 .../exchangeCalendar/mivExchangeCalendar.js     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 15707036..a15929b4 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2615,20 +2615,9 @@ calExchangeCalendar.prototype = {
 
 		}
 
-		var dateChanged = false;
-		var startChanged = false;
-		var endChanged = false;
-
-		if (!this.periods) {
-			this.periods = [];
-		}
-		// Check if this requested period touches a previous seen period.
-		var periodMatch = false;
-		var i = 0;
-		while ((!periodMatch) && (i < this.periods.length)) {
-			if (this.periods[i].startDate.compare(aRangeStart) > 0) {}
-			i++;
-		}
+		let dateChanged = false;
+		let startChanged = false;
+		let endChanged = false;
 
 		if (!this.startDate) {
 			if (this.debug) this.logInfo("no startdate");

From db9665734a5b24fdf7c95be86902664ed901debb Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 10:30:37 +0200
Subject: [PATCH 107/222] mivExchangeCalendar.js: getItems: code style in param
 initializations

Remove use of this.debug
Inverse tests inside if statements to avoid double negation (not, else)
---
 .../exchangeCalendar/mivExchangeCalendar.js   | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index a15929b4..b2b30ded 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2529,7 +2529,7 @@ calExchangeCalendar.prototype = {
 
 		this.exporting = false;
 		if (aItemFilter === Ci.calICalendar.ITEM_FILTER_ALL_ITEMS
-			&& aCount == 0
+			&& aCount === 0
 			&& aRangeStart === null
 			&& aRangeEnd === null) {
 
@@ -2598,6 +2598,7 @@ calExchangeCalendar.prototype = {
 				aRangeStart = this.startDate.clone();
 			}
 
+			this.logInfo("getItems: aRangeStart has been updated:" + aRangeStart.toString());
 		}
 
 		// When range end is not defined,
@@ -2613,54 +2614,62 @@ calExchangeCalendar.prototype = {
 				aRangeEnd = this.endDate.clone();
 			}
 
+			this.logInfo("getItems: aRangeEnd has been updated:" + aRangeEnd.toString());
 		}
 
+		if (!this.lastValidRangeStart) {
+			this.lastValidRangeStart = aRangeStart.clone();
+		}
+
+		if (!this.lastValidRangeEnd) {
+			this.lastValidRangeEnd = aRangeEnd.clone();
+		}
+
+		// Check if requested range is bigger than memory cache.
+
 		let dateChanged = false;
 		let startChanged = false;
 		let endChanged = false;
 
-		if (!this.startDate) {
-			if (this.debug) this.logInfo("no startdate");
-			this.startDate = aRangeStart.clone();
-			dateChanged = true;
-		}
-		else {
+		if (this.startDate) {
+			// New start date is before the memory cache one.
+			// memory cache is growing.
 			if (this.startDate.compare(aRangeStart) > 0) {
-				if (this.debug) this.logInfo("aRangeStart (" + aRangeStart.toString() + ") is before current startDate (" + this.startDate.toString() + ")");
-				// New start date is before old startdate. Period has grown.
+				this.logInfo("getItems: calendar has start date and aRangeStart (" + aRangeStart.toString() + ") is before current startDate (" + this.startDate.toString() + ")");
+
 				var oldStartDate = this.startDate.clone();
 				this.startDate = aRangeStart.clone();
+
 				dateChanged = true;
 				startChanged = true;
 			}
 		}
+		else {
+			this.logInfo("getItems: calendar hasn't start date, use the range start");
 
-		if (!this.endDate) {
-			if (this.debug) this.logInfo("no enddate");
-			this.endDate = aRangeEnd.clone();
+			this.startDate = aRangeStart.clone();
 			dateChanged = true;
 		}
-		else {
+
+		if (this.endDate) {
+			// New end date is after the memory cache one.
+			// Memory cache is growing.
 			if (this.endDate.compare(aRangeEnd) < 0) {
-				if (this.debug) this.logInfo("aRangeEnd (" + aRangeEnd.toString() + ") is after current endDate (" + this.endDate.toString() + ")");
-				// New end date is after old enddate. Period has grown.
+				this.logInfo("getItems: calendar has endDate and aRangeEnd (" + aRangeEnd.toString() + ") is after current endDate (" + this.endDate.toString() + ")");
+
 				var oldEndDate = this.endDate.clone();
 				this.endDate = aRangeEnd.clone();
 				dateChanged = true;
 				endChanged = true;
 			}
 		}
+		else {
+			this.logInfo("getItems: calendar hasn't end date, use the range end");
 
-		if (aRangeStart) {
-			if (this.debug) this.logInfo("getItems 5a: aRangeStart:" + aRangeStart.toString());
-		}
-		if (aRangeEnd) {
-			if (this.debug) this.logInfo("getItems 5b: aRangeEnd:" + aRangeEnd.toString());
+			this.endDate = aRangeEnd.clone();
+			dateChanged = true;
 		}
 
-		if (!this.lastValidRangeStart) this.lastValidRangeStart = aRangeStart.clone();
-		if (!this.lastValidRangeEnd) this.lastValidRangeEnd = aRangeEnd.clone();
-
 		if ((this.useOfflineCache) && (dateChanged)) {
 			if (((wantEvents) && (this.supportsEvents)) || ((wantTodos) && (this.supportsTasks))) {
 				if (this.debug) this.logInfo("Requesting events/tasks from offline cache.");

From 6b623bf80ac85cc1ff3bbf2d3cae0c4ce42a64a7 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 10:35:58 +0200
Subject: [PATCH 108/222] mivExchangeCalendar.js: getItems: simplify conditions
 to request memory cache

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index b2b30ded..a5e5ac6c 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2670,59 +2670,61 @@ calExchangeCalendar.prototype = {
 			dateChanged = true;
 		}
 
-		if ((this.useOfflineCache) && (dateChanged)) {
-			if (((wantEvents) && (this.supportsEvents)) || ((wantTodos) && (this.supportsTasks))) {
-				if (this.debug) this.logInfo("Requesting events/tasks from offline cache.");
-
-				if ((startChanged) || (endChanged)) {
-
-					if (startChanged) {
-						if (this.debug) this.logInfo("Startdate has changed to an earlier date. Requesting difference.");
-						this.getItemsFromOfflineCache(aRangeStart, oldStartDate);
-					}
-					if (endChanged) {
-						if (this.debug) this.logInfo("Enddate has changed to a later date. Requesting difference.");
-						this.getItemsFromOfflineCache(oldEndDate, aRangeEnd, aListener);
-					}
+		// If offline cache is enabled and requested range is bigger than the
+		// memory cache one, try to get items from offline cache.
+		if (this.useOfflineCache
+			&& dateChanged) {
+			if ((eventsRequestedAndPossible && !this.OnlyShowAvailability)
+				|| tasksRequestedAndPossible) {
+				if (startChanged) {
+					this.logInfo("getItems: Startdate has changed to an earlier date. Requesting difference from offline cache.");
+					this.getItemsFromOfflineCache(aRangeStart, oldStartDate, aListener);
+				}
 
-					// We need to get the period which did not change from memorycache.
+				if (endChanged) {
+					this.logInfo("getItems: Enddate has changed to a later date. Requesting difference from offline cache.");
+					this.getItemsFromOfflineCache(oldEndDate, aRangeEnd, aListener);
 				}
-				else {
-					if (this.debug) this.logInfo("New time period. Requesting items in period.");
+
+				// We didn't had any memory cache (startDate and endDate has just been defined)
+				if (!startChanged
+					&& !endChanged) {
+					this.logInfo("getItems: New time period to cache. Requesting full period from offline cache.");
 					this.getItemsFromOfflineCache(aRangeStart, aRangeEnd, aListener);
 				}
 			}
 
-			if ((this.offlineStartDate) && (aRangeStart.compare(this.offlineStartDate) < 0)) {
-				if (this.debug) this.logInfo("Rangestart is before offlineCache start.");
-				oldStartDate = this.offlineStartDate.clone();
-				startChanged = true;
-			}
-			else {
-				if (this.offlineStartDate) {
-					if (this.debug) this.logInfo("Rangestart is after offlineCache start.");
-					startChanged = false;
+			// Update startChanged and endChanged according to offline cache range
+			// It allows us to know if we have to ask Exchange server new items
+			if (this.offlineStartDate) {
+				if (aRangeStart.compare(this.offlineStartDate) < 0) {
+					this.logInfo("getItems: aRangestart is before offlineCache start.");
+					oldStartDate = this.offlineStartDate.clone();
+					startChanged = true;
 				}
 				else {
-					startChanged = true;
+					this.logInfo("getItems: aRangestart is after offlineCache start.");
+					startChanged = false;
 				}
 			}
-
-			if ((this.offlineEndDate) && (aRangeEnd.compare(this.offlineEndDate) > 0)) {
-				if (this.debug) this.logInfo("RangeEnd is after offlineCache end.");
-				oldEndDate = this.offlineEndDate.clone();
-				endChanged = true;
-			}
 			else {
-				if (this.offlineEndDate) {
-					if (this.debug) this.logInfo("RangeEnd is before offlineCache end.");
-					endChanged = false;
+				startChanged = true;
+			}
+
+			if (this.offlineEndDate) {
+				if (aRangeEnd.compare(this.offlineEndDate) > 0) {
+					this.logInfo("RangeEnd is after offlineCache end.");
+					oldEndDate = this.offlineEndDate.clone();
+					endChanged = true;
 				}
 				else {
-					endChanged = true;
+					this.logInfo("RangeEnd is before offlineCache end.");
+					endChanged = false;
 				}
 			}
-
+			else {
+				endChanged = true;
+			}
 		}
 
 		//Update calendar/task view 

From dff77aa2cee4cfbfd27ac90c524957e88900009e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 10:42:53 +0200
Subject: [PATCH 109/222] mivExchangeCalendar.js: getItems: simplify conditions
 to get only-availability calendar events

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index a5e5ac6c..10192f50 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2727,19 +2727,20 @@ calExchangeCalendar.prototype = {
 			}
 		}
 
-		//Update calendar/task view 
+		// Update calendar/task view with items in memory
 		this.getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, this.exporting);
 
 		if (this.OnlyShowAvailability) {
-			if ((startChanged) || (endChanged)) {
-				if (startChanged) {
-					this.getOnlyFreeBusyInformation(aRangeStart, oldStartDate);
-				}
-				if (endChanged) {
-					this.getOnlyFreeBusyInformation(oldEndDate, aRangeEnd);
-				}
+			if (startChanged) {
+				this.getOnlyFreeBusyInformation(aRangeStart, oldStartDate);
 			}
-			else {
+
+			if (endChanged) {
+				this.getOnlyFreeBusyInformation(oldEndDate, aRangeEnd);
+			}
+
+			if (!startChanged
+				&& !endChanged) {
 				this.getOnlyFreeBusyInformation(aRangeStart, aRangeEnd);
 			}
 

From 2c6d20fa65cc1046a62cbfbee84b0597ab39d3fb Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 10:44:51 +0200
Subject: [PATCH 110/222] mivExchangeCalendar.js: getItems: old comments
 cleanup

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 43 ++++++++-----------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 10192f50..faa7d197 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2747,41 +2747,30 @@ calExchangeCalendar.prototype = {
 			return;
 		}
 
-		/* We started the inbox poller again in the normal place
-				if ((this.syncInboxState) && (!this.weAreInboxSyncing)) {
-					if ((this.folderBase == "calendar") && (!this.folderID)) {
-
-						// Start the inbox poller to check for meetinginvitations or cancelations.
-						this.checkInbox();
-					}
-				}
-		*/
-		// 2013-11-19 Going to request getitems period from exchange.
+		// Check if we should add items from Exchange server
 		if (!dateChanged) {
-			if (this.debug) this.logInfo("No dateChanged. Not going to request items from server.");
+			this.logInfo("getItems: No dateChanged. Not going to request items from server.");
+
 			return;
 		}
 
 		if (this.isOffline) {
-			if (this.debug) this.logInfo("We are offline. Not going to request items from server.");
+			this.logInfo("getItems: We are offline. Not going to request items from server.");
+
 			return;
 		}
 
-		// 2013-11-19 Going to request getitems period from exchange.
-		/*		if ((wantEvents) && (this.supportsEvents)) {
-					this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
-				}*/
-
-		if ((wantEvents) && (this.supportsEvents)) {
-			if (this.debug) this.logInfo("Requesting events from exchange server.");
-			if (((startChanged) && (oldStartDate)) || ((endChanged) && (oldEndDate))) {
+		if (eventsRequestedAndPossible) {
 
-				//this.getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, this.exporting);
+			this.logInfo("getItems: Requesting events from exchange server.");
+			if ((startChanged && oldStartDate)
+				|| (endChanged && oldEndDate)) {
 
 				if (startChanged) {
 					if (this.debug) this.logInfo("Startdate has changed to an earlier date. Requesting difference.");
 					this.requestPeriod(aRangeStart, oldStartDate, aItemFilter, aCount, false);
 				}
+
 				if (endChanged) {
 					if (this.debug) this.logInfo("Enddate has changed to a later date. Requesting difference.");
 					this.requestPeriod(oldEndDate, aRangeEnd, aItemFilter, aCount, true);
@@ -2790,14 +2779,16 @@ calExchangeCalendar.prototype = {
 				// We need to get the period which did not change from memorycache.
 			}
 			else {
-				if (this.debug) this.logInfo("New time period. Requesting items in period.");
+				this.logInfo("New time period. Requesting items in period.");
 				this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
 			}
 		}
 
-		//Request server when calendar date changed  .
-		if ((wantTodos) && (this.supportsTasks) && (startChanged || endChanged)) {
-			if (this.debug) this.logInfo("Requesting tasks from exchange server.");
+		// Request server when calendar date changed  .
+		if (tasksRequestedAndPossible
+			&& (startChanged || endChanged)) {
+			this.logInfo("getItems: Requesting tasks from exchange server.");
+
 			var self = this;
 			this.addToQueue(erFindTaskItemsRequest, {
 					user: this.user,
@@ -2818,7 +2809,7 @@ calExchangeCalendar.prototype = {
 				null);
 
 			if (!this.deactivateTaskFollowup) {
-				if (this.debug) this.logInfo("Requesting followup tasks from exchange server.");
+				this.logInfo("getItems: Requesting followup tasks from exchange server.");
 				this.addToQueue(erFindFollowupItemsRequest, {
 						user: this.user,
 						mailbox: this.mailbox,

From deeea44ca3442c8f71d475b29f87c3a602e31bb3 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 10:47:42 +0200
Subject: [PATCH 111/222] mivExchangeCalendar.js: getItemsFromMemoryCache: code
 cleanup and conditions rewrite

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 75 +++++++++----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index faa7d197..f2de5d32 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2832,15 +2832,13 @@ calExchangeCalendar.prototype = {
 	},
 
 	getItemsFromMemoryCache: function _getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, aExporting) {
-		if (this.debug) this.logInfo("getItemsFromMemoryCache startDate:" + aRangeStart + ", endDate:" + aRangeEnd + ", aListener:" + aListener + ", aExporting:" + aExporting);
-		var events = [];
-		var tasks = [];
+		this.logInfo("getItemsFromMemoryCache: startDate:" + aRangeStart + ", endDate:" + aRangeEnd + ", aListener:" + aListener + ", aExporting:" + aExporting);
 
-		var wantEvents = ((aItemFilter & Ci.calICalendar
-			.ITEM_FILTER_TYPE_EVENT) != 0);
+		let events = [];
+		let tasks = [];
 
-		var wantTodos = ((aItemFilter & Ci.calICalendar
-			.ITEM_FILTER_TYPE_TODO) != 0);
+		let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) != 0);
+		let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) != 0);
 
 		// This is by using the this.itemCacheByStartDate and this.itemCacheByEndDate index.
 		if (wantEvents) {
@@ -2870,47 +2868,47 @@ calExchangeCalendar.prototype = {
 				}
 			}
 
-			for (var itemid in ids) {
-				if (this.itemCacheById[itemid]) {
-					if (isEvent(this.itemCacheById[itemid])) {
-						if (this.deleteCancelledInvitation && this.itemCacheById[itemid].isCancelled) {
-							events.push(this.itemCacheById[itemid]);
-							this.deleteItemCancelled(this.itemCacheById[itemid]);
+			// For all found ids, if item cache has it, push it to events answer
+			// Check also if invitation should be cancelled
+			for (let itemid in ids) {
+				if (this.itemCacheById[itemid]
+					&& cal.isEvent(this.itemCacheById[itemid])) {
+					events.push(this.itemCacheById[itemid]);
 
-						}
-						else {
-							events.push(this.itemCacheById[itemid]);
-						}
+					if (this.deleteCancelledInvitation
+						&& this.itemCacheById[itemid].isCancelled) {
+						this.deleteItemCancelled(this.itemCacheById[itemid]);
 					}
 				}
 			}
 		}
-		else {
-			if (wantTodos) {
-				for (var index in this.itemCacheById) {
-					if (isToDo(this.itemCacheById[index])) {
-						if ((this.deactivateTaskFollowup) && (this.itemCacheById[index].itemClass == "IPM.Note")) {
-							//Do not change order or removing from local or it will throw db error
-							//remove from offlinecache 
-							this.removeFromOfflineCache(this.itemCacheById[index]);
-							//remove from lighting GUI  
-							this.removeItemFromCache(this.itemCacheById[index]);
-						}
-						else {
-							if (((this.itemCacheById[index].isCompleted) && (aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_YES))
-								|| ((!this.itemCacheById[index].isCompleted) && (aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_NO))) {
-								tasks.push(this.itemCacheById[index]);
-							}
-						}
+		else if (wantTodos) {
+			let wantCompletedTodo = aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_YES;
+			let wantNotCompletedTodo = aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_NO;
+
+			for (let index in this.itemCacheById) {
+				if (cal.isToDo(this.itemCacheById[index])) {
+					if (this.deactivateTaskFollowup
+						&& this.itemCacheById[index].itemClass == "IPM.Note") {
+						//Do not change order or removing from local or it will throw db error
+						//remove from offlinecache
+						this.removeFromOfflineCache(this.itemCacheById[index]);
+						//remove from lighting GUI
+						this.removeItemFromCache(this.itemCacheById[index]);
+					}
+					else if ((this.itemCacheById[index].isCompleted && wantCompletedTodo)
+						|| (!this.itemCacheById[index].isCompleted && wantNotCompletedTodo)) {
+						tasks.push(this.itemCacheById[index]);
 					}
 				}
 			}
 		}
 
-		if (this.debug) this.logInfo("We got '" + events.length + "' events and  '" + tasks.length + "'  tasks from memory cache.");
+		this.logInfo("getItemsFromMemoryCache: We got '" + events.length + "' events and  '" + tasks.length + "'  tasks from memory cache.");
 		if (aListener) {
-			if (this.debug) this.logInfo("We have a listener so going to inform it.(2)");
-			if ((events.length > 0) && (wantEvents)) {
+			this.logInfo("getItemsFromMemoryCache: We have a listener so going to inform it.");
+			if (events.length > 0
+				&& wantEvents) {
 				aListener.onGetResult(this,
 					Cr.NS_OK,
 					Ci.calIEvent,
@@ -2919,7 +2917,8 @@ calExchangeCalendar.prototype = {
 					events);
 			}
 
-			if ((tasks.length > 0) && (wantTodos)) {
+			if (tasks.length > 0
+				&& wantTodos) {
 				aListener.onGetResult(this,
 					Cr.NS_OK,
 					Ci.calITodo,

From 8963df8bbb62ed37e091daf51c9b31dbb64c753c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 23:22:39 +1200
Subject: [PATCH 112/222] mivExchangeCalendar.js: getItemsFromMemoryCache: fix
 looking for items in cache

The code before were using simple day index to go through start and end of the
range. Furthermore, it didn't managed that range were given in local timezone
and memory cache is in UTC.

This fix use Lightning tools to go through range and it converts local timezone
to UTC, so the cache is correctly read.

Fixes #67
---
 .../exchangeCalendar/mivExchangeCalendar.js   | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index f2de5d32..7cc64e8f 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -2842,30 +2842,31 @@ calExchangeCalendar.prototype = {
 
 		// This is by using the this.itemCacheByStartDate and this.itemCacheByEndDate index.
 		if (wantEvents) {
-
-			var startYear = aRangeStart.year;
-			var startYearday = aRangeStart.yearday;
-
-			var endYear = aRangeEnd.year;
-			var endYearday = aRangeEnd.yearday;
-			var doStop = false;
-			var ids = {};
-			while (!doStop) {
-				if ((startYear == endYear) && (startYearday == endYearday)) {
-					doStop = true;
-				}
-
-				if ((this.itemCacheByStartDate) && (this.itemCacheByStartDate[startYear]) && (this.itemCacheByStartDate[startYear][startYearday])) {
-					for (var itemid in this.itemCacheByStartDate[startYear][startYearday]) {
+			let ids = {};
+
+			let dayOffset = cal.createDuration();
+			dayOffset.days = 1;
+
+			let dayPos = cal.createDateTime();
+			dayPos = aRangeStart.clone();
+
+			// Convert date from local timezone to UTC
+			// Given range is in local timezone and cache save in UTC
+			dayPos.isDate = false;
+			dayPos = dayPos.getInTimezone(cal.UTC());
+			dayPos.isDate = true;
+
+			// Go through all days bewteen the range start day and the range end day
+			while (dayPos.compare(aRangeEnd) < 0 ) {
+				if (this.itemCacheByStartDate
+					&& this.itemCacheByStartDate[dayPos.year]
+					&& this.itemCacheByStartDate[dayPos.year][dayPos.yearday]) {
+					for (let itemid in this.itemCacheByStartDate[dayPos.year][dayPos.yearday]) {
 						ids[itemid] = true;
 					}
 				}
 
-				startYearday++;
-				if (startYearday > 366) {
-					startYear++;
-					startYearday = 1;
-				}
+				dayPos.addDuration(dayOffset);
 			}
 
 			// For all found ids, if item cache has it, push it to events answer

From 527e232240c702f43370328fa2668c22c3870d8e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 14:37:24 +0200
Subject: [PATCH 113/222] mivExchangeCalendar.js: getItemsFromOfflineCache:
 coding style

---
 .../exchangeCalendar/mivExchangeCalendar.js   | 123 +++++++-----------
 1 file changed, 50 insertions(+), 73 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 7cc64e8f..215c5b8c 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -10338,14 +10338,14 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 	},
 
 	getItemsFromOfflineCache: function _getItemsFromOfflineCache(aStartDate, aEndDate) {
-		if (this.debug) this.logInfo("getItemsFromOfflineCache startDate:" + aStartDate + ", endDate:" + aEndDate);
-		//dump("getItemsFromOfflineCache: name:"+this.name+", startDate:"+aStartDate+", endDate:"+aEndDate+"\n");
+		this.logInfo("getItemsFromOfflineCache: startDate:" + aStartDate + ", endDate:" + aEndDate);
 
 		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
 			return;
 		}
 
-		var result = [];
+		let result = [];
+
 
 		if (aStartDate) {
 			var startDate = cal.toRFC3339(aStartDate.getInTimezone(this.globalFunctions.ecUTC()));
@@ -10361,104 +10361,81 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			var endDate = "3500-01-01";
 		}
 
-		var sqlStr = "SELECT item FROM items";
-		var whereStr = "";
-		if ((this.supportsEvents) && (!this.supportsTasks)) {
-			whereStr = " WHERE event = 'y' AND startDate <= '" + endDate + "' AND endDate >= '" + startDate + "'";
-			sqlStr += whereStr + " ORDER BY type ASC";
+		let sqlStr = "SELECT item FROM items";
+		let whereStr = "";
+
+		if (this.supportsEvents
+			&& !this.supportsTasks) {
+			whereStr = " WHERE event = 'y' AND "
+				+ "startDate <= '" + endDate + "' AND endDate >= '" + startDate + "'";
 		}
-		else {
-			if ((!this.supportsEvents) && (this.supportsTasks)) {
-				whereStr = " WHERE event = 'n' AND ((startDate = '' AND endDate >= '" + startDate + "' AND endDate <= '" + endDate + "') OR (endDate = '' AND startDate >= '" + startDate + "' AND startDate <= '" + endDate + "') OR (startDate <= '" + endDate + "' AND endDate >= '" + startDate + "') OR (startDate = '' AND endDate = ''))";
-				sqlStr += whereStr + " ORDER BY type ASC";
-			}
+		else if (!this.supportsEvents
+			&& this.supportsTasks) {
+			whereStr = " WHERE event = 'n' AND ("
+				+ "(startDate = '' AND endDate >= '" + startDate + "' AND endDate <= '" + endDate + "')"
+				+ "OR (endDate = '' AND startDate >= '" + startDate + "' AND startDate <= '" + endDate + "')"
+				+ "OR (startDate <= '" + endDate + "' AND endDate >= '" + startDate + "')"
+				+ "OR (startDate = '' AND endDate = '')"
+				+ ")";
 		}
 
-		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+		sqlStr += whereStr + " ORDER BY type ASC";
+
+		this.logInfo("getItemsFromOfflineCache: sql-query:" + sqlStr, 2);
+
+		let sqlStatement;
+
 		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+			sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
 		}
 		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+			this.logInfo("getItemsFromOfflineCache: Error on SQL statement creation: " + this.offlineCacheDB.lastError
+				+ ", Msg:" + this.offlineCacheDB.lastErrorString
+				+ ", Exception:" + exc + ". (SQL source: " + sqlStr + ")");
+
 			return false;
 		}
 
-		var doContinue = true;
+		let doContinue = true;
+
 		try {
-			while (doContinue) {
-				doContinue = sqlStatement.executeStep();
+			while (sqlStatement.executeStep()) {
+				this.logInfo("getItemsFromOfflineCache: Found item in offline Cache.");
 
-				if (doContinue) {
-					if (this.debug) this.logInfo("Found item in offline Cache.");
-					var root = xml2json.newJSON();
-					xml2json.parseXML(root, sqlStatement.row.item);
-					var cachedItem = root[telements][0];
+				let root = xml2json.newJSON();
+				xml2json.parseXML(root, sqlStatement.row.item);
 
-					//cachedItem.content = ;
-					//if (this.debug) this.logInfo(" --:"+cachedItem.toString());
-					result.push(cachedItem);
-					cachedItem = null;
-				}
+				let cachedItem = root[telements][0];
+
+				result.push(cachedItem);
 			}
 		}
 		finally {
 			sqlStatement.reset();
 		}
 
-		/*		var self = this;
-				sqlStatement.executeAsync({
-					handleResult: function(aResultSet) {
-						if (self.debug) self.logInfo("Found item in offline Cache.");
-						var row;
-						while (row = aResultSet.getNextRow()) {
-
-							if (row) {
-								var cachedItem = this.globalFunctions.xmlToJxon(row.getResultByName('item'));
+		this.logInfo("getItemsFromOfflineCache: retrieved '" + result.length
+			+ "' records from offline cache. "
+			+ "startDate:" + startDate + ", endDate:" + endDate);
 
-								//cachedItem.content = ;
-								//if (self.debug) self.logInfo(" --:"+cachedItem.toString());
-								//var result = [];
-								result.push(cachedItem);
-								//self.updateCalendar(null, result, false);
-							}
-						}
-					},
-
-					handleError: function(aError) {
-						self.logInfo("Error reading from offline cache:" + aError.message);
-					},
-
-					handleCompletion: function(aReason) {
-						sqlStatement.finalize();
-						if (self.debug) self.logInfo("Retreived 1 '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
-						if (aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED) {
-							if (self.debug) self.logInfo("Retreived 2 '"+result.length+"' records from offline cache. startDate:"+startDate+", endDate:"+endDate);
-							if (result.length > 0) {
-								if (self.noDB) return;
-								self.executeQuery("UPDATE items set event=(event || '_')"+whereStr);
-
-								self.updateCalendar(null, result, false);
-							}
-						} else {
-							if (self.debug) self.logInfo("Error executing Query. Error:"+aReason);
-						}
-					}
-				});*/
-
-		if (this.debug) this.logInfo("Retreived '" + result.length + "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+		let sqliteSuccessCode = [0, 100, 101];
 
+		if (sqliteSuccessCode.indexOf(this.offlineCacheDB.lastError) > -1) {
 			if (result.length > 0) {
-				//this.executeQuery("UPDATE items set event=(event || '_')"+whereStr); // Turned this of so items are always requested from offline cache. Even if they have been requested already.
+				// Turned off so items are always requested from offline cache. Even if they have been requested already.
+				//this.executeQuery("UPDATE items set event=(event || '_')"+whereStr);
 
 				let updateResult = this.updateCalendar(null, result, false, true, false);
 
-				if (this.debug) this.logInfo("Updated calendar with '" + result.length + "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
+				this.logInfo("getItemsFromOfflineCache: Updated calendar with '" + result.length
+					+ "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
+
 				return updateResult;
 			}
 		}
 		else {
-			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+			this.logInfo("getItemsFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+
 			return null;
 		}
 		return null;

From b106ea47d6efe999b364d1bef12ac3a1f5b6f961 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 18 Aug 2017 14:38:06 +0200
Subject: [PATCH 114/222] mivExchangeCalendar.js: getItemsFromOfflineCache:
 correctly look items from offline cache

Translate range from local timezone to UTC time zone to correctly find all
elements from offline cache.
---
 .../exchangeCalendar/mivExchangeCalendar.js   | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 215c5b8c..55c22007 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -10346,21 +10346,26 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 
 		let result = [];
 
+		let utcStartDate = cal.createDateTime("1900-01-01");
+		let utcEndDate = cal.createDateTime("3500-01-01");
 
 		if (aStartDate) {
-			var startDate = cal.toRFC3339(aStartDate.getInTimezone(this.globalFunctions.ecUTC()));
-		}
-		else {
-			var startDate = "1900-01-01";
+			utcStartDate = aStartDate.clone();
+			utcStartDate.isDate = false;
+			utcStartDate = utcStartDate.getInTimezone(cal.UTC());
+			utcStartDate.isDate = true;
 		}
 
 		if (aEndDate) {
-			var endDate = cal.toRFC3339(aEndDate.getInTimezone(this.globalFunctions.ecUTC()));
-		}
-		else {
-			var endDate = "3500-01-01";
+			utcEndDate = aEndDate.clone();
+			utcEndDate.isDate = false;
+			utcEndDate = utcEndDate.getInTimezone(cal.UTC());
+			utcEndDate.isDate = true;
 		}
 
+		let startDate = cal.toRFC3339(utcStartDate);
+		let endDate = cal.toRFC3339(utcEndDate);
+
 		let sqlStr = "SELECT item FROM items";
 		let whereStr = "";
 

From d9f0ddc793594bac37422bd3e5f28ce3257c7eed Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 27 Aug 2017 10:20:25 +0200
Subject: [PATCH 115/222] mivExchangeCalendar.js: remove extra variable which
 is not needed any more due to code simplification

---
 interfaces/exchangeCalendar/mivExchangeCalendar.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 55c22007..975c1c65 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -10401,8 +10401,6 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
 			return false;
 		}
 
-		let doContinue = true;
-
 		try {
 			while (sqlStatement.executeStep()) {
 				this.logInfo("getItemsFromOfflineCache: Found item in offline Cache.");

From 25bc7c90276dba4e3b45d14115ac7b802b1fd532 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 28 Aug 2017 16:03:39 +0200
Subject: [PATCH 116/222] l10n: add en language files to be coordinated with
 the Transifex source language setup

---
 chrome.manifest                               |  1 +
 .../exchangeAddressBook.manifest              |  1 +
 .../en/ExchangeContacts.properties            |  3 +
 .../en/ExchangeDistLists.properties           |  3 +
 .../en/addressbookOverlay.dtd                 |  9 +++
 .../en/exchangeContactSettings.dtd            | 11 ++++
 .../exchangecalendar/en/attachments-view.dtd  |  2 +
 locale/exchangecalendar/en/browseFolder.dtd   | 12 ++++
 .../en/calExchangeCalendar.properties         | 49 ++++++++++++++++
 .../en/calendar-calendars-list.dtd            |  5 ++
 .../en/calendar-summary-dialog.dtd            |  3 +
 .../en/delegate-calendar-dialog.dtd           | 25 +++++++++
 .../exchangecalendar/en/delegate-folder.dtd   | 45 +++++++++++++++
 .../en/ecCalendarCreation.dtd                 |  5 ++
 .../en/exchangeCloneSettings.dtd              |  6 ++
 .../en/exchangeReminderDialog.dtd             |  4 ++
 .../exchangecalendar/en/exchangeSettings.dtd  | 54 ++++++++++++++++++
 .../en/exchangeSettingsOverlay.dtd            | 56 +++++++++++++++++++
 locale/exchangecalendar/en/extra-priority.dtd | 18 ++++++
 .../en/invitationResponse.dtd                 | 20 +++++++
 locale/exchangecalendar/en/inviteStyle.dtd    |  2 +
 .../en/lightning-item-iframe.dtd              |  7 +++
 .../exchangecalendar/en/manageEWSAccounts.dtd | 16 ++++++
 .../en/messenger_task_delegation.dtd          |  6 ++
 locale/exchangecalendar/en/oofSettings.dtd    | 26 +++++++++
 .../en/preInvitationResponse.dtd              | 14 +++++
 locale/exchangecalendar/en/preferences.dtd    | 48 ++++++++++++++++
 locale/exchangecalendar/en/rtews.dtd          | 15 +++++
 locale/exchangecalendar/en/rtews.properties   |  2 +
 locale/exchangecalendar/en/selectEWSUrl.dtd   |  9 +++
 locale/exchangecalendar/en/sendUpdateTo.dtd   |  9 +++
 .../en/sharedCalendarParser.dtd               |  3 +
 .../en/timezonePreference.dtd                 |  1 +
 33 files changed, 490 insertions(+)
 create mode 100644 interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
 create mode 100644 interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
 create mode 100644 interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
 create mode 100644 interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
 create mode 100644 locale/exchangecalendar/en/attachments-view.dtd
 create mode 100644 locale/exchangecalendar/en/browseFolder.dtd
 create mode 100644 locale/exchangecalendar/en/calExchangeCalendar.properties
 create mode 100644 locale/exchangecalendar/en/calendar-calendars-list.dtd
 create mode 100644 locale/exchangecalendar/en/calendar-summary-dialog.dtd
 create mode 100644 locale/exchangecalendar/en/delegate-calendar-dialog.dtd
 create mode 100644 locale/exchangecalendar/en/delegate-folder.dtd
 create mode 100644 locale/exchangecalendar/en/ecCalendarCreation.dtd
 create mode 100644 locale/exchangecalendar/en/exchangeCloneSettings.dtd
 create mode 100644 locale/exchangecalendar/en/exchangeReminderDialog.dtd
 create mode 100644 locale/exchangecalendar/en/exchangeSettings.dtd
 create mode 100644 locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
 create mode 100644 locale/exchangecalendar/en/extra-priority.dtd
 create mode 100644 locale/exchangecalendar/en/invitationResponse.dtd
 create mode 100644 locale/exchangecalendar/en/inviteStyle.dtd
 create mode 100644 locale/exchangecalendar/en/lightning-item-iframe.dtd
 create mode 100644 locale/exchangecalendar/en/manageEWSAccounts.dtd
 create mode 100644 locale/exchangecalendar/en/messenger_task_delegation.dtd
 create mode 100644 locale/exchangecalendar/en/oofSettings.dtd
 create mode 100644 locale/exchangecalendar/en/preInvitationResponse.dtd
 create mode 100644 locale/exchangecalendar/en/preferences.dtd
 create mode 100644 locale/exchangecalendar/en/rtews.dtd
 create mode 100644 locale/exchangecalendar/en/rtews.properties
 create mode 100644 locale/exchangecalendar/en/selectEWSUrl.dtd
 create mode 100644 locale/exchangecalendar/en/sendUpdateTo.dtd
 create mode 100644 locale/exchangecalendar/en/sharedCalendarParser.dtd
 create mode 100644 locale/exchangecalendar/en/timezonePreference.dtd

diff --git a/chrome.manifest b/chrome.manifest
index 4acc3405..f6f50799 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -44,6 +44,7 @@ overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/co
 overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/rtews-overlay.xul
 
 locale exchangecalendar nl locale/exchangecalendar/nl/
+locale exchangecalendar en locale/exchangecalendar/en/
 locale exchangecalendar en-US locale/exchangecalendar/en-US/
 locale exchangecalendar fr-FR locale/exchangecalendar/fr-FR/
 locale exchangecalendar de locale/exchangecalendar/de/
diff --git a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
index 93c90297..ca8493ae 100644
--- a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
+++ b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
@@ -11,6 +11,7 @@ manifest exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
 manifest exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
 
 locale exchangecontacts nl    locale/exchangecontacts/nl/
+locale exchangecontacts en    locale/exchangecontacts/en/
 locale exchangecontacts en-US locale/exchangecontacts/en-US/
 locale exchangecontacts fr-FR locale/exchangecontacts/fr-FR/
 locale exchangecontacts de    locale/exchangecontacts/de/
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
new file mode 100644
index 00000000..b3ce0023
--- /dev/null
+++ b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received contact update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
new file mode 100644
index 00000000..6b147ee3
--- /dev/null
+++ b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received distribution list update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
new file mode 100644
index 00000000..c49542bf
--- /dev/null
+++ b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
@@ -0,0 +1,9 @@
+<!ENTITY toolbar.button.label.addaccount "Add Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.addaccount "This will add a new Exchange contact folder">
+
+<!ENTITY toolbar.button.label.deleteaccount "Remove Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.deleteaccount "This will remove an existing Exchange contact folder">
+
+<!ENTITY deleteExchangeCmd.label "Remove Exchange contact folder">
+
+
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
new file mode 100644
index 00000000..d2500dd0
--- /dev/null
+++ b/interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
@@ -0,0 +1,11 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting request">
+
+<!ENTITY label.ecExchangeSettings.title "Name in list:">
+<!ENTITY exchangeWebService.preference.contacts.pollinterval "Refresh interval in seconds:">
+
+<!ENTITY exchWebService.add.globaladdresslist.label "Add global address list to search results.">
+
diff --git a/locale/exchangecalendar/en/attachments-view.dtd b/locale/exchangecalendar/en/attachments-view.dtd
new file mode 100644
index 00000000..f97a6d55
--- /dev/null
+++ b/locale/exchangecalendar/en/attachments-view.dtd
@@ -0,0 +1,2 @@
+<!ENTITY exchWebServie.add.attachment.button.label "Attachments">
+
diff --git a/locale/exchangecalendar/en/browseFolder.dtd b/locale/exchangecalendar/en/browseFolder.dtd
new file mode 100644
index 00000000..88334642
--- /dev/null
+++ b/locale/exchangecalendar/en/browseFolder.dtd
@@ -0,0 +1,12 @@
+<!ENTITY label.acceptbutton "Select">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY browsefolder.title "Browse folders">
+
+<!ENTITY treecol.label.foldername "Folder name">
+<!ENTITY treecol.label.folderclass "Folder class">
+
+
+
+
+
diff --git a/locale/exchangecalendar/en/calExchangeCalendar.properties b/locale/exchangecalendar/en/calExchangeCalendar.properties
new file mode 100644
index 00000000..feb1af9c
--- /dev/null
+++ b/locale/exchangecalendar/en/calExchangeCalendar.properties
@@ -0,0 +1,49 @@
+displayName=Exchange 2007/2010 Calendar and Tasks Provider
+
+resetEventMessage=Calendar "%1$S" has been reset.
+addTaskEventMessage=Added task "%1$S" (%2$S).
+addCalendarEventMessage=Added appointment "%1$S" (%2$S).
+ewsErrorEventMessage=Error in communication with EWS server for "%1$S". Error: %2$S, Code: %3$S.
+updateCalendarEventMessage=Appointment "%1$S" has been modified (%2$S).
+updateTaskEventMessage=Task "%1$S" has been modified (%2$S).
+deleteCalendarEventMessage=Appointment "%1$S" has been removed (%2$S).
+deleteTaskEventMessage=Task "%1$S" has been removed (%2$S).
+syncFolderEventMessage="%4$S": Received updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxRequests="%4$S": Inbox received meeting invitation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxCancelations="%4$S": Inbox received meeting cancelation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxResponses="%4$S": Inbox received meeting response updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+ewsMeetingResponsEventMessage=Meeting request "%1$S" answered with "%2$S" (%3$S). Your message:
+
+ecErrorServerCheck=Error while checking with server: %1$S (%2$S)
+ecErrorAutodiscovery=Error during autodiscovery: %1$S (%2$S)
+ecErrorAutodiscoveryURLInvalid=It was not possible to find settings through autodiscovery using the domain name part of the mailbox (%1$S).\nUsually this means there is not an autodiscovery server defined with the domain name part as hostname.
+ecErrorServerCheckURLInvalid=Server "%1$S" does not exist.
+ecErrorServerAndMailboxCheck=Error during checking of server and mailbox: %1$S (Code: %2$S)
+
+updateUserPrefs1=User preferences updated for new version (since 0.7.26)
+
+autoRemoveConfirmedInvitationOnCancellation=Confirmed appointment "%1$S" has been canceled and was automatically removed as specified by user settings (%2$S).
+
+sendAutoRespondMeetingRequestMessage=Meeting request "%1$S" has been automatically answered as specified by the user settings (%2$S).
+
+ecLoadingOofSettings=(Retrieving data)
+ecLoadedOofSettings=(Data retrieved)
+ecErrorLoadingOofSettings=Error during loading of out of office settings. Code: %2$S, Message: %1$S.
+ecSavingOofSettings=(Saving data)
+ecSavedOofSettings=(Data saved)
+ecErrorSavingOofSettings=Error during saving of out of office settings. Code: %2$S, Message: %1$S.
+
+
+exchWebService.PidLidTaskHistory.duedate.changed=Due date was changed
+exchWebService.PidLidTaskHistory.some.property.changed=A property was changed
+exchWebService.PidLidTaskHistory.accepted=Task accepted by %1$S
+exchWebService.PidLidTaskHistory.rejected=Task rejected by %1$S
+exchWebService.PidLidTaskHistory.assigned=Task assigned to %1$S
+exchWebService.PidLidTaskHistory.no.changes=No changes
+
+ecErrorServerAndMailboxCheckFolderNotFound=Either you do not have read permission on the selected mailbox or the mailbox is incorrect.\n\nWhen the mailbox is corrected you might have permissions to view the busy/tentative/OOO user availability status for its calendar.\n\n(%2$S: %1$S)
+
+tooltipCalendarDisconnected=The calendar %1$S is not connected to the Exchange server\n(Reason: %2$S).
+tooltipCalendarDisconnectedReadOnly=The calendar %1$S is not connected to the Exchange server and is read only\n(Reason: %2$S).
+tooltipCalendarConnected=The calendar %1$S is connected to the Exchange server.
+tooltipCalendarConnectedReadOnly=The calendar %1$S is connected to the Exchange server and is readonly.
diff --git a/locale/exchangecalendar/en/calendar-calendars-list.dtd b/locale/exchangecalendar/en/calendar-calendars-list.dtd
new file mode 100644
index 00000000..0e815eff
--- /dev/null
+++ b/locale/exchangecalendar/en/calendar-calendars-list.dtd
@@ -0,0 +1,5 @@
+<!ENTITY calendar.context.exchange.convert.label "Convert to Exchange 2007/2010 Calendar and Tasks Add-on">
+<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) properties">
+<!ENTITY calendar.context.exchange.oof.settings.label "Out of office settings">
+<!ENTITY calendar.context.exchange.clone.settings.label "Clone settings to new calendar">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delegate calendar">
diff --git a/locale/exchangecalendar/en/calendar-summary-dialog.dtd b/locale/exchangecalendar/en/calendar-summary-dialog.dtd
new file mode 100644
index 00000000..ba560434
--- /dev/null
+++ b/locale/exchangecalendar/en/calendar-summary-dialog.dtd
@@ -0,0 +1,3 @@
+<!ENTITY forward.invite.label "Forward invite">
+<!ENTITY required.attendee.label "Required attendee">
+<!ENTITY optional.attendee.label "Optional attendee">
diff --git a/locale/exchangecalendar/en/delegate-calendar-dialog.dtd b/locale/exchangecalendar/en/delegate-calendar-dialog.dtd
new file mode 100644
index 00000000..2b13f6fe
--- /dev/null
+++ b/locale/exchangecalendar/en/delegate-calendar-dialog.dtd
@@ -0,0 +1,25 @@
+ 
+<!ENTITY  label.delegateCalendar.cancelbutton "Cancel">
+<!ENTITY  label.delegateCalendar.userEmail "Email">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Deliver meeting requests">
+
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates Only">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and Me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Delegates and Send Notifications to Me">
+
+<!ENTITY  label.delegateCalendar.permission "Permission">
+<!ENTITY  menuitem.delegateCalendar.permission.author "Author">
+<!ENTITY  menuitem.delegateCalendar.permission.editor "Editor">
+<!ENTITY  menuitem.delegateCalendar.permission.reviewer "Reviewer">
+<!ENTITY  menuitem.delegateCalendar.permission.none "None">
+
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Receive copies Of meeting messages" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "View private items" >
+
+
+<!ENTITY  delegateCalendar.permission.description.author "Read and create items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.editor "Read, create, and modify items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.reviewer "Read items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.none "No access permissions to the calendar folder." >
+
+<!ENTITY  delegateCalendar.permission.details.label "Permission details: " >
diff --git a/locale/exchangecalendar/en/delegate-folder.dtd b/locale/exchangecalendar/en/delegate-folder.dtd
new file mode 100644
index 00000000..28dbfd40
--- /dev/null
+++ b/locale/exchangecalendar/en/delegate-folder.dtd
@@ -0,0 +1,45 @@
+ 
+<!ENTITY  label.delegatefolder.cancelbutton "Cancel">
+<!ENTITY  label.delegatefolder.userEmail "Email">
+ 
+<!ENTITY  label.delegatefolder.permissionLevel "Permission level">
+<!ENTITY  label.delegatefolder.userboxcolumn1 "User"> 
+<!ENTITY  label.delegatefolder.userboxcolumn2 "Permissions"> 
+
+<!ENTITY  menuitem.delegatefolder.permission.author "Author">
+<!ENTITY  menuitem.delegatefolder.permission.editor "Editor">
+<!ENTITY  menuitem.delegatefolder.permission.reviewer "Reviewer">
+<!ENTITY  menuitem.delegatefolder.permission.none "None">
+<!ENTITY  menuitem.delegatefolder.permission.owner "Owner" > 
+<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "PublishingEditor" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "PublishingAuthor" >
+<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "NoneditingAuthor" >
+<!ENTITY  menuitem.delegatefolder.permission.contributor "Contributor" >
+<!ENTITY  menuitem.delegatefolder.permission.custom "Custom" >
+                            
+<!ENTITY  delegatefolder.permission.description.author "Read and create items in the folder." >
+<!ENTITY  delegatefolder.permission.description.editor "Read, create, and modify items in the folder." >
+<!ENTITY  delegatefolder.permission.description.reviewer "Read items in the folder." >
+<!ENTITY  delegatefolder.permission.description.none "No access permissions to the folder." >
+
+ <!ENTITY  delegatefolder.permission.details.caption "Permission "> 
+
+<!ENTITY  delegatefolder.tab.msg.label  "No calendar or task found for this mail account.">
+<!ENTITY  delegatefolder.tab.name  "Exchange folder sharing">
+
+<!ENTITY  delegatefolder.permissions.none  "None">
+<!ENTITY  delegatefolder.permissions.own  "Own items">
+<!ENTITY  delegatefolder.permissions.all  "All items">
+<!ENTITY  delegatefolder.permissions.full  "Full details">
+
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Create items">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Create subfolders">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Folder owner">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Folder visible">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Folder contact">
+<!ENTITY  delegatefolder.permissions.edititems  "Edit items">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Delete items">
+<!ENTITY  delegatefolder.permissions.readitems  "Read items">  
+ 
+<!ENTITY  delegatefolder.permissions.true  "True">
+<!ENTITY  delegatefolder.permissions.false  "False">
diff --git a/locale/exchangecalendar/en/ecCalendarCreation.dtd b/locale/exchangecalendar/en/ecCalendarCreation.dtd
new file mode 100644
index 00000000..4c90ead9
--- /dev/null
+++ b/locale/exchangecalendar/en/ecCalendarCreation.dtd
@@ -0,0 +1,5 @@
+<!ENTITY exchange1.description "Exchange/Windows Active Directory settings">
+<!ENTITY exchange.cache.label "Use offline cache">
+
+
+
diff --git a/locale/exchangecalendar/en/exchangeCloneSettings.dtd b/locale/exchangecalendar/en/exchangeCloneSettings.dtd
new file mode 100644
index 00000000..01f7f685
--- /dev/null
+++ b/locale/exchangecalendar/en/exchangeCloneSettings.dtd
@@ -0,0 +1,6 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY label.ecExchangeSettings.title "New description:">
+
+
diff --git a/locale/exchangecalendar/en/exchangeReminderDialog.dtd b/locale/exchangecalendar/en/exchangeReminderDialog.dtd
new file mode 100644
index 00000000..84bc01fe
--- /dev/null
+++ b/locale/exchangecalendar/en/exchangeReminderDialog.dtd
@@ -0,0 +1,4 @@
+<!ENTITY exchWebService.reminder.relation.origin.label "before the event starts">
+
+
+
diff --git a/locale/exchangecalendar/en/exchangeSettings.dtd b/locale/exchangecalendar/en/exchangeSettings.dtd
new file mode 100644
index 00000000..9e88575e
--- /dev/null
+++ b/locale/exchangecalendar/en/exchangeSettings.dtd
@@ -0,0 +1,54 @@
+<!ENTITY label.acceptbutton "Save and reset">
+<!ENTITY label.cancelbutton "Cancel">
+<!ENTITY ecsettings.title "EWS calendar and mail settings">
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting requests">
+<!ENTITY ecsettings.tab.calendarfolderproperties "Folder properties">
+
+<!ENTITY label.ecExchangeSettings.title "Settings for calendar:">
+
+<!ENTITY label.poll.inbox "Poll inbox for requests, changes and cancellations.">
+<!ENTITY label.poll.inbox.interval "Frequency (in seconds) to poll inbox:">
+<!ENTITY label.poll.calendar.interval "Frequency (in seconds) to poll calendar:">
+
+<!ENTITY label.nomeetingrequestsettings "You cannot set a meeting request because you did not select the main calendar for the mailbox">
+
+<!ENTITY label.autorespond.meetingrequest "Automatically respond to a new invitation with ">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "I might attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
+
+<!ENTITY label.autoremove.invitation_cancellation1 "Automatically remove the invitation and accompanying cancelation message if you did not yet respond to the invitation request.">
+<!ENTITY label.autoremove.invitation_cancellation2 "Automatically remove a confirmed invitation when you receive a cancelation message.">
+
+<!ENTITY label.autoremove.invitation_response1 "Automatically remove a response from others to a meeting invitation of which you are not the organizer.">
+
+<!ENTITY label.doautorespond.meetingrequest.message "Send the following message with responses instead of asking for a message.">
+<!ENTITY label.autorespond.meetingrequest.message "Your message:">
+
+<!ENTITY treecol.label.userid "User ID">
+<!ENTITY treecol.label.email "Email">
+
+
+<!ENTITY ecsettings.tab.offlineCachingproperties "Offline caching">
+
+<!ENTITY label.offlineCacheproperties.cachingStartDate "Start date of caching:">
+<!ENTITY label.offlineCacheproperties.cachingEndDate "End date of caching:">
+<!ENTITY label.offlineCacheproperties.totalEvents "Total number of events cached:">
+<!ENTITY label.offlineCacheproperties.totalTasks "Total number of tasks cached:">
+
+<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate "Number of months to cache items prior to today:">
+<!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Number of months to cache items after today:">
+
+<!ENTITY button.offlineCacheproperties.clearCache "Clear offline cached data">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Automatic processing">
+<!ENTITY ecsettings.tab.mailitemsProperties "EWS settings (mail)">
+
+<!ENTITY label.syncmailitems.interval "Delay syncing mail items (tags, etc.)">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove canceled events">
+<!ENTITY label.autoprocessingproperties.markeventtentative "Automatically mark event as tentative and send response to organizer">
+<!ENTITY label.syncmailitems.active "Keep enabled syncing mail items (tags, etc.)">
+
+<!ENTITY label.syncfollowup.deactivtate "Disable followup task">
+ 
diff --git a/locale/exchangecalendar/en/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
new file mode 100644
index 00000000..cc52398a
--- /dev/null
+++ b/locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
@@ -0,0 +1,56 @@
+<!ENTITY ecautodiscover "Use Exchange's autodiscovery function.">
+<!ENTITY ecfolderbase.label "Folder base:">
+<!ENTITY ecfolderpath.label "Path below folder base:">
+<!ENTITY ecfolderidofshare.label "Share Folder ID:">
+<!ENTITY exchWebServices.SharedFolderID.label "Shared display name:">
+
+<!ENTITY menuitem.label.ecfolderbase.calendar "Calendar folder">
+<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Public folders">
+<!ENTITY menuitem.label.ecfolderbase.inbox "Mail inbox folder">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Voice mail folder">
+<!ENTITY menuitem.label.ecfolderbase.msgfolderroot "Message folder root">
+<!ENTITY menuitem.label.ecfolderbase.root "Root of the mailbox">
+<!ENTITY menuitem.label.ecfolderbase.tasks "Tasks folder">
+
+<!ENTITY menuitem.label.ecfolderbase.contacts "Contacts folder">
+<!ENTITY menuitem.label.ecfolderbase.deleteditems "Deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.drafts "Drafts folder">
+<!ENTITY menuitem.label.ecfolderbase.journal "Journal folder">
+<!ENTITY menuitem.label.ecfolderbase.notes "Notes folder">
+<!ENTITY menuitem.label.ecfolderbase.outbox "Mail outbox folder">
+<!ENTITY menuitem.label.ecfolderbase.sentitems "Sent items folder">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Junk email folder">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Search folders folder">
+<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Options below are only for Exchange 2010 --">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Dumpster root folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Dumpster deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Dumpster versions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges "Dumpster purges folder">
+<!ENTITY menuitem.label.ecfolderbase.archiveroot "Root archive folder">
+<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot "Root archive message folder">
+<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems "Archive deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot "Archive recoverable items root folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions "Archive recoverable items deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsversions "Archive recoverable items versions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemspurges "Archive recoverable items purges folder">
+
+<!ENTITY button.label.autodiscovercheck "Perform autodiscovery">
+<!ENTITY button.label.serverandmailboxcheck "Check server and mailbox">
+<!ENTITY button.label.servercheck "Check server and account">
+
+<!ENTITY ecmailbox.label "Primary email address:">
+<!ENTITY ecmailbox.tooltip "If you do not specify a mailbox you will only have access to public folders.">
+<!ENTITY ecwindowsuser.label "Username:">
+<!ENTITY ecwindowsdomain.label "Domain name:">
+<!ENTITY ecwindowspassword.label "Password:">
+
+<!ENTITY button.label.folderpathcheck "Check">
+<!ENTITY button.label.folderbrowse "Browse">
+
+<!ENTITY exchWebServices.UserAvailability.label "Only user availability status for the mailbox's calendar will be visible.">
+
+<!ENTITY exchWebServices.exchtype.label "Exchange type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office 365">
+<!ENTITY exchWebServices.detail.label "Details">
+ 
diff --git a/locale/exchangecalendar/en/extra-priority.dtd b/locale/exchangecalendar/en/extra-priority.dtd
new file mode 100644
index 00000000..f06cd6e4
--- /dev/null
+++ b/locale/exchangecalendar/en/extra-priority.dtd
@@ -0,0 +1,18 @@
+<!ENTITY prefwindow.title "Extras">
+<!ENTITY general.label  "General"> 
+<!ENTITY about.label "About"> 
+ 
+<!ENTITY about.description.label "Enhanced Features for Thunderbird and SeaMonkey applications">
+<!ENTITY iconify.label "Display priority icons only"> 
+<!ENTITY shadeHigh.label "Color background for high-priority messages">
+<!ENTITY shadeLow.label "Color background for low-priority messages">
+<!ENTITY tagImportant.label "Automatically tag high-priority mail as important">
+ 
+<!ENTITY highestColor.label "Highest">
+
+<!ENTITY highColor.label "High">
+<!ENTITY lowColor.label "Low">
+<!ENTITY lowestColor.label "Lowest">
+ 
+<!ENTITY prioritycolor  "Custom Color">
+<!ENTITY pref.color "Color preferences:">
diff --git a/locale/exchangecalendar/en/invitationResponse.dtd b/locale/exchangecalendar/en/invitationResponse.dtd
new file mode 100644
index 00000000..660d0a33
--- /dev/null
+++ b/locale/exchangecalendar/en/invitationResponse.dtd
@@ -0,0 +1,20 @@
+<!ENTITY label.acceptbutton "Confirm change">
+<!ENTITY label.cancelbutton "Cancel change">
+
+<!ENTITY description.invitationResponse "Confirm change of your meeting response.">
+
+<!ENTITY label.calendarName "Calendar:">
+<!ENTITY label.itemTitle "Subject:">
+<!ENTITY label.itemStart "Start time:">
+<!ENTITY label.itemResponse "Your response:">
+<!ENTITY label.meetingOrganiser "Organizer:">
+
+<!ENTITY label.messageReponseBody "Response message:">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "I might attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
+
+<!ENTITY label.proposenewtime.title "Propose new time (>= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/locale/exchangecalendar/en/inviteStyle.dtd b/locale/exchangecalendar/en/inviteStyle.dtd
new file mode 100644
index 00000000..ada3d520
--- /dev/null
+++ b/locale/exchangecalendar/en/inviteStyle.dtd
@@ -0,0 +1,2 @@
+<!ENTITY label.inviteCol "Calendar invite">
+<!ENTITY tooltip.inviteCol "Sort by invitation">
diff --git a/locale/exchangecalendar/en/lightning-item-iframe.dtd b/locale/exchangecalendar/en/lightning-item-iframe.dtd
new file mode 100644
index 00000000..e6606773
--- /dev/null
+++ b/locale/exchangecalendar/en/lightning-item-iframe.dtd
@@ -0,0 +1,7 @@
+<!ENTITY exchWebService.owner.label "Owner:">
+<!ENTITY exchWebService.totalWork.label "Total work:">
+<!ENTITY exchWebService.actualWork.label "Actual work:">
+<!ENTITY exchWebService.mileage.label "Mileage:">
+<!ENTITY exchWebService.billingInformation.label "Billing information:">
+<!ENTITY exchWebService.companies.label "Company:">
+
diff --git a/locale/exchangecalendar/en/manageEWSAccounts.dtd b/locale/exchangecalendar/en/manageEWSAccounts.dtd
new file mode 100644
index 00000000..21b6c947
--- /dev/null
+++ b/locale/exchangecalendar/en/manageEWSAccounts.dtd
@@ -0,0 +1,16 @@
+<!ENTITY label.acceptbutton "Close">
+
+<!ENTITY exchWebService.manageEWSAccounts.newAccount.button "Add account">
+<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button "Remove account">
+<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button "Save settings">
+
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.label "Use Exchange's autodiscovery function.">
+<!ENTITY exchWebService.manageEWSAccounts.mailbox.label "Mailbox name:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label "Username:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label "Domain name:">
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button "Perform autodiscovery">
+<!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Check server and account">
+<!ENTITY exchWebService.manageEWSAccounts.name.label "Name:">
+
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services accounts">
+
diff --git a/locale/exchangecalendar/en/messenger_task_delegation.dtd b/locale/exchangecalendar/en/messenger_task_delegation.dtd
new file mode 100644
index 00000000..7009f00b
--- /dev/null
+++ b/locale/exchangecalendar/en/messenger_task_delegation.dtd
@@ -0,0 +1,6 @@
+<!ENTITY exchWebService.task.delegation.owner.name "Task owner">
+<!ENTITY exchWebService.task.delegation.delegator.name "Task delegator">
+<!ENTITY exchWebService.task.delegation.accept.button "Accept">
+<!ENTITY exchWebService.task.delegation.decline.button "Decline">
+<!ENTITY exchWebService.task.delegation.lastUpdateDate "Last change on">
+
diff --git a/locale/exchangecalendar/en/oofSettings.dtd b/locale/exchangecalendar/en/oofSettings.dtd
new file mode 100644
index 00000000..19061349
--- /dev/null
+++ b/locale/exchangecalendar/en/oofSettings.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.oofsettings "Out of office settings">
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Close">
+<!ENTITY label.oofsettings.title "Out of office settings for:">
+
+<!ENTITY label.oofstatus "Out of office status:">
+
+<!ENTITY label.externalaudience "To which external persons do you want to send out of office messages: ">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "To nobody">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Only to persons in my contact list">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "To everybody">
+
+<!ENTITY button.label.internal "Internal message">
+<!ENTITY button.label.external "External message">
+<!ENTITY label.internalreply "Message that will be sent to people within my organization:">
+<!ENTITY label.externalreply "Message that will be sent to people outside my organization:">
+
+<!ENTITY menuitem.label.exchWebService-oof-status.disabled "Disabled">
+<!ENTITY menuitem.label.exchWebService-oof-status.enabled "Enabled">
+
+<!ENTITY checkbox.label.exchWebService-oof-scheduled "Only enabled in specified time frame:">
+<!ENTITY label.hbox-oof-scheduled-startTime "Start time:">
+<!ENTITY label.hbox-oof-scheduled-endTime "End time:">
+
+
+
diff --git a/locale/exchangecalendar/en/preInvitationResponse.dtd b/locale/exchangecalendar/en/preInvitationResponse.dtd
new file mode 100644
index 00000000..d8c0ea54
--- /dev/null
+++ b/locale/exchangecalendar/en/preInvitationResponse.dtd
@@ -0,0 +1,14 @@
+<!ENTITY dialog.exchWebService.preInvitationResponse.title "How do you want to react?">
+<!ENTITY label.acceptbutton "OK">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY label.calendarName "Calendar:">
+<!ENTITY label.itemTitle "Subject:">
+<!ENTITY label.itemStart "Start time:">
+<!ENTITY label.itemResponse "Your response:">
+<!ENTITY label.meetingOrganiser "Organizer:">
+
+<!ENTITY radio.label.exchWebService.preInvitationResponse.edit "Edit the response before sending.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow "Send the response now.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend "Don't send a response.">
+
diff --git a/locale/exchangecalendar/en/preferences.dtd b/locale/exchangecalendar/en/preferences.dtd
new file mode 100644
index 00000000..b5922ad7
--- /dev/null
+++ b/locale/exchangecalendar/en/preferences.dtd
@@ -0,0 +1,48 @@
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Logging">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Accounts">
+<!ENTITY exchangeWebService.preferences.tab.debug "Logging">
+<!ENTITY exchangeWebService.preference.debug.file "Log file location:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Communication with Exchange server:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Log information to the console and/or a file">
+<!ENTITY exchangeWebService.preference.debug.file.button "Browse">
+<!ENTITY exchangeWebService.preference.network.debug.label "Log communication with Exchange server">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Log level">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Log communication progress information (e.g., Authentication)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Show password in clear text in log file.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Addressbook/Contacts:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Log level">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Log info about addressbook/contacts part">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) Preferences">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Core provider object:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = None, 1 = Basic information, 2 = Extended information">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Caching">
+<!ENTITY exchangeWebService.preference.cache.memory.label "Minimal temporary memory cache">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Number of days to download before start date of program:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Number of days to download after start date of program:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Others">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Communication preferences:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Maximum number of retries for exchange communication:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Add-on update function:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatically check for a new add-on version online when starting Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Show warning when a new version is available so you can easily install it.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximum number of simultaneous request to exchange server:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
+
+<!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
+<!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
+<!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/locale/exchangecalendar/en/rtews.dtd b/locale/exchangecalendar/en/rtews.dtd
new file mode 100644
index 00000000..bb3cd384
--- /dev/null
+++ b/locale/exchangecalendar/en/rtews.dtd
@@ -0,0 +1,15 @@
+ <!ENTITY rtews.selectaccountdesc "Select Microsoft Exchange mail account for which to configure.">
+ <!ENTITY rtews.accconfigured "Account already configured">
+ <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Exchange Web Services (EWS) URL or configure it manually">
+ <!ENTITY rtews.dicoverdesc2 "To configure it manually enter the URL in the field below.">
+ <!ENTITY rtews.autodiscover "Autodiscover">
+ <!ENTITY rtews.doautodicover "Do autodiscovery">
+ <!ENTITY rtews.manual "Manual">
+ <!ENTITY rtews.test "Click here to verify the EWS URL">
+ <!ENTITY rtews.msexchewsurl "Verified EWS URL. Click Finish to complete the configuration">
+ <!ENTITY rtews.selectaccount "Select account">
+ <!ENTITY rtews.configure.label "Configure...">
+ <!ENTITY rtews.rtforexch "Remote tagger for Microsoft Exchange">
+ <!ENTITY rtews.confirmAccDetail "Confirm following account details">
+ <!ENTITY rtews.username "Username">
+ <!ENTITY rtews.domain "Domain">
diff --git a/locale/exchangecalendar/en/rtews.properties b/locale/exchangecalendar/en/rtews.properties
new file mode 100644
index 00000000..5b07c0df
--- /dev/null
+++ b/locale/exchangecalendar/en/rtews.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger  
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/locale/exchangecalendar/en/selectEWSUrl.dtd b/locale/exchangecalendar/en/selectEWSUrl.dtd
new file mode 100644
index 00000000..b69a27b8
--- /dev/null
+++ b/locale/exchangecalendar/en/selectEWSUrl.dtd
@@ -0,0 +1,9 @@
+<!ENTITY label.acceptbutton "Select">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY description.selectews "Choose an EWS server from the list which is suitable for your current location.">
+<!ENTITY label.selectews "EWS server list:">
+
+
+
+
diff --git a/locale/exchangecalendar/en/sendUpdateTo.dtd b/locale/exchangecalendar/en/sendUpdateTo.dtd
new file mode 100644
index 00000000..5f44675b
--- /dev/null
+++ b/locale/exchangecalendar/en/sendUpdateTo.dtd
@@ -0,0 +1,9 @@
+<!ENTITY title.sendupdateto "To whom do you want to send this update?">
+<!ENTITY label.acceptbutton "Execute">
+<!ENTITY label.cancelbutton "Cancel">
+<!ENTITY label.calendaritem.title "Send update for meeting:">
+
+<!ENTITY radio.label.sendtonone "Send to nobody.">
+<!ENTITY radio.label.sendtoall "Send to everyone invited.">
+<!ENTITY radio.label.sendtochanged "Send only to added or removed persons.">
+
diff --git a/locale/exchangecalendar/en/sharedCalendarParser.dtd b/locale/exchangecalendar/en/sharedCalendarParser.dtd
new file mode 100644
index 00000000..39c9f897
--- /dev/null
+++ b/locale/exchangecalendar/en/sharedCalendarParser.dtd
@@ -0,0 +1,3 @@
+<!ENTITY exchWebService_vbox_label "Detected an Exchange sharing invitation">
+<!ENTITY exchWebService_button_label_add_calendar "Add calendar">
+
diff --git a/locale/exchangecalendar/en/timezonePreference.dtd b/locale/exchangecalendar/en/timezonePreference.dtd
new file mode 100644
index 00000000..a61aa649
--- /dev/null
+++ b/locale/exchangecalendar/en/timezonePreference.dtd
@@ -0,0 +1 @@
+<!ENTITY calendar.timezone.local.auto.label  "Automatically change timezone">

From 68682df80c603807bb4aa9410903a068fbb8837c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 29 Aug 2017 15:24:17 +0200
Subject: [PATCH 117/222] =?UTF-8?q?l10n:=20fix=20DTD=20files=20to=20use=20?=
 =?UTF-8?q?double=20quotes=20(")=20instead=20of=20characters=20=E2=80=9C?=
 =?UTF-8?q?=20and=20=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatically done with command:
egrep -rni '(“|”)' -l -Z | xargs -0 -l sed -i -r -e 's/“|”/"/g'

I didn't commited modifications on ".properties" files as I don't know if these
characters are usable for properties.
---
 .../exchangecalendar/tr/attachments-view.dtd  |  2 +-
 locale/exchangecalendar/tr/browseFolder.dtd   | 10 +--
 .../tr/calendar-calendars-list.dtd            | 10 +--
 .../tr/delegate-calendar-dialog.dtd           | 32 ++++----
 .../tr/ecCalendarCreation.dtd                 |  4 +-
 .../tr/exchangeCloneSettings.dtd              |  6 +-
 .../tr/exchangeReminderDialog.dtd             |  2 +-
 .../exchangecalendar/tr/exchangeSettings.dtd  | 56 ++++++-------
 .../tr/exchangeSettingsOverlay.dtd            | 78 +++++++++----------
 locale/exchangecalendar/tr/extra-priority.dtd | 28 +++----
 .../tr/invitationResponse.dtd                 | 24 +++---
 locale/exchangecalendar/tr/inviteStyle.dtd    |  4 +-
 .../tr/lightning-item-iframe.dtd              | 12 +--
 .../exchangecalendar/tr/manageEWSAccounts.dtd | 20 ++---
 .../tr/messenger_task_delegation.dtd          | 10 +--
 locale/exchangecalendar/tr/oofSettings.dtd    | 36 ++++-----
 .../tr/preInvitationResponse.dtd              | 22 +++---
 locale/exchangecalendar/tr/preferences.dtd    | 58 +++++++-------
 locale/exchangecalendar/tr/selectEWSUrl.dtd   |  8 +-
 locale/exchangecalendar/tr/sendUpdateTo.dtd   | 14 ++--
 .../tr/sharedCalendarParser.dtd               |  4 +-
 21 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/locale/exchangecalendar/tr/attachments-view.dtd b/locale/exchangecalendar/tr/attachments-view.dtd
index f2ecb9ab..22bbe8da 100644
--- a/locale/exchangecalendar/tr/attachments-view.dtd
+++ b/locale/exchangecalendar/tr/attachments-view.dtd
@@ -1 +1 @@
-<!ENTITY exchWebServie.add.attachment.button.label “Ekler”>
+<!ENTITY exchWebServie.add.attachment.button.label "Ekler">
diff --git a/locale/exchangecalendar/tr/browseFolder.dtd b/locale/exchangecalendar/tr/browseFolder.dtd
index d255705a..f66a0da7 100644
--- a/locale/exchangecalendar/tr/browseFolder.dtd
+++ b/locale/exchangecalendar/tr/browseFolder.dtd
@@ -1,10 +1,10 @@
-<!ENTITY label.acceptbutton “Seç”>
-<!ENTITY label.cancelbutton “İptal et”>
+<!ENTITY label.acceptbutton "Seç">
+<!ENTITY label.cancelbutton "İptal et">
 
-<!ENTITY browsefolder.title “Klasörlere gözat”>
+<!ENTITY browsefolder.title "Klasörlere gözat">
 
-<!ENTITY treecol.label.foldername “Klasör adı">
-<!ENTITY treecol.label.folderclass “Klasör sınıfı”>
+<!ENTITY treecol.label.foldername "Klasör adı">
+<!ENTITY treecol.label.folderclass "Klasör sınıfı">
 
 
 
diff --git a/locale/exchangecalendar/tr/calendar-calendars-list.dtd b/locale/exchangecalendar/tr/calendar-calendars-list.dtd
index 0efaf650..9f707886 100644
--- a/locale/exchangecalendar/tr/calendar-calendars-list.dtd
+++ b/locale/exchangecalendar/tr/calendar-calendars-list.dtd
@@ -1,5 +1,5 @@
-<!ENTITY calendar.context.exchange.convert.label "Exchange 2007/2010 Takvim and Görev Eklentisine Dönüştür”>
-<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) Özellikleri“>
-<!ENTITY calendar.context.exchange.oof.settings.label “İşyeri Dışında ayarları”>
-<!ENTITY calendar.context.exchange.clone.settings.label “Ayarları yeni takvime kopyala">
-<!ENTITY calendar.context.exchange.delegate.calendar.settings.label “Takvime erişim yetkisi aktar”>
+<!ENTITY calendar.context.exchange.convert.label "Exchange 2007/2010 Takvim and Görev Eklentisine Dönüştür">
+<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) Özellikleri">
+<!ENTITY calendar.context.exchange.oof.settings.label "İşyeri Dışında ayarları">
+<!ENTITY calendar.context.exchange.clone.settings.label "Ayarları yeni takvime kopyala">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Takvime erişim yetkisi aktar">
diff --git a/locale/exchangecalendar/tr/delegate-calendar-dialog.dtd b/locale/exchangecalendar/tr/delegate-calendar-dialog.dtd
index f8539ee0..41a2225d 100644
--- a/locale/exchangecalendar/tr/delegate-calendar-dialog.dtd
+++ b/locale/exchangecalendar/tr/delegate-calendar-dialog.dtd
@@ -1,25 +1,25 @@
  
-<!ENTITY  label.delegateCalendar.cancelbutton “İptal Et”>
-<!ENTITY  label.delegateCalendar.userEmail “E-posta”>
-<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl “Toplantı Taleplerini İlet">
+<!ENTITY  label.delegateCalendar.cancelbutton "İptal Et">
+<!ENTITY  label.delegateCalendar.userEmail "E-posta">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Toplantı Taleplerini İlet">
 
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly “Yalnız Yetkililer">
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe “Yetkililer ve Ben”>
-<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo “Yetkililer (bana bildirileri gönder)”>
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Yalnız Yetkililer">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Yetkililer ve Ben">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Yetkililer (bana bildirileri gönder)">
 
-<!ENTITY  label.delegateCalendar.permission “İzinler”>
-<!ENTITY  menuitem.delegateCalendar.permission.author “Yaratıcı”>
-<!ENTITY  menuitem.delegateCalendar.permission.editor “Düzenleyici”>
-<!ENTITY  menuitem.delegateCalendar.permission.reviewer “Gözden Geçirici”>
-<!ENTITY  menuitem.delegateCalendar.permission.none “Yok”>
+<!ENTITY  label.delegateCalendar.permission "İzinler">
+<!ENTITY  menuitem.delegateCalendar.permission.author "Yaratıcı">
+<!ENTITY  menuitem.delegateCalendar.permission.editor "Düzenleyici">
+<!ENTITY  menuitem.delegateCalendar.permission.reviewer "Gözden Geçirici">
+<!ENTITY  menuitem.delegateCalendar.permission.none "Yok">
 
-<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy “Toplantı İletilerinin Kopyalarını Al” >
-<!ENTITY  label.delegateCalendar.permission.viewPrivateItems “Özel Öğeleri Gör” >
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Toplantı İletilerinin Kopyalarını Al" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "Özel Öğeleri Gör" >
 
 
-<!ENTITY  delegateCalendar.permission.description.author “Takvim klasöründeki öğeleri oku ya da yarat.” >
+<!ENTITY  delegateCalendar.permission.description.author "Takvim klasöründeki öğeleri oku ya da yarat." >
 <!ENTITY  delegateCalendar.permission.description.editor "Takvim klasöründeki öğeleri oku, yarat ya da değiştir." >
 <!ENTITY  delegateCalendar.permission.description.reviewer "Takvim klasöründeki öğeleri oku." >
-<!ENTITY  delegateCalendar.permission.description.none “Takvim klasörüne erişim in yok." >
+<!ENTITY  delegateCalendar.permission.description.none "Takvim klasörüne erişim in yok." >
 
-<!ENTITY  delegateCalendar.permission.details.label “İzin Detayları: " >
+<!ENTITY  delegateCalendar.permission.details.label "İzin Detayları: " >
diff --git a/locale/exchangecalendar/tr/ecCalendarCreation.dtd b/locale/exchangecalendar/tr/ecCalendarCreation.dtd
index 6ff39220..60facf85 100644
--- a/locale/exchangecalendar/tr/ecCalendarCreation.dtd
+++ b/locale/exchangecalendar/tr/ecCalendarCreation.dtd
@@ -1,4 +1,4 @@
-<!ENTITY exchange1.description "Exchange/Windows Active Directory ayarları”>
-<!ENTITY exchange.cache.label “Çevrimdışı önbellek kullan">
+<!ENTITY exchange1.description "Exchange/Windows Active Directory ayarları">
+<!ENTITY exchange.cache.label "Çevrimdışı önbellek kullan">
 
 
diff --git a/locale/exchangecalendar/tr/exchangeCloneSettings.dtd b/locale/exchangecalendar/tr/exchangeCloneSettings.dtd
index e02518c7..077fb41d 100644
--- a/locale/exchangecalendar/tr/exchangeCloneSettings.dtd
+++ b/locale/exchangecalendar/tr/exchangeCloneSettings.dtd
@@ -1,5 +1,5 @@
-<!ENTITY label.acceptbutton “Kaydet”>
-<!ENTITY label.cancelbutton “İptal Et”>
+<!ENTITY label.acceptbutton "Kaydet">
+<!ENTITY label.cancelbutton "İptal Et">
 
-<!ENTITY label.ecExchangeSettings.title “Yeni tarif:”>
+<!ENTITY label.ecExchangeSettings.title "Yeni tarif:">
 
diff --git a/locale/exchangecalendar/tr/exchangeReminderDialog.dtd b/locale/exchangecalendar/tr/exchangeReminderDialog.dtd
index c469bef5..ae351813 100644
--- a/locale/exchangecalendar/tr/exchangeReminderDialog.dtd
+++ b/locale/exchangecalendar/tr/exchangeReminderDialog.dtd
@@ -1,3 +1,3 @@
-<!ENTITY exchWebService.reminder.relation.origin.label “etkinlik başlamadan önce”>
+<!ENTITY exchWebService.reminder.relation.origin.label "etkinlik başlamadan önce">
 
 
diff --git a/locale/exchangecalendar/tr/exchangeSettings.dtd b/locale/exchangecalendar/tr/exchangeSettings.dtd
index c18b5a36..6336d3a1 100644
--- a/locale/exchangecalendar/tr/exchangeSettings.dtd
+++ b/locale/exchangecalendar/tr/exchangeSettings.dtd
@@ -1,53 +1,53 @@
-<!ENTITY label.acceptbutton “Kaydet”>
-<!ENTITY label.cancelbutton “İptal et“>
+<!ENTITY label.acceptbutton "Kaydet">
+<!ENTITY label.cancelbutton "İptal et">
 <!ENTITY ecsettings.title "EWS Takvim ve Posta ayarları">
 <!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
-<!ENTITY ecsettings.tab.meetingrequestsettings “Toplantı teklifleri”>
-<!ENTITY ecsettings.tab.calendarfolderproperties “Klasör özellikleri”>
+<!ENTITY ecsettings.tab.meetingrequestsettings "Toplantı teklifleri">
+<!ENTITY ecsettings.tab.calendarfolderproperties "Klasör özellikleri">
 
-<!ENTITY label.ecExchangeSettings.title “Takvim ayarları:">
+<!ENTITY label.ecExchangeSettings.title "Takvim ayarları:">
 
-<!ENTITY label.poll.inbox “Teklifler, değişiklikler ve iptaller için posta kutusunu yokla.">
-<!ENTITY label.poll.inbox.interval "Posta kutusu yoklama sıklığı (saniye):”>
-<!ENTITY label.poll.calendar.interval “Takvim yoklama sıklığı (saniye):">
+<!ENTITY label.poll.inbox "Teklifler, değişiklikler ve iptaller için posta kutusunu yokla.">
+<!ENTITY label.poll.inbox.interval "Posta kutusu yoklama sıklığı (saniye):">
+<!ENTITY label.poll.calendar.interval "Takvim yoklama sıklığı (saniye):">
 
-<!ENTITY label.nomeetingrequestsettings “Toplantı teklifi ayarlayamazsınız, çünkü posta kutunuzun ana takvimini seçmediniz">
+<!ENTITY label.nomeetingrequestsettings "Toplantı teklifi ayarlayamazsınız, çünkü posta kutunuzun ana takvimini seçmediniz">
 
-<!ENTITY label.autorespond.meetingrequest “Yeni davetlere bu automatic yanıtı ver: ">
+<!ENTITY label.autorespond.meetingrequest "Yeni davetlere bu automatic yanıtı ver: ">
 
-<!ENTITY menuitem.label.ec-autorespond-answer.tentative “Belki katılabilirim”>
-<!ENTITY menuitem.label.ec-autorespond-answer.accepted “Katılacağım”>
-<!ENTITY menuitem.label.ec-autorespond-answer.declined “Katılmayacağım”>
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "Belki katılabilirim">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "Katılacağım">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "Katılmayacağım">
 
-<!ENTITY label.autoremove.invitation_cancellation1 “Davetiyeye yanıt vermediyseniz, daveti ve beraberindeki iptal iletisini automatic olarak sil.">
-<!ENTITY label.autoremove.invitation_cancellation2 “İptal iletisi alırsanız, onaylanmış daveti otomatik olarak sil.">
+<!ENTITY label.autoremove.invitation_cancellation1 "Davetiyeye yanıt vermediyseniz, daveti ve beraberindeki iptal iletisini automatic olarak sil.">
+<!ENTITY label.autoremove.invitation_cancellation2 "İptal iletisi alırsanız, onaylanmış daveti otomatik olarak sil.">
 
-<!ENTITY label.autoremove.invitation_response1 “Düzenleyicisi olmadığınız bir toplantının davetine başkaları tarafından gönderilmiş olan yanıtları otomatik olarak sil.">
+<!ENTITY label.autoremove.invitation_response1 "Düzenleyicisi olmadığınız bir toplantının davetine başkaları tarafından gönderilmiş olan yanıtları otomatik olarak sil.">
 
-<!ENTITY label.doautorespond.meetingrequest.message “Yanıtınızda, bir ileti istemek yerine, şu iletiyi gönderiniz.">
-<!ENTITY label.autorespond.meetingrequest.message “İletiniz:”>
+<!ENTITY label.doautorespond.meetingrequest.message "Yanıtınızda, bir ileti istemek yerine, şu iletiyi gönderiniz.">
+<!ENTITY label.autorespond.meetingrequest.message "İletiniz:">
 
-<!ENTITY treecol.label.userid “Kullanıcı Kimliği”>
-<!ENTITY treecol.label.email “Eposta”>
+<!ENTITY treecol.label.userid "Kullanıcı Kimliği">
+<!ENTITY treecol.label.email "Eposta">
 
 
-<!ENTITY ecsettings.tab.offlineCachingproperties “Çevrimdışı Önbellekleme">
+<!ENTITY ecsettings.tab.offlineCachingproperties "Çevrimdışı Önbellekleme">
 
-<!ENTITY label.offlineCacheproperties.cachingStartDate “Önbelleklemeye başlama tarihi:">
+<!ENTITY label.offlineCacheproperties.cachingStartDate "Önbelleklemeye başlama tarihi:">
 <!ENTITY label.offlineCacheproperties.cachingEndDate "Önbelleklemeyi bitirme tarihi:">
-<!ENTITY label.offlineCacheproperties.totalEvents “Önbelleklenen olay sayısı:">
+<!ENTITY label.offlineCacheproperties.totalEvents "Önbelleklenen olay sayısı:">
 <!ENTITY label.offlineCacheproperties.totalTasks "Önbelleklenen görev sayısı:">
 
-<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate “Bugünden önce önbelleklenen ay sayısı:">
+<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate "Bugünden önce önbelleklenen ay sayısı:">
 <!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Bugünden sonra önbelleklenecek ay sayısı:">
 
-<!ENTITY button.offlineCacheproperties.clearCache “Çevrimdışı önbelleklenmiş verileri temizle">
-<!ENTITY ecsettings.tab.autoprocessingproperties “Otomatik İşlemleme">
+<!ENTITY button.offlineCacheproperties.clearCache "Çevrimdışı önbelleklenmiş verileri temizle">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Otomatik İşlemleme">
 <!ENTITY ecsettings.tab.mailitemsProperties "EWS Ayarları (Posta)">
 
 <!ENTITY label.syncmailitems.interval "Postayla ilişkili öğeleri (etiketler vs.) eşitlemeyi geciktir">
-<!ENTITY label.autoprocessingproperties.deletecancelleditems “İptal edilmiş olayları otomatik olarak sil”>
-<!ENTITY label.autoprocessingproperties.markeventtentative “Olayları otomatikman Kesin değil olarak işaretle ve düzenleyene yanıt gönder">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "İptal edilmiş olayları otomatik olarak sil">
+<!ENTITY label.autoprocessingproperties.markeventtentative "Olayları otomatikman Kesin değil olarak işaretle ve düzenleyene yanıt gönder">
  
 <!ENTITY label.syncmailitems.active "Postayla ilişkili öğeleri (etiketler vs.) eşitlemeyi aktif tut">
 <!ENTITY label.syncfollowup.deactivtate "Görev takip edilmesini devredışı bırak">
diff --git a/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
index 6cf402a1..1784ca43 100644
--- a/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
@@ -1,53 +1,53 @@
 <!ENTITY ecautodiscover "Exchange’in otomatik keşif işlevini kullan.">
-<!ENTITY ecfolderbase.label “Klasör tabanı:">
-<!ENTITY ecfolderpath.label “Klasör tabanının altındaki yol:">
-<!ENTITY ecfolderidofshare.label “Paylaşılan Klasör Kimliği:”>
-<!ENTITY exchWebServices.SharedFolderID.label “Paylaşılan görünüm adı:">
+<!ENTITY ecfolderbase.label "Klasör tabanı:">
+<!ENTITY ecfolderpath.label "Klasör tabanının altındaki yol:">
+<!ENTITY ecfolderidofshare.label "Paylaşılan Klasör Kimliği:">
+<!ENTITY exchWebServices.SharedFolderID.label "Paylaşılan görünüm adı:">
 
-<!ENTITY menuitem.label.ecfolderbase.calendar “Takvim klasörü">
-<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot “Ortak klasörler">
-<!ENTITY menuitem.label.ecfolderbase.inbox “Posta kutusu klasörü">
-<!ENTITY menuitem.label.ecfolderbase.voicemail “Sesli mesaj klasörü">
-<!ENTITY menuitem.label.ecfolderbase.msgfolderroot “İleti klasörü kökü”>
-<!ENTITY menuitem.label.ecfolderbase.root “Posta kutusunun kökü">
-<!ENTITY menuitem.label.ecfolderbase.tasks “Görevler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.calendar "Takvim klasörü">
+<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Ortak klasörler">
+<!ENTITY menuitem.label.ecfolderbase.inbox "Posta kutusu klasörü">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Sesli mesaj klasörü">
+<!ENTITY menuitem.label.ecfolderbase.msgfolderroot "İleti klasörü kökü">
+<!ENTITY menuitem.label.ecfolderbase.root "Posta kutusunun kökü">
+<!ENTITY menuitem.label.ecfolderbase.tasks "Görevler klasörü">
 
-<!ENTITY menuitem.label.ecfolderbase.contacts “Kişiler klasörü">
-<!ENTITY menuitem.label.ecfolderbase.deleteditems “Silinmiş öğeler klasörü">
-<!ENTITY menuitem.label.ecfolderbase.drafts “Taslaklar klasörü">
-<!ENTITY menuitem.label.ecfolderbase.journal “Günlükleme klasörü">
-<!ENTITY menuitem.label.ecfolderbase.notes "Notlar klasörü”>
-<!ENTITY menuitem.label.ecfolderbase.outbox “Gönderilecek postalar klasörü">
-<!ENTITY menuitem.label.ecfolderbase.sentitems “Gidenler klasörü">
-<!ENTITY menuitem.label.ecfolderbase.junkemail “Gereksiz posta klasörü”>
-<!ENTITY menuitem.label.ecfolderbase.searchfolders “Klasör Arama klasörü">
+<!ENTITY menuitem.label.ecfolderbase.contacts "Kişiler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.deleteditems "Silinmiş öğeler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.drafts "Taslaklar klasörü">
+<!ENTITY menuitem.label.ecfolderbase.journal "Günlükleme klasörü">
+<!ENTITY menuitem.label.ecfolderbase.notes "Notlar klasörü">
+<!ENTITY menuitem.label.ecfolderbase.outbox "Gönderilecek postalar klasörü">
+<!ENTITY menuitem.label.ecfolderbase.sentitems "Gidenler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Gereksiz posta klasörü">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Klasör Arama klasörü">
 <!ENTITY menuitem.label.ecfolderbase.version2010 "-- Aşağıdaki seçenekler yalnızca Exchange2010 için geçerlidir --">
-<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot “Çöp kutusu taban klasörü">
-<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions “Çöp kutusu silinenler klasörü">
-<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion “Çöp kutusu sürümler klasörü">
-<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges “Çöp kutusu temizleme klasörü">
-<!ENTITY menuitem.label.ecfolderbase.archiveroot “Arşivleme kök klasörü">
-<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot “Arşivdeki iletiler kök klasörü">
-<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems “Arşivdeki silinmişler klasörü">
-<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot “Arşivdeki kurtarılabilirler kök klasörü">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Çöp kutusu taban klasörü">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Çöp kutusu silinenler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Çöp kutusu sürümler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges "Çöp kutusu temizleme klasörü">
+<!ENTITY menuitem.label.ecfolderbase.archiveroot "Arşivleme kök klasörü">
+<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot "Arşivdeki iletiler kök klasörü">
+<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems "Arşivdeki silinmişler klasörü">
+<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot "Arşivdeki kurtarılabilirler kök klasörü">
 <!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions "Arşivdeki kurtarılabilir silinmişler klasörü">
 <!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsversions "Arşivdeki kurtarılabilir sürümler klasörü">
 <!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemspurges "Arşivdeki kurtarılabilir temizleme klasörü">
 
-<!ENTITY button.label.autodiscovercheck “Otomatik keşif yap">
-<!ENTITY button.label.serverandmailboxcheck “Sunucu ve posta kutusunu denetle">
-<!ENTITY button.label.servercheck “Sunucu ve hesabı denetle">
+<!ENTITY button.label.autodiscovercheck "Otomatik keşif yap">
+<!ENTITY button.label.serverandmailboxcheck "Sunucu ve posta kutusunu denetle">
+<!ENTITY button.label.servercheck "Sunucu ve hesabı denetle">
 
-<!ENTITY ecmailbox.label “Birincil e-posta adresi:">
-<!ENTITY ecmailbox.tooltip “Eğer bir posta kutusu belirtmezseniz, yalnızca ortak klasörlere erişiminiz olacak.">
-<!ENTITY ecwindowsuser.label “Kullanıcı adı:”>
-<!ENTITY ecwindowsdomain.label “Alan adı:”>
-<!ENTITY ecwindowspassword.label “Parola:”>
+<!ENTITY ecmailbox.label "Birincil e-posta adresi:">
+<!ENTITY ecmailbox.tooltip "Eğer bir posta kutusu belirtmezseniz, yalnızca ortak klasörlere erişiminiz olacak.">
+<!ENTITY ecwindowsuser.label "Kullanıcı adı:">
+<!ENTITY ecwindowsdomain.label "Alan adı:">
+<!ENTITY ecwindowspassword.label "Parola:">
 
-<!ENTITY button.label.folderpathcheck “Denetle”>
-<!ENTITY button.label.folderbrowse “Gözat”>
+<!ENTITY button.label.folderpathcheck "Denetle">
+<!ENTITY button.label.folderbrowse "Gözat">
 
-<!ENTITY exchWebServices.UserAvailability.label “Yalnızca posta kutusuna ait takvimin kullanıcı müsaitliği durumu görünür olacak.">
+<!ENTITY exchWebServices.UserAvailability.label "Yalnızca posta kutusuna ait takvimin kullanıcı müsaitliği durumu görünür olacak.">
 
 <!ENTITY exchWebServices.exchtype.label "Exchange Çeşiti">
 <!ENTITY exchWebServices.hostexch.label "Sunucuda Ağırlanan Exchange">
diff --git a/locale/exchangecalendar/tr/extra-priority.dtd b/locale/exchangecalendar/tr/extra-priority.dtd
index a3401d2d..3da173e2 100644
--- a/locale/exchangecalendar/tr/extra-priority.dtd
+++ b/locale/exchangecalendar/tr/extra-priority.dtd
@@ -1,17 +1,17 @@
-<!ENTITY prefwindow.title “İlaveler”>
-<!ENTITY general.label "Genel”> 
-<!ENTITY about.label “Hakkında”> 
+<!ENTITY prefwindow.title "İlaveler">
+<!ENTITY general.label "Genel"> 
+<!ENTITY about.label "Hakkında"> 
  
-<!ENTITY about.description.label “Thunderbird ve Seamonkey uygulamaları için geliştirilmiş özellikler">
-<!ENTITY iconify.label “Yalnız öncelik simgelerini göster"> 
-<!ENTITY shadeHigh.label “Yüksek öncelikli iletiler için arka plan rengi”>
-<!ENTITY shadeLow.label “Alçak öncelikli iletiler için arka plan rengi”>
-<!ENTITY tagImportant.label “Yüksek öncelikli postaları otomatikman Önemli olarak etiketle">
+<!ENTITY about.description.label "Thunderbird ve Seamonkey uygulamaları için geliştirilmiş özellikler">
+<!ENTITY iconify.label "Yalnız öncelik simgelerini göster"> 
+<!ENTITY shadeHigh.label "Yüksek öncelikli iletiler için arka plan rengi">
+<!ENTITY shadeLow.label "Alçak öncelikli iletiler için arka plan rengi">
+<!ENTITY tagImportant.label "Yüksek öncelikli postaları otomatikman Önemli olarak etiketle">
  
-<!ENTITY highestColor.label “En yüksek“>
-<!ENTITY highColor.label “Yüksek”>
-<!ENTITY lowColor.label “Alçak”>
-<!ENTITY lowestColor.label “En alçak“>
+<!ENTITY highestColor.label "En yüksek">
+<!ENTITY highColor.label "Yüksek">
+<!ENTITY lowColor.label "Alçak">
+<!ENTITY lowestColor.label "En alçak">
  
-<!ENTITY prioritycolor  “Özel Renk”>
-<!ENTITY pref.color “Renk Tercihleri:”>
+<!ENTITY prioritycolor  "Özel Renk">
+<!ENTITY pref.color "Renk Tercihleri:">
diff --git a/locale/exchangecalendar/tr/invitationResponse.dtd b/locale/exchangecalendar/tr/invitationResponse.dtd
index 8d4c24e3..84ce42d5 100644
--- a/locale/exchangecalendar/tr/invitationResponse.dtd
+++ b/locale/exchangecalendar/tr/invitationResponse.dtd
@@ -1,19 +1,19 @@
-<!ENTITY label.acceptbutton “Değişikliği kabul et”>
-<!ENTITY label.cancelbutton “Değişikliği iptal et”>
+<!ENTITY label.acceptbutton "Değişikliği kabul et">
+<!ENTITY label.cancelbutton "Değişikliği iptal et">
 
-<!ENTITY description.invitationResponse “Toplantı yanıtını değiştirdiğini onayla.”>
+<!ENTITY description.invitationResponse "Toplantı yanıtını değiştirdiğini onayla.">
 
-<!ENTITY label.calendarName “Takvim:”>
-<!ENTITY label.itemTitle “Konu:”>
-<!ENTITY label.itemStart “Başlama zamanı:”>
-<!ENTITY label.itemResponse "Yanıtın:”>
-<!ENTITY label.meetingOrganiser "Düzenleyen:”>
+<!ENTITY label.calendarName "Takvim:">
+<!ENTITY label.itemTitle "Konu:">
+<!ENTITY label.itemStart "Başlama zamanı:">
+<!ENTITY label.itemResponse "Yanıtın:">
+<!ENTITY label.meetingOrganiser "Düzenleyen:">
 
-<!ENTITY label.messageReponseBody “Yanıt iletisi:">
+<!ENTITY label.messageReponseBody "Yanıt iletisi:">
 
-<!ENTITY menuitem.label.ec-autorespond-answer.tentative “Katılabilirim”>
-<!ENTITY menuitem.label.ec-autorespond-answer.accepted “Katılacağım”>
-<!ENTITY menuitem.label.ec-autorespond-answer.declined “Katılmayacağım”>
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "Katılabilirim">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "Katılacağım">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "Katılmayacağım">
 
 
 
diff --git a/locale/exchangecalendar/tr/inviteStyle.dtd b/locale/exchangecalendar/tr/inviteStyle.dtd
index 732033b5..546ab7f2 100644
--- a/locale/exchangecalendar/tr/inviteStyle.dtd
+++ b/locale/exchangecalendar/tr/inviteStyle.dtd
@@ -1,2 +1,2 @@
-<!ENTITY label.inviteCol “Takvim Daveti”>
-<!ENTITY tooltip.inviteCol “Davetiye ile sırala”>
+<!ENTITY label.inviteCol "Takvim Daveti">
+<!ENTITY tooltip.inviteCol "Davetiye ile sırala">
diff --git a/locale/exchangecalendar/tr/lightning-item-iframe.dtd b/locale/exchangecalendar/tr/lightning-item-iframe.dtd
index dd9bcb02..4822ca76 100644
--- a/locale/exchangecalendar/tr/lightning-item-iframe.dtd
+++ b/locale/exchangecalendar/tr/lightning-item-iframe.dtd
@@ -1,6 +1,6 @@
-<!ENTITY exchWebService.owner.label “Sahip:”>
-<!ENTITY exchWebService.totalWork.label "Toplam iş:”>
-<!ENTITY exchWebService.actualWork.label “Gerçekleşen iş:”>
-<!ENTITY exchWebService.mileage.label "Mil olarka uzaklık:”>
-<!ENTITY exchWebService.billingInformation.label “Faturalama bilgileri:”>
-<!ENTITY exchWebService.companies.label “Şirket:”>
+<!ENTITY exchWebService.owner.label "Sahip:">
+<!ENTITY exchWebService.totalWork.label "Toplam iş:">
+<!ENTITY exchWebService.actualWork.label "Gerçekleşen iş:">
+<!ENTITY exchWebService.mileage.label "Mil olarka uzaklık:">
+<!ENTITY exchWebService.billingInformation.label "Faturalama bilgileri:">
+<!ENTITY exchWebService.companies.label "Şirket:">
diff --git a/locale/exchangecalendar/tr/manageEWSAccounts.dtd b/locale/exchangecalendar/tr/manageEWSAccounts.dtd
index 0d60b37c..7235b3aa 100644
--- a/locale/exchangecalendar/tr/manageEWSAccounts.dtd
+++ b/locale/exchangecalendar/tr/manageEWSAccounts.dtd
@@ -1,16 +1,16 @@
-<!ENTITY label.acceptbutton “Kapat”>
+<!ENTITY label.acceptbutton "Kapat">
 
 <!ENTITY exchWebService.manageEWSAccounts.newAccount.button "Hesap ekle">
-<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button “Hesap kaldır”>
-<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button “Ayarları kaydet”>
+<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button "Hesap kaldır">
+<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button "Ayarları kaydet">
 
 <!ENTITY exchWebService.manageEWSAccounts.autodiscover.label "Exchange’in otomatik keşif işlevini kullan.">
-<!ENTITY exchWebService.manageEWSAccounts.mailbox.label “Posta kutusu adı:">
-<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label “Kullanıcı adı:”>
-<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label “Alan adı:”>
-<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button “Otomatik keşif yap">
-<!ENTITY exchWebService.manageEWSAccounts.servercheck.button “Sunucu ve hesabı denetle">
-<!ENTITY exchWebService.manageEWSAccounts.name.label “Ad:”>
+<!ENTITY exchWebService.manageEWSAccounts.mailbox.label "Posta kutusu adı:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label "Kullanıcı adı:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label "Alan adı:">
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button "Otomatik keşif yap">
+<!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Sunucu ve hesabı denetle">
+<!ENTITY exchWebService.manageEWSAccounts.name.label "Ad:">
 
-<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services Hesapları”>
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services Hesapları">
 
diff --git a/locale/exchangecalendar/tr/messenger_task_delegation.dtd b/locale/exchangecalendar/tr/messenger_task_delegation.dtd
index 67e51988..04ad943f 100644
--- a/locale/exchangecalendar/tr/messenger_task_delegation.dtd
+++ b/locale/exchangecalendar/tr/messenger_task_delegation.dtd
@@ -1,6 +1,6 @@
-<!ENTITY exchWebService.task.delegation.owner.name “Görev sahibi”>
-<!ENTITY exchWebService.task.delegation.delegator.name “Görev yetkilisi”>
-<!ENTITY exchWebService.task.delegation.accept.button “Kabul et”>
-<!ENTITY exchWebService.task.delegation.decline.button “Reddet”>
-<!ENTITY exchWebService.task.delegation.lastUpdateDate “Son değişikliğin yapıldığı zaman:“>
+<!ENTITY exchWebService.task.delegation.owner.name "Görev sahibi">
+<!ENTITY exchWebService.task.delegation.delegator.name "Görev yetkilisi">
+<!ENTITY exchWebService.task.delegation.accept.button "Kabul et">
+<!ENTITY exchWebService.task.delegation.decline.button "Reddet">
+<!ENTITY exchWebService.task.delegation.lastUpdateDate "Son değişikliğin yapıldığı zaman:">
 
diff --git a/locale/exchangecalendar/tr/oofSettings.dtd b/locale/exchangecalendar/tr/oofSettings.dtd
index 259029d9..4d95ae11 100644
--- a/locale/exchangecalendar/tr/oofSettings.dtd
+++ b/locale/exchangecalendar/tr/oofSettings.dtd
@@ -1,26 +1,26 @@
-<!ENTITY title.oofsettings “İşyeri Dışında ayarları”>
-<!ENTITY label.acceptbutton “Kaydet”>
-<!ENTITY label.cancelbutton “Kapat”>
-<!ENTITY label.oofsettings.title “İşyeri Dışında ayarları bu adres için geçerli:">
+<!ENTITY title.oofsettings "İşyeri Dışında ayarları">
+<!ENTITY label.acceptbutton "Kaydet">
+<!ENTITY label.cancelbutton "Kapat">
+<!ENTITY label.oofsettings.title "İşyeri Dışında ayarları bu adres için geçerli:">
 
-<!ENTITY label.oofstatus "İşyeri Dışında durumu:”>
+<!ENTITY label.oofstatus "İşyeri Dışında durumu:">
 
-<!ENTITY label.externalaudience “Dışarıdaki hangi kişilere İşyeri Dışında iletileri göndermek istiyorsunuz: ">
-<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none “Hiç kimseye”>
-<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known “Yalnızca Kişiler listemde olanlara">
-<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all “Herkese”>
+<!ENTITY label.externalaudience "Dışarıdaki hangi kişilere İşyeri Dışında iletileri göndermek istiyorsunuz: ">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "Hiç kimseye">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Yalnızca Kişiler listemde olanlara">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "Herkese">
 
-<!ENTITY button.label.internal “İç ileti“>
-<!ENTITY button.label.external “Dış ileti”>
-<!ENTITY label.internalreply “Kendi işimdeki kişilere gönderilecek ileti:">
-<!ENTITY label.externalreply “İşimde olmayanlara gönderilecek ileti:">
+<!ENTITY button.label.internal "İç ileti">
+<!ENTITY button.label.external "Dış ileti">
+<!ENTITY label.internalreply "Kendi işimdeki kişilere gönderilecek ileti:">
+<!ENTITY label.externalreply "İşimde olmayanlara gönderilecek ileti:">
 
-<!ENTITY menuitem.label.exchWebService-oof-status.disabled “Devre dışı“>
-<!ENTITY menuitem.label.exchWebService-oof-status.enabled “Etkin”>
+<!ENTITY menuitem.label.exchWebService-oof-status.disabled "Devre dışı">
+<!ENTITY menuitem.label.exchWebService-oof-status.enabled "Etkin">
 
-<!ENTITY checkbox.label.exchWebService-oof-scheduled “Yalnızca belirtilen zaman  aralığında etkin:">
-<!ENTITY label.hbox-oof-scheduled-startTime “Başlama zamanı:”>
-<!ENTITY label.hbox-oof-scheduled-endTime “Sona erme zamanı:">
+<!ENTITY checkbox.label.exchWebService-oof-scheduled "Yalnızca belirtilen zaman  aralığında etkin:">
+<!ENTITY label.hbox-oof-scheduled-startTime "Başlama zamanı:">
+<!ENTITY label.hbox-oof-scheduled-endTime "Sona erme zamanı:">
 
 
 
diff --git a/locale/exchangecalendar/tr/preInvitationResponse.dtd b/locale/exchangecalendar/tr/preInvitationResponse.dtd
index 0f4b1e38..280c1a3e 100644
--- a/locale/exchangecalendar/tr/preInvitationResponse.dtd
+++ b/locale/exchangecalendar/tr/preInvitationResponse.dtd
@@ -1,14 +1,14 @@
-<!ENTITY dialog.exchWebService.preInvitationResponse.title “Nasıl yanıt vereceksiniz?”>
-<!ENTITY label.acceptbutton “Tamam”>
-<!ENTITY label.cancelbutton “İptal”>
+<!ENTITY dialog.exchWebService.preInvitationResponse.title "Nasıl yanıt vereceksiniz?">
+<!ENTITY label.acceptbutton "Tamam">
+<!ENTITY label.cancelbutton "İptal">
 
-<!ENTITY label.calendarName “Takvim:”>
-<!ENTITY label.itemTitle “Konu:”>
-<!ENTITY label.itemStart “Başlama zamanı:”>
-<!ENTITY label.itemResponse "Yanıtın:”>
-<!ENTITY label.meetingOrganiser “Düzenleyici:”>
+<!ENTITY label.calendarName "Takvim:">
+<!ENTITY label.itemTitle "Konu:">
+<!ENTITY label.itemStart "Başlama zamanı:">
+<!ENTITY label.itemResponse "Yanıtın:">
+<!ENTITY label.meetingOrganiser "Düzenleyici:">
 
-<!ENTITY radio.label.exchWebService.preInvitationResponse.edit “Göndermeden once yanıtını düzenle.”>
-<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow “Yanıtı şimdi gönder.”>
-<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend “Yanıt gönderme.”>
+<!ENTITY radio.label.exchWebService.preInvitationResponse.edit "Göndermeden once yanıtını düzenle.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow "Yanıtı şimdi gönder.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend "Yanıt gönderme.">
 
diff --git a/locale/exchangecalendar/tr/preferences.dtd b/locale/exchangecalendar/tr/preferences.dtd
index 5fc413f3..11d28af4 100644
--- a/locale/exchangecalendar/tr/preferences.dtd
+++ b/locale/exchangecalendar/tr/preferences.dtd
@@ -1,47 +1,47 @@
 <!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
-<!ENTITY exchangeWebService.paneDebug.title “Günlük kaydı”>
-
-<!ENTITY exchangeWebService.preferences.tab.accounts “Hesaplar”>
-<!ENTITY exchangeWebService.preferences.tab.debug “Günlük kaydı”>
-<!ENTITY exchangeWebService.preference.debug.file “Günlük dosyasının yeri:”>
-<!ENTITY exchangeWebService.preference.network.debug.caption "Exchange sunucusu ile iletişim:”>
-<!ENTITY exchangeWebService.preference.debug.log.label “Konsola ve/veya bir dosyaya bilgi günlükleme">
-<!ENTITY exchangeWebService.preference.debug.file.button “Tara”>
-<!ENTITY exchangeWebService.preference.network.debug.label "Exchange sunucusu ile iletişim günlükle”>
-<!ENTITY exchangeWebService.preference.network.debuglevel.label1 “Günlükleme seviyesi”>
+<!ENTITY exchangeWebService.paneDebug.title "Günlük kaydı">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Hesaplar">
+<!ENTITY exchangeWebService.preferences.tab.debug "Günlük kaydı">
+<!ENTITY exchangeWebService.preference.debug.file "Günlük dosyasının yeri:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Exchange sunucusu ile iletişim:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Konsola ve/veya bir dosyaya bilgi günlükleme">
+<!ENTITY exchangeWebService.preference.debug.file.button "Tara">
+<!ENTITY exchangeWebService.preference.network.debug.label "Exchange sunucusu ile iletişim günlükle">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Günlükleme seviyesi">
 <!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Temel bilgiler, 2 = Eksiksiz iletişim">
-<!ENTITY exchangeWebService.preference.authentication.debug.label “İletişimde başarı bilgilerini günlükle (örn. Kimlik doğrulama)”>
-<!ENTITY exchangeWebService.preference.authentication.showpassword.label “Parolayı günlük dosyasında açık metin olarak göster.">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "İletişimde başarı bilgilerini günlükle (örn. Kimlik doğrulama)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Parolayı günlük dosyasında açık metin olarak göster.">
 
-<!ENTITY exchangeWebService.preference.contacts.debug.caption “Adres defteri/Kişiler:”>
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Adres defteri/Kişiler:">
 <!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Günlükleme seviyesi">
 <!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Temel bilgiler, 2 = Eksiksiz iletişim">
 <!ENTITY exchangeWebService.preference.contacts.debug.label "Adres defteri/Kişiler kısmı hakkında bilgileri günlükle">
 
-<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) Seçenekleri”>
+<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) Seçenekleri">
 
-<!ENTITY exchangeWebService.preference.core.debug.caption “Ana sağlayıcı nesnesi:">
-<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Hiç, 1 = Temel bilgiler, 2 = Ek bilgiler”>
+<!ENTITY exchangeWebService.preference.core.debug.caption "Ana sağlayıcı nesnesi:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Hiç, 1 = Temel bilgiler, 2 = Ek bilgiler">
 
-<!ENTITY exchangeWebService.preferences.tab.cache “Önbellekleme”>
-<!ENTITY exchangeWebService.preference.cache.memory.label “En az geçici hafıza önbelleği">
-<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label “Programın başladığı günden kaç gün öncesine kadar indirmeli:">
+<!ENTITY exchangeWebService.preferences.tab.cache "Önbellekleme">
+<!ENTITY exchangeWebService.preference.cache.memory.label "En az geçici hafıza önbelleği">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Programın başladığı günden kaç gün öncesine kadar indirmeli:">
 <!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Programın başladığı günden kaç gün sonrasına kadar indirmeli:">
 
-<!ENTITY exchangeWebService.preferences.tab.others “Diğerleri”>
-<!ENTITY exchangeWebService.preference.others.prefs.label “İletişim Seçenekleri:">
-<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label “Exchange iletişimleri için en çok yeniden deneme sayısı:">
+<!ENTITY exchangeWebService.preferences.tab.others "Diğerleri">
+<!ENTITY exchangeWebService.preference.others.prefs.label "İletişim Seçenekleri:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Exchange iletişimleri için en çok yeniden deneme sayısı:">
 
-<!ENTITY exchangeWebService.preference.updateFunction.label “Eklenti güncelleme işlevi:">
-<!ENTITY exchangeWebService.preference.checkForUpdates.label “Thunderbird başlarken yen bir eklenti sürümü olup olmadığını otomatik olarak denetle.">
-<!ENTITY exchangeWebService.preference.warnForUpdates.label “Sürümleri kolayca yükleyebilmeniz için, yeni bir sürüm olduğunda bir uyarı göster.">
+<!ENTITY exchangeWebService.preference.updateFunction.label "Eklenti güncelleme işlevi:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Thunderbird başlarken yen bir eklenti sürümü olup olmadığını otomatik olarak denetle.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Sürümleri kolayca yükleyebilmeniz için, yeni bir sürüm olduğunda bir uyarı göster.">
 <!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Beta, rc, vs. gibi yeni bir ön sürüm mevcut olduğunda bir uyarı göster."> 
 
-<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption “YükDengeleyici:”>
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "YükDengeleyici:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "YükDengeleyici:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label “Exchange sunucuna aynı anda gönderilebilecek en yüksek istek sayısı:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label “Exchange sunucuna gönderilen istekler arasındaki en kısa bekleme süresi:">
-<!ENTITY exchangeWebService.preference.userAgent.label "HTTP kullanıcı aracısı:”>
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Exchange sunucuna aynı anda gönderilebilecek en yüksek istek sayısı:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Exchange sunucuna gönderilen istekler arasındaki en kısa bekleme süresi:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP kullanıcı aracısı:">
 
 
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Tercihleri:">
diff --git a/locale/exchangecalendar/tr/selectEWSUrl.dtd b/locale/exchangecalendar/tr/selectEWSUrl.dtd
index 37b56ee8..20902ff5 100644
--- a/locale/exchangecalendar/tr/selectEWSUrl.dtd
+++ b/locale/exchangecalendar/tr/selectEWSUrl.dtd
@@ -1,8 +1,8 @@
-<!ENTITY label.acceptbutton "Seç”>
-<!ENTITY label.cancelbutton “İptal et”>
+<!ENTITY label.acceptbutton "Seç">
+<!ENTITY label.cancelbutton "İptal et">
 
-<!ENTITY description.selectews “Listeden, yerinize uygun bir EWS sunucusu seçiniz.”>
-<!ENTITY label.selectews "EWS sunucusu listesi:”>
+<!ENTITY description.selectews "Listeden, yerinize uygun bir EWS sunucusu seçiniz.">
+<!ENTITY label.selectews "EWS sunucusu listesi:">
 
 
 
diff --git a/locale/exchangecalendar/tr/sendUpdateTo.dtd b/locale/exchangecalendar/tr/sendUpdateTo.dtd
index ad892239..914f4308 100644
--- a/locale/exchangecalendar/tr/sendUpdateTo.dtd
+++ b/locale/exchangecalendar/tr/sendUpdateTo.dtd
@@ -1,8 +1,8 @@
-<!ENTITY title.sendupdateto “Bu güncelleştirmeyi kime göndermek istiyorsun?">
-<!ENTITY label.acceptbutton “Gerçekleştir”>
-<!ENTITY label.cancelbutton “İptal et”>
-<!ENTITY label.calendaritem.title “Toplantı için güncelleştirme gönder:”>
+<!ENTITY title.sendupdateto "Bu güncelleştirmeyi kime göndermek istiyorsun?">
+<!ENTITY label.acceptbutton "Gerçekleştir">
+<!ENTITY label.cancelbutton "İptal et">
+<!ENTITY label.calendaritem.title "Toplantı için güncelleştirme gönder:">
 
-<!ENTITY radio.label.sendtonone “Kimseye gönderme.”>
-<!ENTITY radio.label.sendtoall “Davetli olan herkese gönder.”>
-<!ENTITY radio.label.sendtochanged “Yalnızca eklenmiş ya da çıkarılmış olan kişilere gönder.”>
+<!ENTITY radio.label.sendtonone "Kimseye gönderme.">
+<!ENTITY radio.label.sendtoall "Davetli olan herkese gönder.">
+<!ENTITY radio.label.sendtochanged "Yalnızca eklenmiş ya da çıkarılmış olan kişilere gönder.">
diff --git a/locale/exchangecalendar/tr/sharedCalendarParser.dtd b/locale/exchangecalendar/tr/sharedCalendarParser.dtd
index 729769c3..473f6e79 100644
--- a/locale/exchangecalendar/tr/sharedCalendarParser.dtd
+++ b/locale/exchangecalendar/tr/sharedCalendarParser.dtd
@@ -1,3 +1,3 @@
-<!ENTITY exchWebService_vbox_label “Bir Exchange paylaşma daveti tespit edildi”>
-<!ENTITY exchWebService_button_label_add_calendar “Takvim ekle”>
+<!ENTITY exchWebService_vbox_label "Bir Exchange paylaşma daveti tespit edildi">
+<!ENTITY exchWebService_button_label_add_calendar "Takvim ekle">
 

From 8a4b43eaba1d520535d2aab901b1333cc58e33f2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 28 Aug 2017 16:24:57 +0200
Subject: [PATCH 118/222] l10n: transifex init project

---
 .tx/config | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .tx/config

diff --git a/.tx/config b/.tx/config
new file mode 100644
index 00000000..f1603f25
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,3 @@
+[main]
+host = https://www.transifex.com
+

From 7452d4dd70609be8b78ba7250fd213118763e8aa Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 28 Aug 2017 16:36:12 +0200
Subject: [PATCH 119/222] l10n: transifex: add DTD files for exchangecalendar
 addressbook feature

To add these files automatically, I used this bash script:

find -wholename "*interfaces/exchangeAddressBook/*/en/*.dtd" -exec bash -c 'resource="$(basename {})"; resdir="$(dirname $(dirname {}))"; tx set --auto-local --source-lang en --type DTD -r "exchangecalendar.addressbook-${resource%%.dtd}" "${resdir##./}/<lang>/${resource}" --execute' \;
---
 .tx/config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.tx/config b/.tx/config
index f1603f25..8e2f3128 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,3 +1,15 @@
 [main]
 host = https://www.transifex.com
 
+[exchangecalendar.addressbook-addressbookOverlay]
+file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/addressbookOverlay.dtd
+source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.addressbook-exchangeContactSettings]
+file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/exchangeContactSettings.dtd
+source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
+source_lang = en
+type = DTD
+

From ad652602f6681dc0e4f960650f7552201e93d06e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 28 Aug 2017 16:38:17 +0200
Subject: [PATCH 120/222] l10n: transifex: add properties files for
 exchangecalendar addressbook feature

To add these files automatically, I used this bash script:

find -wholename "*interfaces/exchangeAddressBook/*/en/*.properties" -exec bash -xc 'resource="$(basename {})"; resdir="$(dirname $(dirname {}))"; tx set --auto-local --source-lang en --type MOZILLAPROPERTIES -r "exchangecalendar.addressbook-${resource%%.properties}" "${resdir##./}/<lang>/${resource}" --execute' \;
---
 .tx/config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.tx/config b/.tx/config
index 8e2f3128..6520037d 100644
--- a/.tx/config
+++ b/.tx/config
@@ -13,3 +13,15 @@ source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchange
 source_lang = en
 type = DTD
 
+[exchangecalendar.addressbook-ExchangeContacts]
+file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/ExchangeContacts.properties
+source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
+source_lang = en
+type = MOZILLAPROPERTIES
+
+[exchangecalendar.addressbook-ExchangeDistLists]
+file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/ExchangeDistLists.properties
+source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
+source_lang = en
+type = MOZILLAPROPERTIES
+

From d2a649c164da0cd784a4f5e1e265433c39f347dd Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 29 Aug 2017 15:03:41 +0200
Subject: [PATCH 121/222] l10n: transifex: add DTD files for other
 exchangecalendar files

Automatically configured with:
find -wholename "./locale/exchangecalendar/en/*.dtd" -exec bash -c 'resource="$(basename {})"; resdir="$(dirname $(dirname {}))"; tx set --auto-local --source-lang en --type DTD -r "exchangecalendar.${resource%%.dtd}" "${resdir##./}/<lang>/${resource}" --execute ' \;
---
 .tx/config | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)

diff --git a/.tx/config b/.tx/config
index 6520037d..f0f71870 100644
--- a/.tx/config
+++ b/.tx/config
@@ -25,3 +25,153 @@ source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/Exchange
 source_lang = en
 type = MOZILLAPROPERTIES
 
+[exchangecalendar.attachments-view]
+file_filter = locale/exchangecalendar/<lang>/attachments-view.dtd
+source_file = locale/exchangecalendar/en/attachments-view.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.browseFolder]
+file_filter = locale/exchangecalendar/<lang>/browseFolder.dtd
+source_file = locale/exchangecalendar/en/browseFolder.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.exchangeCloneSettings]
+file_filter = locale/exchangecalendar/<lang>/exchangeCloneSettings.dtd
+source_file = locale/exchangecalendar/en/exchangeCloneSettings.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.exchangeReminderDialog]
+file_filter = locale/exchangecalendar/<lang>/exchangeReminderDialog.dtd
+source_file = locale/exchangecalendar/en/exchangeReminderDialog.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.messenger_task_delegation]
+file_filter = locale/exchangecalendar/<lang>/messenger_task_delegation.dtd
+source_file = locale/exchangecalendar/en/messenger_task_delegation.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.sendUpdateTo]
+file_filter = locale/exchangecalendar/<lang>/sendUpdateTo.dtd
+source_file = locale/exchangecalendar/en/sendUpdateTo.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.timezonePreference]
+file_filter = locale/exchangecalendar/<lang>/timezonePreference.dtd
+source_file = locale/exchangecalendar/en/timezonePreference.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.invitationResponse]
+file_filter = locale/exchangecalendar/<lang>/invitationResponse.dtd
+source_file = locale/exchangecalendar/en/invitationResponse.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.lightning-item-iframe]
+file_filter = locale/exchangecalendar/<lang>/lightning-item-iframe.dtd
+source_file = locale/exchangecalendar/en/lightning-item-iframe.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.calendar-calendars-list]
+file_filter = locale/exchangecalendar/<lang>/calendar-calendars-list.dtd
+source_file = locale/exchangecalendar/en/calendar-calendars-list.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.calendar-summary-dialog]
+file_filter = locale/exchangecalendar/<lang>/calendar-summary-dialog.dtd
+source_file = locale/exchangecalendar/en/calendar-summary-dialog.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.delegate-calendar-dialog]
+file_filter = locale/exchangecalendar/<lang>/delegate-calendar-dialog.dtd
+source_file = locale/exchangecalendar/en/delegate-calendar-dialog.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.delegate-folder]
+file_filter = locale/exchangecalendar/<lang>/delegate-folder.dtd
+source_file = locale/exchangecalendar/en/delegate-folder.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.exchangeSettings]
+file_filter = locale/exchangecalendar/<lang>/exchangeSettings.dtd
+source_file = locale/exchangecalendar/en/exchangeSettings.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.extra-priority]
+file_filter = locale/exchangecalendar/<lang>/extra-priority.dtd
+source_file = locale/exchangecalendar/en/extra-priority.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.inviteStyle]
+file_filter = locale/exchangecalendar/<lang>/inviteStyle.dtd
+source_file = locale/exchangecalendar/en/inviteStyle.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.manageEWSAccounts]
+file_filter = locale/exchangecalendar/<lang>/manageEWSAccounts.dtd
+source_file = locale/exchangecalendar/en/manageEWSAccounts.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.oofSettings]
+file_filter = locale/exchangecalendar/<lang>/oofSettings.dtd
+source_file = locale/exchangecalendar/en/oofSettings.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.preInvitationResponse]
+file_filter = locale/exchangecalendar/<lang>/preInvitationResponse.dtd
+source_file = locale/exchangecalendar/en/preInvitationResponse.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.preferences]
+file_filter = locale/exchangecalendar/<lang>/preferences.dtd
+source_file = locale/exchangecalendar/en/preferences.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.rtews]
+file_filter = locale/exchangecalendar/<lang>/rtews.dtd
+source_file = locale/exchangecalendar/en/rtews.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.selectEWSUrl]
+file_filter = locale/exchangecalendar/<lang>/selectEWSUrl.dtd
+source_file = locale/exchangecalendar/en/selectEWSUrl.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.sharedCalendarParser]
+file_filter = locale/exchangecalendar/<lang>/sharedCalendarParser.dtd
+source_file = locale/exchangecalendar/en/sharedCalendarParser.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.ecCalendarCreation]
+file_filter = locale/exchangecalendar/<lang>/ecCalendarCreation.dtd
+source_file = locale/exchangecalendar/en/ecCalendarCreation.dtd
+source_lang = en
+type = DTD
+
+[exchangecalendar.exchangeSettingsOverlay]
+file_filter = locale/exchangecalendar/<lang>/exchangeSettingsOverlay.dtd
+source_file = locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
+source_lang = en
+type = DTD
+

From 6121e5affce6b65a0702e8c32dfe05dec0ea6b3c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 29 Aug 2017 15:07:16 +0200
Subject: [PATCH 122/222] l10n: transifex: add properties files for other
 exchangecalendar files

Manually added because rtwes.dtd and rtwes.properties uses same resource identifier otherwise.
---
 .tx/config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.tx/config b/.tx/config
index f0f71870..7f48efbf 100644
--- a/.tx/config
+++ b/.tx/config
@@ -151,6 +151,12 @@ source_file = locale/exchangecalendar/en/rtews.dtd
 source_lang = en
 type = DTD
 
+[exchangecalendar.rtews-properties]
+file_filter = locale/exchangecalendar/<lang>/rtews.properties
+source_file = locale/exchangecalendar/en/rtews.properties
+source_lang = en
+type = MOZILLAPROPERTIES
+
 [exchangecalendar.selectEWSUrl]
 file_filter = locale/exchangecalendar/<lang>/selectEWSUrl.dtd
 source_file = locale/exchangecalendar/en/selectEWSUrl.dtd
@@ -175,3 +181,9 @@ source_file = locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
 source_lang = en
 type = DTD
 
+[exchangecalendar.calExchangeCalendar]
+file_filter = locale/exchangecalendar/<lang>/calExchangeCalendar.properties
+source_file = locale/exchangecalendar/en/calExchangeCalendar.properties
+source_lang = en
+type = MOZILLAPROPERTIES
+

From 222056be967b288f2be48214a991a3b94cf4fa33 Mon Sep 17 00:00:00 2001
From: Brian Goad <bdgoad@gmail.com>
Date: Tue, 19 Sep 2017 13:12:03 -0400
Subject: [PATCH 123/222] Upgrade the console messages to redirect to the
 ExchangeCalendar Github page instead of Ericsson

---
 components/ecExchangeRequest.js                               | 2 +-
 components/erBrowseFolder.js                                  | 2 +-
 .../mivExchangeAuthPromptProvider.js                          | 2 +-
 interfaces/updater/mivUpdater.js                              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index f0dd9a61..fe5ef0ff 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -1219,7 +1219,7 @@ ecnsIAuthPrompt2.prototype = {
 			return Cr.NS_NOINTERFACE;  // We do not support this.
 		}
 
-		this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/Ericsson/exchangecalendar/issues: ecnsIAuthPrompt2.getInterface("+iid+")");
+		this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: ecnsIAuthPrompt2.getInterface("+iid+")");
 		throw Cr.NS_NOINTERFACE;
 	},
 
diff --git a/components/erBrowseFolder.js b/components/erBrowseFolder.js
index 4c639254..4f08583d 100644
--- a/components/erBrowseFolder.js
+++ b/components/erBrowseFolder.js
@@ -134,7 +134,7 @@ erBrowseFolderRequest.prototype = {
 				}
 				else {
 					// We do not know how to handle this yet. Do not know if it ever happens. We did not restrict MaxEntriesReturned.
-					exchWebService.commonFunctions.LOG("SUBMIT THIS LINE TO https://github.com/Ericsson/exchangecalendar/issues: IncludesLastItemInRange == false in FindFolderResponse.");
+					exchWebService.commonFunctions.LOG("SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: IncludesLastItemInRange == false in FindFolderResponse.");
 				}
 			}
 			else {
diff --git a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js b/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
index adabbbf0..e465b189 100644
--- a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
+++ b/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
@@ -64,7 +64,7 @@ mivExchangeAuthPromptProvider.prototype = {
 		} 
 
 		this.logInfo("  --- mivExchangeAuthPromptProvider.getAuthPrompt:aPromptReason:"+aPromptReason+", iid:"+iid);
-		this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/Ericsson/exchangecalendar/issues: ecnsIAuthPrompt2.getAuthPrompt("+iid+")");
+		this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: ecnsIAuthPrompt2.getAuthPrompt("+iid+")");
   
 		return Cr.NS_ERROR_NOT_AVAILABLE;
 	},
diff --git a/interfaces/updater/mivUpdater.js b/interfaces/updater/mivUpdater.js
index 254ff0ae..5d054d84 100644
--- a/interfaces/updater/mivUpdater.js
+++ b/interfaces/updater/mivUpdater.js
@@ -240,7 +240,7 @@ mivUpdater.prototype = {
 	addonByIDCallback: function _addonByIDCallback(aAddon)
 	{
 		if (aAddon) {
-			var url="https://api.github.com/repos/Ericsson/exchangecalendar/releases";
+			var url="https://api.github.com/repos/ExchangeCalendar/exchangecalendar/releases";
 			this._addon = aAddon;
 			this._updateURL = this.safeGetCharPref(null, EXTENSION_MAINPART+this._extensionID, url, true);
 			this._updateURL = url;
@@ -292,7 +292,7 @@ mivUpdater.prototype = {
 		var actualJson=JSON.parse(xmlReq.responseText);
 		var latest = 0;
 		var updateDetails = [];
- 		updateDetails[3]='https://github.com/Ericsson/exchangecalendar/wiki'; 
+ 		updateDetails[3]='https://github.com/ExchangeCalendar/exchangecalendar/wiki'; 
 		if( actualJson.length > 0 ){
 			updateDetails[0]=actualJson[latest].prerelease; 
 			updateDetails[1]=actualJson[latest].tag_name;

From 695b06ec7574dfb8c8de60e5fbcb832fe5e8612b Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 22 Sep 2017 22:48:26 +0200
Subject: [PATCH 124/222] remove home made translation updater

Now we use Transifex to update translations, that mean that we'll use the standard Transifex cient to update our source code according to resource configuiration made in /.tx/config file
---
 translationupdater.sh | 210 ------------------------------------------
 1 file changed, 210 deletions(-)
 delete mode 100755 translationupdater.sh

diff --git a/translationupdater.sh b/translationupdater.sh
deleted file mode 100755
index ff76fbe9..00000000
--- a/translationupdater.sh
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/bash
- 
-declare -a LOCALEFILES 
-declare -a LOCALEFOLDERS 
-
-declare -a ELOG
-
-ECOUNT=0
-
-LOCALEROOT=""
-LOCALEFILESCOUNT=0
-LOCALEFOLDERSCOUNT=0
-
-LOCALEROOT=""  
-ENUSFOLDERPATH=""
-function IsFolder(){
-	DIR=$1
-	[ -d $DIR ] && [ -n $DIR ] && echo "true" || echo "false"	 
-}
-
-function IsFile(){
-	FILE=$1
-	[ -f $FILE ] && [ -n $FILE ] && echo "true" || echo "false"	
-}
-
-function LogLine(){
-	[ -n "$1" ] &&echo -en "\n$1"  
-}
-
-function LogError(){  
-	echo -en "\nERROR:- $1."
-	echo -en "\n"
-	exit 1 
-}
-
-function GetLocaleFolder(){
-	if [ "$(IsFolder $LOCALEROOT)" = "false" ];then
-	LogError "Not a valid locale folder"
-	fi	
-	LOCALEFOLDERS=( $( find $LOCALEROOT -maxdepth 1 -type d | sed "s|^$LOCALEROOT/||" ) )
-}
- 
-function GetEnUsFiles(){
-	if [ "$(IsFolder $ENUSFOLDERPATH)" = "false" ];then
-	LogError "Locale(en-US) Path is not valid"
-	fi	
-	
-	LOCALEFILES=( $( find $ENUSFOLDERPATH  -type f 	 -name "*.dtd" | sed "s|^$ENUSFOLDERPATH/||" ) )
-}
- 
-function CopyMissingFiles(){
-	 LogLine "\n**Copying missing files from en-Us"
-	
-	stage=0
-	#loop each locale folder
-	for FLDR in "${LOCALEFOLDERS[@]}"
-	do	
-			MissingCount=0
-			TEMPFOLDER=""
-			TEMPFOLDER="$LOCALEROOT/$FLDR"
-			 			
- 			[  $LOCALEROOT = "$FLDR" ]	 && continue
-			[  $TEMPFOLDER = $ENUSFOLDERPATH  ]	 && continue 
-			[ "$( IsFolder $TEMPFOLDER)" = "false" ] && continue
-		
-			LogLine "\n[$((++stage))]Checking for missing files in Locale Folder $FLDR"
-			
-			#loop each file in en-us folder with others
-			for FLS in "${LOCALEFILES[@]}"
-			do
-				TEMPFILE=""
-				TEMPFILE="$TEMPFOLDER/$FLS"
-									
-				ENFILE=""
-				ENFILE=$ENUSFOLDERPATH/$FLS
-				
-				if [ "$(IsFile $TEMPFILE)" = "true" ];then
-					:
-				else			
-						((MissingCount++))
-						#lets copy the missing files
-						status="fail"  
-						cp  "$ENFILE" "$TEMPFILE"
-						if [ $? -eq 0 ];then
-							status="success"
-						fi
-						ELOG[$((ECOUNT++))]="cp: $ENFILE --> $TEMPFILE -- $status"
-				fi
-						
-			done	
-			[ $MissingCount -gt 0 ] &&	LogLine "MissingCount: $MissingCount" 	
-	done
-}
-
-function CopyMissingTranslation(){
-	 LogLine "\n**Copying missing tranlation from en-Us files"
-	stage=0
-	#loop each locale folder
-	for FLDR in "${LOCALEFOLDERS[@]}"
-	do	
-			TEMPFOLDER=""
-			TEMPFOLDER="$LOCALEROOT/$FLDR"
-			 			
- 			[  $LOCALEROOT = "$FLDR" ]	 && continue
-			[  $TEMPFOLDER = $ENUSFOLDERPATH  ]	 && continue 
-			[ "$( IsFolder $TEMPFOLDER)" = "false" ] && continue
-		
-			LogLine "\n[$((++stage))]Checking for missing translation in Locale Folder $FLDR"
-			
-			#loop each file in en-us folder with others
-			for FLS in "${LOCALEFILES[@]}"
-			do
-				TEMPFILE=""
-				TEMPFILE="$TEMPFOLDER/$FLS"
-									
-				ENFILE=""
-				ENFILE=$ENUSFOLDERPATH/$FLS
-				
-				if [ "$(IsFile $TEMPFILE)" = "true" ];then 
-					#process one file in en-Us at a time with current locale folder
-					declare -a ENLINE
-					MissingCount=0 
-					while read ENLINE
-					do 
- 						
-						#convert line to array
-						declare -a LINEARR=(`echo "$ENLINE"`) 
-										
-						#we know that fild 1 is identifier in dtd file 
-    					IDENTIFIER=${LINEARR[1]}	
-    					
-    					grep  "$IDENTIFIER" "$TEMPFILE"  >/dev/null 
-    					if [ $? -eq 0 ];then
-    						:
-    					else
-    						 ((MissingCount++))    						 
-    						#lets copy the missing files
-							status="fail"  
-     						echo "$ENLINE" >> $TEMPFILE 
-							if [ $? -eq 0 ];then
-								status="success"
-							fi
-    						ELOG[$((ECOUNT++))]="+>> $IDENTIFIER --> $TEMPFILE -- $status"    												 
-    					fi    			
-					done<$ENFILE   
-					[ $MissingCount -gt 0 ] &&	LogLine "$TEMPFILE\nMissingCount: $MissingCount" 		 
-				else	
-					:		 
-				fi
-						
-			done	
-	done
-}
-
-function ExtaLog(){
-			LogLine "\n**More Logs:"
-			
-			for Line in "${ELOG[@]}"
-			do
-				LogLine "$Line"
-			done
-}
- 
-#Propmt for path
-ROOT=$1
-
-[ $# -lt 1 ] && LogError "Input Required. Exit"
-
-if [ "$(IsFolder $ROOT)" = "false" ];then
-	LogError "Folder \"$ROOT\" is invalid"
-fi 
-
-LogLine "ROOT Set to $ROOT"   
-LOCALEROOT="$ROOT/locale/exchangecalendar"
-LogLine "Locale Path: $LOCALEROOT" 
-ENUSFOLDERPATH="$LOCALEROOT/en-US"
-LogLine "en-US Locale Path: $ENUSFOLDERPATH"  
-
-#GetLocaleFolder
-GetLocaleFolder
-LOCALEFOLDERSCOUNT=${#LOCALEFOLDERS[@]} 
-#echo -en  "c" ${#LOCALEFOLDERS[@]} ${LOCALEFOLDERS[@]}
-
-if [ ${#LOCALEFOLDERSCOUNT[@]} -lt 1  ] ; then
-LogError "Locale Folder not found"
-fi
-
-GetEnUsFiles
-LOCALEFILESCOUNT=${#LOCALEFILES[@]} 
-#echo -en  "c" ${#LOCALEFILES[@]} ${LOCALEFILES[@]}
-
-if [ ${#LOCALEFILESCOUNT[@]} -lt 1  ] ; then
-LogError "Locale files not found"
-fi
-#lets copy missing locale file in other folders from en-Us
-CopyMissingFiles 
-
-#lets copy missing locale translation to other files from en-Us 
-CopyMissingTranslation
-
-if [ ${#ELOG[@]} -gt 0  ] ; then
-LogLine ""
-read -n 1 -p 'Do you see extra logs [y/N?]' REPLY
-[ "$REPLY" = "y" ] && ExtaLog
-
-LogLine "\n--->Log Wrtitten to /tmp/ExtraLog"
-echo -en "${ELOG[@]} " > /tmp/ExtraLog
-fi
- 
-echo -ne "\n"

From 75064b2676d3a3245cb32286b4845c4c2ecb46d2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 22 Sep 2017 22:49:29 +0200
Subject: [PATCH 125/222] cleaning build tools: use simpler Makefile instead of
 home made build.sh script

---
 Makefile | 28 ++++++++++++++++++++++++++++
 VERSION  |  1 +
 build.sh | 32 --------------------------------
 3 files changed, 29 insertions(+), 32 deletions(-)
 create mode 100644 Makefile
 create mode 100644 VERSION
 delete mode 100755 build.sh

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..43d3cf01
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,28 @@
+version = $(shell cat VERSION)
+excludefromxpi = \*.git \*.xpi \*.sh update\*.txt Makefile VERSION
+
+# Target to beautify and build your code while developing it
+dev: beautify build
+
+# Beautifier are configured to use indentation with 4 spaces
+beautify: beautify-xml beautify-js
+
+build:
+	# Update version number inside install.rdf file from VERSION file
+	sed -i 's/\(\s*\)<em:version>[^<]*\?<\/em:version>/\1<em:version>$(version)<\/em:version>/' install.rdf
+	# Disable automatic updates of the extension
+	cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
+	# Finally, create the xpi file
+	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
+
+beautify-xml:
+	find \( -name "*.xml" -o -name "*.rdf" -o -name "*.xul" \) -exec \
+		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
+		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
+		--strict-tags-attributes no --write-back yes \
+		 {} \;
+beautify-js:
+	find -name "*.js" -exec \
+		js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \
+		--operator-position after-newline --brace-style end-expand --replace \
+		{} \;
diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000..922d4daa
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+4.0.0-beta5
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 74e7f71f..00000000
--- a/build.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-usage() {
-    printf "Usage: %s [ -u | -d ]\n" "$0" 1>&2
-    printf "  -u   enable update\n" 1>&2
-    printf "  -d   disable update\n" 1>&2
-    exit 1
-}
-
-if [ $# = 0 ];then
-    usage
-fi
-
-version=$(sed -n -e "s/.*<em:version>\(.*\)<\/em:version>/\1/p" install.rdf)
-while getopts ":ud" OPTION
-do
-    case ${OPTION} in
-        u) echo "update"  
-	   cat defaults/preferences/update_enable.txt > defaults/preferences/update.js
- 	   zip -r exchangecalendar-v"$version".xpi ./* -x \*.git \*.xpi \*.sh  update\*.txt
-	   exit
-	   ;;
-        d) echo "no update" 
-	   cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
- 	   zip -r exchangecalendar-v"$version".xpi ./* -x \*.git \*.xpi \*.sh  update\*.txt
-	   exit
-	   ;;
-	*) usage ;; 
-    esac
-done 
-
-usage

From b4e21e8168245243e7dc270c72b2d71576e56a19 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 22 Sep 2017 23:42:30 +0200
Subject: [PATCH 126/222] install.rdf: update with ExchangeCalendar
 informations

Remove long descriptions as [Mozilla documentation](https://developer.mozilla.org/en-US/Add-ons/Install_Manifests)
says that it should be one short line.

Add a link to the GitHub repo to give more complete informations to user.
---
 install.rdf | 157 +++++++++-------------------------------------------
 1 file changed, 25 insertions(+), 132 deletions(-)

diff --git a/install.rdf b/install.rdf
index babc7c69..ec9f5ce0 100644
--- a/install.rdf
+++ b/install.rdf
@@ -1,40 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
-    <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>4.0.0-beta4</em:version>
+    <em:id>exchangecalendar@ExchangeCalendar</em:id>
+    <em:version>4.0.0-beta5</em:version>
     <em:targetApplication>
       <Description>
-      	<!-- Thunderbird -->
+        <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>12.0</em:minVersion>
-        <em:maxVersion>52.*</em:maxVersion>
+        <em:minVersion>52.0.0</em:minVersion>
+        <em:maxVersion>52.*.*</em:maxVersion>
       </Description>
     </em:targetApplication>
-
     <em:targetApplication>
       <Description>
-          <!-- Seamonkey -->
+        <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.6</em:minVersion>
-        <em:maxVersion>2.46.*</em:maxVersion>
+        <em:minVersion>2.49.*</em:minVersion>
+        <em:maxVersion>2.49.*</em:maxVersion>
       </Description>
     </em:targetApplication>
-
-    <em:name>Exchange EWS Provider</em:name>
-    <em:description>Allows you to sync calendars, tasks, and contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within Lightning.
-
-You can view, delete, create, and update calendar and task/todo items, and manage "out of office" settings.
-You can read and use contacts and global address list contacts for address autocompletion.
-
-Dutch, French, English, German, Swedish, Japanese, Russian, Italian and Turkish localizations.
-
-Some of the icons and images used are from the Fugue Icons Collection made by Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
-    <em:creator>Ericsson (exchangecalendar@ericsson.com)</em:creator>
-    <em:developer>Michel Verbraak</em:developer>
+    <em:name>Exchange Calendar</em:name>
+    <em:homepageURL>https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
+    <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
+    <em:creator>Michel Verbraak</em:creator>
+    <em:developer>ExchangeCalendar community</em:developer>
     <em:translator>Michel Verbraak (nl)</em:translator>
     <em:translator>Michel Verbraak (en-US)</em:translator>
     <em:translator>Dominique Fillon (fr-FR)</em:translator>
@@ -44,115 +33,19 @@ Some of the icons and images used are from the Fugue Icons Collection made by Yu
     <em:translator>Alexey Sinitsyn (ru)</em:translator>
     <em:translator>Alessandro Menti (it-IT)</em:translator>
     <em:translator>Engin Özkan (tr)</em:translator>
-    <em:homepageURL>http://www.1st-setup.nl/wordpress/?page_id=133</em:homepageURL>
-    <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
-    <em:type>2</em:type> <!-- type: extension -->
-    <em:unpack>true</em:unpack>
-
-	<em:localized>
-		<Description>
-			<em:locale>en-US</em:locale>
-			<em:name>Exchange EWS Provider</em:name>
-			<em:description>Allows you to sync calendars, tasks, and contacts with your Microsoft Exchange 2007/2010/2013 EWS server from within Lightning.
-
-You can view, delete, create, and update calendar and task/todo items, and manage "out of office" settings.
-You can read and use contacts and global address list contacts for address autocompletion.
-
-Dutch, French, English, German, Swedish, Japanese, Russian, Italian and Turkish localizations.
-
-Some of the icons and images used are from the Fugue Icons Collection made by Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
-		</Description>
-	</em:localized>
-
     <em:localized>
         <Description>
-            <em:locale>de</em:locale>
-                <em:name>Exchange EWS Provider</em:name>
-                <em:description>Ermöglicht es Ihnen Kalender, Aufgaben und Kontakte mit einem Microsoft Exchange 2007/2010/2013 EWS Server aus Lightning heraus zu synchronisieren.
-
-Sie können diese Kalender- und Aufgabeneinträge betrachten, löschen, erstellen und aktualisieren. Sie können die "Out of Office"-Einstellungen verwalten.
-Sie können Kontakte und globale Adresslisten lesen und für die Autovervollständigung der Adressen nutzen.
-
-Übersetzungen in Niederländisch, Französisch, Deutsch, Schwedisch, Japanisch, Russisch, Italienisch und Türkisch.
-
-Einige der Icons und die Bilder werden aus der Fugue Icons Collection erstellt von Yusuke Kamiyamane (http://p.yusukekamiyamane.com/) genutzt.
-               </em:description>
+            <em:locale>en</em:locale>
+            <em:name>Exchange Calendar</em:name>
+            <em:description>Exchange Calendar provides some Microsoft Exchange interfaces for the Lightning calendar.</em:description>
+        </Description>
+    </em:localized>
+    <em:localized>
+        <Description>
+            <em:locale>fr</em:locale>
+            <em:name>Exchange Calendar</em:name>
+            <em:description>Exchange Calendar fournit quelques interfaces Microsoft Exchange pour le calendrier Lightning.</em:description>
         </Description>
     </em:localized>
-
-	<em:localized>
-		<Description>
-			<em:locale>nl</em:locale>
-			<em:name>Exchange EWS Provider</em:name>
-			<em:description>Verzorgt de toegang tot een Microsoft Exchange 2007/2010/2013 EWS server binnen lightning.
-Op dit moment kan men agenda en taken items bekijken, wijzigen, maken en verwijderen. En Out of Office instellen.
-Tevens kan je je persoonlijke contacten en die in de Global Addres List lezen, bekijken en gebruiken in adres autocompletion.
-
-Je kunt ook de Exchange (EWS) instellingen aanpassen.
-
-In het Nederlands, Frans, Engels, Duits, Zweeds en Japans vertaald.
-
-Sommige van de iconen en plaatjes komen uit de Fugue Icons collectie gemaakt door Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
-		</Description>
-	</em:localized>
-
-	<em:localized>
-		<Description>
-			<em:locale>ja-JP</em:locale>
-			<em:name>Exchange EWS Provider</em:name>
-			<em:description>予定表と仕事について、lightningで、マイクロソフト Exchange 2007/2010/2013 EWSサーバと同期できるようにします。
-
-予定表・仕事ややることリストの、閲覧や削除、作成と更新が可能です。「外出中」の管理も可能です。
-
-オランダ語やフランス語、英語、ドイツ語、そして日本語の地域化が提供されます。
-
-使用されている一部のアイコンやイメージは、Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)さんの、the Fugue Icons Collectionから取られました。</em:description>
-		</Description>
-	</em:localized>
-
-	<em:localized>
-		<Description>
-			<em:locale>ru</em:locale>
-			<em:name>Exchange EWS Provider</em:name>
-			<em:description>Позволяет вам синхронизировать календарь, задачи и контакты с вашим Microsoft Exchange 2007/2010/2013 EWS сервером из Lightning дополнения.
-
-Вы можете просматривать, удалять, создавать, обновлять элементы календаря и задач. И управлять настройками "Заместителя".
-Вы можете читать и использовать контакты и глобальный список контактов для вставки адресов в письма автозавершением.
-
-Голландский, французский, английский, немецкий, шведский, японский и русский вариант национальных языковых переводов этого приложения присутствуют тут.
-
-Некоторые значки и изображения используются из коллекции Fugue Icons созданной Юсукэ Камияманэ (http://p.yusukekamiyamane.com/)</em:description>
-		</Description>
-	</em:localized>
-
-	<em:localized>
-		<Description>
-			<em:locale>it-IT</em:locale>
-			<em:name>Provider Exchange EWS</em:name>
-			<em:description>Consente di sincronizzare i propri Calendario, Attività e Contatti con un server Microsoft Exchange 2007/2010/2013 EWS da Lightning.
-
-È possibile visualizzare, eliminare, creare e aggiornare elementi del Calendario e Attività/Da fare e gestire le opzioni Fuori sede.
-È possibile leggere e utilizzare i propri contatti e i contatti della Global Address List per l'autocompletamento degli indirizzi.
-
-Localizzato in olandese, francese, inglese, tedesco, svedese, giapponese e italiano.
-
-Alcune delle icone e immagini utilizzate sono state tratte dalla Fugue Icons Collection di Yusuke Kamiyamane (http://p.yusukekamiyamane.com/)</em:description>
-		</Description>
-	</em:localized>
-	  	  
-	<em:localized>
-		<Description>
-			<em:locale>tr</em:locale>
-			<em:name>Exchange EWS Sağlayıcısı</em:name>
-			<em:description>Lightning içinde, Takvim, Görevler ve Kişileri Microsoft Exchange 2007/2010/2013 EWS sunucunuzla eşitlemenizi sağlar.
-
-Takvim ve Görev-Yapılacaklarınızdaki maddeleri görebilir ve silebilir, yeni maddeler yaratabilir ya da maddeleri güncelleyebilirsiniz. "İşyeri Dışında" ayarlarınızı da denetleyebilirsiniz.
-Kişilerinizdeki ve Genel Adres Listesindeki kişileri görebilir ve automatik adres tamamlamada kullanabilirsiniz.
-				
-Almanca, Flemenkçe, Fransızca, İngilizce, İsveççe, İtalyanca, Japonca, Rusça, ve Türkçe yerelleştirmeleri vardır.
-
-Bazı ikon ve imgeler, Yusuke Kamiyamane tarafından yapılmış olan Fugue Icons Collection'dan alınıp kullanılmıştır. (http://p.yusukekamiyamane.com/)</em:description>
-		</Description>
-	</em:localized>
-	</Description>
+  </Description>
 </RDF>

From dfd3194814fa58b32c53711979c571ee8db9074e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Fri, 22 Sep 2017 23:19:46 +0200
Subject: [PATCH 127/222] Update Changelog with last changes and Readme with
 more details

---
 CHANGELOG.md | 26 +++++++++++++-
 README.md    | 97 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 115 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b805a1c5..42a84eaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.0.0-beta5] - 2017-**-**
+### Added
+
+### Changed
+- Use Makefile instead of custom build shell
+- Update install.rdf, README with new community
+- Builds now will disable automatic update checker to avoid issue with new forks
+
+### Fixed
+
 ## [4.0.0-beta4] - 2017-07-03
 ### Added
 - Turkish localization #43, #44, #46
@@ -28,7 +38,21 @@ All notable changes to this project will be documented in this file.
 
 ## [4.0.0-beta2] - 2017-06-10
 ### Fixed
-- Opening and working with Attachment dialog #12
+- Event/Item editor dialog:
+  - Default toolbar now uses "Save and close" button as in vanilla Lightning #9
+  - Attendees dialog is now managed by Lightning directly
+  - Opening and working with Attachment dialog #12
+
+### Known bugs
+- Event/Item editor dialog:
+  - Some times, the HTML editor for task content is frozen and nothing can be edited.
+  A workaround is to close the task and open it again.
+
+
+## [4.0.0-beta1] - 2017-05-29
+First pre-release under new project and community.
+
+This release should primarily address issues with Thunderbird 52 and Lightning 5.4.
 
 ## [3.9.0] - unknown release date
 - Stable Release
diff --git a/README.md b/README.md
index d133202c..a62fa7b7 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,102 @@
-Exchange EWS Provider is an **add-on for
-[Thunderbird](https://mozilla.org/thunderbird) and
-[Lightning](https://mozilla.org/calendar)** that provides
-**[Microsoft Exchange](http://microsoft.com/exchange) calendar
-support**.
+## Introduction
+
+Exchange Calendar is an add-on for [Thunderbird](https://mozilla.org/thunderbird)
+and [Seamonkey](https://www.seamonkey-project.org/).
+
+It extends the [Lightning](https://mozilla.org/calendar) add-on to provide
+[Microsoft Exchange](http://microsoft.com/exchange) support.
+
+Exchange Calendar extension can:
+  * Synchronize calendars, tasks, and contacts with a Microsoft Exchange server.
+  * Create, edit and update events and tasks.
+  * Display contacts from your address books and the global address list
+    (they are only readable, they are usable with address autocompletion)
+  * Manage the Exchange « out of office » feature
+
+This extension requires:
+  * Lightning extension corresponding to the Thunderbird release
+  * The Exchange server has to provide an Exchange Web Service
+
+This extension was developed by its original author (Michel Verbraak) for
+Exchange 2007, 2010 and 2013.
+
+The ExchangeCalendar community is now maintaining this extension. Support is
+best effort and cannot be guaranteed. Contributions are welcome.
 
 ## Contributing
 
 This add-on is open source and based on the work of many
 [contributors](https://github.com/ExchangeCalendar/exchangecalendar/graphs/contributors).
 
-### Building
+This project is a community driven effort to keep maintained and uptodate
+the "Exchange EWS Provider" extension created by Michel Verbraak.
+
+Currently, the community is really small and have too few developers to
+give any warranty on the future. Please help us to continue this project.
+
+### Provide feedback, report issue
+
+You are welcome to provide feedback on our Github project:
+https://github.com/ExchangeCalendar/exchangecalendar
+
+Please note that the project is built only for latest stable Thunderbird release
+and latest stable Lightning release.
+
+If you use any different release, please write it in your report.
+
+As this add-on extends Thunderbird and Lightning directly, it could be in
+conflict with other add-ons.
 
-To compile the add-on, run the `build.sh` script.
+If you can give us a list of installed and enabled add-ons, it will help us.
+
+### Get project and build it
+
+To build the add-on, you have to:
+```bash
+# clone this project
+git clone https://github.com/ExchangeCalendar/exchangecalendar.git
+cd exchangecalendar
+# build it
+make build
+```
+Then an `xpi` file is created in the project folder.
+This file is directly installable from the add-on page of Thunderbird.
+
+If it doesn't work, please check you have these tools installed (example for
+Debian):
+```bash
+sudo apt install git-core zip
+```
+
+### Patch the code
+
+To help us to maintain the code, we will be thankful to follow these main
+guidelines:
+
+* Use indentation with 4 spaces
+* Avoid too long lines, try to break long lines into smaller ones
+* Avoid to write "spaghetti" code with too many if/else imbrications
+* Try to keep code simple to help us maintain it on long term
+
+Note that our `Makefile` has a `beautify` target which will try to beautify
+all JavaScript (requires `jsbeautifier` Debian package) and XML code
+(requires `tidy` package) to help maintain a clean code.
+
+When your patches are ready, you are welcome to do pull requests on our
+repository.
+
+Please help us to review your code by making multiple small pull
+requests instead of big ones modifying big parts of the code.
+
+### Translate
+
+You are welcome to provide translation updates on our Transifex project:
+https://www.transifex.com/ExchangeCalendar/exchangecalendar
 
 ## License
 
 This software is licensed under the
 [GNU General Public License, Version 3](http://www.gnu.org/licenses/gpl.html).
+
+Some of the icons and images used are from the Fugue Icons Collection made
+by [Yusuke Kamiyamane](http://p.yusukekamiyamane.com/).

From 0775928375d9a33a582270ced221a84bc6c9879f Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 8 Oct 2017 23:30:13 +0200
Subject: [PATCH 128/222] install.rdf: Revert extension ID as it's hard coded
 inside the extension code itself.

It's used with the AddOnManager calls, inside preferences and as ID to
define the calendar provider.
---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index ec9f5ce0..610f62c3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
-    <em:id>exchangecalendar@ExchangeCalendar</em:id>
+    <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
     <em:version>4.0.0-beta5</em:version>
     <em:targetApplication>
       <Description>

From 248156dd43a7209156467e5eba0fb1bfb578dc5a Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 8 Oct 2017 23:31:28 +0200
Subject: [PATCH 129/222] install.rdf: Add back "em:unpack" XML tag which has
 been removed by error.

When this tag is not included, we got exceptions on calendar creation.
---
 install.rdf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.rdf b/install.rdf
index 610f62c3..11826f91 100644
--- a/install.rdf
+++ b/install.rdf
@@ -19,6 +19,7 @@
         <em:maxVersion>2.49.*</em:maxVersion>
       </Description>
     </em:targetApplication>
+    <em:unpack>true</em:unpack>
     <em:name>Exchange Calendar</em:name>
     <em:homepageURL>https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
     <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>

From 06243bda8c71d12c151d5091cf0069988ae2215c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 8 Oct 2017 23:38:48 +0200
Subject: [PATCH 130/222] Makefile: correctly exclude .git and .tx directories
 in the build.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 43d3cf01..bee8b45c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 version = $(shell cat VERSION)
-excludefromxpi = \*.git \*.xpi \*.sh update\*.txt Makefile VERSION
+excludefromxpi = .git/\* .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION
 
 # Target to beautify and build your code while developing it
 dev: beautify build

From fb5dba725008c7d791ec0bbf8ab724f142094863 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 8 Oct 2017 23:38:48 +0200
Subject: [PATCH 131/222] Makefile: reorganize to set the build target as the
 default one

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index bee8b45c..810d3550 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,7 @@
 version = $(shell cat VERSION)
 excludefromxpi = .git/\* .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION
 
-# Target to beautify and build your code while developing it
-dev: beautify build
-
-# Beautifier are configured to use indentation with 4 spaces
-beautify: beautify-xml beautify-js
-
+# Default target is build package
 build:
 	# Update version number inside install.rdf file from VERSION file
 	sed -i 's/\(\s*\)<em:version>[^<]*\?<\/em:version>/\1<em:version>$(version)<\/em:version>/' install.rdf
@@ -15,6 +10,12 @@ build:
 	# Finally, create the xpi file
 	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
 
+# Target to beautify and build your code while developing it
+dev: beautify build
+
+# Beautifier are configured to use indentation with 4 spaces
+beautify: beautify-xml beautify-js
+
 beautify-xml:
 	find \( -name "*.xml" -o -name "*.rdf" -o -name "*.xul" \) -exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \

From 476259f029d7fa97c039b498dd7b6d601ea37eee Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Wed, 11 Oct 2017 19:49:51 +0200
Subject: [PATCH 132/222] install.rdf: description targets users

---
 install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.rdf b/install.rdf
index 11826f91..9ff17775 100644
--- a/install.rdf
+++ b/install.rdf
@@ -38,14 +38,14 @@
         <Description>
             <em:locale>en</em:locale>
             <em:name>Exchange Calendar</em:name>
-            <em:description>Exchange Calendar provides some Microsoft Exchange interfaces for the Lightning calendar.</em:description>
+            <em:description>Allows you to sync calendars, tasks, and contacts with Microsoft Exchange.</em:description>
         </Description>
     </em:localized>
     <em:localized>
         <Description>
             <em:locale>fr</em:locale>
             <em:name>Exchange Calendar</em:name>
-            <em:description>Exchange Calendar fournit quelques interfaces Microsoft Exchange pour le calendrier Lightning.</em:description>
+            <em:description>Vous permet de synchroniser les calendriers, tâches et contactes avec Microsoft Exchange.</em:description>
         </Description>
     </em:localized>
   </Description>

From 75c376570d7d5e01eef7e7aa30b279b734b34229 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 21 Oct 2017 19:12:19 +0200
Subject: [PATCH 133/222] l10n: rename directories to the Transifex notation to
 simplify get and push of translations

---
 chrome.manifest                                        | 10 +++++-----
 .../exchangeAddressBook/exchangeAddressBook.manifest   |  6 +++---
 .../{en-US => en_US}/ExchangeContacts.properties       |  0
 .../{en-US => en_US}/ExchangeDistLists.properties      |  0
 .../{en-US => en_US}/addressbookOverlay.dtd            |  0
 .../{en-US => en_US}/exchangeContactSettings.dtd       |  0
 .../{fr-FR => fr_FR}/ExchangeContacts.properties       |  0
 .../{fr-FR => fr_FR}/ExchangeDistLists.properties      |  0
 .../{fr-FR => fr_FR}/addressbookOverlay.dtd            |  0
 .../{fr-FR => fr_FR}/exchangeContactSettings.dtd       |  0
 .../{ja-JP => ja_JP}/ExchangeContacts.properties       |  0
 .../{ja-JP => ja_JP}/ExchangeDistLists.properties      |  0
 .../{ja-JP => ja_JP}/addressbookOverlay.dtd            |  0
 .../{ja-JP => ja_JP}/exchangeContactSettings.dtd       |  0
 .../{cs-CZ => cs_CZ}/attachments-view.dtd              |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/browseFolder.dtd |  0
 .../{cs-CZ => cs_CZ}/calExchangeCalendar.properties    |  0
 .../{cs-CZ => cs_CZ}/calendar-calendars-list.dtd       |  0
 .../{cs-CZ => cs_CZ}/calendar-summary-dialog.dtd       |  0
 .../{cs-CZ => cs_CZ}/delegate-calendar-dialog.dtd      |  0
 .../{cs-CZ => cs_CZ}/delegate-folder.dtd               |  0
 .../{cs-CZ => cs_CZ}/ecCalendarCreation.dtd            |  0
 .../{cs-CZ => cs_CZ}/exchangeCloneSettings.dtd         |  0
 .../{cs-CZ => cs_CZ}/exchangeReminderDialog.dtd        |  0
 .../{cs-CZ => cs_CZ}/exchangeSettings.dtd              |  0
 .../{cs-CZ => cs_CZ}/exchangeSettingsOverlay.dtd       |  0
 .../{cs-CZ => cs_CZ}/extra-priority.dtd                |  0
 .../{cs-CZ => cs_CZ}/invitationResponse.dtd            |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/inviteStyle.dtd  |  0
 .../{cs-CZ => cs_CZ}/lightning-item-iframe.dtd         |  0
 .../{cs-CZ => cs_CZ}/manageEWSAccounts.dtd             |  0
 .../{cs-CZ => cs_CZ}/messenger_task_delegation.dtd     |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/oofSettings.dtd  |  0
 .../{cs-CZ => cs_CZ}/preInvitationResponse.dtd         |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/preferences.dtd  |  0
 locale/exchangecalendar/{cs-CZ => cs_CZ}/rtews.dtd     |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/rtews.properties |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/selectEWSUrl.dtd |  0
 .../exchangecalendar/{cs-CZ => cs_CZ}/sendUpdateTo.dtd |  0
 .../{cs-CZ => cs_CZ}/sharedCalendarParser.dtd          |  0
 .../{cs-CZ => cs_CZ}/timezonePreference.dtd            |  0
 .../{en-US => en_US}/attachments-view.dtd              |  0
 .../exchangecalendar/{en-US => en_US}/browseFolder.dtd |  0
 .../{en-US => en_US}/calExchangeCalendar.properties    |  0
 .../{en-US => en_US}/calendar-calendars-list.dtd       |  0
 .../{en-US => en_US}/calendar-summary-dialog.dtd       |  0
 .../{en-US => en_US}/delegate-calendar-dialog.dtd      |  0
 .../{en-US => en_US}/delegate-folder.dtd               |  0
 .../{en-US => en_US}/ecCalendarCreation.dtd            |  0
 .../{en-US => en_US}/exchangeCloneSettings.dtd         |  0
 .../{en-US => en_US}/exchangeReminderDialog.dtd        |  0
 .../{en-US => en_US}/exchangeSettings.dtd              |  0
 .../{en-US => en_US}/exchangeSettingsOverlay.dtd       |  0
 .../{en-US => en_US}/extra-priority.dtd                |  0
 .../{en-US => en_US}/invitationResponse.dtd            |  0
 .../exchangecalendar/{en-US => en_US}/inviteStyle.dtd  |  0
 .../{en-US => en_US}/lightning-item-iframe.dtd         |  0
 .../{en-US => en_US}/manageEWSAccounts.dtd             |  0
 .../{en-US => en_US}/messenger_task_delegation.dtd     |  0
 .../exchangecalendar/{en-US => en_US}/oofSettings.dtd  |  0
 .../{en-US => en_US}/preInvitationResponse.dtd         |  0
 .../exchangecalendar/{en-US => en_US}/preferences.dtd  |  0
 locale/exchangecalendar/{en-US => en_US}/rtews.dtd     |  0
 .../exchangecalendar/{en-US => en_US}/rtews.properties |  0
 .../exchangecalendar/{en-US => en_US}/selectEWSUrl.dtd |  0
 .../exchangecalendar/{en-US => en_US}/sendUpdateTo.dtd |  0
 .../{en-US => en_US}/sharedCalendarParser.dtd          |  0
 .../{en-US => en_US}/timezonePreference.dtd            |  0
 .../{fr-FR => fr_FR}/attachments-view.dtd              |  0
 .../exchangecalendar/{fr-FR => fr_FR}/browseFolder.dtd |  0
 .../{fr-FR => fr_FR}/calExchangeCalendar.properties    |  0
 .../{fr-FR => fr_FR}/calendar-calendars-list.dtd       |  0
 .../{fr-FR => fr_FR}/calendar-summary-dialog.dtd       |  0
 .../{fr-FR => fr_FR}/delegate-calendar-dialog.dtd      |  0
 .../{fr-FR => fr_FR}/delegate-folder.dtd               |  0
 .../{fr-FR => fr_FR}/ecCalendarCreation.dtd            |  0
 .../{fr-FR => fr_FR}/exchangeCloneSettings.dtd         |  0
 .../{fr-FR => fr_FR}/exchangeReminderDialog.dtd        |  0
 .../{fr-FR => fr_FR}/exchangeSettings.dtd              |  0
 .../{fr-FR => fr_FR}/exchangeSettingsOverlay.dtd       |  0
 .../{fr-FR => fr_FR}/extra-priority.dtd                |  0
 .../{fr-FR => fr_FR}/invitationResponse.dtd            |  0
 .../exchangecalendar/{fr-FR => fr_FR}/inviteStyle.dtd  |  0
 .../{fr-FR => fr_FR}/lightning-item-iframe.dtd         |  0
 .../{fr-FR => fr_FR}/manageEWSAccounts.dtd             |  0
 .../{fr-FR => fr_FR}/messenger_task_delegation.dtd     |  0
 .../exchangecalendar/{fr-FR => fr_FR}/oofSettings.dtd  |  0
 .../{fr-FR => fr_FR}/preInvitationResponse.dtd         |  0
 .../exchangecalendar/{fr-FR => fr_FR}/preferences.dtd  |  0
 locale/exchangecalendar/{fr-FR => fr_FR}/rtews.dtd     |  0
 .../exchangecalendar/{fr-FR => fr_FR}/rtews.properties |  0
 .../exchangecalendar/{fr-FR => fr_FR}/selectEWSUrl.dtd |  0
 .../exchangecalendar/{fr-FR => fr_FR}/sendUpdateTo.dtd |  0
 .../{fr-FR => fr_FR}/sharedCalendarParser.dtd          |  0
 .../{fr-FR => fr_FR}/timezonePreference.dtd            |  0
 .../{it-IT => it_IT}/attachments-view.dtd              |  0
 .../exchangecalendar/{it-IT => it_IT}/browseFolder.dtd |  0
 .../{it-IT => it_IT}/calExchangeCalendar.properties    |  0
 .../{it-IT => it_IT}/calendar-calendars-list.dtd       |  0
 .../{it-IT => it_IT}/calendar-summary-dialog.dtd       |  0
 .../{it-IT => it_IT}/delegate-calendar-dialog.dtd      |  0
 .../{it-IT => it_IT}/delegate-folder.dtd               |  0
 .../{it-IT => it_IT}/ecCalendarCreation.dtd            |  0
 .../{it-IT => it_IT}/exchangeCloneSettings.dtd         |  0
 .../{it-IT => it_IT}/exchangeReminderDialog.dtd        |  0
 .../{it-IT => it_IT}/exchangeSettings.dtd              |  0
 .../{it-IT => it_IT}/exchangeSettingsOverlay.dtd       |  0
 .../{it-IT => it_IT}/extra-priority.dtd                |  0
 .../{it-IT => it_IT}/invitationResponse.dtd            |  0
 .../exchangecalendar/{it-IT => it_IT}/inviteStyle.dtd  |  0
 .../{it-IT => it_IT}/lightning-item-iframe.dtd         |  0
 .../{it-IT => it_IT}/manageEWSAccounts.dtd             |  0
 .../{it-IT => it_IT}/messenger_task_delegation.dtd     |  0
 .../exchangecalendar/{it-IT => it_IT}/oofSettings.dtd  |  0
 .../{it-IT => it_IT}/preInvitationResponse.dtd         |  0
 .../exchangecalendar/{it-IT => it_IT}/preferences.dtd  |  0
 locale/exchangecalendar/{it-IT => it_IT}/rtews.dtd     |  0
 .../exchangecalendar/{it-IT => it_IT}/rtews.properties |  0
 .../exchangecalendar/{it-IT => it_IT}/selectEWSUrl.dtd |  0
 .../exchangecalendar/{it-IT => it_IT}/sendUpdateTo.dtd |  0
 .../{it-IT => it_IT}/sharedCalendarParser.dtd          |  0
 .../{it-IT => it_IT}/timezonePreference.dtd            |  0
 .../{ja-JP => ja_JP}/attachments-view.dtd              |  0
 .../exchangecalendar/{ja-JP => ja_JP}/browseFolder.dtd |  0
 .../{ja-JP => ja_JP}/calExchangeCalendar.properties    |  0
 .../{ja-JP => ja_JP}/calendar-calendars-list.dtd       |  0
 .../{ja-JP => ja_JP}/calendar-summary-dialog.dtd       |  0
 .../{ja-JP => ja_JP}/delegate-calendar-dialog.dtd      |  0
 .../{ja-JP => ja_JP}/delegate-folder.dtd               |  0
 .../{ja-JP => ja_JP}/ecCalendarCreation.dtd            |  0
 .../{ja-JP => ja_JP}/exchangeCloneSettings.dtd         |  0
 .../{ja-JP => ja_JP}/exchangeReminderDialog.dtd        |  0
 .../{ja-JP => ja_JP}/exchangeSettings.dtd              |  0
 .../{ja-JP => ja_JP}/exchangeSettingsOverlay.dtd       |  0
 .../{ja-JP => ja_JP}/extra-priority.dtd                |  0
 .../{ja-JP => ja_JP}/invitationResponse.dtd            |  0
 .../exchangecalendar/{ja-JP => ja_JP}/inviteStyle.dtd  |  0
 .../{ja-JP => ja_JP}/lightning-item-iframe.dtd         |  0
 .../{ja-JP => ja_JP}/manageEWSAccounts.dtd             |  0
 .../{ja-JP => ja_JP}/messenger_task_delegation.dtd     |  0
 .../exchangecalendar/{ja-JP => ja_JP}/oofSettings.dtd  |  0
 .../{ja-JP => ja_JP}/preInvitationResponse.dtd         |  0
 .../exchangecalendar/{ja-JP => ja_JP}/preferences.dtd  |  0
 locale/exchangecalendar/{ja-JP => ja_JP}/rtews.dtd     |  0
 .../exchangecalendar/{ja-JP => ja_JP}/selectEWSUrl.dtd |  0
 .../exchangecalendar/{ja-JP => ja_JP}/sendUpdateTo.dtd |  0
 .../{ja-JP => ja_JP}/sharedCalendarParser.dtd          |  0
 .../{ja-JP => ja_JP}/timezonePreference.dtd            |  0
 148 files changed, 8 insertions(+), 8 deletions(-)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{en-US => en_US}/ExchangeContacts.properties (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{en-US => en_US}/ExchangeDistLists.properties (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{en-US => en_US}/addressbookOverlay.dtd (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{en-US => en_US}/exchangeContactSettings.dtd (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{fr-FR => fr_FR}/ExchangeContacts.properties (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{fr-FR => fr_FR}/ExchangeDistLists.properties (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{fr-FR => fr_FR}/addressbookOverlay.dtd (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{fr-FR => fr_FR}/exchangeContactSettings.dtd (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{ja-JP => ja_JP}/ExchangeContacts.properties (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{ja-JP => ja_JP}/ExchangeDistLists.properties (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{ja-JP => ja_JP}/addressbookOverlay.dtd (100%)
 rename interfaces/exchangeAddressBook/locale/exchangecontacts/{ja-JP => ja_JP}/exchangeContactSettings.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/attachments-view.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/browseFolder.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/calExchangeCalendar.properties (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/calendar-calendars-list.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/calendar-summary-dialog.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/delegate-calendar-dialog.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/delegate-folder.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/ecCalendarCreation.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/exchangeCloneSettings.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/exchangeReminderDialog.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/exchangeSettings.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/exchangeSettingsOverlay.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/extra-priority.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/invitationResponse.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/inviteStyle.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/lightning-item-iframe.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/manageEWSAccounts.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/messenger_task_delegation.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/oofSettings.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/preInvitationResponse.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/preferences.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/rtews.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/rtews.properties (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/selectEWSUrl.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/sendUpdateTo.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/sharedCalendarParser.dtd (100%)
 rename locale/exchangecalendar/{cs-CZ => cs_CZ}/timezonePreference.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/attachments-view.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/browseFolder.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/calExchangeCalendar.properties (100%)
 rename locale/exchangecalendar/{en-US => en_US}/calendar-calendars-list.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/calendar-summary-dialog.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/delegate-calendar-dialog.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/delegate-folder.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/ecCalendarCreation.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/exchangeCloneSettings.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/exchangeReminderDialog.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/exchangeSettings.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/exchangeSettingsOverlay.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/extra-priority.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/invitationResponse.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/inviteStyle.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/lightning-item-iframe.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/manageEWSAccounts.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/messenger_task_delegation.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/oofSettings.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/preInvitationResponse.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/preferences.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/rtews.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/rtews.properties (100%)
 rename locale/exchangecalendar/{en-US => en_US}/selectEWSUrl.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/sendUpdateTo.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/sharedCalendarParser.dtd (100%)
 rename locale/exchangecalendar/{en-US => en_US}/timezonePreference.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/attachments-view.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/browseFolder.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/calExchangeCalendar.properties (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/calendar-calendars-list.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/calendar-summary-dialog.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/delegate-calendar-dialog.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/delegate-folder.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/ecCalendarCreation.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/exchangeCloneSettings.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/exchangeReminderDialog.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/exchangeSettings.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/exchangeSettingsOverlay.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/extra-priority.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/invitationResponse.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/inviteStyle.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/lightning-item-iframe.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/manageEWSAccounts.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/messenger_task_delegation.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/oofSettings.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/preInvitationResponse.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/preferences.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/rtews.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/rtews.properties (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/selectEWSUrl.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/sendUpdateTo.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/sharedCalendarParser.dtd (100%)
 rename locale/exchangecalendar/{fr-FR => fr_FR}/timezonePreference.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/attachments-view.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/browseFolder.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/calExchangeCalendar.properties (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/calendar-calendars-list.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/calendar-summary-dialog.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/delegate-calendar-dialog.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/delegate-folder.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/ecCalendarCreation.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/exchangeCloneSettings.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/exchangeReminderDialog.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/exchangeSettings.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/exchangeSettingsOverlay.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/extra-priority.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/invitationResponse.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/inviteStyle.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/lightning-item-iframe.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/manageEWSAccounts.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/messenger_task_delegation.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/oofSettings.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/preInvitationResponse.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/preferences.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/rtews.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/rtews.properties (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/selectEWSUrl.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/sendUpdateTo.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/sharedCalendarParser.dtd (100%)
 rename locale/exchangecalendar/{it-IT => it_IT}/timezonePreference.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/attachments-view.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/browseFolder.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/calExchangeCalendar.properties (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/calendar-calendars-list.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/calendar-summary-dialog.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/delegate-calendar-dialog.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/delegate-folder.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/ecCalendarCreation.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/exchangeCloneSettings.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/exchangeReminderDialog.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/exchangeSettings.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/exchangeSettingsOverlay.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/extra-priority.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/invitationResponse.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/inviteStyle.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/lightning-item-iframe.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/manageEWSAccounts.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/messenger_task_delegation.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/oofSettings.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/preInvitationResponse.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/preferences.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/rtews.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/selectEWSUrl.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/sendUpdateTo.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/sharedCalendarParser.dtd (100%)
 rename locale/exchangecalendar/{ja-JP => ja_JP}/timezonePreference.dtd (100%)

diff --git a/chrome.manifest b/chrome.manifest
index f6f50799..3973e104 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -45,15 +45,15 @@ overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/conte
 
 locale exchangecalendar nl locale/exchangecalendar/nl/
 locale exchangecalendar en locale/exchangecalendar/en/
-locale exchangecalendar en-US locale/exchangecalendar/en-US/
-locale exchangecalendar fr-FR locale/exchangecalendar/fr-FR/
+locale exchangecalendar en_US locale/exchangecalendar/en_US/
+locale exchangecalendar fr_FR locale/exchangecalendar/fr_FR/
 locale exchangecalendar de locale/exchangecalendar/de/
-locale exchangecalendar ja-JP locale/exchangecalendar/ja-JP/
+locale exchangecalendar ja_JP locale/exchangecalendar/ja_JP/
 locale exchangecalendar sv locale/exchangecalendar/sv/
 locale exchangecalendar ru locale/exchangecalendar/ru/
-locale exchangecalendar it-IT locale/exchangecalendar/it-IT/
+locale exchangecalendar it_IT locale/exchangecalendar/it_IT/
 locale exchangecalendar tr locale/exchangecalendar/tr/
-locale exchangecalendar cs-CZ locale/exchangecalendar/cs-CZ/
+locale exchangecalendar cs_CZ locale/exchangecalendar/cs_CZ/
 
 manifest interfaces/exchangeCalendar/mivExchangeCalendar.manifest
 
diff --git a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
index ca8493ae..09479293 100644
--- a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
+++ b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
@@ -12,9 +12,9 @@ manifest exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
 
 locale exchangecontacts nl    locale/exchangecontacts/nl/
 locale exchangecontacts en    locale/exchangecontacts/en/
-locale exchangecontacts en-US locale/exchangecontacts/en-US/
-locale exchangecontacts fr-FR locale/exchangecontacts/fr-FR/
+locale exchangecontacts en-US locale/exchangecontacts/en_US/
+locale exchangecontacts fr-FR locale/exchangecontacts/fr_FR/
 locale exchangecontacts de    locale/exchangecontacts/de/
-locale exchangecontacts ja-JP locale/exchangecontacts/ja-JP/
+locale exchangecontacts ja-JP locale/exchangecontacts/ja_JP/
 locale exchangecontacts sv    locale/exchangecontacts/sv/
 locale exchangecontacts ru    locale/exchangecontacts/ru/
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/ExchangeContacts.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/ExchangeContacts.properties
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/ExchangeDistLists.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/ExchangeDistLists.properties
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/addressbookOverlay.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/addressbookOverlay.dtd
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/exchangeContactSettings.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en-US/exchangeContactSettings.dtd
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/ExchangeContacts.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/ExchangeContacts.properties
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/ExchangeDistLists.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/ExchangeDistLists.properties
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/addressbookOverlay.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/addressbookOverlay.dtd
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/exchangeContactSettings.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr-FR/exchangeContactSettings.dtd
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/ExchangeContacts.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/ExchangeContacts.properties
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/ExchangeDistLists.properties b/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/ExchangeDistLists.properties
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/addressbookOverlay.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/addressbookOverlay.dtd
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/exchangeContactSettings.dtd b/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja-JP/exchangeContactSettings.dtd
rename to interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/exchangeContactSettings.dtd
diff --git a/locale/exchangecalendar/cs-CZ/attachments-view.dtd b/locale/exchangecalendar/cs_CZ/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/attachments-view.dtd
rename to locale/exchangecalendar/cs_CZ/attachments-view.dtd
diff --git a/locale/exchangecalendar/cs-CZ/browseFolder.dtd b/locale/exchangecalendar/cs_CZ/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/browseFolder.dtd
rename to locale/exchangecalendar/cs_CZ/browseFolder.dtd
diff --git a/locale/exchangecalendar/cs-CZ/calExchangeCalendar.properties b/locale/exchangecalendar/cs_CZ/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/calExchangeCalendar.properties
rename to locale/exchangecalendar/cs_CZ/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/cs-CZ/calendar-calendars-list.dtd b/locale/exchangecalendar/cs_CZ/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/calendar-calendars-list.dtd
rename to locale/exchangecalendar/cs_CZ/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/cs-CZ/calendar-summary-dialog.dtd b/locale/exchangecalendar/cs_CZ/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/calendar-summary-dialog.dtd
rename to locale/exchangecalendar/cs_CZ/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/cs-CZ/delegate-calendar-dialog.dtd b/locale/exchangecalendar/cs_CZ/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/delegate-calendar-dialog.dtd
rename to locale/exchangecalendar/cs_CZ/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/cs-CZ/delegate-folder.dtd b/locale/exchangecalendar/cs_CZ/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/delegate-folder.dtd
rename to locale/exchangecalendar/cs_CZ/delegate-folder.dtd
diff --git a/locale/exchangecalendar/cs-CZ/ecCalendarCreation.dtd b/locale/exchangecalendar/cs_CZ/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/ecCalendarCreation.dtd
rename to locale/exchangecalendar/cs_CZ/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/cs-CZ/exchangeCloneSettings.dtd b/locale/exchangecalendar/cs_CZ/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/exchangeCloneSettings.dtd
rename to locale/exchangecalendar/cs_CZ/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/cs-CZ/exchangeReminderDialog.dtd b/locale/exchangecalendar/cs_CZ/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/exchangeReminderDialog.dtd
rename to locale/exchangecalendar/cs_CZ/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/cs-CZ/exchangeSettings.dtd b/locale/exchangecalendar/cs_CZ/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/exchangeSettings.dtd
rename to locale/exchangecalendar/cs_CZ/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/cs-CZ/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/cs_CZ/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/exchangeSettingsOverlay.dtd
rename to locale/exchangecalendar/cs_CZ/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/cs-CZ/extra-priority.dtd b/locale/exchangecalendar/cs_CZ/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/extra-priority.dtd
rename to locale/exchangecalendar/cs_CZ/extra-priority.dtd
diff --git a/locale/exchangecalendar/cs-CZ/invitationResponse.dtd b/locale/exchangecalendar/cs_CZ/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/invitationResponse.dtd
rename to locale/exchangecalendar/cs_CZ/invitationResponse.dtd
diff --git a/locale/exchangecalendar/cs-CZ/inviteStyle.dtd b/locale/exchangecalendar/cs_CZ/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/inviteStyle.dtd
rename to locale/exchangecalendar/cs_CZ/inviteStyle.dtd
diff --git a/locale/exchangecalendar/cs-CZ/lightning-item-iframe.dtd b/locale/exchangecalendar/cs_CZ/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/lightning-item-iframe.dtd
rename to locale/exchangecalendar/cs_CZ/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/cs-CZ/manageEWSAccounts.dtd b/locale/exchangecalendar/cs_CZ/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/manageEWSAccounts.dtd
rename to locale/exchangecalendar/cs_CZ/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/cs-CZ/messenger_task_delegation.dtd b/locale/exchangecalendar/cs_CZ/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/messenger_task_delegation.dtd
rename to locale/exchangecalendar/cs_CZ/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/cs-CZ/oofSettings.dtd b/locale/exchangecalendar/cs_CZ/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/oofSettings.dtd
rename to locale/exchangecalendar/cs_CZ/oofSettings.dtd
diff --git a/locale/exchangecalendar/cs-CZ/preInvitationResponse.dtd b/locale/exchangecalendar/cs_CZ/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/preInvitationResponse.dtd
rename to locale/exchangecalendar/cs_CZ/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/cs-CZ/preferences.dtd b/locale/exchangecalendar/cs_CZ/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/preferences.dtd
rename to locale/exchangecalendar/cs_CZ/preferences.dtd
diff --git a/locale/exchangecalendar/cs-CZ/rtews.dtd b/locale/exchangecalendar/cs_CZ/rtews.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/rtews.dtd
rename to locale/exchangecalendar/cs_CZ/rtews.dtd
diff --git a/locale/exchangecalendar/cs-CZ/rtews.properties b/locale/exchangecalendar/cs_CZ/rtews.properties
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/rtews.properties
rename to locale/exchangecalendar/cs_CZ/rtews.properties
diff --git a/locale/exchangecalendar/cs-CZ/selectEWSUrl.dtd b/locale/exchangecalendar/cs_CZ/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/selectEWSUrl.dtd
rename to locale/exchangecalendar/cs_CZ/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/cs-CZ/sendUpdateTo.dtd b/locale/exchangecalendar/cs_CZ/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/sendUpdateTo.dtd
rename to locale/exchangecalendar/cs_CZ/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/cs-CZ/sharedCalendarParser.dtd b/locale/exchangecalendar/cs_CZ/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/sharedCalendarParser.dtd
rename to locale/exchangecalendar/cs_CZ/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/cs-CZ/timezonePreference.dtd b/locale/exchangecalendar/cs_CZ/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/cs-CZ/timezonePreference.dtd
rename to locale/exchangecalendar/cs_CZ/timezonePreference.dtd
diff --git a/locale/exchangecalendar/en-US/attachments-view.dtd b/locale/exchangecalendar/en_US/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/attachments-view.dtd
rename to locale/exchangecalendar/en_US/attachments-view.dtd
diff --git a/locale/exchangecalendar/en-US/browseFolder.dtd b/locale/exchangecalendar/en_US/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/browseFolder.dtd
rename to locale/exchangecalendar/en_US/browseFolder.dtd
diff --git a/locale/exchangecalendar/en-US/calExchangeCalendar.properties b/locale/exchangecalendar/en_US/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/en-US/calExchangeCalendar.properties
rename to locale/exchangecalendar/en_US/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/en-US/calendar-calendars-list.dtd b/locale/exchangecalendar/en_US/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/calendar-calendars-list.dtd
rename to locale/exchangecalendar/en_US/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/en-US/calendar-summary-dialog.dtd b/locale/exchangecalendar/en_US/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/calendar-summary-dialog.dtd
rename to locale/exchangecalendar/en_US/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd b/locale/exchangecalendar/en_US/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/delegate-calendar-dialog.dtd
rename to locale/exchangecalendar/en_US/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/en-US/delegate-folder.dtd b/locale/exchangecalendar/en_US/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/delegate-folder.dtd
rename to locale/exchangecalendar/en_US/delegate-folder.dtd
diff --git a/locale/exchangecalendar/en-US/ecCalendarCreation.dtd b/locale/exchangecalendar/en_US/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/ecCalendarCreation.dtd
rename to locale/exchangecalendar/en_US/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/en-US/exchangeCloneSettings.dtd b/locale/exchangecalendar/en_US/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/exchangeCloneSettings.dtd
rename to locale/exchangecalendar/en_US/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/en-US/exchangeReminderDialog.dtd b/locale/exchangecalendar/en_US/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/exchangeReminderDialog.dtd
rename to locale/exchangecalendar/en_US/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/en-US/exchangeSettings.dtd b/locale/exchangecalendar/en_US/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/exchangeSettings.dtd
rename to locale/exchangecalendar/en_US/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/en_US/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
rename to locale/exchangecalendar/en_US/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/en-US/extra-priority.dtd b/locale/exchangecalendar/en_US/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/extra-priority.dtd
rename to locale/exchangecalendar/en_US/extra-priority.dtd
diff --git a/locale/exchangecalendar/en-US/invitationResponse.dtd b/locale/exchangecalendar/en_US/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/invitationResponse.dtd
rename to locale/exchangecalendar/en_US/invitationResponse.dtd
diff --git a/locale/exchangecalendar/en-US/inviteStyle.dtd b/locale/exchangecalendar/en_US/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/inviteStyle.dtd
rename to locale/exchangecalendar/en_US/inviteStyle.dtd
diff --git a/locale/exchangecalendar/en-US/lightning-item-iframe.dtd b/locale/exchangecalendar/en_US/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/lightning-item-iframe.dtd
rename to locale/exchangecalendar/en_US/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/en-US/manageEWSAccounts.dtd b/locale/exchangecalendar/en_US/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/manageEWSAccounts.dtd
rename to locale/exchangecalendar/en_US/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/en-US/messenger_task_delegation.dtd b/locale/exchangecalendar/en_US/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/messenger_task_delegation.dtd
rename to locale/exchangecalendar/en_US/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/en-US/oofSettings.dtd b/locale/exchangecalendar/en_US/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/oofSettings.dtd
rename to locale/exchangecalendar/en_US/oofSettings.dtd
diff --git a/locale/exchangecalendar/en-US/preInvitationResponse.dtd b/locale/exchangecalendar/en_US/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/preInvitationResponse.dtd
rename to locale/exchangecalendar/en_US/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/en-US/preferences.dtd b/locale/exchangecalendar/en_US/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/preferences.dtd
rename to locale/exchangecalendar/en_US/preferences.dtd
diff --git a/locale/exchangecalendar/en-US/rtews.dtd b/locale/exchangecalendar/en_US/rtews.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/rtews.dtd
rename to locale/exchangecalendar/en_US/rtews.dtd
diff --git a/locale/exchangecalendar/en-US/rtews.properties b/locale/exchangecalendar/en_US/rtews.properties
similarity index 100%
rename from locale/exchangecalendar/en-US/rtews.properties
rename to locale/exchangecalendar/en_US/rtews.properties
diff --git a/locale/exchangecalendar/en-US/selectEWSUrl.dtd b/locale/exchangecalendar/en_US/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/selectEWSUrl.dtd
rename to locale/exchangecalendar/en_US/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/en-US/sendUpdateTo.dtd b/locale/exchangecalendar/en_US/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/sendUpdateTo.dtd
rename to locale/exchangecalendar/en_US/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/en-US/sharedCalendarParser.dtd b/locale/exchangecalendar/en_US/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/sharedCalendarParser.dtd
rename to locale/exchangecalendar/en_US/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/en-US/timezonePreference.dtd b/locale/exchangecalendar/en_US/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/en-US/timezonePreference.dtd
rename to locale/exchangecalendar/en_US/timezonePreference.dtd
diff --git a/locale/exchangecalendar/fr-FR/attachments-view.dtd b/locale/exchangecalendar/fr_FR/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/attachments-view.dtd
rename to locale/exchangecalendar/fr_FR/attachments-view.dtd
diff --git a/locale/exchangecalendar/fr-FR/browseFolder.dtd b/locale/exchangecalendar/fr_FR/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/browseFolder.dtd
rename to locale/exchangecalendar/fr_FR/browseFolder.dtd
diff --git a/locale/exchangecalendar/fr-FR/calExchangeCalendar.properties b/locale/exchangecalendar/fr_FR/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/fr-FR/calExchangeCalendar.properties
rename to locale/exchangecalendar/fr_FR/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/fr-FR/calendar-calendars-list.dtd b/locale/exchangecalendar/fr_FR/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/calendar-calendars-list.dtd
rename to locale/exchangecalendar/fr_FR/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/fr-FR/calendar-summary-dialog.dtd b/locale/exchangecalendar/fr_FR/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/calendar-summary-dialog.dtd
rename to locale/exchangecalendar/fr_FR/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/fr-FR/delegate-calendar-dialog.dtd b/locale/exchangecalendar/fr_FR/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/delegate-calendar-dialog.dtd
rename to locale/exchangecalendar/fr_FR/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/fr-FR/delegate-folder.dtd b/locale/exchangecalendar/fr_FR/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/delegate-folder.dtd
rename to locale/exchangecalendar/fr_FR/delegate-folder.dtd
diff --git a/locale/exchangecalendar/fr-FR/ecCalendarCreation.dtd b/locale/exchangecalendar/fr_FR/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/ecCalendarCreation.dtd
rename to locale/exchangecalendar/fr_FR/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/fr-FR/exchangeCloneSettings.dtd b/locale/exchangecalendar/fr_FR/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/exchangeCloneSettings.dtd
rename to locale/exchangecalendar/fr_FR/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/fr-FR/exchangeReminderDialog.dtd b/locale/exchangecalendar/fr_FR/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/exchangeReminderDialog.dtd
rename to locale/exchangecalendar/fr_FR/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/fr-FR/exchangeSettings.dtd b/locale/exchangecalendar/fr_FR/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/exchangeSettings.dtd
rename to locale/exchangecalendar/fr_FR/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/fr-FR/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/fr_FR/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/exchangeSettingsOverlay.dtd
rename to locale/exchangecalendar/fr_FR/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/fr-FR/extra-priority.dtd b/locale/exchangecalendar/fr_FR/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/extra-priority.dtd
rename to locale/exchangecalendar/fr_FR/extra-priority.dtd
diff --git a/locale/exchangecalendar/fr-FR/invitationResponse.dtd b/locale/exchangecalendar/fr_FR/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/invitationResponse.dtd
rename to locale/exchangecalendar/fr_FR/invitationResponse.dtd
diff --git a/locale/exchangecalendar/fr-FR/inviteStyle.dtd b/locale/exchangecalendar/fr_FR/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/inviteStyle.dtd
rename to locale/exchangecalendar/fr_FR/inviteStyle.dtd
diff --git a/locale/exchangecalendar/fr-FR/lightning-item-iframe.dtd b/locale/exchangecalendar/fr_FR/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/lightning-item-iframe.dtd
rename to locale/exchangecalendar/fr_FR/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/fr-FR/manageEWSAccounts.dtd b/locale/exchangecalendar/fr_FR/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/manageEWSAccounts.dtd
rename to locale/exchangecalendar/fr_FR/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/fr-FR/messenger_task_delegation.dtd b/locale/exchangecalendar/fr_FR/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/messenger_task_delegation.dtd
rename to locale/exchangecalendar/fr_FR/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/fr-FR/oofSettings.dtd b/locale/exchangecalendar/fr_FR/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/oofSettings.dtd
rename to locale/exchangecalendar/fr_FR/oofSettings.dtd
diff --git a/locale/exchangecalendar/fr-FR/preInvitationResponse.dtd b/locale/exchangecalendar/fr_FR/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/preInvitationResponse.dtd
rename to locale/exchangecalendar/fr_FR/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/fr-FR/preferences.dtd b/locale/exchangecalendar/fr_FR/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/preferences.dtd
rename to locale/exchangecalendar/fr_FR/preferences.dtd
diff --git a/locale/exchangecalendar/fr-FR/rtews.dtd b/locale/exchangecalendar/fr_FR/rtews.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/rtews.dtd
rename to locale/exchangecalendar/fr_FR/rtews.dtd
diff --git a/locale/exchangecalendar/fr-FR/rtews.properties b/locale/exchangecalendar/fr_FR/rtews.properties
similarity index 100%
rename from locale/exchangecalendar/fr-FR/rtews.properties
rename to locale/exchangecalendar/fr_FR/rtews.properties
diff --git a/locale/exchangecalendar/fr-FR/selectEWSUrl.dtd b/locale/exchangecalendar/fr_FR/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/selectEWSUrl.dtd
rename to locale/exchangecalendar/fr_FR/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/fr-FR/sendUpdateTo.dtd b/locale/exchangecalendar/fr_FR/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/sendUpdateTo.dtd
rename to locale/exchangecalendar/fr_FR/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/fr-FR/sharedCalendarParser.dtd b/locale/exchangecalendar/fr_FR/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/sharedCalendarParser.dtd
rename to locale/exchangecalendar/fr_FR/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/fr-FR/timezonePreference.dtd b/locale/exchangecalendar/fr_FR/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/fr-FR/timezonePreference.dtd
rename to locale/exchangecalendar/fr_FR/timezonePreference.dtd
diff --git a/locale/exchangecalendar/it-IT/attachments-view.dtd b/locale/exchangecalendar/it_IT/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/attachments-view.dtd
rename to locale/exchangecalendar/it_IT/attachments-view.dtd
diff --git a/locale/exchangecalendar/it-IT/browseFolder.dtd b/locale/exchangecalendar/it_IT/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/browseFolder.dtd
rename to locale/exchangecalendar/it_IT/browseFolder.dtd
diff --git a/locale/exchangecalendar/it-IT/calExchangeCalendar.properties b/locale/exchangecalendar/it_IT/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/it-IT/calExchangeCalendar.properties
rename to locale/exchangecalendar/it_IT/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/it-IT/calendar-calendars-list.dtd b/locale/exchangecalendar/it_IT/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/calendar-calendars-list.dtd
rename to locale/exchangecalendar/it_IT/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/it-IT/calendar-summary-dialog.dtd b/locale/exchangecalendar/it_IT/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/calendar-summary-dialog.dtd
rename to locale/exchangecalendar/it_IT/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/it-IT/delegate-calendar-dialog.dtd b/locale/exchangecalendar/it_IT/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/delegate-calendar-dialog.dtd
rename to locale/exchangecalendar/it_IT/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/it-IT/delegate-folder.dtd b/locale/exchangecalendar/it_IT/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/delegate-folder.dtd
rename to locale/exchangecalendar/it_IT/delegate-folder.dtd
diff --git a/locale/exchangecalendar/it-IT/ecCalendarCreation.dtd b/locale/exchangecalendar/it_IT/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/ecCalendarCreation.dtd
rename to locale/exchangecalendar/it_IT/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/it-IT/exchangeCloneSettings.dtd b/locale/exchangecalendar/it_IT/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/exchangeCloneSettings.dtd
rename to locale/exchangecalendar/it_IT/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/it-IT/exchangeReminderDialog.dtd b/locale/exchangecalendar/it_IT/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/exchangeReminderDialog.dtd
rename to locale/exchangecalendar/it_IT/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/it-IT/exchangeSettings.dtd b/locale/exchangecalendar/it_IT/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/exchangeSettings.dtd
rename to locale/exchangecalendar/it_IT/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/it-IT/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/it_IT/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/exchangeSettingsOverlay.dtd
rename to locale/exchangecalendar/it_IT/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/it-IT/extra-priority.dtd b/locale/exchangecalendar/it_IT/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/extra-priority.dtd
rename to locale/exchangecalendar/it_IT/extra-priority.dtd
diff --git a/locale/exchangecalendar/it-IT/invitationResponse.dtd b/locale/exchangecalendar/it_IT/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/invitationResponse.dtd
rename to locale/exchangecalendar/it_IT/invitationResponse.dtd
diff --git a/locale/exchangecalendar/it-IT/inviteStyle.dtd b/locale/exchangecalendar/it_IT/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/inviteStyle.dtd
rename to locale/exchangecalendar/it_IT/inviteStyle.dtd
diff --git a/locale/exchangecalendar/it-IT/lightning-item-iframe.dtd b/locale/exchangecalendar/it_IT/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/lightning-item-iframe.dtd
rename to locale/exchangecalendar/it_IT/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/it-IT/manageEWSAccounts.dtd b/locale/exchangecalendar/it_IT/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/manageEWSAccounts.dtd
rename to locale/exchangecalendar/it_IT/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/it-IT/messenger_task_delegation.dtd b/locale/exchangecalendar/it_IT/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/messenger_task_delegation.dtd
rename to locale/exchangecalendar/it_IT/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/it-IT/oofSettings.dtd b/locale/exchangecalendar/it_IT/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/oofSettings.dtd
rename to locale/exchangecalendar/it_IT/oofSettings.dtd
diff --git a/locale/exchangecalendar/it-IT/preInvitationResponse.dtd b/locale/exchangecalendar/it_IT/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/preInvitationResponse.dtd
rename to locale/exchangecalendar/it_IT/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/it-IT/preferences.dtd b/locale/exchangecalendar/it_IT/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/preferences.dtd
rename to locale/exchangecalendar/it_IT/preferences.dtd
diff --git a/locale/exchangecalendar/it-IT/rtews.dtd b/locale/exchangecalendar/it_IT/rtews.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/rtews.dtd
rename to locale/exchangecalendar/it_IT/rtews.dtd
diff --git a/locale/exchangecalendar/it-IT/rtews.properties b/locale/exchangecalendar/it_IT/rtews.properties
similarity index 100%
rename from locale/exchangecalendar/it-IT/rtews.properties
rename to locale/exchangecalendar/it_IT/rtews.properties
diff --git a/locale/exchangecalendar/it-IT/selectEWSUrl.dtd b/locale/exchangecalendar/it_IT/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/selectEWSUrl.dtd
rename to locale/exchangecalendar/it_IT/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/it-IT/sendUpdateTo.dtd b/locale/exchangecalendar/it_IT/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/sendUpdateTo.dtd
rename to locale/exchangecalendar/it_IT/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/it-IT/sharedCalendarParser.dtd b/locale/exchangecalendar/it_IT/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/sharedCalendarParser.dtd
rename to locale/exchangecalendar/it_IT/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/it-IT/timezonePreference.dtd b/locale/exchangecalendar/it_IT/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/it-IT/timezonePreference.dtd
rename to locale/exchangecalendar/it_IT/timezonePreference.dtd
diff --git a/locale/exchangecalendar/ja-JP/attachments-view.dtd b/locale/exchangecalendar/ja_JP/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/attachments-view.dtd
rename to locale/exchangecalendar/ja_JP/attachments-view.dtd
diff --git a/locale/exchangecalendar/ja-JP/browseFolder.dtd b/locale/exchangecalendar/ja_JP/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/browseFolder.dtd
rename to locale/exchangecalendar/ja_JP/browseFolder.dtd
diff --git a/locale/exchangecalendar/ja-JP/calExchangeCalendar.properties b/locale/exchangecalendar/ja_JP/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/ja-JP/calExchangeCalendar.properties
rename to locale/exchangecalendar/ja_JP/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/ja-JP/calendar-calendars-list.dtd b/locale/exchangecalendar/ja_JP/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/calendar-calendars-list.dtd
rename to locale/exchangecalendar/ja_JP/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/ja-JP/calendar-summary-dialog.dtd b/locale/exchangecalendar/ja_JP/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/calendar-summary-dialog.dtd
rename to locale/exchangecalendar/ja_JP/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/ja-JP/delegate-calendar-dialog.dtd b/locale/exchangecalendar/ja_JP/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/delegate-calendar-dialog.dtd
rename to locale/exchangecalendar/ja_JP/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/ja-JP/delegate-folder.dtd b/locale/exchangecalendar/ja_JP/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/delegate-folder.dtd
rename to locale/exchangecalendar/ja_JP/delegate-folder.dtd
diff --git a/locale/exchangecalendar/ja-JP/ecCalendarCreation.dtd b/locale/exchangecalendar/ja_JP/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/ecCalendarCreation.dtd
rename to locale/exchangecalendar/ja_JP/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/ja-JP/exchangeCloneSettings.dtd b/locale/exchangecalendar/ja_JP/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/exchangeCloneSettings.dtd
rename to locale/exchangecalendar/ja_JP/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/ja-JP/exchangeReminderDialog.dtd b/locale/exchangecalendar/ja_JP/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/exchangeReminderDialog.dtd
rename to locale/exchangecalendar/ja_JP/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/ja-JP/exchangeSettings.dtd b/locale/exchangecalendar/ja_JP/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/exchangeSettings.dtd
rename to locale/exchangecalendar/ja_JP/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/ja-JP/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/ja_JP/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/exchangeSettingsOverlay.dtd
rename to locale/exchangecalendar/ja_JP/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/ja-JP/extra-priority.dtd b/locale/exchangecalendar/ja_JP/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/extra-priority.dtd
rename to locale/exchangecalendar/ja_JP/extra-priority.dtd
diff --git a/locale/exchangecalendar/ja-JP/invitationResponse.dtd b/locale/exchangecalendar/ja_JP/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/invitationResponse.dtd
rename to locale/exchangecalendar/ja_JP/invitationResponse.dtd
diff --git a/locale/exchangecalendar/ja-JP/inviteStyle.dtd b/locale/exchangecalendar/ja_JP/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/inviteStyle.dtd
rename to locale/exchangecalendar/ja_JP/inviteStyle.dtd
diff --git a/locale/exchangecalendar/ja-JP/lightning-item-iframe.dtd b/locale/exchangecalendar/ja_JP/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/lightning-item-iframe.dtd
rename to locale/exchangecalendar/ja_JP/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/ja-JP/manageEWSAccounts.dtd b/locale/exchangecalendar/ja_JP/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/manageEWSAccounts.dtd
rename to locale/exchangecalendar/ja_JP/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/ja-JP/messenger_task_delegation.dtd b/locale/exchangecalendar/ja_JP/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/messenger_task_delegation.dtd
rename to locale/exchangecalendar/ja_JP/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/ja-JP/oofSettings.dtd b/locale/exchangecalendar/ja_JP/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/oofSettings.dtd
rename to locale/exchangecalendar/ja_JP/oofSettings.dtd
diff --git a/locale/exchangecalendar/ja-JP/preInvitationResponse.dtd b/locale/exchangecalendar/ja_JP/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/preInvitationResponse.dtd
rename to locale/exchangecalendar/ja_JP/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/ja-JP/preferences.dtd b/locale/exchangecalendar/ja_JP/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/preferences.dtd
rename to locale/exchangecalendar/ja_JP/preferences.dtd
diff --git a/locale/exchangecalendar/ja-JP/rtews.dtd b/locale/exchangecalendar/ja_JP/rtews.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/rtews.dtd
rename to locale/exchangecalendar/ja_JP/rtews.dtd
diff --git a/locale/exchangecalendar/ja-JP/selectEWSUrl.dtd b/locale/exchangecalendar/ja_JP/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/selectEWSUrl.dtd
rename to locale/exchangecalendar/ja_JP/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/ja-JP/sendUpdateTo.dtd b/locale/exchangecalendar/ja_JP/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/sendUpdateTo.dtd
rename to locale/exchangecalendar/ja_JP/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/ja-JP/sharedCalendarParser.dtd b/locale/exchangecalendar/ja_JP/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/sharedCalendarParser.dtd
rename to locale/exchangecalendar/ja_JP/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/ja-JP/timezonePreference.dtd b/locale/exchangecalendar/ja_JP/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/ja-JP/timezonePreference.dtd
rename to locale/exchangecalendar/ja_JP/timezonePreference.dtd

From 47640df7f103bbe683fb982b7ef38374585f3916 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 21 Oct 2017 18:56:18 +0200
Subject: [PATCH 134/222] Makefile: add localisation and release targets

---
 Makefile | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Makefile b/Makefile
index 810d3550..8e0b7db7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 version = $(shell cat VERSION)
 excludefromxpi = .git/\* .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION
+releasebranch = ec-4.0
 
 # Default target is build package
 build:
@@ -10,6 +11,32 @@ build:
 	# Finally, create the xpi file
 	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
 
+# Target to publish a new release:
+release: l10n-auto-commit build
+	git add -- install.rdf
+	git commit -m "releases v$(version)"
+	git tag "v$(version)"
+	@echo 'Translations updated, build done, tag added.'
+	@echo 'Now, if the release is well done, please run one "git push" to publish code and one "git push v$(version)" to publish the new tag.'
+
+# Targets to update translations
+# Requires an already configured Transifex client: https://docs.transifex.com/client/introduction
+# This project has a .tx/ directory which references currently known localisation files
+
+# Get translations updates from Transifex
+l10n-get:
+	git checkout $(releasebranch)
+	tx pull -a
+
+l10n-auto-commit: l10n-get
+	git add -- locale interfaces/exchangeAddressBook/locale/
+	-git commit -m 'l10n: automatic translations updates'
+
+# Send new texts to translate to Transifex
+l10n-push:
+	git checkout $(releasebranch)
+	tx push
+
 # Target to beautify and build your code while developing it
 dev: beautify build
 

From dcb0ab58857d56115c983ec0e8c33f74bb8cded3 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 24 Oct 2017 09:30:24 +0200
Subject: [PATCH 135/222] readme: update with latest suggestions

---
 README.md | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index a62fa7b7..92d9c46e 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,12 @@ Exchange Calendar extension can:
   * Synchronize calendars, tasks, and contacts with a Microsoft Exchange server.
   * Create, edit and update events and tasks.
   * Display contacts from your address books and the global address list
-    (they are only readable, they are usable with address autocompletion)
-  * Manage the Exchange « out of office » feature
+    (they are only readable, they are usable with address autocompletion).
+  * Manage the Exchange « out of office » feature.
 
 This extension requires:
-  * Lightning extension corresponding to the Thunderbird release
-  * The Exchange server has to provide an Exchange Web Service
+  * Lightning extension corresponding to the Thunderbird release.
+  * The Exchange server has to provide an Exchange Web Service.
 
 This extension was developed by its original author (Michel Verbraak) for
 Exchange 2007, 2010 and 2013.
@@ -28,11 +28,8 @@ best effort and cannot be guaranteed. Contributions are welcome.
 This add-on is open source and based on the work of many
 [contributors](https://github.com/ExchangeCalendar/exchangecalendar/graphs/contributors).
 
-This project is a community driven effort to keep maintained and uptodate
-the "Exchange EWS Provider" extension created by Michel Verbraak.
-
-Currently, the community is really small and have too few developers to
-give any warranty on the future. Please help us to continue this project.
+This project is a community driven effort to develop and maintain the
+"Exchange EWS Provider" extension originally created by Michel Verbraak.
 
 ### Provide feedback, report issue
 
@@ -42,12 +39,12 @@ https://github.com/ExchangeCalendar/exchangecalendar
 Please note that the project is built only for latest stable Thunderbird release
 and latest stable Lightning release.
 
-If you use any different release, please write it in your report.
-
-As this add-on extends Thunderbird and Lightning directly, it could be in
-conflict with other add-ons.
-
-If you can give us a list of installed and enabled add-ons, it will help us.
+The more information you can provide about an issue, the easier it becomes to
+reproduce and fix. Examples of helpful informations are:
+  * Thunderbird version
+  * Lightning version
+  * Active Thunderbird add-ons
+  * Log output
 
 ### Get project and build it
 
@@ -95,8 +92,9 @@ https://www.transifex.com/ExchangeCalendar/exchangecalendar
 
 ## License
 
-This software is licensed under the
-[GNU General Public License, Version 3](http://www.gnu.org/licenses/gpl.html).
+This software is provided on a best-effort basis without any warranty.
+Please see the [license](http://www.gnu.org/licenses/gpl.html)
+for details.
 
 Some of the icons and images used are from the Fugue Icons Collection made
 by [Yusuke Kamiyamane](http://p.yusukekamiyamane.com/).

From ab8152a4fd4dc6bc41d485859c845888dfd32a05 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 24 Oct 2017 11:31:44 +0200
Subject: [PATCH 136/222] Beautify automatically all XML code with command
 'make beautify-xml'

---
 chrome/content/OutOfOfficeMenu.xul            |    34 +-
 chrome/content/addressingWidgetOverlay.xul    |    13 +-
 chrome/content/attachments-view.xul           |    32 +-
 chrome/content/browseFolder.xul               |    66 +-
 chrome/content/cachePreferences.xul           |    51 +-
 chrome/content/calendar-calendars-list.xul    |    86 +-
 chrome/content/calendar-common-sets.xul       |    45 +-
 .../calendar-event-dialog-attendees.xml       |   247 +-
 .../calendar-event-dialog-attendees.xul       |    11 +-
 .../calendar-event-dialog-reminder.xul        |    31 +-
 chrome/content/calendar-event-dialog.xul      |    40 +-
 chrome/content/calendar-list-tree.xml         |   341 +-
 chrome/content/calendar-properties-dialog.xul |    31 +-
 chrome/content/calendar-summary-dialog.xul    |   205 +-
 chrome/content/calendar-task-view.xul         |    78 +-
 chrome/content/check4lightning.xul            |    11 +-
 chrome/content/debugPreferences.xul           |   195 +-
 chrome/content/delegateCalendar.xul           |   522 +-
 chrome/content/ecCalendarCreation.xul         |    65 +-
 .../exchService-followup-event-dialog.xml     |  1068 +-
 chrome/content/exchWebServiceEditor.xml       |  1504 +-
 chrome/content/exchWebService_bindings.xml    |    55 +-
 chrome/content/exchangeCloneSettings.xul      |    43 +-
 chrome/content/exchangeSettings.xul           |   798 +-
 chrome/content/exchangeSettingsOverlay.xul    |   360 +-
 .../content/extra-messenger-preferences.xul   |   206 +-
 chrome/content/extra-suite-preferences.xul    |   191 +-
 chrome/content/folderPropsOverlay.xul         |   522 +-
 chrome/content/invitationResponse.xul         |   157 +-
 chrome/content/invite-style.xul               |    39 +-
 chrome/content/lightning-item-iframe.xul      |   113 +-
 chrome/content/lightningtimezoneOverlay.xul   |     7 +-
 chrome/content/manageEWSAccounts.xul          |   168 +-
 chrome/content/manageEWSAccountsMenu.xul      |    29 +-
 .../content/messenger-overlay-preferences.xul |    40 +-
 chrome/content/messenger_task_delegation.xul  |    99 +-
 chrome/content/oofSettings.xul                |   212 +-
 chrome/content/otherPreferences.xul           |   194 +-
 chrome/content/preInvitationResponse.xul      |    97 +-
 chrome/content/priority-display.xul           |    24 +-
 chrome/content/progress_panel.xml             |   203 +-
 chrome/content/progress_panel.xul             |    51 +-
 chrome/content/rtews-overlay.xul              |    20 +-
 chrome/content/selectEWSUrl.xul               |    52 +-
 chrome/content/sendUpdateTo.xul               |    55 +-
 chrome/content/sharedCalendarParser.xul       |    53 +-
 chrome/content/suite-overlay-preferences.xul  |    33 +-
 chrome/content/timezonePreference.xul         |    27 +-
 .../content/am-exchangeWebServiceMail.xul     |    20 +-
 install.rdf                                   |   111 +-
 .../chrome/content/abCardOverlay.xul          |    12 +-
 .../chrome/content/addressbookOverlay.xul     |    81 +-
 .../content/exchangeContactSettings.xul       |    61 +-
 .../chrome/content/exchangeContactsInit.xul   |    10 +-
 .../ewsTimesZoneDefinitions_2007.xml          | 17821 ++++++++++------
 55 files changed, 15833 insertions(+), 10807 deletions(-)

diff --git a/chrome/content/OutOfOfficeMenu.xul b/chrome/content/OutOfOfficeMenu.xul
index 70a67423..206c1b19 100644
--- a/chrome/content/OutOfOfficeMenu.xul
+++ b/chrome/content/OutOfOfficeMenu.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -36,20 +35,25 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-
 <overlay id="outOfOfficeMenu"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/javascript" src="chrome://exchangecalendar/content/OutOfOfficeMenu.js" />
-	<menupopup id="menu_Event_Task_Popup">
-		<menuitem id="exchangecalendar-OutOfOfficeMenu" label="Out of Office..."
-			oncommand="tmpToolsMenu.openOutofOfficeDialog();" hidden="true"/>
-	</menupopup>
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<menupopup id="taskPopup">
-		<menuitem id="exchangecalendar-tools-OutOfOfficeMenu" label="Out of Office..."
-			oncommand="tmpToolsMenu.openOutofOfficeDialog();" hidden="true"/>
-		<menuitem id="exchangecalendar-tools-aboutMemory" label="about:memory"
-			oncommand="tmpToolsMenu.showAboutMemory(false);" hidden="false"/>
-	</menupopup>
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/OutOfOfficeMenu.js" />
+    <menupopup id="menu_Event_Task_Popup">
+        <menuitem id="exchangecalendar-OutOfOfficeMenu"
+                  label="Out of Office..."
+                  oncommand="tmpToolsMenu.openOutofOfficeDialog();"
+                  hidden="true" />
+    </menupopup>
+    <menupopup id="taskPopup">
+        <menuitem id="exchangecalendar-tools-OutOfOfficeMenu"
+                  label="Out of Office..."
+                  oncommand="tmpToolsMenu.openOutofOfficeDialog();"
+                  hidden="true" />
+        <menuitem id="exchangecalendar-tools-aboutMemory"
+                  label="about:memory"
+                  oncommand="tmpToolsMenu.showAboutMemory(false);"
+                  hidden="false" />
+    </menupopup>
 </overlay>
diff --git a/chrome/content/addressingWidgetOverlay.xul b/chrome/content/addressingWidgetOverlay.xul
index 4ba15257..99f2267e 100644
--- a/chrome/content/addressingWidgetOverlay.xul
+++ b/chrome/content/addressingWidgetOverlay.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -18,14 +18,11 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay >
-
+<!DOCTYPE overlay>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/addressingWidgetOverlay.css"?>
-
 <overlay id="exchangeAddressingWidgetOverlay"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/javascript" src="chrome://exchangecalendar/content/addressingWidgetOverlay.js" /> 
-
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/addressingWidgetOverlay.js" />
 </overlay>
diff --git a/chrome/content/attachments-view.xul b/chrome/content/attachments-view.xul
index 79d2235b..8b9ec7a1 100644
--- a/chrome/content/attachments-view.xul
+++ b/chrome/content/attachments-view.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -31,51 +30,46 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/attachments-view.dtd" > 
     %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/attachments-view.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
-
-
 <overlay id="exchWebService-attachment-view"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/attachments-view.js"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/attachments-view.js" />
     <!-- Commands -->
     <commandset>
         <command id="exchWebService_openAttachment"
-                 oncommand="tmpAttachment.openAttachment();"/>
+                 oncommand="tmpAttachment.openAttachment();" />
         <command id="exchWebService_saveAttachment"
-                 oncommand="tmpAttachment.saveAttachment();"/>
+                 oncommand="tmpAttachment.saveAttachment();" />
         <command id="exchWebService_deleteAttachment"
-                 oncommand="tmpAttachment.deleteAttachment();"/>
+                 oncommand="tmpAttachment.deleteAttachment();" />
     </commandset>
-
     <!-- Update context popup-->
     <popupset id="event-dialog-popupset">
-      <menupopup id="exchWebService-attachment-popup">
+        <menupopup id="exchWebService-attachment-popup">
             <menuitem id="exchWebService-attachment-popup-open"
                       label="&event.attachments.popup.open.label;"
                       accesskey="&event.attachments.popup.open.accesskey;"
-                      command="exchWebService_openAttachment"/>
+                      command="exchWebService_openAttachment" />
             <menuitem id="exchWebService-attachment-popup-save"
                       label="&event.menu.item.save.label;"
                       accesskey="&event.menu.item.save.accesskey;"
-                      command="exchWebService_saveAttachment"/>
+                      command="exchWebService_saveAttachment" />
             <menuitem id="exchWebService-attachment-popup-delete"
                       label="&event.menu.item.delete.label;"
                       accesskey="&event.menu.item.delete.accesskey;"
                       disable-on-readonly="true"
-                      command="exchWebService_deleteAttachment"/>
-      </menupopup>
+                      command="exchWebService_deleteAttachment" />
+        </menupopup>
     </popupset>
-
 </overlay>
diff --git a/chrome/content/browseFolder.xul b/chrome/content/browseFolder.xul
index 8039154d..da4483a2 100644
--- a/chrome/content/browseFolder.xul
+++ b/chrome/content/browseFolder.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,37 +36,44 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/browseFolder.css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/browseFolder.dtd" > %dtd1;
 ]>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_BrowseFolders" 
-  title="&browsefolder.title;" 
-  buttons="accept,cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return tmpBrowseFolder.onAccept();"
-  width="640" height="380">
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/browseFolder.js"/>
-
-	<vbox flex="1">
-		<label id="exchWebService_currentSelectedPath"/>
-		<tree id="exchWebService_foldertree" flex="1" seltype="single" onselect="tmpBrowseFolder.doOnSelect();" sortResource="foldername"  sortDirection="natural">
-			<treecols>
-				<treecol id="exchWebService_foldername" label="&treecol.label.foldername;" primary="true" flex="2" fixed="false"/>
-				<treecol id="exchWebService_folderclass" label="&treecol.label.folderclass;" primary="false" flex="1" fixed="false"/>
-			</treecols>
-
-			<treechildren/>
-		</tree>
-	</vbox>
-
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_BrowseFolders"
+        title="&browsefolder.title;"
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return tmpBrowseFolder.onAccept();"
+        width="640"
+        height="380">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/browseFolder.js" />
+    <vbox flex="1">
+        <label id="exchWebService_currentSelectedPath" />
+        <tree id="exchWebService_foldertree"
+              flex="1"
+              seltype="single"
+              onselect="tmpBrowseFolder.doOnSelect();"
+              sortResource="foldername"
+              sortDirection="natural">
+            <treecols>
+                <treecol id="exchWebService_foldername"
+                         label="&treecol.label.foldername;"
+                         primary="true"
+                         flex="2"
+                         fixed="false" />
+                <treecol id="exchWebService_folderclass"
+                         label="&treecol.label.folderclass;"
+                         primary="false"
+                         flex="1"
+                         fixed="false" />
+            </treecols>
+            <treechildren />
+        </tree>
+    </vbox>
 </dialog>
diff --git a/chrome/content/cachePreferences.xul b/chrome/content/cachePreferences.xul
index df672f08..b6acd0cd 100644
--- a/chrome/content/cachePreferences.xul
+++ b/chrome/content/cachePreferences.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -36,8 +36,8 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay [
+<!DOCTYPE overlay
+[
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
@@ -45,42 +45,41 @@
     %preferencesDTD;
     %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
-
 <overlay id="exchangeWebService_cache_preferences_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="exchangeWebService_cache_preferences_vbox">
-
         <preferences>
             <preference id="extensions.1st-setup.cache.startupBefore"
                         name="extensions.1st-setup.cache.startupBefore"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.cache.startupAfter"
                         name="extensions.1st-setup.cache.startupAfter"
-                        type="int"/>
-
+                        type="int" />
         </preferences>
-
         <groupbox id="exchangeWebService_cache_memory_groupbox1">
-            <caption label="&exchangeWebService.preference.cache.memory.label;"/>
+            <caption label="&exchangeWebService.preference.cache.memory.label;" />
             <vbox>
-		    <hbox>
-			<label value="&exchangeWebService.preference.cache.memory.startupBefore.label;"/>
-			<textbox id="exchangeWebService_preference_cache_startupBefore_textbox" 
-				preference="extensions.1st-setup.cache.startupBefore"
-				increment="1" min="0" max="9999" type="number"/>
-		    </hbox>
-		    <hbox>
-			<label value="&exchangeWebService.preference.cache.memory.startupAfter.label;"/>
-			<textbox id="exchangeWebService_preference_cache_startupAfter_textbox" 
-				preference="extensions.1st-setup.cache.startupAfter"
-				increment="1" min="0" max="9999" type="number"/>
-		    </hbox>
+                <hbox>
+                    <label value="&exchangeWebService.preference.cache.memory.startupBefore.label;" />
+                    <textbox id="exchangeWebService_preference_cache_startupBefore_textbox"
+                             preference="extensions.1st-setup.cache.startupBefore"
+                             increment="1"
+                             min="0"
+                             max="9999"
+                             type="number" />
+                </hbox>
+                <hbox>
+                    <label value="&exchangeWebService.preference.cache.memory.startupAfter.label;" />
+                    <textbox id="exchangeWebService_preference_cache_startupAfter_textbox"
+                             preference="extensions.1st-setup.cache.startupAfter"
+                             increment="1"
+                             min="0"
+                             max="9999"
+                             type="number" />
+                </hbox>
             </vbox>
-	</groupbox>
-
+        </groupbox>
     </vbox>
 </overlay>
diff --git a/chrome/content/calendar-calendars-list.xul b/chrome/content/calendar-calendars-list.xul
index 2946cdb0..472b4506 100644
--- a/chrome/content/calendar-calendars-list.xul
+++ b/chrome/content/calendar-calendars-list.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,50 +36,49 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-calendars-list.css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://exchangecalendar/locale/calendar-calendars-list.dtd">
-
+<!DOCTYPE 
+overlay SYSTEM "chrome://exchangecalendar/locale/calendar-calendars-list.dtd">
 <overlay id="calendar-list-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-calendars-list.js"/>
-
-  <commandset id="calendar_commands">
-    <command id="exchWebService_convert_calendar_command" oncommand="tmpCalPopUpMenu.convertSettings()"/>
-    <command id="exchWebService_edit_calendar_command" oncommand="tmpCalPopUpMenu.editExchangeSettings()"/>
-    <command id="exchWebService_oof_settings_command" oncommand="tmpCalPopUpMenu.editOofSettings()"/>
-    <command id="exchWebService_clone_settings_command" oncommand="tmpCalPopUpMenu.cloneSettings()"/>
-    <command id="exchWebService_delegate_calendar_settings_command" oncommand="tmpCalPopUpMenu.delegateCalendarSettings()"/>
-  </commandset>
-
-  <popupset id="calendar-popupset">
-    <menupopup id="list-calendars-context-menu"
-		onpopupshown="tmpCalPopUpMenu.checkForExchangeCalendar()">
-      <menuitem id="exchWebService-list-calendars-context-convertFromOldAddOn"
-                label="&calendar.context.exchange.convert.label;"
-                observes="exchWebService_convert_calendar_command"/>
-      <menuitem id="exchWebService-list-calendars-context-exchange-edit"
-                label="&calendar.context.exchange.properties.label;"
-                observes="exchWebService_edit_calendar_command"/>
-      <menuitem id="exchWebService-list-calendars-context-exchange-oof-settings"
-                label="&calendar.context.exchange.oof.settings.label;"
-                observes="exchWebService_oof_settings_command"/>
-      <menuitem id="exchWebService-list-calendars-context-exchange-clone-settings"
-                label="&calendar.context.exchange.clone.settings.label;"
-                observes="exchWebService_clone_settings_command"/>
-      <menuitem id="exchWebService-list-calendars-context-delegate-calendar-settings" 
-                label="&calendar.context.exchange.delegate.calendar.settings.label;" 
-                observes="exchWebService_delegate_calendar_settings_command" />     
-    </menupopup>
-    <tooltip id="calendar-list-tooltip"
-             onpopupshowing="return tmpCalPopUpMenu.tooltipShowing(event)"/>
-  </popupset>
-
-  <calendar-list-tree id="calendar-list-tree-widget"
-                      type="exchange"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-calendars-list.js" />
+    <commandset id="calendar_commands">
+        <command id="exchWebService_convert_calendar_command"
+                 oncommand="tmpCalPopUpMenu.convertSettings()" />
+        <command id="exchWebService_edit_calendar_command"
+                 oncommand="tmpCalPopUpMenu.editExchangeSettings()" />
+        <command id="exchWebService_oof_settings_command"
+                 oncommand="tmpCalPopUpMenu.editOofSettings()" />
+        <command id="exchWebService_clone_settings_command"
+                 oncommand="tmpCalPopUpMenu.cloneSettings()" />
+        <command id="exchWebService_delegate_calendar_settings_command"
+                 oncommand="tmpCalPopUpMenu.delegateCalendarSettings()" />
+    </commandset>
+    <popupset id="calendar-popupset">
+        <menupopup id="list-calendars-context-menu"
+                   onpopupshown="tmpCalPopUpMenu.checkForExchangeCalendar()">
+                   
+            <menuitem id="exchWebService-list-calendars-context-convertFromOldAddOn"
+                      label="&calendar.context.exchange.convert.label;"
+                      observes="exchWebService_convert_calendar_command" />
+            <menuitem id="exchWebService-list-calendars-context-exchange-edit"
+                      label="&calendar.context.exchange.properties.label;"
+                      observes="exchWebService_edit_calendar_command" />
+            <menuitem id="exchWebService-list-calendars-context-exchange-oof-settings"
+                      label="&calendar.context.exchange.oof.settings.label;"
+                      observes="exchWebService_oof_settings_command" />
+            <menuitem id="exchWebService-list-calendars-context-exchange-clone-settings"
+                      label="&calendar.context.exchange.clone.settings.label;"
+                      observes="exchWebService_clone_settings_command" />
+            <menuitem id="exchWebService-list-calendars-context-delegate-calendar-settings"
+                      label="&calendar.context.exchange.delegate.calendar.settings.label;"
+                      observes="exchWebService_delegate_calendar_settings_command" />
+        </menupopup>
+        <tooltip id="calendar-list-tooltip"
+                 onpopupshowing="return tmpCalPopUpMenu.tooltipShowing(event)" />
+    </popupset>
+    <calendar-list-tree id="calendar-list-tree-widget"
+                        type="exchange" />
 </overlay>
- 
- 
diff --git a/chrome/content/calendar-common-sets.xul b/chrome/content/calendar-common-sets.xul
index 21440219..0e92a3e0 100644
--- a/chrome/content/calendar-common-sets.xul
+++ b/chrome/content/calendar-common-sets.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -35,30 +35,35 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay [
+<!DOCTYPE overlay
+[
   <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
   <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %eventDialogDTD;
   <!ENTITY % menuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %menuOverlayDTD;
 ]>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-common-sets.js" />
-
-	<commandset id="calendar_commands" commandupdater="true"
-		events="calendar_commands" oncommandupdate="calendarController.updateCommands()">
-		<command id="calendar_forward_event_command" oncommand="tmpForewardEvent.onForEve()" />
-	</commandset>
 
-	<menupopup id="calendar-item-context-menu" onpopupshowing="tmpForewardEvent.checkAllowForwardItem(); return setupContextItemType(event, currentView().getSelectedItems({}));">
-		
-			<menuitem id="calendar-item-forward" acceltext="Fwd"
-					label="Forward Event" observes="calendar_forward_event_command" accesskey="f" hidden="true"/>
-		
-	</menupopup>	
-	
-	<!--<keyset>
- 		 <key id="forward-key" modifiers="control" key="f" oncommand="tmpForewardEvent.onForEve();"/>
-	</keyset>-->	
-  
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-common-sets.js" />
+    <commandset id="calendar_commands"
+                commandupdater="true"
+                events="calendar_commands"
+                oncommandupdate="calendarController.updateCommands()">
                 
+        <command id="calendar_forward_event_command"
+                 oncommand="tmpForewardEvent.onForEve()" />
+    </commandset>
+    <menupopup id="calendar-item-context-menu"
+               onpopupshowing="tmpForewardEvent.checkAllowForwardItem(); return setupContextItemType(event, currentView().getSelectedItems({}));">
+
+        <menuitem id="calendar-item-forward"
+                  acceltext="Fwd"
+                  label="Forward Event"
+                  observes="calendar_forward_event_command"
+                  accesskey="f"
+                  hidden="true" />
+    </menupopup>
+    <!--<keyset>
+                 <key id="forward-key" modifiers="control" key="f" oncommand="tmpForewardEvent.onForEve();"/>
+        </keyset>-->
 </overlay>
diff --git a/chrome/content/calendar-event-dialog-attendees.xml b/chrome/content/calendar-event-dialog-attendees.xml
index 6effef94..4fa9a941 100644
--- a/chrome/content/calendar-event-dialog-attendees.xml
+++ b/chrome/content/calendar-event-dialog-attendees.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -23,136 +22,147 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd3;
 ]>
-
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<binding id="attendees-list" extends="chrome://calendar/content/calendar-event-dialog-attendees.xml#attendees-list">
 
-    <content>
-      <xul:listbox anonid="listbox"
-                   seltype="multiple"
-                   class="listbox-noborder"
-                   rows="-1"
-                   flex="1">
-        <xul:listcols>
-          <xul:listcol/>
-          <xul:listcol/>
-          <xul:listcol flex="1"/>
-        </xul:listcols>
-        <xul:listitem anonid="item" class="addressingWidgetItem" allowevents="true">
-          <xul:listcell class="addressingWidgetCell" align="center" pack="center">
-            <xul:image id="attendeeCol1#1" anonid="rolestatus-icon"/>
-          </xul:listcell>
-          <xul:listcell class="addressingWidgetCell">
-              <xul:image id="attendeeCol2#1" anonid="usertype-icon" class="usertype-icon" onclick="this.parentNode.select();"/>
-          </xul:listcell>
-          <xul:listcell class="addressingWidgetCell">
-            <xul:textbox id="attendeeCol3#1"
-                         anonid="input"
-                         class="plain textbox-addressingWidget uri-element"
-                         type="autocomplete"
-                         flex="1"
-                         autocompletesearch="addrbook ldap exchangeAutoCompleteSearch"
-                         autocompletesearchparam="{}"
-                         timeout="300"
-                         maxrows="4"
-                         completedefaultindex="true"
-                         forcecomplete="true"
-                         minresultsforpopup="1"
-                         onblur="if (this.localName === 'textbox') document.getBindingParent(this).onBlurInput(event);"
-                         ignoreblurwhilesearching="true"
-                         oninput="this.setAttribute('dirty', 'true');">
-            </xul:textbox>
-          </xul:listcell>
-        </xul:listitem>
-      </xul:listbox>
-    </content>
-		<implementation>
-			
-			<method name="onInitialize">
-        			<body><![CDATA[
-					  var args = window.arguments[0];
-					  var organizer = args.organizer;
-					  var attendees = args.attendees;
-					  var calendar = args.calendar;
+    <binding id="attendees-list"
+             extends="chrome://calendar/content/calendar-event-dialog-attendees.xml#attendees-list">
+
+        <content>
+            <xul:listbox anonid="listbox"
+                         seltype="multiple"
+                         class="listbox-noborder"
+                         rows="-1"
+                         flex="1">
+                <xul:listcols>
+                    <xul:listcol />
+                    <xul:listcol />
+                    <xul:listcol flex="1" />
+                </xul:listcols>
+                <xul:listitem anonid="item"
+                              class="addressingWidgetItem"
+                              allowevents="true">
+                    <xul:listcell class="addressingWidgetCell"
+                                  align="center"
+                                  pack="center">
+                        <xul:image id="attendeeCol1#1"
+                                   anonid="rolestatus-icon" />
+                    </xul:listcell>
+                    <xul:listcell class="addressingWidgetCell">
+                        <xul:image id="attendeeCol2#1"
+                                   anonid="usertype-icon"
+                                   class="usertype-icon"
+                                   onclick="this.parentNode.select();" />
+                    </xul:listcell>
+                    <xul:listcell class="addressingWidgetCell">
+                        <xul:textbox id="attendeeCol3#1"
+                                     anonid="input"
+                                     class="plain textbox-addressingWidget uri-element"
+                                     type="autocomplete"
+                                     flex="1"
+                                     autocompletesearch="addrbook ldap exchangeAutoCompleteSearch"
+                                     autocompletesearchparam="{}"
+                                     timeout="300"
+                                     maxrows="4"
+                                     completedefaultindex="true"
+                                     forcecomplete="true"
+                                     minresultsforpopup="1"
+                                     onblur="if (this.localName === 'textbox') document.getBindingParent(this).onBlurInput(event);"
+                                     ignoreblurwhilesearching="true"
+                                     oninput="this.setAttribute('dirty', 'true');">
+                        </xul:textbox>
+                    </xul:listcell>
+                </xul:listitem>
+            </xul:listbox>
+        </content>
+        <implementation>
+            <method name="onInitialize">
+                <body>
+<![CDATA[
+                                          var args = window.arguments[0];
+                                          var organizer = args.organizer;
+                                          var attendees = args.attendees;
+                                          var calendar = args.calendar;
 
-					  this.mIsReadOnly = calendar.readOnly;
+                                          this.mIsReadOnly = calendar.readOnly;
 
-					  // assume we're the organizer [in case that the calendar
-					  // does not support the concept of identities].
-					  var organizerID = ((organizer && organizer.id)
-							     ? organizer.id
-							     : calendar.getProperty("organizerId"));
+                                          // assume we're the organizer [in case that the calendar
+                                          // does not support the concept of identities].
+                                          var organizerID = ((organizer && organizer.id)
+                                                             ? organizer.id
+                                                             : calendar.getProperty("organizerId"));
 
 
-					  var listbox =
-					      document.getAnonymousElementByAttribute(
-						  this, "anonid", "listbox");
-					  var template =
-					      document.getAnonymousElementByAttribute(
-						  this, "anonid", "item");
-					  template.focus();
+                                          var listbox =
+                                              document.getAnonymousElementByAttribute(
+                                                  this, "anonid", "listbox");
+                                          var template =
+                                              document.getAnonymousElementByAttribute(
+                                                  this, "anonid", "item");
+                                          template.focus();
 
-					  if (this.mIsReadOnly || this.mIsInvitation) {
-					    listbox.setAttribute("disabled", "true");
-					  }
+                                          if (this.mIsReadOnly || this.mIsInvitation) {
+                                            listbox.setAttribute("disabled", "true");
+                                          }
 
-					  // TODO: the organizer should show up in the attendee list, but this information
-					  // should be based on the organizer contained in the appropriate field of calIItemBase.
-					  // This is currently not supported, since we're still missing calendar identities.
-					  if (organizerID && organizerID != "") {
-					      if (!organizer) {
-						  organizer = this.createAttendee();
-						  organizer.id = organizerID;
-						  organizer.role = "CHAIR";
-						  organizer.participationStatus = "ACCEPTED";
-					      } else {
-						  if (!organizer.id) {
-						      organizer.id = organizerID;
-						  }
-						  if (!organizer.role) {
-						      organizer.role = "CHAIR";
-						  }
-						  if (!organizer.participationStatus) {
-						      organizer.participationStatus = "ACCEPTED";
-						  }
-					      }
-					      if (!organizer.commonName || !organizer.commonName.length) {
-						  organizer.commonName = calendar.getProperty("organizerCN");
-					      }
-					      organizer.isOrganizer = true;
-					      this.appendAttendee(organizer, listbox, template, true);
-					  }
+                                          // TODO: the organizer should show up in the attendee list, but this information
+                                          // should be based on the organizer contained in the appropriate field of calIItemBase.
+                                          // This is currently not supported, since we're still missing calendar identities.
+                                          if (organizerID && organizerID != "") {
+                                              if (!organizer) {
+                                                  organizer = this.createAttendee();
+                                                  organizer.id = organizerID;
+                                                  organizer.role = "CHAIR";
+                                                  organizer.participationStatus = "ACCEPTED";
+                                              } else {
+                                                  if (!organizer.id) {
+                                                      organizer.id = organizerID;
+                                                  }
+                                                  if (!organizer.role) {
+                                                      organizer.role = "CHAIR";
+                                                  }
+                                                  if (!organizer.participationStatus) {
+                                                      organizer.participationStatus = "ACCEPTED";
+                                                  }
+                                              }
+                                              if (!organizer.commonName || !organizer.commonName.length) {
+                                                  organizer.commonName = calendar.getProperty("organizerCN");
+                                              }
+                                              organizer.isOrganizer = true;
+                                              this.appendAttendee(organizer, listbox, template, true);
+                                          }
 
-					  var numRowsAdded = 0;
-					  if (attendees.length > 0) {
-					      for each (var attendee in attendees) {
-						  this.appendAttendee(attendee, listbox, template, false);
-						  numRowsAdded++;
-					      }
-					  }
-					  if (numRowsAdded === 0) {
-					      this.appendAttendee(null, listbox, template, false);
-					  }
+                                          var numRowsAdded = 0;
+                                          if (attendees.length > 0) {
+                                              for each (var attendee in attendees) {
+                                                  this.appendAttendee(attendee, listbox, template, false);
+                                                  numRowsAdded++;
+                                              }
+                                          }
+                                          if (numRowsAdded === 0) {
+                                              this.appendAttendee(null, listbox, template, false);
+                                          }
 
-					  // detach the template item from the listbox, but hold the reference.
-					  // until this function returns we add at least a single copy of this template back again.
-					  listbox.removeChild(template);
+                                          // detach the template item from the listbox, but hold the reference.
+                                          // until this function returns we add at least a single copy of this template back again.
+                                          listbox.removeChild(template);
 
-					  this.addDirectoryServerObserver();
+                                          this.addDirectoryServerObserver();
 
-					  this.setFocus(this.mMaxAttendees);
-        			]]></body>
-      			</method>
-                <method name="addDirectoryServerObserver">
-                    <body><![CDATA[
+                                          this.setFocus(this.mMaxAttendees);
+                                ]]>
+                </body>
+            </method>
+            <method name="addDirectoryServerObserver">
+                <body>
+<![CDATA[
                     if (this.mPrefs) {
                         this.mPrefs.addObserver(
                                 "ldap_2.autoComplete.useDirectory",
@@ -163,8 +173,9 @@
                                 this.mDirectoryServerObserver,
                                 false);
                     }
-                    ]]></body>
-                </method>
-		</implementation>
-	</binding>
+                    ]]>
+                </body>
+            </method>
+        </implementation>
+    </binding>
 </bindings>
diff --git a/chrome/content/calendar-event-dialog-attendees.xul b/chrome/content/calendar-event-dialog-attendees.xul
index aa8cba4e..ee77850b 100644
--- a/chrome/content/calendar-event-dialog-attendees.xul
+++ b/chrome/content/calendar-event-dialog-attendees.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -35,11 +35,10 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-event-dialog-attendees.css"?>
-
 <overlay id="forwardOnRightClick"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog-attendees.js"/>
-   
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-event-dialog-attendees.js" />
 </overlay>
diff --git a/chrome/content/calendar-event-dialog-reminder.xul b/chrome/content/calendar-event-dialog-reminder.xul
index 9afbf262..7f4188e3 100644
--- a/chrome/content/calendar-event-dialog-reminder.xul
+++ b/chrome/content/calendar-event-dialog-reminder.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,23 +36,25 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeReminderDialog.dtd" > 
     %dtd1;
 ]>
-
 <overlay id="ecCalendarProperties.Reminder"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog-reminder.js"/> 
-
-	<button id="reminder-new-button" oncommand="tmpChangeCalendarPropertiesReminder.onNewReminder();"/>
-
-	<vbox id="reminder-relation-radiogroup"> 
-		<hbox flex="1" pack="center" insertafter="reminder-relative-box">
-			<label id="exchWebService-reminder-relation-origin" hidden="true" value="&exchWebService.reminder.relation.origin.label;"/>
-		</hbox>
-	</vbox> 
-	
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-event-dialog-reminder.js" />
+    <button id="reminder-new-button"
+            oncommand="tmpChangeCalendarPropertiesReminder.onNewReminder();" />
+    <vbox id="reminder-relation-radiogroup">
+        <hbox flex="1"
+              pack="center"
+              insertafter="reminder-relative-box">
+            <label id="exchWebService-reminder-relation-origin"
+                   hidden="true"
+                   value="&exchWebService.reminder.relation.origin.label;" />
+        </hbox>
+    </vbox>
 </overlay>
diff --git a/chrome/content/calendar-event-dialog.xul b/chrome/content/calendar-event-dialog.xul
index cef7fb5d..be9824b8 100644
--- a/chrome/content/calendar-event-dialog.xul
+++ b/chrome/content/calendar-event-dialog.xul
@@ -1,28 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE dialog [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE dialog
+[
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/attachments-view.dtd" >
     %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/attachments-view.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
-
-
 <overlay id="exchWebService-calendar-event-dialog"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-event-dialog.js"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-event-dialog.js" />
     <!-- Commands -->
     <commandset id="itemCommands">
         <command id="exchWebService_addAttachmentDialog"
-                 oncommand='sendMessage( {command: "exchWebService_addAttachmentDialog"} );'/>
+                 oncommand='sendMessage( {command: "exchWebService_addAttachmentDialog"} );' />
     </commandset>
-
     <!-- Update windows menu -->
     <toolbox id="event-toolbox">
         <menubar id="event-menubar">
@@ -30,7 +26,6 @@
                 <menupopup id="options-menupopup">
                     <menu id="options-attachments-menu"
                           collapsed="false" />
-
                     <menuitem id="exchWebService-options-attachments"
                               insertafter="options-attendees-menuitem"
                               label="&exchWebServie.add.attachment.button.label;"
@@ -40,23 +35,20 @@
             </menu>
         </menubar>
     </toolbox>
-
     <!-- Update toolbar -->
     <toolbarpalette id="event-toolbarpalette">
         <toolbarbutton id="exchWebService-add-attachment-button"
-            mode="dialog"
-            class="cal-event-toolbarbutton toolbarbutton-1"
-            label="&exchWebServie.add.attachment.button.label;"
-            disable-on-readonly="true"
-            removable="true"
-            command="exchWebService_addAttachmentDialog"
-            hidden="true"/>
+                       mode="dialog"
+                       class="cal-event-toolbarbutton toolbarbutton-1"
+                       label="&exchWebServie.add.attachment.button.label;"
+                       disable-on-readonly="true"
+                       removable="true"
+                       command="exchWebService_addAttachmentDialog"
+                       hidden="true" />
     </toolbarpalette>
-
     <!-- Add exchangecalendar attachment button
          Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul -->
-     <toolbar id="event-toolbar"
-        defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
-     </toolbar>
-
+    <toolbar id="event-toolbar"
+             defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete">
+    </toolbar>
 </overlay>
diff --git a/chrome/content/calendar-list-tree.xml b/chrome/content/calendar-list-tree.xml
index 0773acf8..b46c28df 100644
--- a/chrome/content/calendar-list-tree.xml
+++ b/chrome/content/calendar-list-tree.xml
@@ -1,185 +1,191 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <!DOCTYPE overlay SYSTEM "chrome://calendar/locale/calendar.dtd">
-
 <bindings id="exchange-calendar-list-tree-bindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <binding id="exchange-calendar-list-tree"
-		extends="chrome://calendar/content/widgets/calendar-list-tree.xml#full-calendar-list-tree">
-
-    <content>
-      <xul:tree anonid="tree"
-                xbl:inherits="hidecolumnpicker"
-                hidecolumnpicker="true"
-                seltype="single"
-                flex="1">
-        <xul:treecols anonid="treecols"
-                      xbl:inherits="hideheader"
-                      hideheader="true">
-          <xul:treecol anonid="checkbox-treecol"
-                       xbl:inherits="cycler,hideheader"
-                       cycler="true"
-                       hideheader="true"
-                       width="17"/>
-          <xul:treecol anonid="color-treecol"
-                       xbl:inherits="cycler,hideheader"
-                       hideheader="true"
-                       width="16"/>
-          <xul:treecol anonid="calendarname-treecol"
-                       xbl:inherits="cycler,hideheader"
-                       hideheader="true"
-                       label="&calendar.unifinder.tree.calendarname.label;"
-                       flex="1"/>
-          <xul:treecol anonid="exchange-status-treecol"
-                       xbl:inherits="cycler,hideheader"
-                       hideheader="true"
-                       width="20"/>
-          <xul:treecol anonid="status-treecol"
-                       xbl:inherits="cycler,hideheader"
-                       hideheader="true"
-                       width="18"/>
-          <children includes="treecol"/>
-          <xul:treecol anonid="scrollbar-spacer"
-                       xbl:inherits="cycler,hideheader"
-                       fixed="true"
-                       hideheader="true">
-            <!-- This is a very elegant workaround to make sure the last column
+
+    <binding id="exchange-calendar-list-tree"
+             extends="chrome://calendar/content/widgets/calendar-list-tree.xml#full-calendar-list-tree">
+
+        <content>
+            <xul:tree anonid="tree"
+                      xbl:inherits="hidecolumnpicker"
+                      hidecolumnpicker="true"
+                      seltype="single"
+                      flex="1">
+                <xul:treecols anonid="treecols"
+                              xbl:inherits="hideheader"
+                              hideheader="true">
+                    <xul:treecol anonid="checkbox-treecol"
+                                 xbl:inherits="cycler,hideheader"
+                                 cycler="true"
+                                 hideheader="true"
+                                 width="17" />
+                    <xul:treecol anonid="color-treecol"
+                                 xbl:inherits="cycler,hideheader"
+                                 hideheader="true"
+                                 width="16" />
+                    <xul:treecol anonid="calendarname-treecol"
+                                 xbl:inherits="cycler,hideheader"
+                                 hideheader="true"
+                                 label="&calendar.unifinder.tree.calendarname.label;"
+                                 flex="1" />
+                    <xul:treecol anonid="exchange-status-treecol"
+                                 xbl:inherits="cycler,hideheader"
+                                 hideheader="true"
+                                 width="20" />
+                    <xul:treecol anonid="status-treecol"
+                                 xbl:inherits="cycler,hideheader"
+                                 hideheader="true"
+                                 width="18" />
+                    <children includes="treecol" />
+                    <xul:treecol anonid="scrollbar-spacer"
+                                 xbl:inherits="cycler,hideheader"
+                                 fixed="true"
+                                 hideheader="true">
+                        <!-- This is a very elegant workaround to make sure the last column
                  is not covered by the scrollbar in case of an overflow. This
                  treecol needs to be here last -->
-            <xul:slider anonid="scrollbar-slider" orient="vertical"/>
-          </xul:treecol>
-        </xul:treecols>
-        <xul:treechildren anonid="treechildren"
-                          xbl:inherits="tooltip=childtooltip,context=childcontext"
-                          tooltip="_child"
-                          context="_child"
-                          ondragstart="onDragStart(event);"
-                          onoverflow="displayScrollbarSpacer(true)"
-                          onunderflow="displayScrollbarSpacer(false)">
-          <children includes="tooltip|menupopup"/>
-        </xul:treechildren>
-      </xul:tree>
-    </content>
-    <implementation>
-      <constructor><![CDATA[
+                        <xul:slider anonid="scrollbar-slider"
+                                    orient="vertical" />
+                    </xul:treecol>
+                </xul:treecols>
+                <xul:treechildren anonid="treechildren"
+                                  xbl:inherits="tooltip=childtooltip,context=childcontext"
+                                  tooltip="_child"
+                                  context="_child"
+                                  ondragstart="onDragStart(event);"
+                                  onoverflow="displayScrollbarSpacer(true)"
+                                  onunderflow="displayScrollbarSpacer(false)">
+                                  
+                    <children includes="tooltip|menupopup" />
+                </xul:treechildren>
+            </xul:tree>
+        </content>
+        <implementation>
+            <constructor>
+<![CDATA[
         Components.utils.import("resource://calendar/modules/calUtils.jsm");
         let calMgr = cal.getCalendarManager();
         calMgr.addObserver(this.calMgrObserver);
 
-      ]]></constructor>
-      <destructor><![CDATA[
+      ]]>
+            </constructor>
+            <destructor>
+<![CDATA[
         let calMgr = cal.getCalendarManager();
         calMgr.removeObserver(this.calMgrObserver);
         this.calMgrObserver.listTree = null;
-      ]]></destructor>
-
-      <method name="getRowProperties">
-        <parameter name="aRow"/>
-        <parameter name="aProps"/>
-        <body><![CDATA[
+      ]]>
+            </destructor>
+            <method name="getRowProperties">
+                <parameter name="aRow" />
+                <parameter name="aProps" />
+                <body>
+<![CDATA[
           let calendar = this.getCalendar(aRow);
           let composite = this.compositeCalendar;
 
-	  if (aProps) {
-		  // Set up the composite calendar status
-		  if (composite.getCalendarById(calendar.id)) {
-		      aProps.AppendElement(cal.getAtomFromService("checked"));
-		  } else {
-		      aProps.AppendElement(cal.getAtomFromService("unchecked"));
-		  }
-
-		  // Set up the calendar id
-		  aProps.AppendElement(cal.getAtomFromService("id-" + calendar.id));
-
-		  // Get the calendar color
-		  let color = (calendar.getProperty("color") || "").substr(1);
-
-		  // Set up the calendar color (background)
-		  let bgColorProp = "color-" + (color || "default");
-		  aProps.AppendElement(cal.getAtomFromService(bgColorProp));
-
-		  // Set a property to get the contrasting text color (foreground)
-		  let fgColorProp = cal.getContrastingTextColor(color || "a8c2e1");
-		  aProps.AppendElement(cal.getAtomFromService(fgColorProp));
-
-		  if (calendar.type == "exchangecalendar") {
-			  let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
-			  if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
-			      aProps.AppendElement(cal.getAtomFromService("exchangeCommError"));
-			  } else  {
-			      aProps.AppendElement(cal.getAtomFromService("exchangeCommOk"));
-			  }
-		  }
-
-		  let currentStatus = calendar.getProperty("currentStatus");
-		  if (!Components.isSuccessCode(currentStatus)) {
-		      // 'readfailed' is supposed to "win" over 'readonly', meaning that
-		      // if reading from a calendar fails there is no further need to also display
-		      // information about 'readonly' status
-		      aProps.AppendElement(cal.getAtomFromService("readfailed"));
-		  } else if (calendar.readOnly) {
-		      aProps.AppendElement(cal.getAtomFromService("readonly"));
-		  }
-
-		  // Set up the disabled state
-		  if (!this.ignoreDisabledState && calendar.getProperty("disabled")) {
-		      aProps.AppendElement(cal.getAtomFromService("disabled"));
-		  } else {
-		      aProps.AppendElement(cal.getAtomFromService("enabled"));
-		  }
-		}
-		else {
-		  let properties = [];
-
-		  // Set up the composite calendar status
-		  properties.push(composite.getCalendarById(calendar.id) ? "checked" : "unchecked");
-
-		  // Set up the calendar id
-		  properties.push("id-" + calendar.id);
-
-		  // Get the calendar color
-		  let color = (calendar.getProperty("color") || "").substr(1);
-
-		  // Set up the calendar color (background)
-		  properties.push("color-" + (color || "default"));
-
-		  // Set a property to get the contrasting text color (foreground)
-		  properties.push(cal.getContrastingTextColor(color || "a8c2e1"));
-
-		  if (calendar.type == "exchangecalendar") {
-			  let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
-			  if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
-			      properties.push("exchangeCommError");
-			  } else  {
-			      properties.push("exchangeCommOk");
-			  }
-		  }
-
-		  let currentStatus = calendar.getProperty("currentStatus");
-		  if (!Components.isSuccessCode(currentStatus)) {
-		      // 'readfailed' is supposed to "win" over 'readonly', meaning that
-		      // if reading from a calendar fails there is no further need to also display
-		      // information about 'readonly' status
-		      properties.push("readfailed");
-		  } else if (calendar.readOnly) {
-		      properties.push("readonly");
-		  }
-
-		  // Set up the disabled state
-		  properties.push(!this.ignoreDisabledState && calendar.getProperty("disabled") ?
-		                  "disabled" : "enabled");
-
-		  return properties.join(" ");
-		}
-        ]]></body>
-      </method>
-
-      <field name="calObserver"><![CDATA[
+          if (aProps) {
+                  // Set up the composite calendar status
+                  if (composite.getCalendarById(calendar.id)) {
+                      aProps.AppendElement(cal.getAtomFromService("checked"));
+                  } else {
+                      aProps.AppendElement(cal.getAtomFromService("unchecked"));
+                  }
+
+                  // Set up the calendar id
+                  aProps.AppendElement(cal.getAtomFromService("id-" + calendar.id));
+
+                  // Get the calendar color
+                  let color = (calendar.getProperty("color") || "").substr(1);
+
+                  // Set up the calendar color (background)
+                  let bgColorProp = "color-" + (color || "default");
+                  aProps.AppendElement(cal.getAtomFromService(bgColorProp));
+
+                  // Set a property to get the contrasting text color (foreground)
+                  let fgColorProp = cal.getContrastingTextColor(color || "a8c2e1");
+                  aProps.AppendElement(cal.getAtomFromService(fgColorProp));
+
+                  if (calendar.type == "exchangecalendar") {
+                          let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
+                          if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
+                              aProps.AppendElement(cal.getAtomFromService("exchangeCommError"));
+                          } else  {
+                              aProps.AppendElement(cal.getAtomFromService("exchangeCommOk"));
+                          }
+                  }
+
+                  let currentStatus = calendar.getProperty("currentStatus");
+                  if (!Components.isSuccessCode(currentStatus)) {
+                      // 'readfailed' is supposed to "win" over 'readonly', meaning that
+                      // if reading from a calendar fails there is no further need to also display
+                      // information about 'readonly' status
+                      aProps.AppendElement(cal.getAtomFromService("readfailed"));
+                  } else if (calendar.readOnly) {
+                      aProps.AppendElement(cal.getAtomFromService("readonly"));
+                  }
+
+                  // Set up the disabled state
+                  if (!this.ignoreDisabledState && calendar.getProperty("disabled")) {
+                      aProps.AppendElement(cal.getAtomFromService("disabled"));
+                  } else {
+                      aProps.AppendElement(cal.getAtomFromService("enabled"));
+                  }
+                }
+                else {
+                  let properties = [];
+
+                  // Set up the composite calendar status
+                  properties.push(composite.getCalendarById(calendar.id) ? "checked" : "unchecked");
+
+                  // Set up the calendar id
+                  properties.push("id-" + calendar.id);
+
+                  // Get the calendar color
+                  let color = (calendar.getProperty("color") || "").substr(1);
+
+                  // Set up the calendar color (background)
+                  properties.push("color-" + (color || "default"));
+
+                  // Set a property to get the contrasting text color (foreground)
+                  properties.push(cal.getContrastingTextColor(color || "a8c2e1"));
+
+                  if (calendar.type == "exchangecalendar") {
+                          let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
+                          if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
+                              properties.push("exchangeCommError");
+                          } else  {
+                              properties.push("exchangeCommOk");
+                          }
+                  }
+
+                  let currentStatus = calendar.getProperty("currentStatus");
+                  if (!Components.isSuccessCode(currentStatus)) {
+                      // 'readfailed' is supposed to "win" over 'readonly', meaning that
+                      // if reading from a calendar fails there is no further need to also display
+                      // information about 'readonly' status
+                      properties.push("readfailed");
+                  } else if (calendar.readOnly) {
+                      properties.push("readonly");
+                  }
+
+                  // Set up the disabled state
+                  properties.push(!this.ignoreDisabledState && calendar.getProperty("disabled") ?
+                                  "disabled" : "enabled");
+
+                  return properties.join(" ");
+                }
+        ]]>
+                </body>
+            </method>
+            <field name="calObserver">
+<![CDATA[
       ({ listTree: this,
 
         QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIObserver]),
@@ -209,7 +215,7 @@
                 case "name":
                 case "currentStatus":
                 case "readOnly":
-		case "exchangeCurrentStatus":
+                case "exchangeCurrentStatus":
                 case "disabled":
                     this.listTree.updateCalendar(aCalendar);
                     // Fall through, update commands in any cases.
@@ -224,9 +230,8 @@
             this.onPropertyChanged(aCalendar, aName, null, null);
         }
       })
-      ]]></field>
-
-    </implementation>
-
-  </binding>
+      ]]>
+            </field>
+        </implementation>
+    </binding>
 </bindings>
diff --git a/chrome/content/calendar-properties-dialog.xul b/chrome/content/calendar-properties-dialog.xul
index fa894718..8ac1a7c0 100644
--- a/chrome/content/calendar-properties-dialog.xul
+++ b/chrome/content/calendar-properties-dialog.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,23 +36,19 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <overlay id="ecCalendarProperties"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-properties-dialog.js"/>
-
-	   
-		<rows id="calendar-properties-rows">
-			<row id="exchange-cache-row"
-				align="center">
-				<spacer/>
-				<checkbox id="exchange-cache"
-					hidden="true"
-					label="exchange-cache" 
-					oncommand="return tmpChangeCalendarProperties.changeCachePref();"/>
-			</row>
-		     
-		</rows>
-	
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-properties-dialog.js" />
+    <rows id="calendar-properties-rows">
+        <row id="exchange-cache-row"
+             align="center">
+            <spacer />
+            <checkbox id="exchange-cache"
+                      hidden="true"
+                      label="exchange-cache"
+                      oncommand="return tmpChangeCalendarProperties.changeCachePref();" />
+        </row>
+    </rows>
 </overlay>
diff --git a/chrome/content/calendar-summary-dialog.xul b/chrome/content/calendar-summary-dialog.xul
index bb689c4a..1398bc2f 100644
--- a/chrome/content/calendar-summary-dialog.xul
+++ b/chrome/content/calendar-summary-dialog.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -31,97 +30,131 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-summary-dialog.css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
-	<!ENTITY % summaryDialogDTD SYSTEM "chrome://exchangecalendar/locale/calendar-summary-dialog.dtd">
+        <!ENTITY % summaryDialogDTD SYSTEM "chrome://exchangecalendar/locale/calendar-summary-dialog.dtd">
     %summaryDialogDTD;
 ]>
-
 <?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
-
 <overlay id="exchWebService-calendar-summary-dialog"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<dialog id="calendar-summary-dialog" windowtype="Calendar:EventSummaryDialog"
-		buttons="accept,cancel" buttonlabelextra1="&forward.invite.label;"
-		ondialogextra1="tmpEventSummaryDialog.onForward();" persist="screenX screenY width height"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-		
-		<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-summary-dialog.js" />
-		
-		<box id="item-general-box" orient="vertical">
-		 <box orient="horizontal">
-	     <grid flex="1"> 
-		 <rows>
-		  <row id="reminder-row" hidden="false"/>
-		  </rows>
-		  </grid>
-		  </box>
-		</box>
-		<box id="item-description-box" flex="1">
-
-		<browser id="exchWebService-body-editor" 
-			class="exchWebService-browser-class" 
-			type="content-targetable" 
-			insertafter="item-description" 
-			onclick = "return tmpEventSummaryDialog.onClick(event);"
-			flex="1"/>
-
-		<commandset id="itemCommands">
-		</commandset>
-
-		<popupset id="event-dialog-popupset">
-		</popupset>
-
-			<spacer class="default-spacer" id="exchWebService-attachment-summary-space" hidden="true"/>
-			<calendar-caption label="&event.attachments.label;"
-				control="item-description" id="exchWebService-attachment-summary-caption" hidden="true"/>
-			<box orient="horizontal" flex="1" id="exchWebService-attachment-summary-box" hidden="true">
-				<spacer class="default-spacer"/>
-				<listbox id="exchWebService-attachment-link" rows="3" flex="1"/>
-			</box>
-		</box>
-
-		<box id="item-attendees" hidden="true" orient="vertical">
-
-			<spacer id="required-attendee-spacer" class="default-spacer" hidden="true"/>
-			<calendar-caption id="required-attendee-caption" label="&required.attendee.label;"
-			control="item-required-attendee-listbox" hidden="true"/>
-			<box orient="horizontal" id="item-required-attendee" hidden="true">
-				<spacer class="default-spacer"/>
-				<listbox id="item-required-attendee-listbox" rows="4" flex="1" disabled="true">
-					<listcols>
-						<listcol id="item-attendee-left-col" flex="1"/>
-						<listcol id="item-attendee-right-col" flex="1"/>
-					</listcols>
-					<listitem>
-						<listcell class="listcell-iconic status-icon" crop="end" hidden="true"/>
-						<listcell class="listcell-iconic status-icon" crop="end" hidden="true"/>
-					</listitem>
-				</listbox>
-			</box>
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-			<spacer id="optional-attendee-spacer" class="default-spacer" hidden="true"/>
-			<calendar-caption id="optional-attendee-caption" label="&optional.attendee.label;"
-			control="item-optional-attendee-listbox" hidden="true"/>
-			<box orient="horizontal" id="item-optional-attendee" hidden="true">
-				<spacer class="default-spacer"/>
-				<listbox id="item-optional-attendee-listbox" rows="4" flex="1" disabled="true">
-					<listcols>
-						<listcol id="item-attendee-left-col" flex="1"/>
-						<listcol id="item-attendee-right-col" flex="1"/>
-					</listcols>
-					<listitem>
-						<listcell class="listcell-iconic status-icon" crop="end" hidden="true"/>
-						<listcell class="listcell-iconic status-icon" crop="end" hidden="true"/>
-					</listitem>
-				</listbox>
-			</box>
+    <dialog id="calendar-summary-dialog"
+            windowtype="Calendar:EventSummaryDialog"
+            buttons="accept,cancel"
+            buttonlabelextra1="&forward.invite.label;"
+            ondialogextra1="tmpEventSummaryDialog.onForward();"
+            persist="screenX screenY width height"
+            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-		</box>
-	</dialog>
+        <script type="application/javascript"
+                src="chrome://exchangecalendar/content/calendar-summary-dialog.js" />
+        <box id="item-general-box"
+             orient="vertical">
+            <box orient="horizontal">
+                <grid flex="1">
+                    <rows>
+                        <row id="reminder-row"
+                             hidden="false" />
+                    </rows>
+                </grid>
+            </box>
+        </box>
+        <box id="item-description-box"
+             flex="1">
+            <browser id="exchWebService-body-editor"
+                     class="exchWebService-browser-class"
+                     type="content-targetable"
+                     insertafter="item-description"
+                     onclick="return tmpEventSummaryDialog.onClick(event);"
+                     flex="1" />
+            <commandset id="itemCommands"></commandset>
+            <popupset id="event-dialog-popupset"></popupset>
+            <spacer class="default-spacer"
+                    id="exchWebService-attachment-summary-space"
+                    hidden="true" />
+            <calendar-caption label="&event.attachments.label;"
+                              control="item-description"
+                              id="exchWebService-attachment-summary-caption"
+                              hidden="true" />
+            <box orient="horizontal"
+                 flex="1"
+                 id="exchWebService-attachment-summary-box"
+                 hidden="true">
+                <spacer class="default-spacer" />
+                <listbox id="exchWebService-attachment-link"
+                         rows="3"
+                         flex="1" />
+            </box>
+        </box>
+        <box id="item-attendees"
+             hidden="true"
+             orient="vertical">
+            <spacer id="required-attendee-spacer"
+                    class="default-spacer"
+                    hidden="true" />
+            <calendar-caption id="required-attendee-caption"
+                              label="&required.attendee.label;"
+                              control="item-required-attendee-listbox"
+                              hidden="true" />
+            <box orient="horizontal"
+                 id="item-required-attendee"
+                 hidden="true">
+                <spacer class="default-spacer" />
+                <listbox id="item-required-attendee-listbox"
+                         rows="4"
+                         flex="1"
+                         disabled="true">
+                    <listcols>
+                        <listcol id="item-attendee-left-col"
+                                 flex="1" />
+                        <listcol id="item-attendee-right-col"
+                                 flex="1" />
+                    </listcols>
+                    <listitem>
+                        <listcell class="listcell-iconic status-icon"
+                                  crop="end"
+                                  hidden="true" />
+                        <listcell class="listcell-iconic status-icon"
+                                  crop="end"
+                                  hidden="true" />
+                    </listitem>
+                </listbox>
+            </box>
+            <spacer id="optional-attendee-spacer"
+                    class="default-spacer"
+                    hidden="true" />
+            <calendar-caption id="optional-attendee-caption"
+                              label="&optional.attendee.label;"
+                              control="item-optional-attendee-listbox"
+                              hidden="true" />
+            <box orient="horizontal"
+                 id="item-optional-attendee"
+                 hidden="true">
+                <spacer class="default-spacer" />
+                <listbox id="item-optional-attendee-listbox"
+                         rows="4"
+                         flex="1"
+                         disabled="true">
+                    <listcols>
+                        <listcol id="item-attendee-left-col"
+                                 flex="1" />
+                        <listcol id="item-attendee-right-col"
+                                 flex="1" />
+                    </listcols>
+                    <listitem>
+                        <listcell class="listcell-iconic status-icon"
+                                  crop="end"
+                                  hidden="true" />
+                        <listcell class="listcell-iconic status-icon"
+                                  crop="end"
+                                  hidden="true" />
+                    </listitem>
+                </listbox>
+            </box>
+        </box>
+    </dialog>
 </overlay>
diff --git a/chrome/content/calendar-task-view.xul b/chrome/content/calendar-task-view.xul
index 99549fc7..df442a2e 100644
--- a/chrome/content/calendar-task-view.xul
+++ b/chrome/content/calendar-task-view.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -31,68 +30,65 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
 ]>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-task-view.css"?>
-
 <?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
-
-<overlay id="calendar-task-view.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<overlay id="calendar-task-view.xul"
+         xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-task-view.js"/>
 
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/calendar-task-view.js" />
     <!-- Commands -->
     <commandset id="mailCommands">
         <command id="exchWebService_openAttachment"
-                 oncommand="tmpAttachment.openAttachment();"/> 
+                 oncommand="tmpAttachment.openAttachment();" />
         <command id="exchWebService_saveAttachment"
-                 oncommand="tmpAttachment.saveAttachment();"/> 
+                 oncommand="tmpAttachment.saveAttachment();" />
         <command id="exchWebService_deleteAttachment"
-                 oncommand="tmpAttachment.deleteAttachment();"/> 
-	<command id="exchWebService_addAttachmentDialog"
-		 oncommand="tmpAttachment.addAttachmentDialog();"/>
+                 oncommand="tmpAttachment.deleteAttachment();" />
+        <command id="exchWebService_addAttachmentDialog"
+                 oncommand="tmpAttachment.addAttachmentDialog();" />
     </commandset>
- 
-    <vbox id="calendar-task-box" onselect="taskHtmlDetailsView(event);"/>
-     <vbox id="calendar-task-details-container">
+    <vbox id="calendar-task-box"
+          onselect="taskHtmlDetailsView(event);" />
+    <vbox id="calendar-task-details-container">
         <browser id="exchService-task-details-description"
-             name="messagepane02"
-             height="0"
-             flex="1"
-             minwidth="1"
-             minheight="1"
-             context="mailContext"
-             tooltip="aHTMLTooltip"
-             disablesecurity="true"
-             disablehistory="true"
-             autofind="false"
-             type="content-primary"
-             onresize="return true;"
-             src="about:blank"  insertbefore="calendar-task-details-description" />
-       </vbox>
-   
+                 name="messagepane02"
+                 height="0"
+                 flex="1"
+                 minwidth="1"
+                 minheight="1"
+                 context="mailContext"
+                 tooltip="aHTMLTooltip"
+                 disablesecurity="true"
+                 disablehistory="true"
+                 autofind="false"
+                 type="content-primary"
+                 onresize="return true;"
+                 src="about:blank"
+                 insertbefore="calendar-task-details-description" />
+    </vbox>
     <popupset id="mainPopupSet">
-      <menupopup id="exchWebService-attachment-popup">
+        <menupopup id="exchWebService-attachment-popup">
             <menuitem id="exchWebService-attachment-popup-open"
                       label="&event.attachments.popup.open.label;"
                       accesskey="&event.attachments.popup.open.accesskey;"
-                      command="exchWebService_openAttachment"/>
+                      command="exchWebService_openAttachment" />
             <menuitem id="exchWebService-attachment-popup-save"
                       label="&event.menu.item.save.label;"
                       accesskey="&event.menu.item.save.accesskey;"
-                      command="exchWebService_saveAttachment"/>
+                      command="exchWebService_saveAttachment" />
             <menuitem id="exchWebService-attachment-popup-delete"
                       label="&event.menu.item.delete.label;"
                       accesskey="&event.menu.item.delete.accesskey;"
-			disable-on-readonly="true"
-			hidden="true"
-                      command="exchWebService_deleteAttachment"/>
-      </menupopup>
+                      disable-on-readonly="true"
+                      hidden="true"
+                      command="exchWebService_deleteAttachment" />
+        </menupopup>
     </popupset>
-
 </overlay>
-
-
diff --git a/chrome/content/check4lightning.xul b/chrome/content/check4lightning.xul
index 7f0bf7cc..42061885 100644
--- a/chrome/content/check4lightning.xul
+++ b/chrome/content/check4lightning.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -30,11 +29,11 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <overlay id="exchWebService-overlay-check4lightning"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-	<script type="application/javascript" src="chrome://exchangecalendar/content/check4lightning.js"/>
-
+    <script type="application/javascript"
+            src="chrome://communicator/content/utilityOverlay.js" />
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/check4lightning.js" />
 </overlay>
diff --git a/chrome/content/debugPreferences.xul b/chrome/content/debugPreferences.xul
index 821e7956..7c54643b 100644
--- a/chrome/content/debugPreferences.xul
+++ b/chrome/content/debugPreferences.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -36,8 +36,8 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay [
+<!DOCTYPE overlay
+[
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
@@ -45,153 +45,150 @@
     %preferencesDTD;
     %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
-
 <overlay id="exchangeWebService_debug_preferences_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript" src="chrome://exchangecalendar/content/debugPreferences.js"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/debugPreferences.js" />
     <vbox id="exchangeWebService_debug_preferences_vbox">
-
         <preferences>
             <preference id="extensions.1st-setup.debug.log"
                         name="extensions.1st-setup.debug.log"
-                        type="bool"/>
-
+                        type="bool" />
             <preference id="extensions.1st-setup.debug.file"
                         name="extensions.1st-setup.debug.file"
-                        type="string"/>
-
+                        type="string" />
             <preference id="extensions.1st-setup.network.debug"
                         name="extensions.1st-setup.network.debug"
-                        type="bool"/>
-
+                        type="bool" />
             <preference id="extensions.1st-setup.network.debuglevel"
                         name="extensions.1st-setup.network.debuglevel"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.authentication.debug"
                         name="extensions.1st-setup.authentication.debug"
-                        type="bool"/>
-
+                        type="bool" />
             <preference id="extensions.1st-setup.authentication.showpassword"
                         name="extensions.1st-setup.authentication.showpassword"
-                        type="bool"/>
-
+                        type="bool" />
             <preference id="extensions.1st-setup.core.debuglevel"
                         name="extensions.1st-setup.core.debuglevel"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.contacts.debug"
                         name="extensions.1st-setup.contacts.debug"
-                        type="bool"/>
-
+                        type="bool" />
             <preference id="extensions.1st-setup.contacts.debuglevel"
                         name="extensions.1st-setup.contacts.debuglevel"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.exchangecalendar.loadbalancer.debuglevel"
                         name="extensions.1st-setup.exchangecalendar.loadbalancer.debuglevel"
-                        type="int"/>
-
+                        type="int" />
         </preferences>
-
-	<checkbox id="exchangeWebService_debug_log"
-			preference="extensions.1st-setup.debug.log"
-			label="&exchangeWebService.preference.debug.log.label;"
-			oncommand="exchWebService.debugPreferences.debugLogChanged(this);"/>
-
+        <checkbox id="exchangeWebService_debug_log"
+                  preference="extensions.1st-setup.debug.log"
+                  label="&exchangeWebService.preference.debug.log.label;"
+                  oncommand="exchWebService.debugPreferences.debugLogChanged(this);" />
         <groupbox id="exchangeWebService_debug_groupbox1">
-            <caption label="&exchangeWebService.preference.debug.file;"/>
+            <caption label="&exchangeWebService.preference.debug.file;" />
             <vbox>
-                <hbox align="center" flex="1">
+                <hbox align="center"
+                      flex="1">
                     <textbox id="exchangeWebService_preference_debug_file_filefield"
-                               flex="1"
-                               preference="extensions.1st-setup.debug.file"
-                               preference-editable="true"
-                               onsyncfrompreference="return exchWebService.debugPreferences.readLogLocation();"/>
+                             flex="1"
+                             preference="extensions.1st-setup.debug.file"
+                             preference-editable="true"
+                             onsyncfrompreference="return exchWebService.debugPreferences.readLogLocation();" />
                 </hbox>
                 <hbox pack="end">
                     <button id="exchangeWebService_preference_debug_file_button"
                             label="&exchangeWebService.preference.debug.file.button;"
-                            oncommand="exchWebService.debugPreferences.browseDebugFile()"/>
+                            oncommand="exchWebService.debugPreferences.browseDebugFile()" />
                 </hbox>
             </vbox>
-	</groupbox>
-
-	<groupbox id="exchangeWebService_debug_groupbox3">
-            <caption label="&exchangeWebService.preference.core.debug.caption;"/>
-	    <hbox>
-		<label value="&exchangeWebService.preference.network.debuglevel.label1;"/>
-		<textbox id="exchangeWebService_preference_core_debuglevel_textbox" 
-			preference="extensions.1st-setup.core.debuglevel"
-			increment="1" min="0" max="2" type="number"/>
-	    </hbox>
-	    <hbox pack="end">
-		<label value="&exchangeWebService.preference.core.debuglevel.label2;"/>
-	    </hbox>
         </groupbox>
-
-	<groupbox id="exchangeWebService_debug_groupbox2">
-            <caption label="&exchangeWebService.preference.network.debug.caption;"/>
-            <hbox align="center" flex="1">
+        <groupbox id="exchangeWebService_debug_groupbox3">
+            <caption label="&exchangeWebService.preference.core.debug.caption;" />
+            <hbox>
+                <label value="&exchangeWebService.preference.network.debuglevel.label1;" />
+                <textbox id="exchangeWebService_preference_core_debuglevel_textbox"
+                         preference="extensions.1st-setup.core.debuglevel"
+                         increment="1"
+                         min="0"
+                         max="2"
+                         type="number" />
+            </hbox>
+            <hbox pack="end">
+                <label value="&exchangeWebService.preference.core.debuglevel.label2;" />
+            </hbox>
+        </groupbox>
+        <groupbox id="exchangeWebService_debug_groupbox2">
+            <caption label="&exchangeWebService.preference.network.debug.caption;" />
+            <hbox align="center"
+                  flex="1">
                 <checkbox id="exchangeWebService_preference_network_debug_checkbox"
                           preference="extensions.1st-setup.network.debug"
-                          label="&exchangeWebService.preference.network.debug.label;"/>
+                          label="&exchangeWebService.preference.network.debug.label;" />
+            </hbox>
+            <hbox>
+                <label value="&exchangeWebService.preference.network.debuglevel.label1;" />
+                <textbox id="exchangeWebService_preference_network_debuglevel_textbox"
+                         preference="extensions.1st-setup.network.debuglevel"
+                         increment="1"
+                         min="1"
+                         max="2"
+                         type="number" />
+            </hbox>
+            <hbox pack="end">
+                <label value="&exchangeWebService.preference.network.debuglevel.label2;" />
             </hbox>
-	    <hbox>
-		<label value="&exchangeWebService.preference.network.debuglevel.label1;"/>
-		<textbox id="exchangeWebService_preference_network_debuglevel_textbox" 
-			preference="extensions.1st-setup.network.debuglevel"
-			increment="1" min="1" max="2" type="number"/>
-	    </hbox>
-	    <hbox pack="end">
-		<label value="&exchangeWebService.preference.network.debuglevel.label2;"/>
-	    </hbox>
-            <hbox align="center" flex="1">
+            <hbox align="center"
+                  flex="1">
                 <checkbox id="exchangeWebService_preference_authentication_debug_checkbox"
                           preference="extensions.1st-setup.authentication.debug"
-                          label="&exchangeWebService.preference.authentication.debug.label;"/>
+                          label="&exchangeWebService.preference.authentication.debug.label;" />
             </hbox>
-            <hbox align="center" flex="1">
+            <hbox align="center"
+                  flex="1">
                 <checkbox id="exchangeWebService_preference_authentication_showpassword_checkbox"
                           preference="extensions.1st-setup.authentication.showpassword"
-                          label="&exchangeWebService.preference.authentication.showpassword.label;"/>
+                          label="&exchangeWebService.preference.authentication.showpassword.label;" />
             </hbox>
         </groupbox>
-
-	<groupbox id="exchangeWebService_contacts_groupbox4">
-            <caption label="&exchangeWebService.preference.contacts.debug.caption;"/>
-            <hbox align="center" flex="1">
+        <groupbox id="exchangeWebService_contacts_groupbox4">
+            <caption label="&exchangeWebService.preference.contacts.debug.caption;" />
+            <hbox align="center"
+                  flex="1">
                 <checkbox id="exchangeWebService_preference_contacts_debug_checkbox"
                           preference="extensions.1st-setup.contacts.debug"
-                          label="&exchangeWebService.preference.contacts.debug.label;"/>
+                          label="&exchangeWebService.preference.contacts.debug.label;" />
+            </hbox>
+            <hbox>
+                <label value="&exchangeWebService.preference.contacts.debuglevel.label1;" />
+                <textbox id="exchangeWebService_preference_contacts_debuglevel_textbox"
+                         preference="extensions.1st-setup.contacts.debuglevel"
+                         increment="1"
+                         min="0"
+                         max="2"
+                         type="number" />
+            </hbox>
+            <hbox pack="end">
+                <label value="&exchangeWebService.preference.network.debuglevel.label2;" />
             </hbox>
-	    <hbox>
-		<label value="&exchangeWebService.preference.contacts.debuglevel.label1;"/>
-		<textbox id="exchangeWebService_preference_contacts_debuglevel_textbox" 
-			preference="extensions.1st-setup.contacts.debuglevel"
-			increment="1" min="0" max="2" type="number"/>
-	    </hbox>
-	    <hbox pack="end">
-		<label value="&exchangeWebService.preference.network.debuglevel.label2;"/>
-	    </hbox>
         </groupbox>
-
-	<groupbox id="exchangeWebService_loadbalancer_groupbox5">
-            <caption label="&exchangeWebService.preference.loadbalancer.debug.caption;"/>
-	    <hbox>
-		<label value="&exchangeWebService.preference.contacts.debuglevel.label1;"/>
-		<textbox id="exchangeWebService_preference_loadbalancer_debuglevel_textbox" 
-			preference="extensions.1st-setup.exchangecalendar.loadbalancer.debuglevel"
-			increment="1" min="0" max="2" type="number"/>
-	    </hbox>
-	    <hbox pack="end">
-		<label value="&exchangeWebService.preference.core.debuglevel.label2;"/>
-	    </hbox>
+        <groupbox id="exchangeWebService_loadbalancer_groupbox5">
+            <caption label="&exchangeWebService.preference.loadbalancer.debug.caption;" />
+            <hbox>
+                <label value="&exchangeWebService.preference.contacts.debuglevel.label1;" />
+                <textbox id="exchangeWebService_preference_loadbalancer_debuglevel_textbox"
+                         preference="extensions.1st-setup.exchangecalendar.loadbalancer.debuglevel"
+                         increment="1"
+                         min="0"
+                         max="2"
+                         type="number" />
+            </hbox>
+            <hbox pack="end">
+                <label value="&exchangeWebService.preference.core.debuglevel.label2;" />
+            </hbox>
         </groupbox>
-
     </vbox>
 </overlay>
diff --git a/chrome/content/delegateCalendar.xul b/chrome/content/delegateCalendar.xul
index 593e333d..0c493e48 100644
--- a/chrome/content/delegateCalendar.xul
+++ b/chrome/content/delegateCalendar.xul
@@ -4,226 +4,320 @@
  * The Initial Developer of the Microsoft Exchange Calendar Provider Code is property of Ericsson. 
  * All Rights Reserved.
  * ***** BEGIN LICENSE BLOCK *****/
---> 
- <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
- <?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
- <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css" ?>
- <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/delegateCalendar.css" ?>
- <!DOCTYPE dialog [ 
+--><?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin/global.css" ?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/delegateCalendar.css" ?>
+<!DOCTYPE dialog
+[ 
     <!ENTITY % delegateDialogDTD SYSTEM "chrome://exchangecalendar/locale/delegate-calendar-dialog.dtd" > 
       %delegateDialogDTD;
-]> 
-
-<dialog id="DelegateUserPopup" title="Delegate Calendar" 
-xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-xmlns:html="http://www.w3.org/1999/xhtml" 
-buttons="cancel" ondialogcancel="window.close();" 
-onload="tmpDelegateCalendarSettings.onLoad();"> 
-
-<script type="application/x-javascript" src="chrome://exchangecalendar/content/adutils.js"/>  
-<script type="application/javascript"   src="chrome://exchangecalendar/content/delegateCalendar.js" />  
-
-<tabbox id="myTabList" flex="1" width="600"  selectedIndex="0" >
-<tabs id="delTabs" >
-    <tab id="ownCalButton" label="My Calendar" accesskey="" />
-    <tab id="othersCalButton" label="Other`s Calendar" accesskey="" />
-</tabs>
-<tabpanels id="delPanels">
-    <tabpanel  id="ownCalpanel" >
-        <vbox>
-        <label>Shared by me</label>
-            <vbox>
-                <listbox id="delegatee" width="250" enableColumnDrag="true" resizable="true"
-                         onclick="tmpDelegateCalendarSettings.listSelectEvent()">
-                    <listhead>
-                        <listheader label="Delegatee"  resizable="true" flex="1" enableColumnDrag="true" />
-                    </listhead>
-                    <listcols>
-                        <listcol  flex="1" />
-                    </listcols>
-                </listbox>
-            </vbox> 
-        </vbox> 
-        <!--right panel -->  
-        <vbox class="rightpanel"> 
-            <html:div><hbox><description class="separator"  /></hbox></html:div> 
-  
-            <hbox> 
-            <groupbox id="delegateCalendar.email-detailsgroupbox">
-                <caption label="&label.delegateCalendar.userEmail;:" />  
+]>
+<dialog id="DelegateUserPopup"
+        title="Delegate Calendar"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        buttons="cancel"
+        ondialogcancel="window.close();"
+        onload="tmpDelegateCalendarSettings.onLoad();">
+    <script type="application/x-javascript"
+            src="chrome://exchangecalendar/content/adutils.js" />
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/delegateCalendar.js" />
+    <tabbox id="myTabList"
+            flex="1"
+            width="600"
+            selectedIndex="0">
+        <tabs id="delTabs">
+            <tab id="ownCalButton"
+                 label="My Calendar"
+                 accesskey="" />
+            <tab id="othersCalButton"
+                 label="Other`s Calendar"
+                 accesskey="" />
+        </tabs>
+        <tabpanels id="delPanels">
+            <tabpanel id="ownCalpanel">
                 <vbox>
-                    <hbox>
-                        <!--  <label control="eml" value="&label.delegateCalendar.userEmail;" /> --> 
-                        <textbox id="email"
-                          height="30" 
-                          flex="1"
-                          anonid="input"
-                          class="textbox-addressingWidget uri-element"
-                          type="autocomplete"
-                          autocompletesearch="ldap history"
-                          autocompletepopup="richPopup"
-                          noautofocus="true" 
-                          autocompletesearchparam="{}"
-                          timeout="300"
-                          maxrows="4"
-                          completedefaultindex="true"
-                          forcecomplete="true"
-                          minresultsforpopup="1"
-                          onblur=""
-                          ignoreblurwhilesearching="true"
-                          oninput="this.setAttribute('dirty', 'true');"
-                          ontextentered="" /> 
-                        
-                        <!--          onselect='openDialog("chrome://exchangecalendar/content/contact-lookup.xul","_blank", "chrome,titlebar,modal,resizable",args);'
-                        -->       
-                    </hbox> 
-                    <html:div><hbox><description class="separator"  /></hbox></html:div> 
+                    <label>Shared by me</label>
+                    <vbox>
+                        <listbox id="delegatee"
+                                 width="250"
+                                 enableColumnDrag="true"
+                                 resizable="true"
+                                 onclick="tmpDelegateCalendarSettings.listSelectEvent()">
 
+                            <listhead>
+                                <listheader label="Delegatee"
+                                            resizable="true"
+                                            flex="1"
+                                            enableColumnDrag="true" />
+                            </listhead>
+                            <listcols>
+                                <listcol flex="1" />
+                            </listcols>
+                        </listbox>
+                    </vbox>
+                </vbox>
+                <!--right panel -->
+                <vbox class="rightpanel">
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
                     <hbox>
-                        <button id="delegateCalendaractionadd" label="Add" onclick="tmpDelegateCalendarSettings.addDelegate()" />  
-                        <button id="delegateCalendaractionupdate" label="Update" onclick="tmpDelegateCalendarSettings.updateDelegate()" /> 
-                        <button id="delegateCalendaractiondelete" label="Remove" onclick="tmpDelegateCalendarSettings.removeDelegate()" /> 
-                        <!--   <button id="delegateCalendaractionrefresh" label="Details" align="end" onclick="tmpDelegateCalendarSettings.getDetails();" /> -->
-                        <!--   <button id="delegateCalendaractiongetdelegate" label="testrefresh" align="end" onclick="tmpDelegateCalendarSettings.refresh()" /> -->
+                        <groupbox id="delegateCalendar.email-detailsgroupbox">
+
+                            <caption label="&label.delegateCalendar.userEmail;:" />
+                            <vbox>
+                                <hbox>
+                                    <!--  <label control="eml" value="&label.delegateCalendar.userEmail;" /> -->
+                                    <textbox id="email"
+                                             height="30"
+                                             flex="1"
+                                             anonid="input"
+                                             class="textbox-addressingWidget uri-element"
+                                             type="autocomplete"
+                                             autocompletesearch="ldap history"
+                                             autocompletepopup="richPopup"
+                                             noautofocus="true"
+                                             autocompletesearchparam="{}"
+                                             timeout="300"
+                                             maxrows="4"
+                                             completedefaultindex="true"
+                                             forcecomplete="true"
+                                             minresultsforpopup="1"
+                                             onblur=""
+                                             ignoreblurwhilesearching="true"
+                                             oninput="this.setAttribute('dirty', 'true');"
+                                             ontextentered="" />
+                                    <!--          onselect='openDialog("chrome://exchangecalendar/content/contact-lookup.xul","_blank", "chrome,titlebar,modal,resizable",args);'
+                        -->
+                                </hbox>
+                                <html:div>
+                                    <hbox>
+                                        <description class="separator" />
+                                    </hbox>
+                                </html:div>
+                                <hbox>
+                                    <button id="delegateCalendaractionadd"
+                                            label="Add"
+                                            onclick="tmpDelegateCalendarSettings.addDelegate()" />
+                                    <button id="delegateCalendaractionupdate"
+                                            label="Update"
+                                            onclick="tmpDelegateCalendarSettings.updateDelegate()" />
+                                    <button id="delegateCalendaractiondelete"
+                                            label="Remove"
+                                            onclick="tmpDelegateCalendarSettings.removeDelegate()" />
+                                    <!--   <button id="delegateCalendaractionrefresh" label="Details" align="end" onclick="tmpDelegateCalendarSettings.getDetails();" /> -->
+                                    <!--   <button id="delegateCalendaractiongetdelegate" label="testrefresh" align="end" onclick="tmpDelegateCalendarSettings.refresh()" /> -->
+                                </hbox>
+                            </vbox>
+                        </groupbox>
                     </hbox>
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
+                    <groupbox id="delegateCalendar.permission-detailsgroupbox">
+
+                        <caption label="Calendar Folder Permission Level:" />
+                        <hbox>
+                            <label control="permission"
+                                   value="&label.delegateCalendar.permission;"
+                                   width="180" />
+                            <menulist id="delegateCalendarpermission"
+                                      onselect="tmpDelegateCalendarSettings.permissionsSelectEvent()">
+
+                                <menupopup>
+                                    <menuitem label="&menuitem.delegateCalendar.permission.author;"
+                                              id="a"
+                                              value="Author" />
+                                    <menuitem label="&menuitem.delegateCalendar.permission.editor;"
+                                              id="b"
+                                              value="Editor" />
+                                    <menuitem label="&menuitem.delegateCalendar.permission.reviewer;"
+                                              id="c"
+                                              value="Reviewer" />
+                                    <menuitem label="&menuitem.delegateCalendar.permission.none;"
+                                              id="d"
+                                              value="None" />
+                                </menupopup>
+                            </menulist>
+                        </hbox>
+                        <html:div>
+                            <hbox>
+                                <description id="delegateCalendarpermissiondiv"
+                                             width="" />
+                            </hbox>
+                        </html:div>
+                    </groupbox>
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
+                    <groupbox id="delegateCalendar.deliveryMeetingRerquest-detailsgroupbox">
+
+                        <caption label="Meeting Request Control:" />
+                        <hbox>
+                            <label control="DeliverMeetingRequestscontrol"
+                                   width="180"
+                                   value="&label.delegateCalendar.deliveryMeetingRerquestControl;" />
+                            <menulist id="deliverMeetingRequestslist"
+                                      onselect="tmpDelegateCalendarSettings.deliverMeetingRequestsSelectEvent()">
+
+                                <menupopup>
+                                    <menuitem label="&menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly;"
+                                              id="DelegatesOnly"
+                                              value="DelegatesOnly" />
+                                    <menuitem label="&menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe;"
+                                              id="DelegatesAndMe"
+                                              value="DelegatesAndMe" />
+                                    <menuitem label="&menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo;"
+                                              id="DelegatesAndSendInformationToMe"
+                                              value="DelegatesAndSendInformationToMe" />
+                                </menupopup>
+                            </menulist>
+                        </hbox>
+                        <html:div>
+                            <hbox>
+                                <description id="deliverMeetingRequestsDesc"
+                                             widht="180" />
+                            </hbox>
+                        </html:div>
+                    </groupbox>
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
+                    <groupbox id="delegateCalendar.deliveryMeetingRerquest-detailsgroupbox">
+
+                        <caption label="Others:" />
+                        <hbox>
+                            <vbox>
+                                <checkbox id="ReceiveCopiesOfMeetingMessages"
+                                          label="&label.delegateCalendar.permission.receiveInvitationCopy;"
+                                          checked="true" />
+                                <checkbox id="ViewPrivateItems"
+                                          label="&label.delegateCalendar.permission.viewPrivateItems;" />
+                            </vbox>
+                        </hbox>
+                    </groupbox>
                 </vbox>
-            </groupbox>
-            </hbox>
-            <html:div><hbox><description class="separator"  /></hbox></html:div>  
-  
-            <groupbox id="delegateCalendar.permission-detailsgroupbox">
-                <caption label="Calendar Folder Permission Level:" />   
-                <hbox>      
-                    <label control="permission" value="&label.delegateCalendar.permission;" width="180" /> 
-                    <menulist id="delegateCalendarpermission" onselect="tmpDelegateCalendarSettings.permissionsSelectEvent()">
-                        <menupopup>
-                            <menuitem label="&menuitem.delegateCalendar.permission.author;"   id="a" value="Author" />
-                            <menuitem label="&menuitem.delegateCalendar.permission.editor;"   id="b" value="Editor" />
-                            <menuitem label="&menuitem.delegateCalendar.permission.reviewer;" id="c" value="Reviewer" />
-                            <menuitem label="&menuitem.delegateCalendar.permission.none;"     id="d" value="None" />
-                        </menupopup>
-                    </menulist>
-                </hbox> 
-                <html:div>
-                <hbox>
-                <description id="delegateCalendarpermissiondiv" width="" />
-                </hbox>
-                </html:div>
-            </groupbox>
-            <html:div><hbox><description class="separator"  /></hbox></html:div>                 
-            <html:div><hbox><description class="separator"  /></hbox></html:div> 
-            <groupbox id="delegateCalendar.deliveryMeetingRerquest-detailsgroupbox">
-                <caption label="Meeting Request Control:" />   
-                <hbox> 
-                    <label control="DeliverMeetingRequestscontrol"  width="180"  value="&label.delegateCalendar.deliveryMeetingRerquestControl;" />  
-                    <menulist id="deliverMeetingRequestslist" onselect="tmpDelegateCalendarSettings.deliverMeetingRequestsSelectEvent()">
-                        <menupopup>
-                            <menuitem label="&menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly;" id="DelegatesOnly" value="DelegatesOnly" />
-                            <menuitem label="&menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe;" id="DelegatesAndMe" value="DelegatesAndMe" />
-                            <menuitem label="&menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo;" id="DelegatesAndSendInformationToMe" value="DelegatesAndSendInformationToMe" />
-                        </menupopup>
-                    </menulist> 
-                </hbox>    
-                <html:div>
-                <hbox>
-                <description id="deliverMeetingRequestsDesc"  widht="180"  />
-                </hbox>
-                </html:div>
-            </groupbox>
-            <html:div><hbox><description class="separator"  /></hbox></html:div> 
-            <html:div><hbox><description class="separator"  /></hbox></html:div> 
-            <groupbox id="delegateCalendar.deliveryMeetingRerquest-detailsgroupbox">
-                <caption label="Others:" />   
-                <hbox>  
-                    <vbox>    
-                        <checkbox id="ReceiveCopiesOfMeetingMessages" label="&label.delegateCalendar.permission.receiveInvitationCopy;" checked="true"/>
-                        <checkbox id="ViewPrivateItems" label="&label.delegateCalendar.permission.viewPrivateItems;" />
-                    </vbox> 
-                </hbox>  
-            </groupbox> 
-        </vbox>
-    </tabpanel>
-    <tabpanel id="OthersCalpanel" >   
-        
-        <!--right panel -->
-        <vbox flex="1">
+            </tabpanel>
+            <tabpanel id="OthersCalpanel">
+                <!--right panel -->
+                <vbox flex="1">
+                    <description>Select calendar of any person
+                    listed in the t</description>
+                    <html:div>
+                        <hbox>
+                            <description class="separator" />
+                        </hbox>
+                    </html:div>
+                    <hbox flex="1">
+                        <vbox>
+                            <label>Shared with me</label>
+                            <vbox>
+                                <!--  <label control="eml" value="&label.delegateCalendar.userEmail;" /> -->
+                                <textbox id="customshareduser"
+                                         width="400"
+                                         height="30"
+                                         flex="1"
+                                         anonid="input"
+                                         class="textbox-addressingWidget uri-element"
+                                         type="autocomplete"
+                                         autocompletesearch="ldap history"
+                                         autocompletepopup="richPopup"
+                                         noautofocus="true"
+                                         autocompletesearchparam="{}"
+                                         timeout="300"
+                                         maxrows="4"
+                                         completedefaultindex="true"
+                                         forcecomplete="true"
+                                         minresultsforpopup="1"
+                                         onblur=""
+                                         ignoreblurwhilesearching="true"
+                                         oninput="this.setAttribute('dirty', 'true');"
+                                         ontextentered="" />
+                                <hbox>
+                                    <spacer flex="1" />
+                                    <button id="delegateCalendaractionadd"
+                                            label="Shared User"
+                                            onclick="tmpDelegateCalendarSettings.addSharedUser()" />
+                                    <spacer flex="1" />
+                                </hbox>
+                            </vbox>
+                        </vbox>
+                        <vbox flex="1">
+                            <groupbox flex="1">
+                                <tree xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+                                      id="sharedcalendars"
+                                      flex="1"
+                                      editable="true"
+                                      enableColumnDrag="false"
+                                      keepcurrentinview="true"
+                                      hidehscroll="true"
+                                      clickthrough="never"
+                                      reeallowevents="true"
+                                      onclick="tmpDelegateCalendarSettings.changeDelegatorCalendar(event);">
 
-            <description>
-            Select calendar of any person listed in the t
-            </description>
-            <html:div><hbox><description class="separator"  /></hbox></html:div> 
-            <hbox flex="1">
-            
-            <vbox>
-            <label>Shared with me </label>
-            <vbox> 
-             <!--  <label control="eml" value="&label.delegateCalendar.userEmail;" /> --> 
-             <textbox id="customshareduser"
-                      width="400"
-                          height="30" 
-                          flex="1"
-                          anonid="input"
-                          class="textbox-addressingWidget uri-element"
-                          type="autocomplete"
-                          autocompletesearch="ldap history"
-                          autocompletepopup="richPopup"
-                          noautofocus="true" 
-                          autocompletesearchparam="{}"
-                          timeout="300"
-                          maxrows="4"
-                          completedefaultindex="true"
-                          forcecomplete="true"
-                          minresultsforpopup="1"
-                          onblur=""
-                          ignoreblurwhilesearching="true"
-                          oninput="this.setAttribute('dirty', 'true');"
-                          ontextentered="" />
-             <hbox>
-                <spacer flex="1"/>
-                <button id="delegateCalendaractionadd"
-                     label="Shared User"
-                     onclick="tmpDelegateCalendarSettings.addSharedUser()" />  
-                <spacer flex="1"/>
-             </hbox>                
-            </vbox>
-            </vbox>
-            <vbox flex="1">
-            <groupbox flex="1" >  
-            
-                <tree xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-                id="sharedcalendars" flex="1"  editable="true" 
-                enableColumnDrag="false" keepcurrentinview="true" hidehscroll="true" clickthrough="never" 
-                reeallowevents="true" onclick="tmpDelegateCalendarSettings.changeDelegatorCalendar(event);" >
-                <treecols>
-                    <treecol fixed="true" editable="true"   type="checkbox"  />
-                    <treecol editable="false" label="Shared Calendars" primary="true" flex="1"   />
-                </treecols> 
-                <treechildren>
-                <treeitem container="true" open="close" flex="3"  id="teamcontainer"  >
-                <treerow >
-                <treecell editable="false" />
-                <treecell id="teamheader" editable="false" label="Team Calendars"   />
-                </treerow>  
-                <treechildren id="team" > 
-                </treechildren>  
-                </treeitem> 
-                
-                <treeitem container="true" open="true" flex="3" >
-                <treerow>
-                <treecell editable="false" />
-                <treecell editable="false" label="Shared Calendars" /> 
-                </treerow> 
-                <treechildren id="shared" >  
-                </treechildren>
-                </treeitem>
-                
-                </treechildren>
-                </tree>
-            </groupbox>
-            </vbox>  
-        </hbox>
-        </vbox>
-    </tabpanel>
-    </tabpanels>	
-</tabbox> 
+                                    <treecols>
+                                        <treecol fixed="true"
+                                                 editable="true"
+                                                 type="checkbox" />
+                                        <treecol editable="false"
+                                                 label="Shared Calendars"
+                                                 primary="true"
+                                                 flex="1" />
+                                    </treecols>
+                                    <treechildren>
+                                        <treeitem container="true"
+                                                  open="close"
+                                                  flex="3"
+                                                  id="teamcontainer">
+                                                  
+                                            <treerow>
+                                                <treecell editable="false" />
+                                                <treecell id="teamheader"
+                                                          editable="false"
+                                                          label="Team Calendars" />
+                                            </treerow>
+                                            <treechildren id="team">
+                                            </treechildren>
+                                        </treeitem>
+                                        <treeitem container="true"
+                                                  open="true"
+                                                  flex="3">
+                                            <treerow>
+                                                <treecell editable="false" />
+                                                <treecell editable="false"
+                                                          label="Shared Calendars" />
+                                            </treerow>
+                                            <treechildren id="shared">
+                                            </treechildren>
+                                        </treeitem>
+                                    </treechildren>
+                                </tree>
+                            </groupbox>
+                        </vbox>
+                    </hbox>
+                </vbox>
+            </tabpanel>
+        </tabpanels>
+    </tabbox>
 </dialog>
diff --git a/chrome/content/ecCalendarCreation.xul b/chrome/content/ecCalendarCreation.xul
index ed4a97ed..467e423a 100644
--- a/chrome/content/ecCalendarCreation.xul
+++ b/chrome/content/ecCalendarCreation.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,42 +36,48 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
     <!ENTITY % dtd3 SYSTEM "chrome://exchangecalendar/locale/ecCalendarCreation.dtd" > %dtd3;
 ]>
 <?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
-
 <overlay id="calendarCreation"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	
-    <script type="application/javascript" src="chrome://exchangecalendar/content/ecCalendarCreation.js"/>
-    <script type="application/javascript" src="chrome://gdata-provider/content/gdata-calendar-creation.js"/>  
-
-    <radiogroup id="calendar-format" onselect="tmpCalendarCreation.doRadioExchangeCalendar(this.value);">
-	<vbox>
-	        <radio value="exchangecalendar" label="Microsoft Exchange 2007/2010/2013" id="exchWebService-radioexchangecalendar" />
-		<hbox id="exchange-cache-row" hidden="true">
-			<checkbox hidden="true" checked="true" id="exchange-cache" control="calendar-uri" label="&exchange.cache.label;"/>
-		</hbox>
-	</vbox>
-    </radiogroup>
 
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/ecCalendarCreation.js" />
+    <script type="application/javascript"
+            src="chrome://gdata-provider/content/gdata-calendar-creation.js" />
+    <radiogroup id="calendar-format"
+                onselect="tmpCalendarCreation.doRadioExchangeCalendar(this.value);">
 
-<wizard id="calendar-wizard" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-   <wizardpage pageid="exchWebService_exchange1"
-               next="finishPage"
-               label="&wizard.label;"
-               description="&exchange1.description;"
-               onpageshow="checkRequired();tmpCalendarCreation.initExchange1();"
-               onpageadvanced="tmpCalendarCreation.saveSettings();">
-
-	<vbox id="exchWebService-exchange-settings"/>
-   </wizardpage>
-</wizard>
+        <vbox>
+            <radio value="exchangecalendar"
+                   label="Microsoft Exchange 2007/2010/2013"
+                   id="exchWebService-radioexchangecalendar" />
+            <hbox id="exchange-cache-row"
+                  hidden="true">
+                <checkbox hidden="true"
+                          checked="true"
+                          id="exchange-cache"
+                          control="calendar-uri"
+                          label="&exchange.cache.label;" />
+            </hbox>
+        </vbox>
+    </radiogroup>
+    <wizard id="calendar-wizard"
+            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+        <wizardpage pageid="exchWebService_exchange1"
+                    next="finishPage"
+                    label="&wizard.label;"
+                    description="&exchange1.description;"
+                    onpageshow="checkRequired();tmpCalendarCreation.initExchange1();"
+                    onpageadvanced="tmpCalendarCreation.saveSettings();">
+                    
+            <vbox id="exchWebService-exchange-settings" />
+        </wizardpage>
+    </wizard>
 </overlay>
-
-
diff --git a/chrome/content/exchService-followup-event-dialog.xml b/chrome/content/exchService-followup-event-dialog.xml
index fd440e0d..ee45e569 100644
--- a/chrome/content/exchService-followup-event-dialog.xml
+++ b/chrome/content/exchService-followup-event-dialog.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-alarms.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-attendees.css"?>
@@ -11,8 +10,8 @@
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
     <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
@@ -22,7 +21,6 @@
     %calendarDTD;
     %eventDialogDTD;
 ]>
-
 <!-- Dialog id is changed during excution to allow different Window-icons
      on this dialog. document.loadOverlay() will not work on this one. -->
 <dialog id="calendar-event-dialog"
@@ -36,264 +34,243 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <stringbundleset id="stringbundleset">
-      <stringbundle id="languageBundle"
-                    src="chrome://global/locale/languageNames.properties"/>
+        <stringbundle id="languageBundle"
+                      src="chrome://global/locale/languageNames.properties" />
     </stringbundleset>
-
     <!-- Javascript includes -->
-    <script> 
-    function textInputToReadOnly(){ 
-        var args = window.arguments[0];
-        var item = args.calendarEvent;
-        item = item.clone();  
-        var calendar = item.calendar; 
-        if (item.hasProperty("DESCRIPTION")) {
-        var description = item.getProperty("DESCRIPTION");
-        if(description){
-            if ( description.length ) {
-                document.getElementById("item-description-box")
-                    .removeAttribute("hidden");
-                var textbox = document.getElementById("item-description");
-                        textbox.value = description;
-                        textbox.inputField.readOnly = true;
-                }
-            } 
-        }
-    } 
-    </script>
+    <script>function textInputToReadOnly(){ var args =
+    window.arguments[0]; var item = args.calendarEvent; item =
+    item.clone(); var calendar = item.calendar; if
+    (item.hasProperty("DESCRIPTION")) { var description =
+    item.getProperty("DESCRIPTION"); if(description){ if (
+    description.length ) {
+    document.getElementById("item-description-box")
+    .removeAttribute("hidden"); var textbox =
+    document.getElementById("item-description"); textbox.value =
+    description; textbox.inputField.readOnly = true; } } }
+    }</script>
     <script type="application/javascript"
-            src="chrome://calendar/content/calendar-event-dialog.js"/> 
+            src="chrome://calendar/content/calendar-event-dialog.js" />
     <script type="application/javascript"
-            src="chrome://calendar/content/calendar-dialog-utils.js"/>
+            src="chrome://calendar/content/calendar-dialog-utils.js" />
     <script type="application/javascript"
-            src="chrome://calendar/content/calendar-ui-utils.js"/>
+            src="chrome://calendar/content/calendar-ui-utils.js" />
     <script type="application/javascript"
-            src="chrome://calendar/content/calUtils.js"/>
+            src="chrome://calendar/content/calUtils.js" />
     <script type="application/javascript"
-            src="chrome://calendar/content/calApplicationUtils.js"/>
+            src="chrome://calendar/content/calApplicationUtils.js" />
     <script type="application/javascript"
-            src="chrome://global/content/globalOverlay.js"/>
+            src="chrome://global/content/globalOverlay.js" />
     <script type="application/javascript"
-            src="chrome://global/content/printUtils.js"/>
-    <script type="application/javascript" 
-            src="chrome://calendar/content/calendar-statusbar.js"/>
-
+            src="chrome://global/content/printUtils.js" />
+    <script type="application/javascript"
+            src="chrome://calendar/content/calendar-statusbar.js" />
     <!-- Command updater -->
     <commandset id="globalEditMenuItems"
                 commandupdater="true"
                 events="focus"
-                oncommandupdate="goUpdateGlobalEditMenuItems()"/>
+                oncommandupdate="goUpdateGlobalEditMenuItems()" />
     <commandset id="selectEditMenuItems"
                 commandupdater="true"
                 events="select"
-                oncommandupdate="goUpdateSelectEditMenuItems()"/>
+                oncommandupdate="goUpdateSelectEditMenuItems()" />
     <commandset id="undoEditMenuItems"
                 commandupdater="true"
                 events="undo"
-                oncommandupdate="goUpdateUndoEditMenuItems()"/>
+                oncommandupdate="goUpdateUndoEditMenuItems()" />
     <commandset id="clipboardEditMenuItems"
                 commandupdater="true"
                 events="clipboard"
-                oncommandupdate="goUpdatePasteMenuItems()"/>
-
+                oncommandupdate="goUpdatePasteMenuItems()" />
     <!-- Commands -->
     <commandset id="itemCommands">
-
         <!-- Item menu -->
         <command id="cmd_item_new_event"
-                 oncommand="openNewEvent()"/>
+                 oncommand="openNewEvent()" />
         <command id="cmd_item_new_task"
-                 oncommand="openNewTask()"/>
+                 oncommand="openNewTask()" />
         <command id="cmd_item_new_message"
-                 oncommand="openNewMessage()"/>
+                 oncommand="openNewMessage()" />
         <command id="cmd_item_new_card"
-                 oncommand="openNewCardDialog()"/>
+                 oncommand="openNewCardDialog()" />
         <command id="cmd_item_close"
-                 oncommand="cancelDialog()"/>
+                 oncommand="cancelDialog()" />
         <command id="cmd_save"
                  disable-on-readonly="true"
-                 oncommand="onCommandSave()"/>
+                 oncommand="onCommandSave()" />
         <command id="cmd_item_delete"
                  disable-on-readonly="true"
-                 oncommand="onCommandDeleteItem()"/>
+                 oncommand="onCommandDeleteItem()" />
         <command id="cmd_printSetup"
-                 oncommand="PrintUtils.showPageSetup()"/>
+                 oncommand="PrintUtils.showPageSetup()" />
         <command id="cmd_print"
                  disabled="true"
-                 oncommand="calPrint()"/>
-
+                 oncommand="calPrint()" />
         <!-- Edit menu -->
         <command id="cmd_undo"
                  disabled="true"
-                 oncommand="goDoCommand('cmd_undo')"/>
+                 oncommand="goDoCommand('cmd_undo')" />
         <command id="cmd_redo"
                  disabled="true"
-                 oncommand="goDoCommand('cmd_redo')"/>
+                 oncommand="goDoCommand('cmd_redo')" />
         <command id="cmd_cut"
                  disabled="true"
-                 oncommand="goDoCommand('cmd_cut')"/>
+                 oncommand="goDoCommand('cmd_cut')" />
         <command id="cmd_copy"
                  disabled="true"
-                 oncommand="goDoCommand('cmd_copy')"/>
+                 oncommand="goDoCommand('cmd_copy')" />
         <command id="cmd_paste"
                  disabled="true"
-                 oncommand="goDoCommand('cmd_paste')"/>
+                 oncommand="goDoCommand('cmd_paste')" />
         <command id="cmd_selectAll"
                  disabled="true"
-                 oncommand="goDoCommand('cmd_selectAll')"/>
-
+                 oncommand="goDoCommand('cmd_selectAll')" />
         <!-- View menu -->
         <command id="cmd_toolbar"
-                 oncommand="onCommandViewToolbar('event-toolbar',
-                                                 'view-toolbars-event-menuitem')"/>
+                 oncommand="onCommandViewToolbar('event-toolbar', 'view-toolbars-event-menuitem')" />
         <command id="cmd_customize"
-                 oncommand="onCommandCustomize()"/>
+                 oncommand="onCommandCustomize()" />
         <command id="cmd_toggle_link"
                  persist="checked"
-                 oncommand="toggleLink()"/>
-
+                 oncommand="toggleLink()" />
         <!-- Toolbar commands -->
         <command id="cmd_accept"
                  disable-on-readonly="true"
-                 oncommand="acceptDialog();"/>
+                 oncommand="acceptDialog();" />
         <command id="cmd_recurrence"
-                 oncommand="editRepeat();"/>
+                 oncommand="editRepeat();" />
         <command id="cmd_attendees"
-                 oncommand="editAttendees();"/>
+                 oncommand="editAttendees();" />
         <command id="cmd_email"
-                 oncommand="sendMailToAttendees(window.attendees);"/>
+                 oncommand="sendMailToAttendees(window.attendees);" />
         <command id="cmd_email_undecided"
-                 oncommand="sendMailToUndecidedAttendees(window.attendees);"/>
+                 oncommand="sendMailToUndecidedAttendees(window.attendees);" />
         <command id="cmd_status_none"
                  oncommand="editStatus(event.target)"
                  hidden="true"
-                 value="NONE"/>
+                 value="NONE" />
         <command id="cmd_status_tentative"
                  oncommand="editStatus(event.target)"
-                 value="TENTATIVE"/>
+                 value="TENTATIVE" />
         <command id="cmd_status_confirmed"
                  oncommand="editStatus(event.target)"
-                 value="CONFIRMED"/>
+                 value="CONFIRMED" />
         <command id="cmd_status_cancelled"
                  oncommand="editStatus(event.target)"
-                 value="CANCELLED"/>
+                 value="CANCELLED" />
         <command id="cmd_priority_none"
                  oncommand="editPriority(event.target)"
-                 value="0"/>
+                 value="0" />
         <command id="cmd_priority_low"
                  oncommand="editPriority(event.target)"
-                 value="9"/>
+                 value="9" />
         <command id="cmd_priority_normal"
                  oncommand="editPriority(event.target)"
-                 value="5"/>
+                 value="5" />
         <command id="cmd_priority_high"
                  oncommand="editPriority(event.target)"
-                 value="1"/>
+                 value="1" />
         <command id="cmd_showtimeas_busy"
                  oncommand="editShowTimeAs(event.target)"
-                 value="OPAQUE"/>
+                 value="OPAQUE" />
         <command id="cmd_showtimeas_free"
                  oncommand="editShowTimeAs(event.target)"
-                 value="TRANSPARENT"/>
+                 value="TRANSPARENT" />
         <command id="cmd_attach_url"
                  disable-on-readonly="true"
-                 oncommand="attachURL()"/>
+                 oncommand="attachURL()" />
         <command id="cmd_attach_cloud"
-                 disable-on-readonly="true"/>
+                 disable-on-readonly="true" />
         <command id="cmd_openAttachment"
-                 oncommand="openAttachment()"/>
+                 oncommand="openAttachment()" />
         <command id="cmd_copyAttachment"
-                 oncommand="copyAttachment()"/>
+                 oncommand="copyAttachment()" />
         <command id="cmd_deleteAttachment"
                  disable-on-readonly="true"
-                 oncommand="deleteAttachment()"/>
+                 oncommand="deleteAttachment()" />
         <command id="cmd_deleteAllAttachments"
                  disable-on-readonly="true"
-                 oncommand="deleteAllAttachments()"/>
+                 oncommand="deleteAllAttachments()" />
         <command id="cmd_timezone"
                  persist="checked"
                  checked="false"
-                 oncommand="toggleTimezoneLinks()"/>
+                 oncommand="toggleTimezoneLinks()" />
     </commandset>
-
     <keyset id="calendar-event-dialog-keyset">
         <key id="new-event-key"
              modifiers="accel"
              key="&event.dialog.new.event.key2;"
-             command="cmd_item_new_event"/>
+             command="cmd_item_new_event" />
         <key id="new-task-key"
              modifiers="accel"
              key="&event.dialog.new.task.key2;"
-             command="cmd_item_new_task"/>
+             command="cmd_item_new_task" />
         <key id="new-message-key"
              modifiers="accel"
              key="&event.dialog.new.message.key2;"
-             command="cmd_item_new_message"/>
+             command="cmd_item_new_message" />
         <key id="close-key"
              modifiers="accel"
              key="&event.dialog.close.key;"
-             command="cmd_item_close"/>
+             command="cmd_item_close" />
         <key id="save-key"
              modifiers="accel"
              key="&event.dialog.save.key;"
-             command="cmd_save"/>
+             command="cmd_save" />
         <key id="saveandclose-key"
              modifiers="accel"
              key="&event.dialog.saveandclose.key;"
-             command="cmd_accept"/>
+             command="cmd_accept" />
         <key id="saveandclose-key2"
              modifiers="accel"
              keycode="VK_RETURN"
-             command="cmd_accept"/>
+             command="cmd_accept" />
         <key id="print-key"
              modifiers="accel"
              key="&event.dialog.print.key;"
-             command="cmd_print"/>
+             command="cmd_print" />
         <key id="undo-key"
              modifiers="accel"
              key="&event.dialog.undo.key;"
-             command="cmd_undo"/>
+             command="cmd_undo" />
         <key id="redo-key"
              modifiers="accel"
              key="&event.dialog.redo.key;"
-             command="cmd_redo"/>
+             command="cmd_redo" />
         <key id="cut-key"
              modifiers="accel"
              key="&event.dialog.cut.key;"
-             command="cmd_cut"/>
+             command="cmd_cut" />
         <key id="copy-key"
              modifiers="accel"
              key="&event.dialog.copy.key;"
-             command="cmd_copy"/>
+             command="cmd_copy" />
         <key id="paste-key"
              modifiers="accel"
              key="&event.dialog.paste.key;"
-             command="cmd_paste"/>
+             command="cmd_paste" />
         <key id="select-all-key"
              modifiers="accel"
              key="&event.dialog.select.all.key;"
-             command="cmd_selectAll"/>
+             command="cmd_selectAll" />
     </keyset>
-
-  <menupopup id="event-dialog-toolbar-context-menu">
-    <menuitem id="CustomizeDialogToolbar"
-              label="&event.menu.view.toolbars.customize.label;"
-              command="cmd_customize"/>
-  </menupopup>
-
-  <!-- Toolbox contains the toolbar and menubar -->
+    <menupopup id="event-dialog-toolbar-context-menu">
+        <menuitem id="CustomizeDialogToolbar"
+                  label="&event.menu.view.toolbars.customize.label;"
+                  command="cmd_customize" />
+    </menupopup>
+    <!-- Toolbox contains the toolbar and menubar -->
     <toolbox id="event-toolbox"
              class="toolbox-top"
              mode="full"
              defaultmode="full"
              labelalign="end"
              defaultlabelalign="end">
-
         <!-- Menubar -->
-        <menubar id="event-menubar" hidden="true">
-
+        <menubar id="event-menubar"
+                 hidden="true">
             <!-- Item menu -->
-                  <!-- These 2 Strings are placeholders, values are set at runtime -->
+            <!-- These 2 Strings are placeholders, values are set at runtime -->
             <menu label="Item"
                   accesskey="I"
                   id="item-menu">
@@ -301,70 +278,70 @@
                     <menu id="item-new-menu"
                           label="&event.menu.item.new.label;"
                           accesskey="&event.menu.item.new.accesskey;">
+                          
                         <menupopup id="item-new-menupopup">
                             <menuitem id="item-new-message-menuitem"
                                       label="&event.menu.item.new.message.label;"
                                       accesskey="&event.menu.item.new.message.accesskey;"
                                       key="new-message-key"
                                       command="cmd_item_new_message"
-                                      disable-on-readonly="true"/>
+                                      disable-on-readonly="true" />
                             <menuitem id="item-new-event-menuitem"
                                       label="&event.menu.item.new.event.label;"
                                       accesskey="&event.menu.item.new.event.accesskey;"
                                       key="new-event-key"
                                       command="cmd_item_new_event"
-                                      disable-on-readonly="true"/>
+                                      disable-on-readonly="true" />
                             <menuitem id="item-new-task-menuitem"
                                       label="&event.menu.item.new.task.label;"
                                       accesskey="&event.menu.item.new.task.accesskey;"
                                       key="new-task-key"
                                       command="cmd_item_new_task"
-                                      disable-on-readonly="true"/>
-                            <menuseparator id="item-new-menuseparator1"/>
+                                      disable-on-readonly="true" />
+                            <menuseparator id="item-new-menuseparator1" />
                             <menuitem id="item-new-address-menuitem"
                                       label="&event.menu.item.new.contact.label;"
                                       accesskey="&event.menu.item.new.contact.accesskey;"
                                       command="cmd_item_new_card"
-                                      disable-on-readonly="true"/>
+                                      disable-on-readonly="true" />
                         </menupopup>
                     </menu>
-                    <menuseparator id="item-menuseparator1"/>
+                    <menuseparator id="item-menuseparator1" />
                     <menuitem id="item-save-menuitem"
                               label="&event.menu.item.save.label;"
                               accesskey="&event.menu.item.save.accesskey;"
                               key="save-key"
-                              command="cmd_save"/>
+                              command="cmd_save" />
                     <menuitem id="item-saveandclose-menuitem"
                               label="&event.menu.item.saveandclose.label;"
                               accesskey="&event.menu.item.saveandclose.accesskey;"
                               key="saveandclose-key"
-                              command="cmd_accept"/>
+                              command="cmd_accept" />
                     <menuitem id="item-delete-menuitem"
                               label="&event.menu.item.delete.label;"
                               accesskey="&event.menu.item.delete.accesskey;"
                               command="cmd_item_delete"
-                              disable-on-readonly="true"/>
+                              disable-on-readonly="true" />
                     <menuitem id="item-pagesetup-menuitem"
                               label="&event.menu.item.page.setup.label;"
                               accesskey="&event.menu.item.page.setup.accesskey;"
                               command="cmd_printSetup"
-                              disable-on-readonly="true"/>
+                              disable-on-readonly="true" />
                     <menuitem id="item-print-menuitem"
                               label="&event.menu.item.print.label;"
                               accesskey="&event.menu.item.print.accesskey;"
                               key="print-key"
                               command="cmd_print"
-                              disable-on-readonly="true"/>
-                    <menuseparator id="item-menuseparator1"/>
+                              disable-on-readonly="true" />
+                    <menuseparator id="item-menuseparator1" />
                     <menuitem id="item-close-menuitem"
                               label="&event.menu.item.close.label;"
                               accesskey="&event.menu.item.close.accesskey;"
                               key="close-key"
                               command="cmd_item_close"
-                              disable-on-readonly="true"/>
+                              disable-on-readonly="true" />
                 </menupopup>
             </menu>
-
             <!-- Edit menu -->
             <menu id="edit-menu"
                   label="&event.menu.edit.label;"
@@ -375,37 +352,36 @@
                               label="&event.menu.edit.undo.label;"
                               accesskey="&event.menu.edit.undo.accesskey;"
                               key="undo-key"
-                              command="cmd_undo"/>
+                              command="cmd_undo" />
                     <menuitem id="edit-redo-menuitem"
                               label="&event.menu.edit.redo.label;"
                               accesskey="&event.menu.edit.redo.accesskey;"
                               key="redo-key"
-                              command="cmd_redo"/>
-                    <menuseparator id="edit-menuseparator1"/>
+                              command="cmd_redo" />
+                    <menuseparator id="edit-menuseparator1" />
                     <menuitem id="edit-cut-menuitem"
                               label="&event.menu.edit.cut.label;"
                               accesskey="&event.menu.edit.cut.accesskey;"
                               key="cut-key"
-                              command="cmd_cut"/>
+                              command="cmd_cut" />
                     <menuitem id="edit-copy-menuitem"
                               label="&event.menu.edit.copy.label;"
                               accesskey="&event.menu.edit.copy.accesskey;"
                               key="copy-key"
-                              command="cmd_copy"/>
+                              command="cmd_copy" />
                     <menuitem id="edit-paste-menuitem"
                               label="&event.menu.edit.paste.label;"
                               accesskey="&event.menu.edit.paste.accesskey;"
                               key="paste-key"
-                              command="cmd_paste"/>
-                    <menuseparator id="edit-menuseparator2"/>
+                              command="cmd_paste" />
+                    <menuseparator id="edit-menuseparator2" />
                     <menuitem id="edit-selectall-menuitem"
                               label="&event.menu.edit.select.all.label;"
                               accesskey="&event.menu.edit.select.all.accesskey;"
                               key="select-all-key"
-                              command="cmd_selectAll"/>
+                              command="cmd_selectAll" />
                 </menupopup>
             </menu>
-
             <!-- View menu -->
             <menu id="view-menu"
                   label="&event.menu.view.label;"
@@ -415,173 +391,174 @@
                     <menu id="view-toolbars-menu"
                           label="&event.menu.view.toolbars.label;"
                           accesskey="&event.menu.view.toolbars.accesskey;">
+
                         <menupopup id="view-toolbars-menupopup">
                             <menuitem id="view-toolbars-event-menuitem"
                                       label="&event.menu.view.toolbars.event.label;"
                                       accesskey="&event.menu.view.toolbars.event.accesskey;"
                                       type="checkbox"
                                       checked="true"
-                                      command="cmd_toolbar"/>
-                            <menuseparator id="view-toolbars-menuseparator1"/>
+                                      command="cmd_toolbar" />
+                            <menuseparator id="view-toolbars-menuseparator1" />
                             <menuitem id="view-toolbars-customize-menuitem"
                                       label="&event.menu.view.toolbars.customize.label;"
                                       accesskey="&event.menu.view.toolbars.customize.accesskey;"
-                                      command="cmd_customize"/>
+                                      command="cmd_customize" />
                         </menupopup>
                     </menu>
-                    <menuseparator id="view-menu-toolbars-separator"/>
+                    <menuseparator id="view-menu-toolbars-separator" />
                     <menuitem id="view-show-link-menuitem"
                               label="&event.menu.view.showlink.label;"
                               accesskey="&event.menu.view.showlink.accesskey;"
                               type="checkbox"
                               command="cmd_toggle_link"
-                              observes="cmd_toggle_link"/>
+                              observes="cmd_toggle_link" />
                 </menupopup>
             </menu>
-
             <!-- Options menu -->
             <menu id="options-menu"
                   label="&event.menu.options.label;"
                   accesskey="&event.menu.options.accesskey;">
                 <menupopup id="options-menupopup"
                            onpopupshowing="onPopupShowing(this)">
-                  <menuitem id="options-attendees-menuitem"
-                            label="&event.menu.options.attendees.label;"
-                            accesskey="&event.menu.options.attendees.accesskey;"
-                            command="cmd_attendees"
-                            disable-on-readonly="true"/>
-                  <menu id="options-attachments-menu"
-                        label="&event.attachments.menubutton.label;"
-                        accesskey="&event.attachments.menubutton.accesskey;">
-                    <menupopup id="options-attachments-menupopup">
-                      <menuitem id="options-attachments-url-menuitem"
-                                label="&event.attachments.url.label;"
-                                accesskey="&event.attachments.url.accesskey;"
-                                command="cmd_attach_url"/>
-                    </menupopup>
-                  </menu>
-                  <menuitem id="options-timezones-menuitem"
-                            label="&event.menu.options.timezone2.label;"
-                            accesskey="&event.menu.options.timezone2.accesskey;"
-                            type="checkbox"
-                            command="cmd_timezone"
-                            disable-on-readonly="true"/>
-                  <menuseparator id="options-menuseparator1"/>
-                  <menu id="options-priority-menu"
-                        label="&event.menu.options.priority2.label;"
-                        accesskey="&event.menu.options.priority2.accesskey;"
-                        disable-on-readonly="true">
-                      <menupopup id="options-priority-menupopup">
-                          <menuitem id="options-priority-none-menuitem"
-                                    label="&event.menu.options.priority.notspecified.label;"
-                                    accesskey="&event.menu.options.priority.notspecified.accesskey;"
-                                    type="radio"
-                                    command="cmd_priority_none"
-                                    disable-on-readonly="true"/>
-                          <menuitem id="options-priority-low-menuitem"
-                                    label="&event.menu.options.priority.low.label;"
-                                    accesskey="&event.menu.options.priority.low.accesskey;"
-                                    type="radio"
-                                    command="cmd_priority_low"
-                                    disable-on-readonly="true"/>
-                          <menuitem id="options-priority-normal-label"
-                                    label="&event.menu.options.priority.normal.label;"
-                                    accesskey="&event.menu.options.priority.normal.accesskey;"
-                                    type="radio"
-                                    command="cmd_priority_normal"
-                                    disable-on-readonly="true"/>
-                          <menuitem id="options-priority-high-label"
-                                    label="&event.menu.options.priority.high.label;"
-                                    accesskey="&event.menu.options.priority.high.accesskey;"
-                                    type="radio"
-                                    command="cmd_priority_high"
-                                    disable-on-readonly="true"/>
-                      </menupopup>
-                  </menu>
-                  <menu id="options-privacy-menu"
-                        label="&event.menu.options.privacy.label;"
-                        accesskey="&event.menu.options.privacy.accesskey;"
-                        disable-on-readonly="true">
-                      <menupopup id="options-privacy-menupopup">
-                          <menuitem id="options-privacy-public-menuitem"
-                                    label="&event.menu.options.privacy.public.label;"
-                                    accesskey="&event.menu.options.privacy.public.accesskey;"
-                                    type="radio"
-                                    privacy="PUBLIC"
-                                    oncommand="editPrivacy(this, event)"
-                                    disable-on-readonly="true"/>
-                          <menuitem id="options-privacy-confidential-menuitem"
-                                    label="&event.menu.options.privacy.confidential.label;"
-                                    accesskey="&event.menu.options.privacy.confidential.accesskey;"
-                                    type="radio"
-                                    privacy="CONFIDENTIAL"
-                                    oncommand="editPrivacy(this, event)"
-                                    disable-on-readonly="true"/>
-                          <menuitem id="options-privacy-private-menuitem"
-                                    label="&event.menu.options.privacy.private.label;"
-                                    accesskey="&event.menu.options.privacy.private.accesskey;"
-                                    type="radio"
-                                    privacy="PRIVATE"
-                                    oncommand="editPrivacy(this, event)"
-                                    disable-on-readonly="true"/>
-                      </menupopup>
-                  </menu>
-                  <menu id="options-status-menu"
-                        label="&newevent.status.label;"
-                        accesskey="&newevent.status.accesskey;"
-                        class="event-only"
-                        disable-on-readonly="true">
-                    <menupopup id="options-status-menupopup">
-                      <menuitem id="options-status-none-menuitem"
-                                label="&newevent.eventStatus.none.label;"
-                                accesskey="&newevent.eventStatus.none.accesskey;"
-                                type="radio"
-                                command="cmd_status_none"
-                                disable-on-readonly="true"/>
-                      <menuitem id="options-status-tentative-menuitem"
-                                label="&newevent.status.tentative.label;"
-                                accesskey="&newevent.status.tentative.accesskey;"
-                                type="radio"
-                                command="cmd_status_tentative"
-                                disable-on-readonly="true"/>
-                      <menuitem id="options-status-confirmed-menuitem"
-                                label="&newevent.status.confirmed.label;"
-                                accesskey="&newevent.status.confirmed.accesskey;"
-                                type="radio"
-                                command="cmd_status_confirmed"
-                                disable-on-readonly="true"/>
-                      <menuitem id="options-status-canceled-menuitem"
-                                label="&newevent.eventStatus.cancelled.label;"
-                                accesskey="&newevent.eventStatus.cancelled.accesskey;"
-                                type="radio"
-                                command="cmd_status_cancelled"
-                                disable-on-readonly="true"/>
-                    </menupopup>
-                  </menu>
-                  <menuseparator id="options-menuseparator2"/>
-                  <menu id="options-freebusy-menu"
-                        label="&event.menu.options.show.time.label;"
-                        accesskey="&event.menu.options.show.time.accesskey;"
-                        disable-on-readonly="true">
-                      <menupopup id="options-freebusy-menupopup">
-                          <menuitem id="options-freebusy-busy-menuitem"
-                                    label="&event.menu.options.show.time.busy.label;"
-                                    accesskey="&event.menu.options.show.time.busy.accesskey;"
-                                    type="radio"
-                                    command="cmd_showtimeas_busy"
-                                    disable-on-readonly="true"/>
-                          <menuitem id="options-freebusy-free-menuitem"
-                                    label="&event.menu.options.show.time.free.label;"
-                                    accesskey="&event.menu.options.show.time.free.accesskey;"
-                                    type="radio"
-                                    command="cmd_showtimeas_free"
-                                    disable-on-readonly="true"/>
-                      </menupopup>
-                  </menu>
+                    <menuitem id="options-attendees-menuitem"
+                              label="&event.menu.options.attendees.label;"
+                              accesskey="&event.menu.options.attendees.accesskey;"
+                              command="cmd_attendees"
+                              disable-on-readonly="true" />
+                    <menu id="options-attachments-menu"
+                          label="&event.attachments.menubutton.label;"
+                          accesskey="&event.attachments.menubutton.accesskey;">
+
+                        <menupopup id="options-attachments-menupopup">
+
+                            <menuitem id="options-attachments-url-menuitem"
+                                      label="&event.attachments.url.label;"
+                                      accesskey="&event.attachments.url.accesskey;"
+                                      command="cmd_attach_url" />
+                        </menupopup>
+                    </menu>
+                    <menuitem id="options-timezones-menuitem"
+                              label="&event.menu.options.timezone2.label;"
+                              accesskey="&event.menu.options.timezone2.accesskey;"
+                              type="checkbox"
+                              command="cmd_timezone"
+                              disable-on-readonly="true" />
+                    <menuseparator id="options-menuseparator1" />
+                    <menu id="options-priority-menu"
+                          label="&event.menu.options.priority2.label;"
+                          accesskey="&event.menu.options.priority2.accesskey;"
+                          disable-on-readonly="true">
+                        <menupopup id="options-priority-menupopup">
+                            <menuitem id="options-priority-none-menuitem"
+                                      label="&event.menu.options.priority.notspecified.label;"
+                                      accesskey="&event.menu.options.priority.notspecified.accesskey;"
+                                      type="radio"
+                                      command="cmd_priority_none"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-priority-low-menuitem"
+                                      label="&event.menu.options.priority.low.label;"
+                                      accesskey="&event.menu.options.priority.low.accesskey;"
+                                      type="radio"
+                                      command="cmd_priority_low"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-priority-normal-label"
+                                      label="&event.menu.options.priority.normal.label;"
+                                      accesskey="&event.menu.options.priority.normal.accesskey;"
+                                      type="radio"
+                                      command="cmd_priority_normal"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-priority-high-label"
+                                      label="&event.menu.options.priority.high.label;"
+                                      accesskey="&event.menu.options.priority.high.accesskey;"
+                                      type="radio"
+                                      command="cmd_priority_high"
+                                      disable-on-readonly="true" />
+                        </menupopup>
+                    </menu>
+                    <menu id="options-privacy-menu"
+                          label="&event.menu.options.privacy.label;"
+                          accesskey="&event.menu.options.privacy.accesskey;"
+                          disable-on-readonly="true">
+                        <menupopup id="options-privacy-menupopup">
+                            <menuitem id="options-privacy-public-menuitem"
+                                      label="&event.menu.options.privacy.public.label;"
+                                      accesskey="&event.menu.options.privacy.public.accesskey;"
+                                      type="radio"
+                                      privacy="PUBLIC"
+                                      oncommand="editPrivacy(this, event)"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-privacy-confidential-menuitem"
+                                      label="&event.menu.options.privacy.confidential.label;"
+                                      accesskey="&event.menu.options.privacy.confidential.accesskey;"
+                                      type="radio"
+                                      privacy="CONFIDENTIAL"
+                                      oncommand="editPrivacy(this, event)"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-privacy-private-menuitem"
+                                      label="&event.menu.options.privacy.private.label;"
+                                      accesskey="&event.menu.options.privacy.private.accesskey;"
+                                      type="radio"
+                                      privacy="PRIVATE"
+                                      oncommand="editPrivacy(this, event)"
+                                      disable-on-readonly="true" />
+                        </menupopup>
+                    </menu>
+                    <menu id="options-status-menu"
+                          label="&newevent.status.label;"
+                          accesskey="&newevent.status.accesskey;"
+                          class="event-only"
+                          disable-on-readonly="true">
+                        <menupopup id="options-status-menupopup">
+                            <menuitem id="options-status-none-menuitem"
+                                      label="&newevent.eventStatus.none.label;"
+                                      accesskey="&newevent.eventStatus.none.accesskey;"
+                                      type="radio"
+                                      command="cmd_status_none"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-status-tentative-menuitem"
+                                      label="&newevent.status.tentative.label;"
+                                      accesskey="&newevent.status.tentative.accesskey;"
+                                      type="radio"
+                                      command="cmd_status_tentative"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-status-confirmed-menuitem"
+                                      label="&newevent.status.confirmed.label;"
+                                      accesskey="&newevent.status.confirmed.accesskey;"
+                                      type="radio"
+                                      command="cmd_status_confirmed"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-status-canceled-menuitem"
+                                      label="&newevent.eventStatus.cancelled.label;"
+                                      accesskey="&newevent.eventStatus.cancelled.accesskey;"
+                                      type="radio"
+                                      command="cmd_status_cancelled"
+                                      disable-on-readonly="true" />
+                        </menupopup>
+                    </menu>
+                    <menuseparator id="options-menuseparator2" />
+                    <menu id="options-freebusy-menu"
+                          label="&event.menu.options.show.time.label;"
+                          accesskey="&event.menu.options.show.time.accesskey;"
+                          disable-on-readonly="true">
+                        <menupopup id="options-freebusy-menupopup">
+                            <menuitem id="options-freebusy-busy-menuitem"
+                                      label="&event.menu.options.show.time.busy.label;"
+                                      accesskey="&event.menu.options.show.time.busy.accesskey;"
+                                      type="radio"
+                                      command="cmd_showtimeas_busy"
+                                      disable-on-readonly="true" />
+                            <menuitem id="options-freebusy-free-menuitem"
+                                      label="&event.menu.options.show.time.free.label;"
+                                      accesskey="&event.menu.options.show.time.free.accesskey;"
+                                      type="radio"
+                                      command="cmd_showtimeas_free"
+                                      disable-on-readonly="true" />
+                        </menupopup>
+                    </menu>
                 </menupopup>
             </menu>
         </menubar>
-
         <!-- Toolbar -->
         <toolbarpalette id="event-toolbarpalette">
             <toolbarbutton id="button-save"
@@ -589,14 +566,14 @@
                            class="cal-event-toolbarbutton toolbarbutton-1"
                            label="&event.toolbar.save.label;"
                            tooltiptext="&event.toolbar.save.tooltip;"
-                           command="cmd_accept"/>
+                           command="cmd_accept" />
             <toolbarbutton id="button-attendees"
                            mode="dialog"
                            class="cal-event-toolbarbutton toolbarbutton-1 event-only"
                            disable-on-readonly="true"
                            label="&event.toolbar.attendees.label;"
                            tooltiptext="&event.toolbar.attendees.tooltip;"
-                           command="cmd_attendees"/>
+                           command="cmd_attendees" />
             <toolbarbutton id="button-privacy"
                            mode="dialog"
                            class="cal-event-toolbarbutton toolbarbutton-1"
@@ -604,20 +581,21 @@
                            disable-on-readonly="true"
                            label="&event.toolbar.privacy.label;"
                            tooltiptext="&event.toolbar.privacy.tooltip;"
-                           oncommand="rotatePrivacy()" hidden="true">
+                           oncommand="rotatePrivacy()"
+                           hidden="true">
                 <menupopup id="event-privacy-menupopup">
                     <menuitem id="event-privacy-public-menuitem"
                               name="event-privacy-group"
                               label="&event.menu.options.privacy.public.label;"
                               type="radio"
                               privacy="PUBLIC"
-                              oncommand="editPrivacy(this, event)"/>
+                              oncommand="editPrivacy(this, event)" />
                     <menuitem id="event-privacy-confidential-menuitem"
                               name="event-privacy-group"
                               label="&event.menu.options.privacy.confidential.label;"
                               type="radio"
                               privacy="CONFIDENTIAL"
-                              oncommand="editPrivacy(this, event)"/>
+                              oncommand="editPrivacy(this, event)" />
                     <menuitem id="event-privacy-private-menuitem"
                               name="event-privacy-group"
                               label="&event.menu.options.privacy.private.label;"
@@ -633,12 +611,13 @@
                            label="&event.attachments.menubutton.label;"
                            tooltiptext="&event.toolbar.attachments.tooltip;"
                            command="cmd_attach_url"
-                           disable-on-readonly="true" hidden="true">
-              <menupopup id="button-attach-menupopup">
-                <menuitem id="button-attach-url"
-                          label="&event.attachments.url.label;"
-                          command="cmd_attach_url"/>
-              </menupopup>
+                           disable-on-readonly="true"
+                           hidden="true">
+                <menupopup id="button-attach-menupopup">
+                    <menuitem id="button-attach-url"
+                              label="&event.attachments.url.label;"
+                              command="cmd_attach_url" />
+                </menupopup>
             </toolbarbutton>
             <toolbarbutton id="button-delete"
                            mode="dialog"
@@ -646,7 +625,7 @@
                            label="&event.toolbar.delete.label;"
                            tooltiptext="&event.toolbar.delete.tooltip;"
                            command="cmd_item_delete"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
             <toolbarbutton id="button-priority"
                            mode="dialog"
                            class="cal-event-toolbarbutton toolbarbutton-1"
@@ -660,22 +639,22 @@
                               name="event-priority-group"
                               label="&event.menu.options.priority.notspecified.label;"
                               type="radio"
-                              command="cmd_priority_none"/>
+                              command="cmd_priority_none" />
                     <menuitem id="event-priority-low-menuitem"
                               name="event-priority-group"
                               label="&event.menu.options.priority.low.label;"
                               type="radio"
-                              command="cmd_priority_low"/>
+                              command="cmd_priority_low" />
                     <menuitem id="event-priority-normal-menuitem"
                               name="event-priority-group"
                               label="&event.menu.options.priority.normal.label;"
                               type="radio"
-                              command="cmd_priority_normal"/>
+                              command="cmd_priority_normal" />
                     <menuitem id="event-priority-high-menuitem"
                               name="event-priority-group"
                               label="&event.menu.options.priority.high.label;"
                               type="radio"
-                              command="cmd_priority_high"/>
+                              command="cmd_priority_high" />
                 </menupopup>
             </toolbarbutton>
             <toolbarbutton id="button-status"
@@ -691,22 +670,22 @@
                               name="event-status-group"
                               label="&newevent.eventStatus.none.label;"
                               type="radio"
-                              command="cmd_status_none"/>
+                              command="cmd_status_none" />
                     <menuitem id="event-status-tentative-menuitem"
                               name="event-status-group"
                               label="&newevent.status.tentative.label;"
                               type="radio"
-                              command="cmd_status_tentative"/>
+                              command="cmd_status_tentative" />
                     <menuitem id="event-status-confirmed-menuitem"
                               name="event-status-group"
                               label="&newevent.status.confirmed.label;"
                               type="radio"
-                              command="cmd_status_confirmed"/>
+                              command="cmd_status_confirmed" />
                     <menuitem id="event-status-cancelled-menuitem"
                               name="event-status-group"
                               label="&newevent.eventStatus.cancelled.label;"
                               type="radio"
-                              command="cmd_status_cancelled"/>
+                              command="cmd_status_cancelled" />
                 </menupopup>
             </toolbarbutton>
             <toolbarbutton id="button-freebusy"
@@ -722,12 +701,12 @@
                               name="event-freebusy-group"
                               label="&event.menu.options.show.time.busy.label;"
                               type="radio"
-                              command="cmd_showtimeas_busy"/>
+                              command="cmd_showtimeas_busy" />
                     <menuitem id="event-freebusy-free-menuitem"
                               name="event-freebusy-group"
                               label="&event.menu.options.show.time.free.label;"
                               type="radio"
-                              command="cmd_showtimeas_free"/>
+                              command="cmd_showtimeas_free" />
                 </menupopup>
             </toolbarbutton>
             <toolbarbutton id="button-timezones"
@@ -736,28 +715,27 @@
                            class="cal-event-toolbarbutton toolbarbutton-1"
                            label="&event.menu.options.timezone2.label;"
                            tooltiptext="&event.menu.options.timezone2.label;"
-                           command="cmd_timezone"/>
+                           command="cmd_timezone" />
         </toolbarpalette>
-
         <toolbar id="event-toolbar"
                  class="chromeclass-toolbar"
                  customizable="true"
                  labelalign="end"
                  defaultlabelalign="end"
                  context="event-dialog-toolbar-context-menu"
-                 defaultset="button-save,button-attendees,button-privacy,button-url,button-delete"/>
-        <toolbarset id="custom-toolbars"/>
-
+                 defaultset="button-save,button-attendees,button-privacy,button-url,button-delete" />
+        <toolbarset id="custom-toolbars" />
     </toolbox>
-    <notificationbox id="event-dialog-notifications"/>
+    <notificationbox id="event-dialog-notifications" />
     <grid id="event-grid"
           flex="1"
           style="padding-top: 8px; padding-bottom: 10px; -moz-padding-start: 8px; -moz-padding-end: 10px;">
+
         <columns id="event-grid-columns">
-            <column id="event-description-column"/>
-            <column id="event-controls-column" flex="1"/>
+            <column id="event-description-column" />
+            <column id="event-controls-column"
+                    flex="1" />
         </columns>
-
         <rows id="event-grid-rows">
             <!-- Title -->
             <row id="event-grid-title-row"
@@ -765,47 +743,48 @@
                 <label value="&event.title.textbox.label;"
                        accesskey="&event.title.textbox.accesskey;"
                        control="item-title"
-                       disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <label id="item-title"
-                         disable-on-readonly="true"
-                         flex="1"
-                         oninput="updateTitle()"/>
+                       disable-on-readonly="true"
+                       flex="1"
+                       oninput="updateTitle()" />
             </row>
-
             <!-- Location -->
             <row id="event-grid-location-row"
-                 align="center" hidden="true">
+                 align="center"
+                 hidden="true">
                 <label value="&event.location.label;"
                        accesskey="&event.location.accesskey;"
                        control="item-location"
-                       disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <textbox id="item-location"
-                         disable-on-readonly="true"/>
+                         disable-on-readonly="true" />
             </row>
-
             <!-- Category & Calendar -->
             <row id="event-grid-category-color-row"
-                 align="center" hidden="true">
+                 align="center"
+                 hidden="true">
                 <hbox id="event-grid-category-labels-box">
                     <label value="&event.categories.label;"
                            accesskey="&event.categories.accesskey;"
                            control="item-categories"
                            id="item-categories-label"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
                     <label value="&event.calendar.label;"
                            accesskey="&event.calendar.accesskey;"
                            id="item-calendar-aux-label"
                            control="item-calendar"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
                 </hbox>
-                <hbox id="event-grid-category-box" align="center">
+                <hbox id="event-grid-category-box"
+                      align="center">
                     <menulist id="item-categories"
                               type="panel-menulist"
                               disable-on-readonly="true"
                               flex="1">
                         <panel id="item-categories-panel"
                                type="category-panel"
-                               onpopuphiding="updateCategoryMenulist()"/>
+                               onpopuphiding="updateCategoryMenulist()" />
                     </menulist>
                     <label value="&event.calendar.label;"
                            accesskey="&event.calendar.accesskey;"
@@ -815,50 +794,51 @@
                     <menulist id="item-calendar"
                               disable-on-readonly="true"
                               flex="1"
-                              oncommand="updateCalendar();"/>
+                              oncommand="updateCalendar();" />
                 </hbox>
             </row>
-
             <!-- Attendees -->
-            <row id="event-grid-attendee-row" align="center" hidden="true">
+            <row id="event-grid-attendee-row"
+                 align="center"
+                 hidden="true">
                 <label value="&event.attendees.label;"
                        accesskey="&event.attendees.accesskey;"
                        control="attendee-list"
-                       disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <label id="attendee-list"
                        class="text-link"
                        crop="right"
                        tooltiptext=""
-                       onclick="showAttendeePopup(event)"/>
+                       onclick="showAttendeePopup(event)" />
             </row>
             <row id="event-grid-attendee-row-2">
-                <spacer/>
-                <hbox id="notify-options-box" align="center">
-                <checkbox id="notify-attendees-checkbox"
-                          label="&event.attendees.notify.label;"
-                          oncommand="changeUndiscloseCheckboxStatus();"
-                          pack="start"/>
-                <checkbox id="undisclose-attendees-checkbox"
-                          label="&event.attendees.notifyundisclosed.label;"
-                          tooltiptext="&event.attendees.notifyundisclosed.tooltip;"
-                          pack="start"/>
+                <spacer />
+                <hbox id="notify-options-box"
+                      align="center">
+                    <checkbox id="notify-attendees-checkbox"
+                              label="&event.attendees.notify.label;"
+                              oncommand="changeUndiscloseCheckboxStatus();"
+                              pack="start" />
+                    <checkbox id="undisclose-attendees-checkbox"
+                              label="&event.attendees.notifyundisclosed.label;"
+                              tooltiptext="&event.attendees.notifyundisclosed.tooltip;"
+                              pack="start" />
                 </hbox>
             </row>
-
-            <separator class="groove" id="event-grid-basic-separator" hidden="true"/>
-
+            <separator class="groove"
+                       id="event-grid-basic-separator"
+                       hidden="true" />
             <!-- All-Day -->
             <row id="event-grid-allday-row"
                  align="center">
-                <spacer/>
+                <spacer />
                 <checkbox id="event-all-day"
                           class="event-only"
                           disable-on-readonly="true"
                           label="&event.alldayevent.label;"
                           accesskey="&event.alldayevent.accesskey;"
-                          oncommand="onUpdateAllDay();"/>
+                          oncommand="onUpdateAllDay();" />
             </row>
-
             <!-- StartDate -->
             <row id="event-grid-startdate-row">
                 <hbox id="event-grid-startdate-label-box"
@@ -867,37 +847,39 @@
                            accesskey="&event.from.accesskey;"
                            control="event-starttime"
                            class="event-only"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
                     <label value="&task.from.label;"
                            accesskey="&task.from.accesskey;"
                            control="todo-has-entrydate"
                            class="todo-only"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
                 </hbox>
                 <hbox id="event-grid-startdate-picker-box">
                     <datetimepicker id="event-starttime"
                                     class="event-only"
                                     disable-on-readonly="true"
-                                    onchange="dateTimeControls2State(true);"/>
+                                    onchange="dateTimeControls2State(true);" />
                     <checkbox id="todo-has-entrydate"
                               class="todo-only checkbox-no-label"
                               disable-on-readonly="true"
-                              oncommand="updateEntryDate();"/>
+                              oncommand="updateEntryDate();" />
                     <datetimepicker id="todo-entrydate"
                                     class="todo-only"
                                     disable-on-readonly="true"
-                                    onchange="dateTimeControls2State(true);"/>
+                                    onchange="dateTimeControls2State(true);" />
                     <vbox>
                         <hbox>
-                            <image id="link-image-top" class="keepduration-link-image" keep="true"/>
+                            <image id="link-image-top"
+                                   class="keepduration-link-image"
+                                   keep="true" />
                         </hbox>
-                        <spacer flex="1"/>
+                        <spacer flex="1" />
                         <toolbarbutton id="keepduration-button"
                                        accesskey="&event.dialog.keepDurationButton.accesskey;"
                                        oncommand="toggleKeepDuration();"
                                        persist="keep"
                                        keep="false"
-                                       tooltiptext="&event.dialog.keepDurationButton.tooltip;"/>
+                                       tooltiptext="&event.dialog.keepDurationButton.tooltip;" />
                     </vbox>
                     <hbox align="center">
                         <label id="timezone-starttime"
@@ -907,11 +889,10 @@
                                disable-on-readonly="true"
                                flex="1"
                                hyperlink="true"
-                               onclick="showTimezonePopup(event, gStartTime.getInTimezone(gStartTimezone), editStartTimezone)"/>
+                               onclick="showTimezonePopup(event, gStartTime.getInTimezone(gStartTimezone), editStartTimezone)" />
                     </hbox>
                 </hbox>
             </row>
-
             <!-- EndDate -->
             <row id="event-grid-enddate-row">
                 <hbox id="event-grid-enddate-label-box"
@@ -920,29 +901,30 @@
                            accesskey="&event.to.accesskey;"
                            control="event-endtime"
                            class="event-only"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
                     <label value="&task.to.label;"
                            accesskey="&task.to.accesskey;"
                            control="todo-has-duedate"
                            class="todo-only"
-                           disable-on-readonly="true"/>
+                           disable-on-readonly="true" />
                 </hbox>
                 <vbox>
                     <hbox id="event-grid-enddate-picker-box">
                         <datetimepicker id="event-endtime"
                                         class="event-only"
                                         disable-on-readonly="true"
-                                        onchange="dateTimeControls2State(false);"/>
+                                        onchange="dateTimeControls2State(false);" />
                         <checkbox id="todo-has-duedate"
                                   class="todo-only checkbox-no-label"
                                   disable-on-readonly="true"
-                                  oncommand="updateDueDate();"/>
+                                  oncommand="updateDueDate();" />
                         <datetimepicker id="todo-duedate"
                                         class="todo-only"
                                         disable-on-readonly="true"
-                                        onchange="dateTimeControls2State(false);"/>
+                                        onchange="dateTimeControls2State(false);" />
                         <vbox pack="end">
-                            <image id="link-image-bottom" class="keepduration-link-image"/>
+                            <image id="link-image-bottom"
+                                   class="keepduration-link-image" />
                         </vbox>
                         <hbox align="center">
                             <label id="timezone-endtime"
@@ -952,12 +934,11 @@
                                    disable-on-readonly="true"
                                    flex="1"
                                    hyperlink="true"
-                                   onclick="showTimezonePopup(event, gEndTime.getInTimezone(gEndTimezone), editEndTimezone)"/>
+                                   onclick="showTimezonePopup(event, gEndTime.getInTimezone(gEndTimezone), editEndTimezone)" />
                         </hbox>
                     </hbox>
                 </vbox>
             </row>
-
             <row id="event-grid-todo-status-row"
                  class="todo-only"
                  align="center">
@@ -965,36 +946,37 @@
                        value="&task.status.label;"
                        accesskey="&task.status.accesskey;"
                        control="todo-status"
-                       disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <hbox id="event-grid-todo-status-picker-box"
                       align="center">
                     <menulist id="todo-status"
                               class="todo-only"
                               disable-on-readonly="true"
                               oncommand="updateToDoStatus(this.value);">
+                              
                         <menupopup id="todo-status-menupopup">
                             <menuitem id="todo-status-none-menuitem"
                                       label="&newevent.todoStatus.none.label;"
-                                      value="NONE"/>
+                                      value="NONE" />
                             <menuitem id="todo-status-needsaction-menuitem"
                                       label="&newevent.status.needsaction.label;"
-                                      value="NEEDS-ACTION"/>
+                                      value="NEEDS-ACTION" />
                             <menuitem id="todo-status-inprogress-menuitem"
                                       label="&newevent.status.inprogress.label;"
-                                      value="IN-PROCESS"/>
+                                      value="IN-PROCESS" />
                             <menuitem id="todo-status-completed-menuitem"
                                       label="&newevent.status.completed.label;"
-                                      value="COMPLETED"/>
+                                      value="COMPLETED" />
                             <menuitem id="todo-status-canceled-menuitem"
                                       label="&newevent.todoStatus.cancelled.label;"
-                                      value="CANCELLED"/>
+                                      value="CANCELLED" />
                         </menupopup>
                     </menulist>
                     <datepicker id="completed-date-picker"
                                 class="todo-only"
                                 disable-on-readonly="true"
                                 disabled="true"
-                                value=""/>
+                                value="" />
                     <textbox id="percent-complete-textbox"
                              type="number"
                              min="0"
@@ -1002,23 +984,24 @@
                              disable-on-readonly="true"
                              size="3"
                              oninput="updateToDoStatus('percent-changed')"
-                             onselect="updateToDoStatus('percent-changed')"/>
+                             onselect="updateToDoStatus('percent-changed')" />
                     <label id="percent-complete-label"
                            class="todo-only"
                            disable-on-readonly="true"
-                           value="&newtodo.percentcomplete.label;"/>
+                           value="&newtodo.percentcomplete.label;" />
                 </hbox>
             </row>
-
-            <separator id="event-grid-recurrence-separator" class="groove" hidden="true"/>
-
+            <separator id="event-grid-recurrence-separator"
+                       class="groove"
+                       hidden="true" />
             <!-- Recurrence -->
             <row id="event-grid-recurrence-row"
-                 align="center" hidden="true" >
+                 align="center"
+                 hidden="true">
                 <label value="&event.repeat.label;"
                        accesskey="&event.repeat.accesskey;"
                        control="item-repeat"
-                       disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <hbox id="event-grid-recurrence-picker-box"
                       align="center"
                       flex="1">
@@ -1029,65 +1012,68 @@
                             <menuitem id="repeat-none-menuitem"
                                       label="&event.repeat.does.not.repeat.label;"
                                       selected="true"
-                                      value="none"/>
+                                      value="none" />
                             <menuitem id="repeat-daily-menuitem"
                                       label="&event.repeat.daily.label;"
-                                      value="daily"/>
+                                      value="daily" />
                             <menuitem id="repeat-weekly-menuitem"
                                       label="&event.repeat.weekly.label;"
-                                      value="weekly"/>
+                                      value="weekly" />
                             <menuitem id="repeat-weekday-menuitem"
                                       label="&event.repeat.every.weekday.label;"
-                                      value="every.weekday"/>
+                                      value="every.weekday" />
                             <menuitem id="repeat-biweekly-menuitem"
                                       label="&event.repeat.bi.weekly.label;"
-                                      value="bi.weekly"/>
+                                      value="bi.weekly" />
                             <menuitem id="repeat-monthly-menuitem"
                                       label="&event.repeat.monthly.label;"
-                                      value="monthly"/>
+                                      value="monthly" />
                             <menuitem id="repeat-yearly-menuitem"
                                       label="&event.repeat.yearly.label;"
-                                      value="yearly"/>
-                            <menuseparator id="item-repeat-separator"/>
+                                      value="yearly" />
+                            <menuseparator id="item-repeat-separator" />
                             <menuitem id="repeat-custom-menuitem"
                                       label="&event.repeat.custom.label;"
-                                      value="custom"/>
+                                      value="custom" />
                         </menupopup>
                     </menulist>
-                    <deck id="repeat-deck" selectedIndex="-1">
-                        <hbox id="repeat-untilDate" align="center">
+                    <deck id="repeat-deck"
+                          selectedIndex="-1">
+                        <hbox id="repeat-untilDate"
+                              align="center">
                             <label value="&event.until.label;"
                                    accesskey="&event.until.accesskey;"
                                    control="repeat-until-datepicker"
-                                   disable-on-readonly="true"/>
-                            <datepicker-forever id="repeat-until-datepicker" flex="1"
+                                   disable-on-readonly="true" />
+                            <datepicker-forever id="repeat-until-datepicker"
+                                                flex="1"
                                                 disable-on-readonly="true"
                                                 onchange="checkUntilDate();"
                                                 oncommand="checkUntilDate();"
-                                                value=""/>
+                                                value="" />
                         </hbox>
-                        <vbox id="repeat-details" flex="1">
+                        <vbox id="repeat-details"
+                              flex="1">
                             <label class="text-link"
                                    crop="right"
                                    disable-on-readonly="true"
                                    hyperlink="true"
                                    flex="1"
-                                   onclick="updateRepeat()"/>
+                                   onclick="updateRepeat()" />
                         </vbox>
                     </deck>
                 </hbox>
             </row>
-
             <separator id="event-grid-alarm-separator"
-                       class="groove" hidden="true" />
-
+                       class="groove"
+                       hidden="true" />
             <!-- Reminder (Alarm) -->
             <row id="event-grid-alarm-row"
                  align="center">
                 <label value="&event.reminder.label;"
                        accesskey="&event.reminder.accesskey;"
                        control="item-alarm"
-                       disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <hbox id="event-grid-alarm-picker-box"
                       align="center">
                     <menulist id="item-alarm"
@@ -1097,8 +1083,8 @@
                             <menuitem id="reminder-none-menuitem"
                                       label="&event.reminder.none.label;"
                                       selected="true"
-                                      value="none"/>
-                                      <!--
+                                      value="none" />
+                            <!--
                             <menuseparator id="reminder-none-separator"/>
                             <menuitem id="reminder-0minutes-menuitem"
                                       label="&event.reminder.0minutes.before.label;"
@@ -1163,16 +1149,16 @@
                                       relation="START"
                                       unit="days"/>
                                       -->
-                            <menuseparator id="reminder-custom-separator"/>
+                            <menuseparator id="reminder-custom-separator" />
                             <menuitem id="reminder-custom-menuitem"
                                       label="&event.reminder.custom.label;"
-                                      value="custom"/>
+                                      value="custom" />
                         </menupopup>
                     </menulist>
                     <hbox id="reminder-details">
                         <hbox id="reminder-icon-box"
                               class="alarm-icons-box"
-                              align="center"/>
+                              align="center" />
                         <!-- TODO oncommand? onkeypress? -->
                         <label id="reminder-multiple-alarms-label"
                                hidden="true"
@@ -1181,36 +1167,38 @@
                                disable-on-readonly="true"
                                flex="1"
                                hyperlink="true"
-                               onclick="updateReminder()"/>
+                               onclick="updateReminder()" />
                         <label id="reminder-single-alarms-label"
                                hidden="true"
                                class="text-link"
                                disable-on-readonly="true"
                                flex="1"
                                hyperlink="true"
-                               onclick="updateReminder()"/>
+                               onclick="updateReminder()" />
                     </hbox>
-               </hbox>
+                </hbox>
             </row>
-
             <separator id="event-grid-description-separator"
-                       class="groove" hidden="true"/>
- 
-             <box id="item-description-box" hidden="true" orient="vertical" flex="1">
-                <spacer class="default-spacer"/>
+                       class="groove"
+                       hidden="true" />
+            <box id="item-description-box"
+                 hidden="true"
+                 orient="vertical"
+                 flex="1">
+                <spacer class="default-spacer" />
                 <calendar-caption label="&read.only.description.label;"
-                                  control="item-description"/>
-                <box orient="horizontal" flex="1">
-                  <spacer class="default-spacer"/>
-                  <textbox id="item-description"
-                           multiline="true"
-                           rows="6"
-                           flex="1"/>
+                                  control="item-description" />
+                <box orient="horizontal"
+                     flex="1">
+                    <spacer class="default-spacer" />
+                    <textbox id="item-description"
+                             multiline="true"
+                             rows="6"
+                             flex="1" />
                 </box>
-              </box>
- 
+            </box>
             <!-- Description -->
-   	    <!--
+            <!--
             <row id="event-grid-description-row" flex="1">
                 <label value="&event.description.label;"
                        accesskey="&event.description.accesskey;"
@@ -1223,158 +1211,166 @@
                          rows="12" onload="function(){this.inputField.readOnly}" />
             </row>
      -->
-            <separator class="groove" id="event-grid-attachment-separator" hidden="true"/>
-
+            <separator class="groove"
+                       id="event-grid-attachment-separator"
+                       hidden="true" />
             <!-- Attachment -->
             <row id="event-grid-attachment-row"
                  flex="1"
                  collapsed="true">
                 <label value="&event.attachments.label;"
-                    accesskey="&event.attachments.accesskey;"
+                       accesskey="&event.attachments.accesskey;"
                        control="attachment-link"
-                       disable-on-readonly="true"/>
-                 <listbox id="attachment-link"
-                          context="attachment-popup"
-                          rows="3"
-                          onkeypress="attachmentLinkKeyPress(event)"
-                          onclick="attachmentLinkClicked(event);"/>
+                       disable-on-readonly="true" />
+                <listbox id="attachment-link"
+                         context="attachment-popup"
+                         rows="3"
+                         onkeypress="attachmentLinkKeyPress(event)"
+                         onclick="attachmentLinkClicked(event);" />
             </row>
-
             <separator id="event-grid-link-separator"
-                       class="groove" 
-                       hidden="true"/>
+                       class="groove"
+                       hidden="true" />
             <row id="event-grid-link-row"
                  align="center"
                  hidden="true">
                 <label value="&event.url.label;"
-                       control="url-link"/>
+                       control="url-link" />
                 <label id="url-link"
                        onclick="launchBrowser(this.getAttribute('href'), event)"
                        oncommand="launchBrowser(this.getAttribute('href'), event)"
                        class="text-link"
-                       crop="end"/>
+                       crop="end" />
             </row>
         </rows>
     </grid>
-
-    <statusbar class="chromeclass-status" id="status-bar" hidden="true">
-      <statusbarpanel id="status-text"
-                      flex="1"/>
-      <statusbarpanel id="status-privacy"
-                      align="center"
-                      flex="1"
-                      collapsed="true"
-                      pack="start">
-        <label value="&event.statusbarpanel.privacy.label;"/>
-        <hbox id="status-privacy-public-box" privacy="PUBLIC">
-          <label value="&event.menu.options.privacy.public.label;"/>
-        </hbox>
-        <hbox id="status-privacy-confidential-box" privacy="CONFIDENTIAL">
-          <label value="&event.menu.options.privacy.confidential.label;"/>
-        </hbox>
-        <hbox id="status-privacy-private-box" privacy="PRIVATE">
-          <label value="&event.menu.options.privacy.private.label;"/>
-        </hbox>
-      </statusbarpanel>
-      <statusbarpanel id="status-priority"
-                      align="center"
-                      flex="1"
-                      collapsed="true"
-                      pack="start">
-        <label value="&event.priority2.label;"/>
-        <image id="image-priority-low"
-               class="cal-statusbar-1"
-               collapsed="true"
-               value="low"/>
-        <image id="image-priority-normal"
-               class="cal-statusbar-1"
-               collapsed="true"
-               value="normal"/>
-        <image id="image-priority-high"
-               class="cal-statusbar-1"
-               collapsed="true"
-               value="high"/>
-      </statusbarpanel>
-      <statusbarpanel id="status-status"
-                      align="center"
-                      flex="1"
-                      collapsed="true"
-                      pack="start">
-        <label value="&task.status.label;"/>
-        <label id="status-status-tentative-label"
-               value="&newevent.status.tentative.label;"
-               hidden="true"/>
-        <label id="status-status-confirmed-label"
-               value="&newevent.status.confirmed.label;"
-               hidden="true"/>
-        <label id="status-status-cancelled-label"
-               value="&newevent.eventStatus.cancelled.label;"
-               hidden="true"/>
-      </statusbarpanel>
-      <statusbarpanel id="status-freebusy"
-                      align="center"
-                      flex="1"
-                      collapsed="true"
-                      pack="start">
-        <label value="&event.statusbarpanel.freebusy.label;"/>
-        <label id="status-freebusy-free-label"
-               value="&event.freebusy.legend.free;"
-               hidden="true"/>
-        <label id="status-freebusy-busy-label"
-               value="&event.freebusy.legend.busy;"
-               hidden="true"/>
-      </statusbarpanel>
+    <statusbar class="chromeclass-status"
+               id="status-bar"
+               hidden="true">
+        <statusbarpanel id="status-text"
+                        flex="1" />
+        <statusbarpanel id="status-privacy"
+                        align="center"
+                        flex="1"
+                        collapsed="true"
+                        pack="start">
+            <label value="&event.statusbarpanel.privacy.label;" />
+            <hbox id="status-privacy-public-box"
+                  privacy="PUBLIC">
+                <label value="&event.menu.options.privacy.public.label;" />
+            </hbox>
+            <hbox id="status-privacy-confidential-box"
+                  privacy="CONFIDENTIAL">
+                <label value="&event.menu.options.privacy.confidential.label;" />
+            </hbox>
+            <hbox id="status-privacy-private-box"
+                  privacy="PRIVATE">
+                <label value="&event.menu.options.privacy.private.label;" />
+            </hbox>
+        </statusbarpanel>
+        <statusbarpanel id="status-priority"
+                        align="center"
+                        flex="1"
+                        collapsed="true"
+                        pack="start">
+            <label value="&event.priority2.label;" />
+            <image id="image-priority-low"
+                   class="cal-statusbar-1"
+                   collapsed="true"
+                   value="low" />
+            <image id="image-priority-normal"
+                   class="cal-statusbar-1"
+                   collapsed="true"
+                   value="normal" />
+            <image id="image-priority-high"
+                   class="cal-statusbar-1"
+                   collapsed="true"
+                   value="high" />
+        </statusbarpanel>
+        <statusbarpanel id="status-status"
+                        align="center"
+                        flex="1"
+                        collapsed="true"
+                        pack="start">
+            <label value="&task.status.label;" />
+            <label id="status-status-tentative-label"
+                   value="&newevent.status.tentative.label;"
+                   hidden="true" />
+            <label id="status-status-confirmed-label"
+                   value="&newevent.status.confirmed.label;"
+                   hidden="true" />
+            <label id="status-status-cancelled-label"
+                   value="&newevent.eventStatus.cancelled.label;"
+                   hidden="true" />
+        </statusbarpanel>
+        <statusbarpanel id="status-freebusy"
+                        align="center"
+                        flex="1"
+                        collapsed="true"
+                        pack="start">
+            <label value="&event.statusbarpanel.freebusy.label;" />
+            <label id="status-freebusy-free-label"
+                   value="&event.freebusy.legend.free;"
+                   hidden="true" />
+            <label id="status-freebusy-busy-label"
+                   value="&event.freebusy.legend.busy;"
+                   hidden="true" />
+        </statusbarpanel>
     </statusbar>
-
     <popupset id="event-dialog-popupset">
-      <menupopup id="attendee-popup" position="after_start">
-        <menuitem id="attendee-popup-invite-menuitem"
-                  label="&event.invite.attendees.label;"
-                  accesskey="&event.invite.attendees.accesskey;"
-                  command="cmd_attendees"
-                  disable-on-readonly="true"/>
-        <menuseparator id="attendees-popup-menuseparator"/>
-        <menuitem id="attendee-popup-sendemail-menuitem"
-                  label="&event.email.attendees.label;"
-                  accesskey="&event.email.attendees.accesskey;"
-                  command="cmd_email"/>
-        <menuitem id="attendee-popup-sendtentativeemail-menuitem"
-                  label="&event.email.tentative.attendees.label;"
-                  accesskey="&event.email.tentative.attendees.accesskey;"
-                  command="cmd_email_undecided"/>
-        <menuseparator id="attendee-popup-separator"/>
-        <menuitem class="status-icon menuitem-iconic" oncommand="sendMailToAttendees([event.target.attendee])" crop="end"/>
-      </menupopup>
-      <menupopup id="attachment-popup">
+        <menupopup id="attendee-popup"
+                   position="after_start">
+            <menuitem id="attendee-popup-invite-menuitem"
+                      label="&event.invite.attendees.label;"
+                      accesskey="&event.invite.attendees.accesskey;"
+                      command="cmd_attendees"
+                      disable-on-readonly="true" />
+            <menuseparator id="attendees-popup-menuseparator" />
+            <menuitem id="attendee-popup-sendemail-menuitem"
+                      label="&event.email.attendees.label;"
+                      accesskey="&event.email.attendees.accesskey;"
+                      command="cmd_email" />
+            <menuitem id="attendee-popup-sendtentativeemail-menuitem"
+                      label="&event.email.tentative.attendees.label;"
+                      accesskey="&event.email.tentative.attendees.accesskey;"
+                      command="cmd_email_undecided" />
+            <menuseparator id="attendee-popup-separator" />
+            <menuitem class="status-icon menuitem-iconic"
+                      oncommand="sendMailToAttendees([event.target.attendee])"
+                      crop="end" />
+        </menupopup>
+        <menupopup id="attachment-popup">
             <menuitem id="attachment-popup-open"
                       label="&event.attachments.popup.open.label;"
                       accesskey="&event.attachments.popup.open.accesskey;"
-                      command="cmd_openAttachment"/>
+                      command="cmd_openAttachment" />
             <menuitem id="attachment-popup-copy"
                       label="&calendar.copylink.label;"
                       accesskey="&calendar.copylink.accesskey;"
-                      command="cmd_copyAttachment"/>
+                      command="cmd_copyAttachment" />
             <menuitem id="attachment-popup-delete"
                       label="&event.attachments.popup.remove.label;"
                       accesskey="&event.attachments.popup.remove.accesskey;"
-                      command="cmd_deleteAttachment"/>
+                      command="cmd_deleteAttachment" />
             <menuitem id="attachment-popup-deleteAll"
                       label="&event.attachments.popup.removeAll.label;"
                       accesskey="&event.attachments.popup.removeAll.accesskey;"
-                      command="cmd_deleteAllAttachments"/>
-            <menuseparator/>
+                      command="cmd_deleteAllAttachments" />
+            <menuseparator />
             <menuitem id="attachment-popup-attachPage"
                       label="&event.attachments.popup.attachPage.label;"
                       accesskey="&event.attachments.popup.attachPage.accesskey;"
-                      command="cmd_attach_url"/>
-      </menupopup>
-      <menupopup id="timezone-popup" position="after_start" oncommand="chooseRecentTimezone(event)">
-        <menuitem id="timezone-popup-defaulttz"/>
-        <menuseparator id="timezone-popup-menuseparator"/>
-        <menuitem id="timezone-custom-menuitem"
-                  label="&event.timezone.custom.label;"
-                  value="custom"
-                  oncommand="this.parentNode.editTimezone()"/>
-      </menupopup>
+                      command="cmd_attach_url" />
+        </menupopup>
+        <menupopup id="timezone-popup"
+                   position="after_start"
+                   oncommand="chooseRecentTimezone(event)">
+            <menuitem id="timezone-popup-defaulttz" />
+            <menuseparator id="timezone-popup-menuseparator" />
+            <menuitem id="timezone-custom-menuitem"
+                      label="&event.timezone.custom.label;"
+                      value="custom"
+                      oncommand="this.parentNode.editTimezone()" />
+        </menupopup>
     </popupset>
 </dialog>
diff --git a/chrome/content/exchWebServiceEditor.xml b/chrome/content/exchWebServiceEditor.xml
index a3113529..51354b4f 100644
--- a/chrome/content/exchWebServiceEditor.xml
+++ b/chrome/content/exchWebServiceEditor.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,750 +23,773 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd3;
 ]>
-
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<binding id="exchWebServiceEditor">
-
-	<!-- CSS needed to correctly display color buttons (font and background) -->
-	<resources>
-		<stylesheet src="chrome://messenger/skin/messengercompose/messengercompose.css" />
-	</resources>
-
-	<content>
-
-	<xul:vbox flex="1">
-		<xul:toolbox anonid="FormatToolbox" mode="icons">
-			<xul:toolbar class="chromeclass-toolbar embedded-toolbar" anonid="FormatToolbar">
-				<xul:toolbarbutton anonid="cmd_bold"
-					class="bold-button"
-					tooltiptext="Bold"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_all"/>
-				<xul:toolbarbutton anonid="cmd_italic"
-					class="italic-button"
-					tooltiptext="Italic"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_all"/>
-				<xul:toolbarbutton anonid="cmd_underline"
-					class="underline-button"
-					tooltiptext="Underline"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_all"/>
-				<xul:toolbarseparator class="toolbarseparator-standard"/>
-				<xul:toolbarbutton anonid="cmd_decreaseFont"
-					class="decreaseFont-button"
-					tooltiptext="Indent"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"/>
-				<xul:toolbarbutton anonid="cmd_increaseFont"
-					class="increaseFont-button"
-					tooltiptext="Outdent"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"/>
-				<xul:toolbarseparator class="toolbarseparator-standard"/>
-				<xul:toolbarbutton anonid="cmd_indent"
-					class="indent-button"
-					tooltiptext="Indent"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"/>
-				<xul:toolbarbutton anonid="cmd_outdent"
-					class="outdent-button"
-					tooltiptext="Outdent"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"/>
-				<xul:toolbarseparator class="toolbarseparator-standard"/>
-				<xul:toolbarbutton anonid="cmd_ol"
-					class="orderedlist-button"
-					tooltiptext="Indent"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_all"/>
-				<xul:toolbarbutton anonid="cmd_ul"
-					class="unorderedlist-button"
-					tooltiptext="Outdent"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_all"/>
-				<xul:toolbarseparator class="toolbarseparator-standard"/>
-				<xul:toolbaritem class="formatting-button">
-					<xul:stack align="center" state="rgb(102,102,102)">
-						<xul:box style="background-color:#FFFFFF"
-							anonid="cmd_backgroundColor"
-							class="color-button"
-							tooltiptext="Choose higlight color for text"
-							id="BackgroundColorButton"
-						/>
-						<xul:box style="background-color:rgb(0,0,0)"
-							anonid="cmd_fontColor"
-							class="color-button"
-							tooltiptext="Choose font color for text"
-							id="TextColorButton"
-						/>
-					</xul:stack>
-				</xul:toolbaritem>
-				<xul:toolbarseparator class="toolbarseparator-standard"/>
-				<xul:toolbarbutton anonid="cmd_align_left"
-					class="align-left-button"
-					tooltiptext="Align left"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_attribute"/>
-				<xul:toolbarbutton anonid="cmd_align_center"
-					class="align-center-button"
-					tooltiptext="Align center"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_attribute"/>
-				<xul:toolbarbutton anonid="cmd_align_right"
-					class="align-right-button"
-					tooltiptext="Align right"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_attribute"/>
-				<xul:toolbarbutton anonid="cmd_align_justify"
-					class="align-justify-button"
-					tooltiptext="Align justify"
-					type="checkbox"
-					autoCheck="false"
-					connect="true"
-					state="state_attribute"/>
-				<xul:toolbarbutton anonid="cmd_add_link"
-					class="addlink-button"
-					tooltiptext="Add link"
-					type="checkbox"
-					autoCheck="false"
-					connect="false"
-					state="state_attribute"/>
-				<xul:toolbarbutton anonid="cmd_edit_link"
-					class="editlink-button"
-					tooltiptext="Edit link"
-					type="checkbox"
-					autoCheck="false"
-					connect="false"
-					state="state_attribute"
-					hidden="true"/>
-				<xul:toolbarbutton anonid="cmd_remove_link"
-					class="removelink-button"
-					tooltiptext="Remove link"
-					type="checkbox"
-					autoCheck="false"
-					connect="false"
-					state="state_attribute"
-					hidden="true"/>
-			</xul:toolbar>
-		</xul:toolbox>
-		<xul:toolbox anonid="FormatToolbox" mode="icons">
-			<xul:toolbar class="chromeclass-toolbar embedded-toolbar" anonid="FormatToolbar">
-				<xul:toolbaritem class="formatting-button">
-					<xul:menulist anonid="fontFaceMenuList" class="toolbar-focustarget" crop="right">
-						<xul:menupopup anonid="fontFaceSelect"/>
-					</xul:menulist>
-				</xul:toolbaritem>
-			</xul:toolbar>
-		</xul:toolbox>
-		<xul:editor
-			type="content-primary"
-			anonid="editor"
-			class="exchWebService-editor"
-			src="about:blank"
-			editortype="htmlmail"
-			flex="1"/>
-	</xul:vbox>
-
-	</content>
-	<implementation>
-		<constructor><![CDATA[
-			var self=this;
-
-			// To be able to set correct HTML content
-			this.globalFunctions = Components.classes["@1st-setup.nl/global/functions;1"]
-				.getService(Components.interfaces.mivFunctions);
-
-			this.editorElement = document.getAnonymousElementByAttribute(this, "anonid", "editor");
-			if (this.editorElement) {
-				this.commandManager = this.editorElement.commandManager;
-				this.editorClickFunction = function(aEvent) { self.onClickEditor(aEvent);};
-				this.editorElement.addEventListener("click", this.editorClickFunction, false);
-
-				this.editorDblClickFunction = function(aEvent) { self.onDblClickEditor(aEvent);};
-				this.editorElement.addEventListener("dblclick", this.editorDblClickFunction, false);
-
-				this.editorKeyPressFunction = function(aEvent) { self.onKeyPressEditor(aEvent);};
-				this.editorElement.addEventListener("keyup", this.editorKeyPressFunction, false);
-
-				this.editorMouseOver = function(aEvent) { self.onMouseOver(aEvent);};
-				this.editorElement.addEventListener("mouseover", this.editorMouseOver , false);
-
-				this.editorMouseOut = function(aEvent) { self.onMouseOut(aEvent);};
-				this.editorElement.addEventListener("mouseout", this.editorMouseOut, false);
-
-				// Set default document to empty HTML content
-				this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(null);
-			}
-
-			this.atomService = Components.classes["@mozilla.org/atom-service;1"]
-				.getService(Components.interfaces.nsIAtomService);
-
-			this.connectAllCommandListenerToolbar("FormatToolbar");
-
-			// Connect color button
-			this.bgColorFunction = function(){ self.selectColor("cmd_backgroundColor");};
-			var bgColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
-			bgColorElement.addEventListener("click", this.bgColorFunction, false);
-
-			this.fontColorFunction = function(){ self.selectColor("cmd_fontColor");};
-			var fontColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor")
-			fontColorElement.addEventListener("click", this.fontColorFunction, false);
-
-			this.highlightColor = "#FFFFFF";
-			this.fontColor = "#000000";
-
-			// Connect FontFace popup menu
-			this.menuPopupFunction = function(event){ self.selectFont("cmd_fontFace", event.target.value);};
-			this.menuPopup = document.getAnonymousElementByAttribute(this, "anonid", "fontFaceSelect");
-			this.menuPopup.addEventListener("command", this.menuPopupFunction, false);
-			this.fillFontFace();
-
-			// Connect HyperLink buttons
-			this.addLinkFunction = function(){ self.addLink();};
-			var addLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
-			addLinkElement.addEventListener("click", this.addLinkFunction, false);
-
-			this.removeLinkFunction = function(){ self.removeLink();};
-			var removeLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link")
-			removeLinkElement.addEventListener("click", this.removeLinkFunction, false);
-
-			this.editLinkFunction = function(){ self.editLink();};
-			var editLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
-			editLinkElement.addEventListener("click", this.editLinkFunction, false);
-		]]></constructor>
-
-		<destructor><![CDATA[
-			if (this.editorElement) {
-				this.editorElement.removeEventListener("click", this.editorClickFunction, false);
-				this.editorElement.removeEventListener("keyup", this.editorKeyPressFunction, false);
-
-				this.editorElement.removeEventListener("dblclick", this.editorDblClickFunction, false);
-
-				this.editorElement.removeEventListener("mouseover", this.editorMouseOver , false);
-				this.editorElement.removeEventListener("mouseout", this.editorMouseOut, false);
-			}
-
-			this.removeAllCommandListenerToolbar("FormatToolbar");
-
-			// Disconnect color button
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
-				.removeEventListener("click", this.bgColorFunction, false);
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor")
-				.removeEventListener("click", this.fontColorFunction, false);
-
-			// Disconnect Font face button
-			if (this.menuPopupFunction) {
-				this.menuPopup.removeEventListener("command", this.menuPopupFunction, false);
-			}
-
-			// Disconnect HyperLink buttons
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
-				.removeEventListener("click", this.addLinkFunction, false);
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link")
-				.removeEventListener("click", this.removeLinkFunction, false);
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
-				.removeEventListener("click", this.editLinkFunction, false);
-		]]></destructor>
-			
-		<property name="content">
-			<getter>
-			  <![CDATA[
-			    return this.editorElement.contentDocument.documentElement.innerHTML;
-			  ]]>
-			</getter>
-			<setter>
-			  <![CDATA[
-				if (this.editorElement) {
-					this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(val);
-				}
-			  ]]>
-			</setter>
-		</property>
-
-		<method name="fillFontFace">
-			<body><![CDATA[
-			if (gExchWebServiceLocalFonts === undefined) {
-				// Build list of all local fonts once per editor
-				try {
-					var enumerator = Components.classes["@mozilla.org/gfx/fontenumerator;1"]
-								 .getService(Components.interfaces.nsIFontEnumerator);
-					var localFontCount = { value: 0 }
-					var gExchWebServiceLocalFonts = enumerator.EnumerateAllFonts(localFontCount);
-				}
-				catch(e) { }
-			}
-
-			if (gExchWebServiceLocalFonts !== undefined) {
-
-				var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
-				itemNode.setAttribute("label", "Variable width");
-				itemNode.setAttribute("value", "Arial");
-				this.menuPopup.appendChild(itemNode);
-
-				var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuseparator");
-				this.menuPopup.appendChild(itemNode);
-
-				for (var i = 0; i < gExchWebServiceLocalFonts.length; ++i) {
-					if (gExchWebServiceLocalFonts[i] != "") {
-						var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
-						itemNode.setAttribute("label", gExchWebServiceLocalFonts[i]);
-						itemNode.setAttribute("value", gExchWebServiceLocalFonts[i]);
-						itemNode.setAttribute("style", "font-family: "+gExchWebServiceLocalFonts[i]+" !important;");
-						this.menuPopup.appendChild(itemNode);
-					}
-				}
-			}
-		]]></body>
-		</method>
-
-		<method name="connectAllCommandListenerToolbar">
-			<parameter name="aAnonId" />
-			<body><![CDATA[
-			var toolbar = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
-
-			if (!this.functions) {
-				this.functions = {};
-			}
-
-			if (toolbar) {
-				var toolbarButtons = toolbar.getElementsByTagName("xul:toolbarbutton");
-				for (var i=0; i<toolbarButtons.length;i++) {
-					if ((toolbarButtons[i].hasAttribute("connect")) && (toolbarButtons[i].getAttribute("connect") === "true")) {
-						this.addCommandListener(toolbarButtons[i].getAttribute("anonid"), aAnonId);
-					}
-				}
-			}
-		]]></body>
-		</method>
-
-		<method name="addCommandListener">
-			<parameter name="aAnonId" />
-			<parameter name="aStore" />
-			<body><![CDATA[
-			var self = this;
-
-			if (!this.functions[aStore]) {
-				this.functions[aStore] = {};
-			}
-			this.functions[aStore][aAnonId] = function() { self.toggleButton(aAnonId);};
-			document.getAnonymousElementByAttribute(this, "anonid", aAnonId).addEventListener("command", this.functions[aStore][aAnonId], false);
-		]]></body>
-		</method>
-
-		<method name="removeAllCommandListenerToolbar">
-			<parameter name="aAnonId" />
-			<body><![CDATA[
-			if ((this.functions) && (this.functions[aAnonId])) {
-				for (var name in this.functions[aAnonId]) {
-					this.removeCommandListener(name, aAnonId);
-				}
-			}
-		]]></body>
-		</method>
-
-		<method name="removeCommandListener">
-			<parameter name="aAnonId" />
-			<parameter name="aStore" />
-			<body><![CDATA[
-			document.getAnonymousElementByAttribute(this, "anonid", aAnonId).removeEventListener("command", this.functions[aStore][aAnonId], false);
-		]]></body>
-		</method>
-
-		<method name="selectFont">
-			<parameter name="aCmd" />
-			<parameter name="aFontName" />
-			<body><![CDATA[
-			var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
-					.createInstance(Components.interfaces.nsICommandParams);
-			state.setCStringValue("state_attribute", aFontName);
-			this.commandManager.doCommand(aCmd, state, null);
-			document.getAnonymousElementByAttribute(this, "anonid", "fontFaceMenuList").setAttribute("style", "font-family: "+aFontName+";");
-		]]></body>
-		</method>
-
-		<method name="onKeyPressEditor">
-			<parameter name="aEvent" />
-			<body><![CDATA[
-			if ( ( (aEvent.keyCode > 36) && (aEvent.keyCode < 41) ) || (aEvent.keyCode === 33) || (aEvent.keyCode === 34)) {
-				this.onClickEditor(aEvent);
-			}
-		]]></body>
-		</method>
-
-		<method name="hrefAndLinkNodeForClickEvent">
-			<parameter name="event" />
-			<body><![CDATA[
-			{
-				var href = "";
-				var isKeyCommand = (event.type === "command");
-				var linkNode = isKeyCommand ? this.editorElement.commandDispatcher.focusedElement
-							: event.originalTarget;
-				while (linkNode instanceof Element) {
-					if (linkNode instanceof HTMLAnchorElement ||
-					  linkNode instanceof HTMLAreaElement ||
-					  linkNode instanceof HTMLLinkElement) {
-						href = linkNode.href;
-						if (href)
-						  break;
-					}
-					// Try MathML href
-					else if (linkNode.namespaceURI == "http://www.w3.org/1998/Math/MathML" &&
-					       linkNode.hasAttribute("href")) {
-						href = linkNode.getAttribute("href");
-						href = makeURLAbsolute(linkNode.baseURI, href);
-						break;
-					}
-					// Try simple XLink
-					else if (linkNode.hasAttributeNS("http://www.w3.org/1999/xlink", "href")) {
-						href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
-						href = makeURLAbsolute(linkNode.baseURI, href);
-						break;
-					}
-					linkNode = linkNode.parentNode;
-				}
-				return href ? {href: href, linkNode: linkNode} : null;
-			}
-		]]></body>
-		</method>
-
-		<method name="onClickEditor">
-			<parameter name="aEvent" />
-			<body><![CDATA[
-			if (aEvent) {
-				this.ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
-				if (this.ceParams) {
-					// We have a link active.
-					document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link").hidden = true;
-					document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").hidden = false;
-					document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").hidden = false;
-
-					if (aEvent.ctrlKey) {
-						// Ctrl key was pressed on click so we are going to open the link and the program which can handle it.
-						try {
-							var extProtService = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].getService();
-							extProtService = extProtService.QueryInterface(Components.interfaces.nsIExternalProtocolService);
-							var scheme = this.ceParams.href.substring(0, this.ceParams.href.indexOf(":"));
-							if (extProtService.isExposedProtocol(scheme)) {
-								var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-									  .getService(Components.interfaces.nsIIOService);
-								extProtService.loadUrl(ioService.newURI(this.ceParams.href, null, null));
-							}
-						} 
-						catch (ex) {
-							alert("Do not know how to handle this reference:"+this.ceParams.href);
-						}
-					}
-				}
-				else {
-					document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link").hidden = false;
-					document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").hidden = true;
-					document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").hidden = true;
-				}
-			}
-
-			for (var aStore in this.functions) {
-				for (var aAnonId in this.functions[aStore]) {
-					this.setButtonState(aAnonId);
-				}
-			}
-
-			var color = this.getCStringCommandState("cmd_fontColor", this.commandManager, this.editorElement.contentWindow, "state_attribute");
-			if (color === "") {
-				color = "transparent";
-			}
-			else {
-				color = this.ConvertRGBColorIntoHEXColor(color);
-			}
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor").setAttribute("style","background-color:"+color);
-
-			var aFirst = { value: false };
-			var aAny = { value: false };
-			var aAll = { value: false };
-			var propAtom = this.atomService.getAtom("font");
-			var edElement = this.editorElement.getHTMLEditor(this.editorElement.contentWindow);
-			color = edElement.getInlinePropertyWithAttrValue(propAtom, "bgcolor", null, aFirst, aAny, aAll);
-
-			document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor").setAttribute("style","background-color:"+color);
-			
-			var font = this.getCStringCommandState("cmd_fontFace", this.commandManager, this.editorElement.contentWindow, "state_attribute");
-			font = font.replace(/"/g, "");
-			var fontElement;
-			if (font.indexOf(",") !== -1) {
-				var fonts = font.split(",");
-				for(var i = 0; ((i<fonts.length) && (!fontElement)); i++) {
-					fontElement = document.getAnonymousElementByAttribute(this, "label", fonts[i]);
-					font = fonts[i];
-				}
-			}
-			else {
-				fontElement = document.getAnonymousElementByAttribute(this, "label", font);
-			}
-			if (fontElement) {
-				document.getAnonymousElementByAttribute(this, "anonid", "fontFaceMenuList").selectedItem = fontElement;
-				document.getAnonymousElementByAttribute(this, "anonid", "fontFaceMenuList").setAttribute("style", "font-family: "+font+";");
-			}
-			else {
-			}
-		
-		]]></body>
-		</method>
-
-		<method name="onDblClickEditor">
-			<parameter name="aEvent" />
-			<body><![CDATA[
-			if (aEvent) {
-				this.ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
-				if (this.ceParams) {
-					this.editLink();
-				}
-			}
-
-		]]></body>
-		</method>
-		
-		<method name="onMouseOver">
-			<parameter name="aEvent" />
-			<body><![CDATA[
-			if (aEvent) {
-				var ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
-				if (ceParams) {
-					this.mouseEnterHRef = ceParams.href;
-					this.setAttribute("tooltiptext", "ctrl+click to follow link:"+ceParams.href);
-					aEvent.preventDefault();
-					return true;
-				}
-			}
-			return true;
-		]]></body>
-		</method>
-		
-		<method name="onMouseOut">
-			<parameter name="aEvent" />
-			<body><![CDATA[
-			if (aEvent) {
-				var ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
-				if (ceParams) {
-					if (ceParams.href != this.mouseEnterHRef) {
-						return true;
-					}
-					this.removeAttribute("tooltiptext");
-					aEvent.preventDefault();
-					return true;
-				}
-			}
-			return false;
-
-		]]></body>
-		</method>
-		
-		<method name="selectColor">
-			<parameter name="aAnonId" />
-			<body><![CDATA[
-			var element = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
-
-			// Get current color
-			var color = this.getCStringCommandState(aAnonId, this.commandManager, this.editorElement.contentWindow, "state_attribute");
-			if (color === "") {
-				color = "transparent";
-			}
-			else {
-				color = this.ConvertRGBColorIntoHEXColor(color);
-			}
-			var colorObj = {};
-			colorObj.Type = "Text";
-			colorObj.TextColor = color;
-			window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
-
-			if (colorObj.Cancel) {
-				return;
-			}
-
-			element.setAttribute("style","background-color:"+colorObj.TextColor);
-
-			if (aAnonId === "cmd_fontColor") {
-				var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
-						.createInstance(Components.interfaces.nsICommandParams);
-				state.setCStringValue("state_attribute", colorObj.TextColor);
-				this.commandManager.doCommand(aAnonId, state, null);
-			}
-			else {
-				var propAtom = this.atomService.getAtom("font");
-				var edElement = this.editorElement.getHTMLEditor(this.editorElement.contentWindow);
-				edElement.setInlineProperty(propAtom, "bgcolor", colorObj.TextColor);			
-			}
-
-		]]></body>
-		</method>
-
-		<method name="ConvertRGBColorIntoHEXColor">
-			<parameter name="color" />
-			<body><![CDATA[
-			  if ( /rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/.test(color) ) {
-			    var r = Number(RegExp.$1).toString(16);
-			    if (r.length === 1){
-			    	r = "0"+r;
-			    }
-
-			    var g = Number(RegExp.$2).toString(16);
-			    if (g.length === 1) {
-			    	g = "0"+g;
-			    }
-
-			    var b = Number(RegExp.$3).toString(16);
-			    if (b.length === 1) {
-			    	b = "0"+b;
-			    }
-
-			    return "#"+r+g+b;
-			  }
-			  else
-			  {
-			    return color;
-			  }
-		]]></body>
-		</method>
-
-		<method name="getCStringCommandState">
-			<parameter name="aCommandName" />
-			<parameter name="aCommandManager" />
-			<parameter name="aWindow" />
-			<parameter name="aState" />
-			<body><![CDATA[
-			var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
-					.createInstance(Components.interfaces.nsICommandParams);
-			aCommandManager.getCommandState(aCommandName, aWindow,state);
-
-			return state.getCStringValue(aState);
-		]]></body>
-		</method>
-
-		<method name="getBoolCommandState">
-			<parameter name="aCommandName" />
-			<parameter name="aCommandManager" />
-			<parameter name="aWindow" />
-			<parameter name="aState" />
-			<body><![CDATA[
-			var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
-					.createInstance(Components.interfaces.nsICommandParams);
-			aCommandManager.getCommandState(aCommandName, aWindow,state);
-
-			return state.getBooleanValue(aState);
-		]]></body>
-		</method>
-
-		<method name="setButtonState">
-			<parameter name="aAnonId" />
-			<body><![CDATA[
-			if (this.commandManager) {
-				var button = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
-				if (button.hasAttribute("state")) {
-					if (aAnonId.indexOf("cmd_align") !== -1) {
-						button.checked = (aAnonId.indexOf(this.getCStringCommandState("cmd_align", this.commandManager, this.editorElement.contentWindow, "state_attribute")) > 0);
-					}
-					else {
-						button.checked = this.getBoolCommandState(aAnonId, this.commandManager, this.editorElement.contentWindow, button.getAttribute("state"));
-					}
-				}
-			}
-		]]></body>
-		</method>
-		<method name="toggleButton">
-			<parameter name="aAnonId" />
-			<body><![CDATA[
-			if (this.commandManager) {
-				if (aAnonId.indexOf("cmd_align") !== -1) {
-					var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
-							.createInstance(Components.interfaces.nsICommandParams);
-					state.setCStringValue("state_attribute", aAnonId.substr(10));
-					this.commandManager.doCommand("cmd_align", state, null);
-				}
-				else {
-					this.commandManager.doCommand(aAnonId, null, null);
-				}
-
-				this.onClickEditor();
-			}
-		]]></body>
-		</method>
-
-		<method name="addLink">
-			<body><![CDATA[
-
-				var result = window.prompt("Link URL:", "http://");
-				if (result) {
-					var selObj = this.editorElement.contentDocument.getSelection();
-
-					var range  = selObj.getRangeAt(0);
-					var textElement = range.startContainer;
-					var parent = textElement.parentElement;
-
-					var startOffset = range.startOffset;
-					
-					var newLink = document.createElement("a");
-					newLink.setAttribute("href", result);
-					range.surroundContents(newLink);
-
-					var splitText = textElement.splitText(startOffset);
-					parent.insertBefore(newLink, splitText);
-					this.content = this.content;
-				}
-		]]></body>
-		</method>
-
-		<method name="removeLink">
-			<body><![CDATA[
-
-			if (this.ceParams) {
-				var parent = this.ceParams.linkNode.parentElement;
-				while (this.ceParams.linkNode.firstChild) {
-					parent.insertBefore(this.ceParams.linkNode.firstChild, this.ceParams.linkNode);
-				}
-				parent.removeChild(this.ceParams.linkNode);
-			}
-		]]></body>
-		</method>
-
-		<method name="editLink">
-			<body><![CDATA[
-
-			if (this.ceParams) {
-				var result = window.prompt("Link URL:", this.ceParams.href);
-				if (result) {
-					this.ceParams.linkNode.setAttribute("href", result);
-				}
-			}
-		]]></body>
-		</method>
-
-	</implementation>
-	</binding>
+
+    <binding id="exchWebServiceEditor">
+        <!-- CSS needed to correctly display color buttons (font and background) -->
+        <resources>
+            <stylesheet src="chrome://messenger/skin/messengercompose/messengercompose.css" />
+        </resources>
+        <content>
+            <xul:vbox flex="1">
+                <xul:toolbox anonid="FormatToolbox"
+                             mode="icons">
+                    <xul:toolbar class="chromeclass-toolbar embedded-toolbar"
+                                 anonid="FormatToolbar">
+                        <xul:toolbarbutton anonid="cmd_bold"
+                                           class="bold-button"
+                                           tooltiptext="Bold"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_all" />
+                        <xul:toolbarbutton anonid="cmd_italic"
+                                           class="italic-button"
+                                           tooltiptext="Italic"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_all" />
+                        <xul:toolbarbutton anonid="cmd_underline"
+                                           class="underline-button"
+                                           tooltiptext="Underline"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_all" />
+                        <xul:toolbarseparator class="toolbarseparator-standard" />
+                        <xul:toolbarbutton anonid="cmd_decreaseFont"
+                                           class="decreaseFont-button"
+                                           tooltiptext="Indent"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true" />
+                        <xul:toolbarbutton anonid="cmd_increaseFont"
+                                           class="increaseFont-button"
+                                           tooltiptext="Outdent"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true" />
+                        <xul:toolbarseparator class="toolbarseparator-standard" />
+                        <xul:toolbarbutton anonid="cmd_indent"
+                                           class="indent-button"
+                                           tooltiptext="Indent"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true" />
+                        <xul:toolbarbutton anonid="cmd_outdent"
+                                           class="outdent-button"
+                                           tooltiptext="Outdent"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true" />
+                        <xul:toolbarseparator class="toolbarseparator-standard" />
+                        <xul:toolbarbutton anonid="cmd_ol"
+                                           class="orderedlist-button"
+                                           tooltiptext="Indent"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_all" />
+                        <xul:toolbarbutton anonid="cmd_ul"
+                                           class="unorderedlist-button"
+                                           tooltiptext="Outdent"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_all" />
+                        <xul:toolbarseparator class="toolbarseparator-standard" />
+                        <xul:toolbaritem class="formatting-button">
+                            <xul:stack align="center"
+                                       state="rgb(102,102,102)">
+                                <xul:box style="background-color:#FFFFFF"
+                                         anonid="cmd_backgroundColor"
+                                         class="color-button"
+                                         tooltiptext="Choose higlight color for text"
+                                         id="BackgroundColorButton" />
+                                <xul:box style="background-color:rgb(0,0,0)"
+                                         anonid="cmd_fontColor"
+                                         class="color-button"
+                                         tooltiptext="Choose font color for text"
+                                         id="TextColorButton" />
+                            </xul:stack>
+                        </xul:toolbaritem>
+                        <xul:toolbarseparator class="toolbarseparator-standard" />
+                        <xul:toolbarbutton anonid="cmd_align_left"
+                                           class="align-left-button"
+                                           tooltiptext="Align left"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_attribute" />
+                        <xul:toolbarbutton anonid="cmd_align_center"
+                                           class="align-center-button"
+                                           tooltiptext="Align center"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_attribute" />
+                        <xul:toolbarbutton anonid="cmd_align_right"
+                                           class="align-right-button"
+                                           tooltiptext="Align right"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_attribute" />
+                        <xul:toolbarbutton anonid="cmd_align_justify"
+                                           class="align-justify-button"
+                                           tooltiptext="Align justify"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="true"
+                                           state="state_attribute" />
+                        <xul:toolbarbutton anonid="cmd_add_link"
+                                           class="addlink-button"
+                                           tooltiptext="Add link"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="false"
+                                           state="state_attribute" />
+                        <xul:toolbarbutton anonid="cmd_edit_link"
+                                           class="editlink-button"
+                                           tooltiptext="Edit link"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="false"
+                                           state="state_attribute"
+                                           hidden="true" />
+                        <xul:toolbarbutton anonid="cmd_remove_link"
+                                           class="removelink-button"
+                                           tooltiptext="Remove link"
+                                           type="checkbox"
+                                           autoCheck="false"
+                                           connect="false"
+                                           state="state_attribute"
+                                           hidden="true" />
+                    </xul:toolbar>
+                </xul:toolbox>
+                <xul:toolbox anonid="FormatToolbox"
+                             mode="icons">
+                    <xul:toolbar class="chromeclass-toolbar embedded-toolbar"
+                                 anonid="FormatToolbar">
+                        <xul:toolbaritem class="formatting-button">
+                            <xul:menulist anonid="fontFaceMenuList"
+                                          class="toolbar-focustarget"
+                                          crop="right">
+                                <xul:menupopup anonid="fontFaceSelect" />
+                            </xul:menulist>
+                        </xul:toolbaritem>
+                    </xul:toolbar>
+                </xul:toolbox>
+                <xul:editor type="content-primary"
+                            anonid="editor"
+                            class="exchWebService-editor"
+                            src="about:blank"
+                            editortype="htmlmail"
+                            flex="1" />
+            </xul:vbox>
+        </content>
+        <implementation>
+            <constructor>
+<![CDATA[
+                        var self=this;
+
+                        // To be able to set correct HTML content
+                        this.globalFunctions = Components.classes["@1st-setup.nl/global/functions;1"]
+                                .getService(Components.interfaces.mivFunctions);
+
+                        this.editorElement = document.getAnonymousElementByAttribute(this, "anonid", "editor");
+                        if (this.editorElement) {
+                                this.commandManager = this.editorElement.commandManager;
+                                this.editorClickFunction = function(aEvent) { self.onClickEditor(aEvent);};
+                                this.editorElement.addEventListener("click", this.editorClickFunction, false);
+
+                                this.editorDblClickFunction = function(aEvent) { self.onDblClickEditor(aEvent);};
+                                this.editorElement.addEventListener("dblclick", this.editorDblClickFunction, false);
+
+                                this.editorKeyPressFunction = function(aEvent) { self.onKeyPressEditor(aEvent);};
+                                this.editorElement.addEventListener("keyup", this.editorKeyPressFunction, false);
+
+                                this.editorMouseOver = function(aEvent) { self.onMouseOver(aEvent);};
+                                this.editorElement.addEventListener("mouseover", this.editorMouseOver , false);
+
+                                this.editorMouseOut = function(aEvent) { self.onMouseOut(aEvent);};
+                                this.editorElement.addEventListener("mouseout", this.editorMouseOut, false);
+
+                                // Set default document to empty HTML content
+                                this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(null);
+                        }
+
+                        this.atomService = Components.classes["@mozilla.org/atom-service;1"]
+                                .getService(Components.interfaces.nsIAtomService);
+
+                        this.connectAllCommandListenerToolbar("FormatToolbar");
+
+                        // Connect color button
+                        this.bgColorFunction = function(){ self.selectColor("cmd_backgroundColor");};
+                        var bgColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
+                        bgColorElement.addEventListener("click", this.bgColorFunction, false);
+
+                        this.fontColorFunction = function(){ self.selectColor("cmd_fontColor");};
+                        var fontColorElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor")
+                        fontColorElement.addEventListener("click", this.fontColorFunction, false);
+
+                        this.highlightColor = "#FFFFFF";
+                        this.fontColor = "#000000";
+
+                        // Connect FontFace popup menu
+                        this.menuPopupFunction = function(event){ self.selectFont("cmd_fontFace", event.target.value);};
+                        this.menuPopup = document.getAnonymousElementByAttribute(this, "anonid", "fontFaceSelect");
+                        this.menuPopup.addEventListener("command", this.menuPopupFunction, false);
+                        this.fillFontFace();
+
+                        // Connect HyperLink buttons
+                        this.addLinkFunction = function(){ self.addLink();};
+                        var addLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
+                        addLinkElement.addEventListener("click", this.addLinkFunction, false);
+
+                        this.removeLinkFunction = function(){ self.removeLink();};
+                        var removeLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link")
+                        removeLinkElement.addEventListener("click", this.removeLinkFunction, false);
+
+                        this.editLinkFunction = function(){ self.editLink();};
+                        var editLinkElement = document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
+                        editLinkElement.addEventListener("click", this.editLinkFunction, false);
+                ]]>
+            </constructor>
+            <destructor>
+<![CDATA[
+                        if (this.editorElement) {
+                                this.editorElement.removeEventListener("click", this.editorClickFunction, false);
+                                this.editorElement.removeEventListener("keyup", this.editorKeyPressFunction, false);
+
+                                this.editorElement.removeEventListener("dblclick", this.editorDblClickFunction, false);
+
+                                this.editorElement.removeEventListener("mouseover", this.editorMouseOver , false);
+                                this.editorElement.removeEventListener("mouseout", this.editorMouseOut, false);
+                        }
+
+                        this.removeAllCommandListenerToolbar("FormatToolbar");
+
+                        // Disconnect color button
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor")
+                                .removeEventListener("click", this.bgColorFunction, false);
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor")
+                                .removeEventListener("click", this.fontColorFunction, false);
+
+                        // Disconnect Font face button
+                        if (this.menuPopupFunction) {
+                                this.menuPopup.removeEventListener("command", this.menuPopupFunction, false);
+                        }
+
+                        // Disconnect HyperLink buttons
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link")
+                                .removeEventListener("click", this.addLinkFunction, false);
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link")
+                                .removeEventListener("click", this.removeLinkFunction, false);
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link")
+                                .removeEventListener("click", this.editLinkFunction, false);
+                ]]>
+            </destructor>
+            <property name="content">
+                <getter>
+<![CDATA[
+                            return this.editorElement.contentDocument.documentElement.innerHTML;
+                          ]]>
+                </getter>
+                <setter>
+<![CDATA[
+                                if (this.editorElement) {
+                                        this.editorElement.contentDocument.documentElement.innerHTML = this.globalFunctions.fromText2HTML(val);
+                                }
+                          ]]>
+                </setter>
+            </property>
+            <method name="fillFontFace">
+                <body>
+<![CDATA[
+                        if (gExchWebServiceLocalFonts === undefined) {
+                                // Build list of all local fonts once per editor
+                                try {
+                                        var enumerator = Components.classes["@mozilla.org/gfx/fontenumerator;1"]
+                                                                 .getService(Components.interfaces.nsIFontEnumerator);
+                                        var localFontCount = { value: 0 }
+                                        var gExchWebServiceLocalFonts = enumerator.EnumerateAllFonts(localFontCount);
+                                }
+                                catch(e) { }
+                        }
+
+                        if (gExchWebServiceLocalFonts !== undefined) {
+
+                                var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
+                                itemNode.setAttribute("label", "Variable width");
+                                itemNode.setAttribute("value", "Arial");
+                                this.menuPopup.appendChild(itemNode);
+
+                                var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuseparator");
+                                this.menuPopup.appendChild(itemNode);
+
+                                for (var i = 0; i < gExchWebServiceLocalFonts.length; ++i) {
+                                        if (gExchWebServiceLocalFonts[i] != "") {
+                                                var itemNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
+                                                itemNode.setAttribute("label", gExchWebServiceLocalFonts[i]);
+                                                itemNode.setAttribute("value", gExchWebServiceLocalFonts[i]);
+                                                itemNode.setAttribute("style", "font-family: "+gExchWebServiceLocalFonts[i]+" !important;");
+                                                this.menuPopup.appendChild(itemNode);
+                                        }
+                                }
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="connectAllCommandListenerToolbar">
+                <parameter name="aAnonId" />
+                <body>
+<![CDATA[
+                        var toolbar = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
+
+                        if (!this.functions) {
+                                this.functions = {};
+                        }
+
+                        if (toolbar) {
+                                var toolbarButtons = toolbar.getElementsByTagName("xul:toolbarbutton");
+                                for (var i=0; i<toolbarButtons.length;i++) {
+                                        if ((toolbarButtons[i].hasAttribute("connect")) && (toolbarButtons[i].getAttribute("connect") === "true")) {
+                                                this.addCommandListener(toolbarButtons[i].getAttribute("anonid"), aAnonId);
+                                        }
+                                }
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="addCommandListener">
+                <parameter name="aAnonId" />
+                <parameter name="aStore" />
+                <body>
+<![CDATA[
+                        var self = this;
+
+                        if (!this.functions[aStore]) {
+                                this.functions[aStore] = {};
+                        }
+                        this.functions[aStore][aAnonId] = function() { self.toggleButton(aAnonId);};
+                        document.getAnonymousElementByAttribute(this, "anonid", aAnonId).addEventListener("command", this.functions[aStore][aAnonId], false);
+                ]]>
+                </body>
+            </method>
+            <method name="removeAllCommandListenerToolbar">
+                <parameter name="aAnonId" />
+                <body>
+<![CDATA[
+                        if ((this.functions) && (this.functions[aAnonId])) {
+                                for (var name in this.functions[aAnonId]) {
+                                        this.removeCommandListener(name, aAnonId);
+                                }
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="removeCommandListener">
+                <parameter name="aAnonId" />
+                <parameter name="aStore" />
+                <body>
+<![CDATA[
+                        document.getAnonymousElementByAttribute(this, "anonid", aAnonId).removeEventListener("command", this.functions[aStore][aAnonId], false);
+                ]]>
+                </body>
+            </method>
+            <method name="selectFont">
+                <parameter name="aCmd" />
+                <parameter name="aFontName" />
+                <body>
+<![CDATA[
+                        var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
+                                        .createInstance(Components.interfaces.nsICommandParams);
+                        state.setCStringValue("state_attribute", aFontName);
+                        this.commandManager.doCommand(aCmd, state, null);
+                        document.getAnonymousElementByAttribute(this, "anonid", "fontFaceMenuList").setAttribute("style", "font-family: "+aFontName+";");
+                ]]>
+                </body>
+            </method>
+            <method name="onKeyPressEditor">
+                <parameter name="aEvent" />
+                <body>
+<![CDATA[
+                        if ( ( (aEvent.keyCode > 36) && (aEvent.keyCode < 41) ) || (aEvent.keyCode === 33) || (aEvent.keyCode === 34)) {
+                                this.onClickEditor(aEvent);
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="hrefAndLinkNodeForClickEvent">
+                <parameter name="event" />
+                <body>
+<![CDATA[
+                        {
+                                var href = "";
+                                var isKeyCommand = (event.type === "command");
+                                var linkNode = isKeyCommand ? this.editorElement.commandDispatcher.focusedElement
+                                                        : event.originalTarget;
+                                while (linkNode instanceof Element) {
+                                        if (linkNode instanceof HTMLAnchorElement ||
+                                          linkNode instanceof HTMLAreaElement ||
+                                          linkNode instanceof HTMLLinkElement) {
+                                                href = linkNode.href;
+                                                if (href)
+                                                  break;
+                                        }
+                                        // Try MathML href
+                                        else if (linkNode.namespaceURI == "http://www.w3.org/1998/Math/MathML" &&
+                                               linkNode.hasAttribute("href")) {
+                                                href = linkNode.getAttribute("href");
+                                                href = makeURLAbsolute(linkNode.baseURI, href);
+                                                break;
+                                        }
+                                        // Try simple XLink
+                                        else if (linkNode.hasAttributeNS("http://www.w3.org/1999/xlink", "href")) {
+                                                href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
+                                                href = makeURLAbsolute(linkNode.baseURI, href);
+                                                break;
+                                        }
+                                        linkNode = linkNode.parentNode;
+                                }
+                                return href ? {href: href, linkNode: linkNode} : null;
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="onClickEditor">
+                <parameter name="aEvent" />
+                <body>
+<![CDATA[
+                        if (aEvent) {
+                                this.ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
+                                if (this.ceParams) {
+                                        // We have a link active.
+                                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link").hidden = true;
+                                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").hidden = false;
+                                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").hidden = false;
+
+                                        if (aEvent.ctrlKey) {
+                                                // Ctrl key was pressed on click so we are going to open the link and the program which can handle it.
+                                                try {
+                                                        var extProtService = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].getService();
+                                                        extProtService = extProtService.QueryInterface(Components.interfaces.nsIExternalProtocolService);
+                                                        var scheme = this.ceParams.href.substring(0, this.ceParams.href.indexOf(":"));
+                                                        if (extProtService.isExposedProtocol(scheme)) {
+                                                                var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                                                                          .getService(Components.interfaces.nsIIOService);
+                                                                extProtService.loadUrl(ioService.newURI(this.ceParams.href, null, null));
+                                                        }
+                                                } 
+                                                catch (ex) {
+                                                        alert("Do not know how to handle this reference:"+this.ceParams.href);
+                                                }
+                                        }
+                                }
+                                else {
+                                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_add_link").hidden = false;
+                                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_edit_link").hidden = true;
+                                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_remove_link").hidden = true;
+                                }
+                        }
+
+                        for (var aStore in this.functions) {
+                                for (var aAnonId in this.functions[aStore]) {
+                                        this.setButtonState(aAnonId);
+                                }
+                        }
+
+                        var color = this.getCStringCommandState("cmd_fontColor", this.commandManager, this.editorElement.contentWindow, "state_attribute");
+                        if (color === "") {
+                                color = "transparent";
+                        }
+                        else {
+                                color = this.ConvertRGBColorIntoHEXColor(color);
+                        }
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_fontColor").setAttribute("style","background-color:"+color);
+
+                        var aFirst = { value: false };
+                        var aAny = { value: false };
+                        var aAll = { value: false };
+                        var propAtom = this.atomService.getAtom("font");
+                        var edElement = this.editorElement.getHTMLEditor(this.editorElement.contentWindow);
+                        color = edElement.getInlinePropertyWithAttrValue(propAtom, "bgcolor", null, aFirst, aAny, aAll);
+
+                        document.getAnonymousElementByAttribute(this, "anonid", "cmd_backgroundColor").setAttribute("style","background-color:"+color);
+                        
+                        var font = this.getCStringCommandState("cmd_fontFace", this.commandManager, this.editorElement.contentWindow, "state_attribute");
+                        font = font.replace(/"/g, "");
+                        var fontElement;
+                        if (font.indexOf(",") !== -1) {
+                                var fonts = font.split(",");
+                                for(var i = 0; ((i<fonts.length) && (!fontElement)); i++) {
+                                        fontElement = document.getAnonymousElementByAttribute(this, "label", fonts[i]);
+                                        font = fonts[i];
+                                }
+                        }
+                        else {
+                                fontElement = document.getAnonymousElementByAttribute(this, "label", font);
+                        }
+                        if (fontElement) {
+                                document.getAnonymousElementByAttribute(this, "anonid", "fontFaceMenuList").selectedItem = fontElement;
+                                document.getAnonymousElementByAttribute(this, "anonid", "fontFaceMenuList").setAttribute("style", "font-family: "+font+";");
+                        }
+                        else {
+                        }
+                
+                ]]>
+                </body>
+            </method>
+            <method name="onDblClickEditor">
+                <parameter name="aEvent" />
+                <body>
+<![CDATA[
+                        if (aEvent) {
+                                this.ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
+                                if (this.ceParams) {
+                                        this.editLink();
+                                }
+                        }
+
+                ]]>
+                </body>
+            </method>
+            <method name="onMouseOver">
+                <parameter name="aEvent" />
+                <body>
+<![CDATA[
+                        if (aEvent) {
+                                var ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
+                                if (ceParams) {
+                                        this.mouseEnterHRef = ceParams.href;
+                                        this.setAttribute("tooltiptext", "ctrl+click to follow link:"+ceParams.href);
+                                        aEvent.preventDefault();
+                                        return true;
+                                }
+                        }
+                        return true;
+                ]]>
+                </body>
+            </method>
+            <method name="onMouseOut">
+                <parameter name="aEvent" />
+                <body>
+<![CDATA[
+                        if (aEvent) {
+                                var ceParams = this.hrefAndLinkNodeForClickEvent(aEvent);
+                                if (ceParams) {
+                                        if (ceParams.href != this.mouseEnterHRef) {
+                                                return true;
+                                        }
+                                        this.removeAttribute("tooltiptext");
+                                        aEvent.preventDefault();
+                                        return true;
+                                }
+                        }
+                        return false;
+
+                ]]>
+                </body>
+            </method>
+            <method name="selectColor">
+                <parameter name="aAnonId" />
+                <body>
+<![CDATA[
+                        var element = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
+
+                        // Get current color
+                        var color = this.getCStringCommandState(aAnonId, this.commandManager, this.editorElement.contentWindow, "state_attribute");
+                        if (color === "") {
+                                color = "transparent";
+                        }
+                        else {
+                                color = this.ConvertRGBColorIntoHEXColor(color);
+                        }
+                        var colorObj = {};
+                        colorObj.Type = "Text";
+                        colorObj.TextColor = color;
+                        window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
+
+                        if (colorObj.Cancel) {
+                                return;
+                        }
+
+                        element.setAttribute("style","background-color:"+colorObj.TextColor);
+
+                        if (aAnonId === "cmd_fontColor") {
+                                var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
+                                                .createInstance(Components.interfaces.nsICommandParams);
+                                state.setCStringValue("state_attribute", colorObj.TextColor);
+                                this.commandManager.doCommand(aAnonId, state, null);
+                        }
+                        else {
+                                var propAtom = this.atomService.getAtom("font");
+                                var edElement = this.editorElement.getHTMLEditor(this.editorElement.contentWindow);
+                                edElement.setInlineProperty(propAtom, "bgcolor", colorObj.TextColor);                   
+                        }
+
+                ]]>
+                </body>
+            </method>
+            <method name="ConvertRGBColorIntoHEXColor">
+                <parameter name="color" />
+                <body>
+<![CDATA[
+                          if ( /rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/.test(color) ) {
+                            var r = Number(RegExp.$1).toString(16);
+                            if (r.length === 1){
+                                r = "0"+r;
+                            }
+
+                            var g = Number(RegExp.$2).toString(16);
+                            if (g.length === 1) {
+                                g = "0"+g;
+                            }
+
+                            var b = Number(RegExp.$3).toString(16);
+                            if (b.length === 1) {
+                                b = "0"+b;
+                            }
+
+                            return "#"+r+g+b;
+                          }
+                          else
+                          {
+                            return color;
+                          }
+                ]]>
+                </body>
+            </method>
+            <method name="getCStringCommandState">
+                <parameter name="aCommandName" />
+                <parameter name="aCommandManager" />
+                <parameter name="aWindow" />
+                <parameter name="aState" />
+                <body>
+<![CDATA[
+                        var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
+                                        .createInstance(Components.interfaces.nsICommandParams);
+                        aCommandManager.getCommandState(aCommandName, aWindow,state);
+
+                        return state.getCStringValue(aState);
+                ]]>
+                </body>
+            </method>
+            <method name="getBoolCommandState">
+                <parameter name="aCommandName" />
+                <parameter name="aCommandManager" />
+                <parameter name="aWindow" />
+                <parameter name="aState" />
+                <body>
+<![CDATA[
+                        var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
+                                        .createInstance(Components.interfaces.nsICommandParams);
+                        aCommandManager.getCommandState(aCommandName, aWindow,state);
+
+                        return state.getBooleanValue(aState);
+                ]]>
+                </body>
+            </method>
+            <method name="setButtonState">
+                <parameter name="aAnonId" />
+                <body>
+<![CDATA[
+                        if (this.commandManager) {
+                                var button = document.getAnonymousElementByAttribute(this, "anonid", aAnonId);
+                                if (button.hasAttribute("state")) {
+                                        if (aAnonId.indexOf("cmd_align") !== -1) {
+                                                button.checked = (aAnonId.indexOf(this.getCStringCommandState("cmd_align", this.commandManager, this.editorElement.contentWindow, "state_attribute")) > 0);
+                                        }
+                                        else {
+                                                button.checked = this.getBoolCommandState(aAnonId, this.commandManager, this.editorElement.contentWindow, button.getAttribute("state"));
+                                        }
+                                }
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="toggleButton">
+                <parameter name="aAnonId" />
+                <body>
+<![CDATA[
+                        if (this.commandManager) {
+                                if (aAnonId.indexOf("cmd_align") !== -1) {
+                                        var state = Components.classes["@mozilla.org/embedcomp/command-params;1"]
+                                                        .createInstance(Components.interfaces.nsICommandParams);
+                                        state.setCStringValue("state_attribute", aAnonId.substr(10));
+                                        this.commandManager.doCommand("cmd_align", state, null);
+                                }
+                                else {
+                                        this.commandManager.doCommand(aAnonId, null, null);
+                                }
+
+                                this.onClickEditor();
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="addLink">
+                <body>
+<![CDATA[
+
+                                var result = window.prompt("Link URL:", "http://");
+                                if (result) {
+                                        var selObj = this.editorElement.contentDocument.getSelection();
+
+                                        var range  = selObj.getRangeAt(0);
+                                        var textElement = range.startContainer;
+                                        var parent = textElement.parentElement;
+
+                                        var startOffset = range.startOffset;
+                                        
+                                        var newLink = document.createElement("a");
+                                        newLink.setAttribute("href", result);
+                                        range.surroundContents(newLink);
+
+                                        var splitText = textElement.splitText(startOffset);
+                                        parent.insertBefore(newLink, splitText);
+                                        this.content = this.content;
+                                }
+                ]]>
+                </body>
+            </method>
+            <method name="removeLink">
+                <body>
+<![CDATA[
+
+                        if (this.ceParams) {
+                                var parent = this.ceParams.linkNode.parentElement;
+                                while (this.ceParams.linkNode.firstChild) {
+                                        parent.insertBefore(this.ceParams.linkNode.firstChild, this.ceParams.linkNode);
+                                }
+                                parent.removeChild(this.ceParams.linkNode);
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="editLink">
+                <body>
+<![CDATA[
+
+                        if (this.ceParams) {
+                                var result = window.prompt("Link URL:", this.ceParams.href);
+                                if (result) {
+                                        this.ceParams.linkNode.setAttribute("href", result);
+                                }
+                        }
+                ]]>
+                </body>
+            </method>
+        </implementation>
+    </binding>
 </bindings>
diff --git a/chrome/content/exchWebService_bindings.xml b/chrome/content/exchWebService_bindings.xml
index f21a44d2..572af7dc 100644
--- a/chrome/content/exchWebService_bindings.xml
+++ b/chrome/content/exchWebService_bindings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,35 +23,27 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <bindings id="exchWebService-bindings"
-  xmlns="http://www.mozilla.org/xbl"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <binding id="exchWebService-statusImage">
-    <content>
-        <xul:image anonid="theImage" class="exchWebService-statusImage-0"/>
-    </content>
-
-    <implementation>
-      <constructor>
-         this._status = 0;
-      </constructor>
-
-	<property name="status"> <!-- define image.exchWebService-statusImage-<status> classes in your css file -->
-		<getter>
-			return this._status;
-		</getter>
-		<setter>
-			this._status = val;
-			var theImage = document.getAnonymousElementByAttribute(this, "anonid", "theImage");
-			theImage.setAttribute("class", "exchWebService-statusImage-"+val);
-		</setter>
-	</property>
-    </implementation>
-
-  </binding>
-
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:html="http://www.w3.org/1999/xhtml"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+    <binding id="exchWebService-statusImage">
+        <content>
+            <xul:image anonid="theImage"
+                       class="exchWebService-statusImage-0" />
+        </content>
+        <implementation>
+            <constructor>this._status = 0;</constructor>
+            <property name="status">
+                <!-- define image.exchWebService-statusImage-<status> classes in your css file -->
+                <getter>return this._status;</getter>
+                <setter>this._status = val; var theImage =
+                document.getAnonymousElementByAttribute(this,
+                "anonid", "theImage");
+                theImage.setAttribute("class",
+                "exchWebService-statusImage-"+val);</setter>
+            </property>
+        </implementation>
+    </binding>
 </bindings>
diff --git a/chrome/content/exchangeCloneSettings.xul b/chrome/content/exchangeCloneSettings.xul
index a1ed531b..57b20e33 100644
--- a/chrome/content/exchangeCloneSettings.xul
+++ b/chrome/content/exchangeCloneSettings.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,32 +23,26 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeCloneSettings.dtd" > %dtd1;
 ]>
 <?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_CloneSettings_dialog" 
-  title="Exchange Clone Settings" 
-  buttons="accept,cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return tmpExchangeCloneSettings.onSave();"
-  onload="tmpExchangeCloneSettings.onLoad();">
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/exchangeCloneSettings.js"/>
-
-	<hbox>
-		<label value="&label.ecExchangeSettings.title;"/>
-		<textbox id="exchWebService_clone_description"/>
-	</hbox>
-
-	<vbox id="exchWebService-exchange-settings" flex="1">
-	</vbox>
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_CloneSettings_dialog"
+        title="Exchange Clone Settings"
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return tmpExchangeCloneSettings.onSave();"
+        onload="tmpExchangeCloneSettings.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/exchangeCloneSettings.js" />
+    <hbox>
+        <label value="&label.ecExchangeSettings.title;" />
+        <textbox id="exchWebService_clone_description" />
+    </hbox>
+    <vbox id="exchWebService-exchange-settings"
+          flex="1"></vbox>
 </dialog>
diff --git a/chrome/content/exchangeSettings.xul b/chrome/content/exchangeSettings.xul
index 27bff534..6d3c42ea 100644
--- a/chrome/content/exchangeSettings.xul
+++ b/chrome/content/exchangeSettings.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,412 +36,421 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeSettings.dtd" > %dtd1;
 ]>
 <?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
-
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	id="exchWebService_ExchangeSettings_dialog" title="&ecsettings.title; " buttons="accept,cancel"
-	buttonlabelaccept="&label.acceptbutton;" buttonlabelcancel="&label.cancelbutton;"
-	ondialogaccept="tmpOfflineCacheSettings.onSave();return tmpExchangeSettings.onSave();"
-	onload="tmpExchangeSettings.onLoad();">
-
-	<script type="application/javascript"
-		src="chrome://exchangecalendar/content/exchangeSettings.js" />
-	<script type="application/javascript"
-		src="chrome://exchangecalendar/content/offlineCacheSettings.js" />
-
-	<commandset>
-		<command id="exchWebService_cmd_poll_inbox"
-			oncommand="tmpExchangeSettings.doPollInboxChanged(this);" />
-		<command id="exchWebService_cmd_autorespond"
-			oncommand="tmpExchangeSettings.doAutoRespondChanged(this);" />
-		<command id="exchWebService_cmd_offlineCache"
-			oncommand="tmpOfflineCacheSettings.doCheckOfflineCacheChanged(this);" />
-	</commandset>
-
-	<hbox>
-		<label value="&label.ecExchangeSettings.title;" />
-		<label id="exchWebService_ExchangeSettings-title" />
-	</hbox>
-
-	<tabbox flex="1">
-		<tabs onselect="tmpExchangeSettings.doTabChanged(this);">
-			<tab label="&ecsettings.tab.adsettings;" selected="true" /> 
-<!--			<tab label="&ecsettings.tab.meetingrequestsettings;" hidden="true"/>  -->
-			<tab label="&ecsettings.tab.calendarfolderproperties;" />
-			<tab label="&ecsettings.tab.offlineCachingproperties;" />
-			<tab label="&ecsettings.tab.autoprocessingproperties;" />
-            <tab label="&ecsettings.tab.mailitemsProperties;" /> 
-		</tabs>
-		<tabpanels flex="1">
-			<tabpanel id="exchWebService-adsettings">
-
-				<vbox>
-					<hbox id="exchWebService-poll-calendar-interval-hbox">
-						<label value="&label.poll.calendar.interval;" />
-						<textbox id="exchWebService-poll-calendar-interval"
-							increment="10" min="10" type="number" value="10" />
-					</hbox>
-					<vbox id="exchWebService-exchange-settings" flex="1">
-					</vbox>
-				</vbox>
-			</tabpanel>
-<!--
-			<tabpanel id="exchWebService-meetingrequestsettings">
-				<vbox id="vbox-exchWebService-meetingrequestsettings" hidden="false">
-					<checkbox id="exchWebService-poll-inbox" label="&label.poll.inbox;"
-						checked="true" command="exchWebService_cmd_poll_inbox" />
-					<hbox id="exchWebService-poll-inbox-interval-hbox">
-						<label value="&label.poll.inbox.interval;" />
-						<textbox id="exchWebService-poll-inbox-interval"
-							increment="1" min="3" type="number" value="3" />
-					</hbox>
-
-					<separator />
-
-					<hbox>
-						<checkbox id="exchWebService-autorespond-meetingrequest"
-							label="&label.autorespond.meetingrequest;" checked="true"
-							command="exchWebService_cmd_autorespond" />
-						<menulist label="(Make a choice)" id="exchWebService-autorespond-answer"
-							value="1">
-							<menupopup>
-								<menuitem label="&menuitem.label.ec-autorespond-answer.tentative;"
-									value="TENTATIVE" />
-								<menuitem label="&menuitem.label.ec-autorespond-answer.accepted;"
-									value="ACCEPTED" />
-								<menuitem label="&menuitem.label.ec-autorespond-answer.declined;"
-									value="DECLINED" />
-							</menupopup>
-						</menulist>
-					</hbox>
-					<checkbox id="exchWebService-doautorespond-meetingrequest-message"
-						label="&label.doautorespond.meetingrequest.message;" checked="false" />
-					<hbox align="left">
-						<label value="&label.autorespond.meetingrequest.message;" />
-						<textbox id="exchWebService-autorespond-meetingrequest-message"
-							multiline="true" label="messageResponseBody" rows="5" />
-					</hbox>
-
-					<separator />
-
-					<checkbox id="exchWebService-autoremove-invitation_cancellation1"
-						label="&label.autoremove.invitation_cancellation1;" checked="true" />
-					<checkbox id="exchWebService-autoremove-invitation_cancellation2"
-						label="&label.autoremove.invitation_cancellation2;" checked="false" />
-
-					<separator />
-
-					<checkbox id="exchWebService-autoremove-invitation_response1"
-						label="&label.autoremove.invitation_response1;" checked="false" />
-
-				</vbox>
-				<vbox id="vbox-exchWebService-nomeetingrequestsettings" hidden="true">
-					<description style="white-space: pre;">&label.nomeetingrequestsettings;
-					</description>
-				</vbox>
-			</tabpanel>
+        id="exchWebService_ExchangeSettings_dialog"
+        title="&ecsettings.title; "
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="tmpOfflineCacheSettings.onSave();return tmpExchangeSettings.onSave();"
+        onload="tmpExchangeSettings.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/exchangeSettings.js" />
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/offlineCacheSettings.js" />
+    <commandset>
+        <command id="exchWebService_cmd_poll_inbox"
+                 oncommand="tmpExchangeSettings.doPollInboxChanged(this);" />
+        <command id="exchWebService_cmd_autorespond"
+                 oncommand="tmpExchangeSettings.doAutoRespondChanged(this);" />
+        <command id="exchWebService_cmd_offlineCache"
+                 oncommand="tmpOfflineCacheSettings.doCheckOfflineCacheChanged(this);" />
+    </commandset>
+    <hbox>
+        <label value="&label.ecExchangeSettings.title;" />
+        <label id="exchWebService_ExchangeSettings-title" />
+    </hbox>
+    <tabbox flex="1">
+        <tabs onselect="tmpExchangeSettings.doTabChanged(this);">
+            <tab label="&ecsettings.tab.adsettings;"
+                 selected="true" />
+            <!--                    <tab label="&ecsettings.tab.meetingrequestsettings;" hidden="true"/>  -->
+            <tab label="&ecsettings.tab.calendarfolderproperties;" />
+            <tab label="&ecsettings.tab.offlineCachingproperties;" />
+            <tab label="&ecsettings.tab.autoprocessingproperties;" />
+            <tab label="&ecsettings.tab.mailitemsProperties;" />
+        </tabs>
+        <tabpanels flex="1">
+            <tabpanel id="exchWebService-adsettings">
+                <vbox>
+                    <hbox id="exchWebService-poll-calendar-interval-hbox">
+
+                        <label value="&label.poll.calendar.interval;" />
+                        <textbox id="exchWebService-poll-calendar-interval"
+                                 increment="10"
+                                 min="10"
+                                 type="number"
+                                 value="10" />
+                    </hbox>
+                    <vbox id="exchWebService-exchange-settings"
+                          flex="1"></vbox>
+                </vbox>
+            </tabpanel>
+            <!--
+                        <tabpanel id="exchWebService-meetingrequestsettings">
+                                <vbox id="vbox-exchWebService-meetingrequestsettings" hidden="false">
+                                        <checkbox id="exchWebService-poll-inbox" label="&label.poll.inbox;"
+                                                checked="true" command="exchWebService_cmd_poll_inbox" />
+                                        <hbox id="exchWebService-poll-inbox-interval-hbox">
+                                                <label value="&label.poll.inbox.interval;" />
+                                                <textbox id="exchWebService-poll-inbox-interval"
+                                                        increment="1" min="3" type="number" value="3" />
+                                        </hbox>
+
+                                        <separator />
+
+                                        <hbox>
+                                                <checkbox id="exchWebService-autorespond-meetingrequest"
+                                                        label="&label.autorespond.meetingrequest;" checked="true"
+                                                        command="exchWebService_cmd_autorespond" />
+                                                <menulist label="(Make a choice)" id="exchWebService-autorespond-answer"
+                                                        value="1">
+                                                        <menupopup>
+                                                                <menuitem label="&menuitem.label.ec-autorespond-answer.tentative;"
+                                                                        value="TENTATIVE" />
+                                                                <menuitem label="&menuitem.label.ec-autorespond-answer.accepted;"
+                                                                        value="ACCEPTED" />
+                                                                <menuitem label="&menuitem.label.ec-autorespond-answer.declined;"
+                                                                        value="DECLINED" />
+                                                        </menupopup>
+                                                </menulist>
+                                        </hbox>
+                                        <checkbox id="exchWebService-doautorespond-meetingrequest-message"
+                                                label="&label.doautorespond.meetingrequest.message;" checked="false" />
+                                        <hbox align="left">
+                                                <label value="&label.autorespond.meetingrequest.message;" />
+                                                <textbox id="exchWebService-autorespond-meetingrequest-message"
+                                                        multiline="true" label="messageResponseBody" rows="5" />
+                                        </hbox>
+
+                                        <separator />
+
+                                        <checkbox id="exchWebService-autoremove-invitation_cancellation1"
+                                                label="&label.autoremove.invitation_cancellation1;" checked="true" />
+                                        <checkbox id="exchWebService-autoremove-invitation_cancellation2"
+                                                label="&label.autoremove.invitation_cancellation2;" checked="false" />
+
+                                        <separator />
+
+                                        <checkbox id="exchWebService-autoremove-invitation_response1"
+                                                label="&label.autoremove.invitation_response1;" checked="false" />
+
+                                </vbox>
+                                <vbox id="vbox-exchWebService-nomeetingrequestsettings" hidden="true">
+                                        <description style="white-space: pre;">&label.nomeetingrequestsettings;
+                                        </description>
+                                </vbox>
+                        </tabpanel>
 -->
-			<tabpanel id="exchWebService-folderproperties">
-
-				<hbox flex="1">
-
-					<vbox id="vbox-exchWebService-folderproperties">
-
-						<label id="exchWebService-folderproperties-xml" value="Details:" />
-						<grid flex="1">
-							<columns>
-								<column />
-								<column flex="1" />
-							</columns>
-							<rows>
-								<row align="center">
-									<label value="Exchange server version:" />
-									<label id="exchWebServices-ServerVersionInfo" value="" />
-								</row>
-								<row align="center">
-									<label value="Displayname:" />
-									<label id="exchWebServices-CalendarFolder-DisplayName"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="Total item count:" />
-									<label id="exchWebServices-CalendarFolder-TotalCount"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="Child folder count:" />
-									<label id="exchWebServices-CalendarFolder-ChildFolderCount"
-										value="" />
-								</row>
-							</rows>
-						</grid>
-
-						<separator />
-
-						<label value="Effective rights:" />
-						<grid flex="1">
-							<columns>
-								<column />
-								<column flex="1" />
-							</columns>
-							<rows>
-								<row align="center">
-									<label value="CreateAssociated:" />
-									<label
-										id="exchWebServices-CalendarFolder-EffectiveRights-CreateAssociated"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="CreateContents:" />
-									<label
-										id="exchWebServices-CalendarFolder-EffectiveRights-CreateContents"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="CreateHierarchy:" />
-									<label
-										id="exchWebServices-CalendarFolder-EffectiveRights-CreateHierarchy"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="Delete:" />
-									<label id="exchWebServices-CalendarFolder-EffectiveRights-Delete"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="Modify:" />
-									<label id="exchWebServices-CalendarFolder-EffectiveRights-Modify"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="Read:" />
-									<label id="exchWebServices-CalendarFolder-EffectiveRights-Read"
-										value="" />
-								</row>
-							</rows>
-						</grid>
-
-						<tree id="exchWebServicesPermissionsTree" flex="1" seltype="single"
-							onselect="tmpExchangeSettings.doOnSelectUserId(this);"
-							sortResource="UserId" sortDirection="natural" rows="5">
-							<treecols>
-								<treecol id="exchWebService_permissonTree_userId" label="&treecol.label.userid;"
-									primary="true" flex="2" fixed="false" />
-								<treecol id="exchWebService_permissonTree_email" label="&treecol.label.email;"
-									primary="false" flex="1" fixed="false" />
-							</treecols>
-
-							<treechildren />
-						</tree>
-
-						<label value="Select user rights:" />
-						<grid flex="1">
-							<columns>
-								<column />
-								<column flex="1" />
-							</columns>
-							<rows>
-								<row align="center">
-									<label value="CanCreateItems:" />
-									<label id="exchWebServices-UserId-EffectiveRights-CanCreateItems"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="CanCreateSubFolders:" />
-									<label
-										id="exchWebServices-UserId-EffectiveRights-CanCreateSubFolders"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="IsFolderOwner:" />
-									<label id="exchWebServices-UserId-EffectiveRights-IsFolderOwner"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="IsFolderVisible:" />
-									<label id="exchWebServices-UserId-EffectiveRights-IsFolderVisible"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="IsFolderContact:" />
-									<label id="exchWebServices-UserId-EffectiveRights-IsFolderContact"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="EditItems:" />
-									<label id="exchWebServices-UserId-EffectiveRights-EditItems"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="DeleteItems:" />
-									<label id="exchWebServices-UserId-EffectiveRights-DeleteItems"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="ReadItems:" />
-									<label id="exchWebServices-UserId-EffectiveRights-ReadItems"
-										value="" />
-								</row>
-								<row align="center">
-									<label value="CalendarPermissionLevel:" />
-									<label
-										id="exchWebServices-UserId-EffectiveRights-CalendarPermissionLevel"
-										value="" />
-								</row>
-							</rows>
-						</grid>
-					</vbox>
-				</hbox>
-			</tabpanel>
-			<tabpanel id="exchWebService-offlineCache-properties">
-				<vbox flex="1">
-					<groupbox id="exchWebService-offlineCacheproperties-detaisgroupbox">
-						<caption label="Details:" />
-						<vbox>
-							<hbox>
-								<checkbox label="Cache" id="exchWebService-offlineCacheproperties-cacheState"
-									command="exchWebService_cmd_offlineCache" disabled="true"/>
-							</hbox>
-						</vbox>
-						<vbox id="exchWebService-offlineCacheproperties-detaisvbox" collapsed="true">					
-							<hbox>
-								<label id="exchWebService-offlineCacheproperties-cachingStartDate"
-									value="&label.offlineCacheproperties.cachingStartDate;" />
-								<label id="exchWebService-offlineCacheproperties-cachingStartDateValue"
-									value="no data" />
-							</hbox>
-							<hbox>
-								<label id="exchWebService-offlineCacheproperties-cachingEndDate"
-									value="&label.offlineCacheproperties.cachingEndDate;" />
-								<label id="exchWebService-offlineCacheproperties-cachingEndDateValue"
-									value="no data" />
-							</hbox>
-							<hbox>
-								<label id="exchWebService-offlineCacheproperties-totalEvents"
-									value="&label.offlineCacheproperties.totalEvents;" />
-								<label id="exchWebService-offlineCacheproperties-totalEventsValue"
-									value="0" />
-							</hbox>
-							<hbox>
-								<label id="exchWebService-offlineCacheproperties-totalTasks"
-									value="&label.offlineCacheproperties.totalTasks;" />
-								<label id="exchWebService-offlineCacheproperties-totalTasksValue"
-									value="0" />
-
-							</hbox>
-							<hbox>
-								<label id="exchWebService-memoryCache-totalItemsLabel"
-									value="Items in memoryCache:" />
-								<label id="exchWebService-memoryCache-totalItems"
-									value="0" />
-
-							</hbox>
-						</vbox>
-					</groupbox>
-
-					<groupbox id="exchWebService-offlineCacheproperties-maintainancegroupbox" collapsed="true">
-						<caption label="Maintainance:" />
-						<vbox>
-							<hbox>
-								<button label="&button.offlineCacheproperties.clearCache;"
-									id="exchWebService-offlineCacheproperties-clearCach" 										command="exchWebService_offlineCacheproperties_cmd_clearCache"/>
-							</hbox>
-						</vbox>
-
-					</groupbox>
-					<groupbox id="exchWebService-offlineCacheproperties-preferencesgroupbox" collapsed="true">
-						<caption label="Preferences:" />
-						<vbox>							
-							<hbox>
-
-
-								<label value="&label.offlineCacheproperties.monthsBeforeStartDate;"
-									id="exchWebService-offlineCacheproperties-monthsBeforeStartDate-label" />
-								<textbox
-									id="exchWebService-offlineCacheproperties-monthsBeforeToday"
-									increment="1" min="1" max= "999" type="number" />
-							</hbox>
-							<hbox>
-
-
-								<label value="&label.offlineCacheproperties.monthsBeforeEndDate;"
-									id="exchWebService-offlineCacheproperties-monthsBeforeEndDate-label" />
-								<textbox
-									id="exchWebService-offlineCacheproperties-monthsAfterToday"
-									increment="1" min="1" max= "999" type="number"  />
-
-							</hbox>
-						</vbox>
-					</groupbox>
-				</vbox>
-
-			</tabpanel>
+            <tabpanel id="exchWebService-folderproperties">
+                <hbox flex="1">
+                    <vbox id="vbox-exchWebService-folderproperties">
+
+                        <label id="exchWebService-folderproperties-xml"
+                               value="Details:" />
+                        <grid flex="1">
+                            <columns>
+                                <column />
+                                <column flex="1" />
+                            </columns>
+                            <rows>
+                                <row align="center">
+                                    <label value="Exchange server version:" />
+                                    <label id="exchWebServices-ServerVersionInfo"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="Displayname:" />
+                                    <label id="exchWebServices-CalendarFolder-DisplayName"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="Total item count:" />
+                                    <label id="exchWebServices-CalendarFolder-TotalCount"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="Child folder count:" />
+                                    <label id="exchWebServices-CalendarFolder-ChildFolderCount"
+                                           value="" />
+                                </row>
+                            </rows>
+                        </grid>
+                        <separator />
+                        <label value="Effective rights:" />
+                        <grid flex="1">
+                            <columns>
+                                <column />
+                                <column flex="1" />
+                            </columns>
+                            <rows>
+                                <row align="center">
+                                    <label value="CreateAssociated:" />
+                                    <label id="exchWebServices-CalendarFolder-EffectiveRights-CreateAssociated"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="CreateContents:" />
+                                    <label id="exchWebServices-CalendarFolder-EffectiveRights-CreateContents"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="CreateHierarchy:" />
+                                    <label id="exchWebServices-CalendarFolder-EffectiveRights-CreateHierarchy"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="Delete:" />
+                                    <label id="exchWebServices-CalendarFolder-EffectiveRights-Delete"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="Modify:" />
+                                    <label id="exchWebServices-CalendarFolder-EffectiveRights-Modify"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="Read:" />
+                                    <label id="exchWebServices-CalendarFolder-EffectiveRights-Read"
+                                           value="" />
+                                </row>
+                            </rows>
+                        </grid>
+                        <tree id="exchWebServicesPermissionsTree"
+                              flex="1"
+                              seltype="single"
+                              onselect="tmpExchangeSettings.doOnSelectUserId(this);"
+                              sortResource="UserId"
+                              sortDirection="natural"
+                              rows="5">
+                            <treecols>
+                                <treecol id="exchWebService_permissonTree_userId"
+                                         label="&treecol.label.userid;"
+                                         primary="true"
+                                         flex="2"
+                                         fixed="false" />
+                                <treecol id="exchWebService_permissonTree_email"
+                                         label="&treecol.label.email;"
+                                         primary="false"
+                                         flex="1"
+                                         fixed="false" />
+                            </treecols>
+                            <treechildren />
+                        </tree>
+                        <label value="Select user rights:" />
+                        <grid flex="1">
+                            <columns>
+                                <column />
+                                <column flex="1" />
+                            </columns>
+                            <rows>
+                                <row align="center">
+                                    <label value="CanCreateItems:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-CanCreateItems"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="CanCreateSubFolders:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-CanCreateSubFolders"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="IsFolderOwner:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-IsFolderOwner"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="IsFolderVisible:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-IsFolderVisible"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="IsFolderContact:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-IsFolderContact"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="EditItems:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-EditItems"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="DeleteItems:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-DeleteItems"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="ReadItems:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-ReadItems"
+                                           value="" />
+                                </row>
+                                <row align="center">
+                                    <label value="CalendarPermissionLevel:" />
+                                    <label id="exchWebServices-UserId-EffectiveRights-CalendarPermissionLevel"
+                                           value="" />
+                                </row>
+                            </rows>
+                        </grid>
+                    </vbox>
+                </hbox>
+            </tabpanel>
+            <tabpanel id="exchWebService-offlineCache-properties">
+                <vbox flex="1">
+                    <groupbox id="exchWebService-offlineCacheproperties-detaisgroupbox">
+
+                        <caption label="Details:" />
+                        <vbox>
+                            <hbox>
+                                <checkbox label="Cache"
+                                          id="exchWebService-offlineCacheproperties-cacheState"
+                                          command="exchWebService_cmd_offlineCache"
+                                          disabled="true" />
+                            </hbox>
+                        </vbox>
+                        <vbox id="exchWebService-offlineCacheproperties-detaisvbox"
+                              collapsed="true">
+                            <hbox>
+                                <label id="exchWebService-offlineCacheproperties-cachingStartDate"
+                                       value="&label.offlineCacheproperties.cachingStartDate;" />
+                                <label id="exchWebService-offlineCacheproperties-cachingStartDateValue"
+                                       value="no data" />
+                            </hbox>
+                            <hbox>
+                                <label id="exchWebService-offlineCacheproperties-cachingEndDate"
+                                       value="&label.offlineCacheproperties.cachingEndDate;" />
+                                <label id="exchWebService-offlineCacheproperties-cachingEndDateValue"
+                                       value="no data" />
+                            </hbox>
+                            <hbox>
+                                <label id="exchWebService-offlineCacheproperties-totalEvents"
+                                       value="&label.offlineCacheproperties.totalEvents;" />
+                                <label id="exchWebService-offlineCacheproperties-totalEventsValue"
+                                       value="0" />
+                            </hbox>
+                            <hbox>
+                                <label id="exchWebService-offlineCacheproperties-totalTasks"
+                                       value="&label.offlineCacheproperties.totalTasks;" />
+                                <label id="exchWebService-offlineCacheproperties-totalTasksValue"
+                                       value="0" />
+                            </hbox>
+                            <hbox>
+                                <label id="exchWebService-memoryCache-totalItemsLabel"
+                                       value="Items in memoryCache:" />
+                                <label id="exchWebService-memoryCache-totalItems"
+                                       value="0" />
+                            </hbox>
+                        </vbox>
+                    </groupbox>
+                    <groupbox id="exchWebService-offlineCacheproperties-maintainancegroupbox"
+                              collapsed="true">
+                        <caption label="Maintainance:" />
+                        <vbox>
+                            <hbox>
+                                <button label="&button.offlineCacheproperties.clearCache;"
+                                        id="exchWebService-offlineCacheproperties-clearCach"
+                                        command="exchWebService_offlineCacheproperties_cmd_clearCache" />
+                            </hbox>
+                        </vbox>
+                    </groupbox>
+                    <groupbox id="exchWebService-offlineCacheproperties-preferencesgroupbox"
+                              collapsed="true">
+                        <caption label="Preferences:" />
+                        <vbox>
+                            <hbox>
+                                <label value="&label.offlineCacheproperties.monthsBeforeStartDate;"
+                                       id="exchWebService-offlineCacheproperties-monthsBeforeStartDate-label" />
+                                <textbox id="exchWebService-offlineCacheproperties-monthsBeforeToday"
+                                         increment="1"
+                                         min="1"
+                                         max="999"
+                                         type="number" />
+                            </hbox>
+                            <hbox>
+                                <label value="&label.offlineCacheproperties.monthsBeforeEndDate;"
+                                       id="exchWebService-offlineCacheproperties-monthsBeforeEndDate-label" />
+                                <textbox id="exchWebService-offlineCacheproperties-monthsAfterToday"
+                                         increment="1"
+                                         min="1"
+                                         max="999"
+                                         type="number" />
+                            </hbox>
+                        </vbox>
+                    </groupbox>
+                </vbox>
+            </tabpanel>
+            <tabpanel id="exchWebService-autoprocessing-properties">
 
-	            <tabpanel id="exchWebService-autoprocessing-properties">
-                 <vbox flex="1">
+                <vbox flex="1">
                     <groupbox id="exchWebService-autoprocessingproperties-detaisgroupbox">
-                         <caption label="Preferences:" />
-                         <vbox>
-                             <hbox>
-                                 <checkbox label="&label.autoprocessingproperties.deletecancelleditems;" id="exchWebService-autoprocessingproperties-deletecancelleditems"
-                                      disabled="false"/> 
+
+                        <caption label="Preferences:" />
+                        <vbox>
+                            <hbox>
+                                <checkbox label="&label.autoprocessingproperties.deletecancelleditems;"
+                                          id="exchWebService-autoprocessingproperties-deletecancelleditems"
+                                          disabled="false" />
+                            </hbox>
+                        </vbox>
+                        <vbox>
+                            <hbox>
+                                <checkbox label="&label.autoprocessingproperties.markeventtentative;"
+                                          id="exchWebService-autoprocessingproperties-markeventtentative"
+                                          disabled="false" />
                             </hbox>
-                        </vbox>  
-                         <vbox>
-                             <hbox>
-                                 <checkbox label="&label.autoprocessingproperties.markeventtentative;" id="exchWebService-autoprocessingproperties-markeventtentative"
-                                      disabled="false"/> 
-                            </hbox> 
-                        </vbox>  
-                    </groupbox>   
-                                              
-                </vbox> 
-            </tabpanel> 
-            
-              <tabpanel id="exchWebService-mail-properties">
-                 <vbox flex="1">
-                   <!-- Add Preferece for calendar related  mail sync --> 
+                        </vbox>
+                    </groupbox>
+                </vbox>
+            </tabpanel>
+            <tabpanel id="exchWebService-mail-properties">
+                <vbox flex="1">
+                    <!-- Add Preferece for calendar related  mail sync -->
                     <groupbox id="exchWebService-mail-properties-calendar">
-                         <caption label="Preferences:" />
-                         <vbox>
-                             <hbox> 
+
+                        <caption label="Preferences:" />
+                        <vbox>
+                            <hbox>
                                 <label value="&label.syncmailitems.interval;" />
-                                <separator /> 
+                                <separator />
                                 <textbox id="exchWebService-syncMailItems-Interval"
-                                       increment="1" min="15" type="number" value="15" />
-                                <separator /> 
-                            </hbox>  
-                           <hbox> 
-                          <checkbox label="&label.syncmailitems.active;" id="exchWebService-syncMailItems-active"
-                                      disabled="false"/> 
-                          </hbox>  
-                        </vbox>  
-                    </groupbox>                
-                     <!-- Add Preferece for task related  mail sync -->
+                                         increment="1"
+                                         min="15"
+                                         type="number"
+                                         value="15" />
+                                <separator />
+                            </hbox>
+                            <hbox>
+                                <checkbox label="&label.syncmailitems.active;"
+                                          id="exchWebService-syncMailItems-active"
+                                          disabled="false" />
+                            </hbox>
+                        </vbox>
+                    </groupbox>
+                    <!-- Add Preferece for task related  mail sync -->
                     <groupbox id="exchWebService-mail-properties-task">
-                         <caption label="Preferences:" />
-                         <vbox> 
-                           <hbox> 
-                          <checkbox label="&label.syncfollowup.deactivtate;" id="exchWebService-followup-deactivtate"
-                                      disabled="false"/> 
-                          </hbox>  
-                        </vbox>  
-                    </groupbox>                
-                </vbox> 
-            </tabpanel>  
-		</tabpanels>
-	</tabbox>
 
-	<commandset>
-		<command id="exchWebService_offlineCacheproperties_cmd_prefenceChanged"
-			oncommand="tmpOfflineCacheSettings.doChangePreferenceforCaching();" />
-		<command id="exchWebService_offlineCacheproperties_cmd_clearCache"
-			oncommand="tmpOfflineCacheSettings.doClearCache();" />
-	</commandset>
+                        <caption label="Preferences:" />
+                        <vbox>
+                            <hbox>
+                                <checkbox label="&label.syncfollowup.deactivtate;"
+                                          id="exchWebService-followup-deactivtate"
+                                          disabled="false" />
+                            </hbox>
+                        </vbox>
+                    </groupbox>
+                </vbox>
+            </tabpanel>
+        </tabpanels>
+    </tabbox>
+    <commandset>
+        <command id="exchWebService_offlineCacheproperties_cmd_prefenceChanged"
+                 oncommand="tmpOfflineCacheSettings.doChangePreferenceforCaching();" />
+        <command id="exchWebService_offlineCacheproperties_cmd_clearCache"
+                 oncommand="tmpOfflineCacheSettings.doClearCache();" />
+    </commandset>
 </dialog>
diff --git a/chrome/content/exchangeSettingsOverlay.xul b/chrome/content/exchangeSettingsOverlay.xul
index ba575d95..c33ce934 100644
--- a/chrome/content/exchangeSettingsOverlay.xul
+++ b/chrome/content/exchangeSettingsOverlay.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,137 +36,242 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeSettingsOverlay.dtd" > %dtd1;
 ]>
 <overlay id="calendarCreation"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/exchangeSettingsOverlay.js"/> 
-
-	<vbox id="exchWebService-exchange-settings"> 
-	<groupbox>
-			<caption label="&exchWebServices.exchtype.label;"/>
-			<radiogroup id="exchWebService_ectype" oncommand="tmpSettingsOverlay.exchWebServicesServerType(this);" >
-				<radio label="&exchWebServices.hostexch.label;" value="exchange"  checked="true"/>
-				<radio label="&exchWebServices.365exch.label;" value="office365"/> 
-			</radiogroup> 
-		</groupbox>
-		<groupbox>
-			<caption label="&exchWebServices.detail.label;"/>
-			<checkbox label="&ecautodiscover;" id="exchWebService_autodiscover" oncommand="tmpSettingsOverlay.exchWebServicesAutodiscoverCheckbox(this);"/>
-        	<grid flex="1">
-        	    <columns>
-        	        <column/>
-        	        <column flex="1"/>
-        	    </columns>
-        	    <rows>
-	                <row id="exchWebService_serverrow" align="center">
-	                    <label value="Server URL:" control="ecserver"/>
-			    <vbox>
-	                    	<textbox id="exchWebService_server"
-	                          	required="true" oninput="tmpSettingsOverlay.exchWebServicesDoServerChanged(this);" 
-					placeholder="https://ews.example.com/ews/exchange.asmx"/>
-			    </vbox>
-	                </row>
-	                <row id="exchWebService_mailboxrow" align="center">
-	                    <label value="&ecmailbox.label;" control="ecmailbox"/>
-				<hbox>
-		                    	<textbox id="exchWebService_mailbox"
-		                             required="true" oninput="tmpSettingsOverlay.exchWebServicesDoMailboxChanged(this);" 
-						placeholder="yourname@example.com"/>
-					<label id="exchWebService_displayname" value="" flex="1"/>
-				</hbox>
-	                </row>
-	                <row align="center">
-	                    <label value="&ecwindowsuser.label;" control="ecwindowsuser"/>
-	                    	<textbox id="exchWebService_windowsuser"
-	                             required="true" oninput="tmpSettingsOverlay.exchWebServicesDoUserChanged(this);"/>
-	                </row>
-	                <row align="center">
-	                    <label value="&ecwindowsdomain.label;" control="ecwindowsdomain"/>
-	                    	<textbox id="exchWebService_windowsdomain"
-	                             required="false" oninput="tmpSettingsOverlay.exchWebServicesDoDomainChanged(this);"/>
-	                </row>
-
-	                <row align="center">
-	                    <label value="&ecfolderidofshare.label;" control="ecfolderidofshare"/>
-	                    	<textbox id="exchWebService_folderidofshare"
-	                             required="false" oninput="tmpSettingsOverlay.exchWebServicesDoFolderIdOfShareChanged(this);"/>
-	                </row>
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/exchangeSettingsOverlay.js" />
+    <vbox id="exchWebService-exchange-settings">
+        <groupbox>
+            <caption label="&exchWebServices.exchtype.label;" />
+            <radiogroup id="exchWebService_ectype"
+                        oncommand="tmpSettingsOverlay.exchWebServicesServerType(this);">
 
-			<row id="exchWebService_autodiscovercheckrow" hidden="true">
-	                    	<label value=""/>
-				<button id="exchWebService_autodiscovercheckbutton" label="&button.label.autodiscovercheck;" oncommand="tmpSettingsOverlay.exchWebServicesDoAutodiscoverCheck();"/>
-			</row>
-			<row id="exchWebService_serverandmailboxcheckrow" hidden="true">
-	                    	<label value=""/>
-				<button id="exchWebService_serverandmailboxcheckbutton" label="&button.label.serverandmailboxcheck;" oncommand="tmpSettingsOverlay.exchWebServicesDoCheckServerAndMailbox();"/>
-			</row>
-			<row id="exchWebService_servercheckrow" hidden="true">
-	                    	<label value=""/>
-				<button id="exchWebService_servercheckbutton" label="&button.label.servercheck;" oncommand="tmpSettingsOverlay.exchWebServicesDoCheckServer();"/>
-			</row>
-			<row hidden="true">
-				<textbox id="exchWebService_detailschecked" required="true"/>
-			</row>
-	                <row id="exchWebService_folderbaserow" align="center" hidden="true">
-	                    <label value="&ecfolderbase.label;" control="ecfolderbase"/>
-				<menulist label="(Make a choice)" id="exchWebService_folderbase" value="1" oncommand="tmpSettingsOverlay.exchWebServicesDoFolderBaseChanged(this);">
-					<menupopup id="menupopup.ecfolderbase">
-						<menuitem id="menuitem.label.ecfolderbase.calendar" label="&menuitem.label.ecfolderbase.calendar;" value="calendar"/>
-						<menuitem id="menuitem.label.ecfolderbase.tasks" label="&menuitem.label.ecfolderbase.tasks;" value ="tasks"/>
-						<menuitem id="menuitem.label.ecfolderbase.publicfoldersroot" label="&menuitem.label.ecfolderbase.publicfoldersroot;" value ="publicfoldersroot"/>
-						<menuitem id="menuitem.label.ecfolderbase.inbox" label="&menuitem.label.ecfolderbase.inbox;" value ="inbox"/>
-						<menuitem id="menuitem.label.ecfolderbase.voicemail" label="&menuitem.label.ecfolderbase.voicemail;" value ="voicemail"/>
-
-						<menuitem id="menuitem.label.ecfolderbase.msgfolderroot" label="&menuitem.label.ecfolderbase.msgfolderroot;" value ="msgfolderroot"/>
-						<menuitem id="menuitem.label.ecfolderbase.root" label="&menuitem.label.ecfolderbase.root;" value ="root"/>
-						<menuitem id="menuitem.label.ecfolderbase.contacts" label="&menuitem.label.ecfolderbase.contacts;" value ="contacts"/>
-						<menuitem id="menuitem.label.ecfolderbase.deleteditems" label="&menuitem.label.ecfolderbase.deleteditems;" value ="deleteditems"/>
-						<menuitem id="menuitem.label.ecfolderbase.drafts" label="&menuitem.label.ecfolderbase.drafts;" value ="drafts"/>
-						<menuitem id="menuitem.label.ecfolderbase.journal" label="&menuitem.label.ecfolderbase.journal;" value ="journal"/>
-						<menuitem id="menuitem.label.ecfolderbase.notes" label="&menuitem.label.ecfolderbase.notes;" value ="notes"/>
-						<menuitem id="menuitem.label.ecfolderbase.outbox" label="&menuitem.label.ecfolderbase.outbox;" value ="outbox"/>
-						<menuitem id="menuitem.label.ecfolderbase.sentitems" label="&menuitem.label.ecfolderbase.sentitems;" value ="sentitems"/>
-						<menuitem id="menuitem.label.ecfolderbase.junkemail" label="&menuitem.label.ecfolderbase.junkemail;" value ="junkemail"/>
-						<menuitem id="menuitem.label.ecfolderbase.searchfolders" label="&menuitem.label.ecfolderbase.searchfolders;" value ="searchfolders"/>
-						<menuitem id="menuitem.label.ecfolderbase.version2010" label="&menuitem.label.ecfolderbase.version2010;" disabled="true" value ="searchfolders" donotchange="true"/>
-						<menuitem id="menuitem.label.ecfolderbase.recoverableitemsroot" label="&menuitem.label.ecfolderbase.recoverableitemsroot;" value ="recoverableitemsroot"/>
-						<menuitem id="menuitem.label.ecfolderbase.recoverableitemsdeletions" label="&menuitem.label.ecfolderbase.recoverableitemsdeletions;" value ="recoverableitemsdeletions"/>
-						<menuitem id="menuitem.label.ecfolderbase.recoverableitemsversion" label="&menuitem.label.ecfolderbase.recoverableitemsversion;" value ="recoverableitemsversion"/>
-						<menuitem id="menuitem.label.ecfolderbase.recoverableitemspurges" label="&menuitem.label.ecfolderbase.recoverableitemspurges;" value ="recoverableitemspurges"/>
-						<menuitem id="menuitem.label.ecfolderbase.archiveroot" label="&menuitem.label.ecfolderbase.archiveroot;" value ="archiveroot"/>
-						<menuitem id="menuitem.label.ecfolderbase.archivemsgfolderroot" label="&menuitem.label.ecfolderbase.archivemsgfolderroot;" value ="archivemsgfolderroot"/>
-						<menuitem id="menuitem.label.ecfolderbase.archivedeleteditems" label="&menuitem.label.ecfolderbase.archivedeleteditems;" value ="archivedeleteditems"/>
-						<menuitem id="menuitem.label.ecfolderbase.archiverecoverableitemsroot" label="&menuitem.label.ecfolderbase.archiverecoverableitemsroot;" value ="archiverecoverableitemsroot"/>
-						<menuitem id="menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions" label="&menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions;" value ="Archiverecoverableitemsdeletions"/>
-						<menuitem id="menuitem.label.ecfolderbase.Archiverecoverableitemsversions" label="&menuitem.label.ecfolderbase.Archiverecoverableitemsversions;" value ="Archiverecoverableitemsversions"/>
-						<menuitem id="menuitem.label.ecfolderbase.Archiverecoverableitemspurges" label="&menuitem.label.ecfolderbase.Archiverecoverableitemspurges;" value ="Archiverecoverableitemspurges"/>
-					</menupopup>
-				</menulist>
-	                </row>
-	                <row id="exchWebService_folderpathrow" align="center" hidden="true">
-	                    <label value="&ecfolderpath.label;" control="ecfolderpath"/>
-				<hbox align="center">
-		                    <label  id="exchWebService_folderpath" value="/" flex="1"/>
-					<button hidden="false" id="exchWebService_folderbrowsebutton" label="&button.label.folderbrowse;" oncommand="tmpSettingsOverlay.exchWebServicesDoFolderBrowse();"/>
-				</hbox>
-	                </row>
-			<row id="exchWebServices-UserAvailability" align="center" hidden="true">
-	                    <label value=""/>
-	                    <label id="exchWebServices-UserAvailability-label" flex="1">&exchWebServices.UserAvailability.label;</label>
-			</row>
-			<row id="exchWebServices-SharedFolderID" align="center" hidden="true">
-	                    <label value="&exchWebServices.SharedFolderID.label;"/>
-	                    <label id="exchWebServices-SharedFolderID-label" value=""/>
-			</row>
-		    </rows>
-		</grid>
-		</groupbox>
-	</vbox>
+                <radio label="&exchWebServices.hostexch.label;"
+                       value="exchange"
+                       checked="true" />
+                <radio label="&exchWebServices.365exch.label;"
+                       value="office365" />
+            </radiogroup>
+        </groupbox>
+        <groupbox>
+            <caption label="&exchWebServices.detail.label;" />
+            <checkbox label="&ecautodiscover;"
+                      id="exchWebService_autodiscover"
+                      oncommand="tmpSettingsOverlay.exchWebServicesAutodiscoverCheckbox(this);" />
+            <grid flex="1">
+                <columns>
+                    <column />
+                    <column flex="1" />
+                </columns>
+                <rows>
+                    <row id="exchWebService_serverrow"
+                         align="center">
+                        <label value="Server URL:"
+                               control="ecserver" />
+                        <vbox>
+                            <textbox id="exchWebService_server"
+                                     required="true"
+                                     oninput="tmpSettingsOverlay.exchWebServicesDoServerChanged(this);"
+                                     placeholder="https://ews.example.com/ews/exchange.asmx" />
+                        </vbox>
+                    </row>
+                    <row id="exchWebService_mailboxrow"
+                         align="center">
+                        <label value="&ecmailbox.label;"
+                               control="ecmailbox" />
+                        <hbox>
+                            <textbox id="exchWebService_mailbox"
+                                     required="true"
+                                     oninput="tmpSettingsOverlay.exchWebServicesDoMailboxChanged(this);"
+                                     placeholder="yourname@example.com" />
+                            <label id="exchWebService_displayname"
+                                   value=""
+                                   flex="1" />
+                        </hbox>
+                    </row>
+                    <row align="center">
+                        <label value="&ecwindowsuser.label;"
+                               control="ecwindowsuser" />
+                        <textbox id="exchWebService_windowsuser"
+                                 required="true"
+                                 oninput="tmpSettingsOverlay.exchWebServicesDoUserChanged(this);" />
+                    </row>
+                    <row align="center">
+                        <label value="&ecwindowsdomain.label;"
+                               control="ecwindowsdomain" />
+                        <textbox id="exchWebService_windowsdomain"
+                                 required="false"
+                                 oninput="tmpSettingsOverlay.exchWebServicesDoDomainChanged(this);" />
+                    </row>
+                    <row align="center">
+                        <label value="&ecfolderidofshare.label;"
+                               control="ecfolderidofshare" />
+                        <textbox id="exchWebService_folderidofshare"
+                                 required="false"
+                                 oninput="tmpSettingsOverlay.exchWebServicesDoFolderIdOfShareChanged(this);" />
+                    </row>
+                    <row id="exchWebService_autodiscovercheckrow"
+                         hidden="true">
+                        <label value="" />
+                        <button id="exchWebService_autodiscovercheckbutton"
+                                label="&button.label.autodiscovercheck;"
+                                oncommand="tmpSettingsOverlay.exchWebServicesDoAutodiscoverCheck();" />
+                    </row>
+                    <row id="exchWebService_serverandmailboxcheckrow"
+                         hidden="true">
+                        <label value="" />
+                        <button id="exchWebService_serverandmailboxcheckbutton"
+                                label="&button.label.serverandmailboxcheck;"
+                                oncommand="tmpSettingsOverlay.exchWebServicesDoCheckServerAndMailbox();" />
+                    </row>
+                    <row id="exchWebService_servercheckrow"
+                         hidden="true">
+                        <label value="" />
+                        <button id="exchWebService_servercheckbutton"
+                                label="&button.label.servercheck;"
+                                oncommand="tmpSettingsOverlay.exchWebServicesDoCheckServer();" />
+                    </row>
+                    <row hidden="true">
+                        <textbox id="exchWebService_detailschecked"
+                                 required="true" />
+                    </row>
+                    <row id="exchWebService_folderbaserow"
+                         align="center"
+                         hidden="true">
+                        <label value="&ecfolderbase.label;"
+                               control="ecfolderbase" />
+                        <menulist label="(Make a choice)"
+                                  id="exchWebService_folderbase"
+                                  value="1"
+                                  oncommand="tmpSettingsOverlay.exchWebServicesDoFolderBaseChanged(this);">
 
+                            <menupopup id="menupopup.ecfolderbase">
+                                <menuitem id="menuitem.label.ecfolderbase.calendar"
+                                          label="&menuitem.label.ecfolderbase.calendar;"
+                                          value="calendar" />
+                                <menuitem id="menuitem.label.ecfolderbase.tasks"
+                                          label="&menuitem.label.ecfolderbase.tasks;"
+                                          value="tasks" />
+                                <menuitem id="menuitem.label.ecfolderbase.publicfoldersroot"
+                                          label="&menuitem.label.ecfolderbase.publicfoldersroot;"
+                                          value="publicfoldersroot" />
+                                <menuitem id="menuitem.label.ecfolderbase.inbox"
+                                          label="&menuitem.label.ecfolderbase.inbox;"
+                                          value="inbox" />
+                                <menuitem id="menuitem.label.ecfolderbase.voicemail"
+                                          label="&menuitem.label.ecfolderbase.voicemail;"
+                                          value="voicemail" />
+                                <menuitem id="menuitem.label.ecfolderbase.msgfolderroot"
+                                          label="&menuitem.label.ecfolderbase.msgfolderroot;"
+                                          value="msgfolderroot" />
+                                <menuitem id="menuitem.label.ecfolderbase.root"
+                                          label="&menuitem.label.ecfolderbase.root;"
+                                          value="root" />
+                                <menuitem id="menuitem.label.ecfolderbase.contacts"
+                                          label="&menuitem.label.ecfolderbase.contacts;"
+                                          value="contacts" />
+                                <menuitem id="menuitem.label.ecfolderbase.deleteditems"
+                                          label="&menuitem.label.ecfolderbase.deleteditems;"
+                                          value="deleteditems" />
+                                <menuitem id="menuitem.label.ecfolderbase.drafts"
+                                          label="&menuitem.label.ecfolderbase.drafts;"
+                                          value="drafts" />
+                                <menuitem id="menuitem.label.ecfolderbase.journal"
+                                          label="&menuitem.label.ecfolderbase.journal;"
+                                          value="journal" />
+                                <menuitem id="menuitem.label.ecfolderbase.notes"
+                                          label="&menuitem.label.ecfolderbase.notes;"
+                                          value="notes" />
+                                <menuitem id="menuitem.label.ecfolderbase.outbox"
+                                          label="&menuitem.label.ecfolderbase.outbox;"
+                                          value="outbox" />
+                                <menuitem id="menuitem.label.ecfolderbase.sentitems"
+                                          label="&menuitem.label.ecfolderbase.sentitems;"
+                                          value="sentitems" />
+                                <menuitem id="menuitem.label.ecfolderbase.junkemail"
+                                          label="&menuitem.label.ecfolderbase.junkemail;"
+                                          value="junkemail" />
+                                <menuitem id="menuitem.label.ecfolderbase.searchfolders"
+                                          label="&menuitem.label.ecfolderbase.searchfolders;"
+                                          value="searchfolders" />
+                                <menuitem id="menuitem.label.ecfolderbase.version2010"
+                                          label="&menuitem.label.ecfolderbase.version2010;"
+                                          disabled="true"
+                                          value="searchfolders"
+                                          donotchange="true" />
+                                <menuitem id="menuitem.label.ecfolderbase.recoverableitemsroot"
+                                          label="&menuitem.label.ecfolderbase.recoverableitemsroot;"
+                                          value="recoverableitemsroot" />
+                                <menuitem id="menuitem.label.ecfolderbase.recoverableitemsdeletions"
+                                          label="&menuitem.label.ecfolderbase.recoverableitemsdeletions;"
+                                          value="recoverableitemsdeletions" />
+                                <menuitem id="menuitem.label.ecfolderbase.recoverableitemsversion"
+                                          label="&menuitem.label.ecfolderbase.recoverableitemsversion;"
+                                          value="recoverableitemsversion" />
+                                <menuitem id="menuitem.label.ecfolderbase.recoverableitemspurges"
+                                          label="&menuitem.label.ecfolderbase.recoverableitemspurges;"
+                                          value="recoverableitemspurges" />
+                                <menuitem id="menuitem.label.ecfolderbase.archiveroot"
+                                          label="&menuitem.label.ecfolderbase.archiveroot;"
+                                          value="archiveroot" />
+                                <menuitem id="menuitem.label.ecfolderbase.archivemsgfolderroot"
+                                          label="&menuitem.label.ecfolderbase.archivemsgfolderroot;"
+                                          value="archivemsgfolderroot" />
+                                <menuitem id="menuitem.label.ecfolderbase.archivedeleteditems"
+                                          label="&menuitem.label.ecfolderbase.archivedeleteditems;"
+                                          value="archivedeleteditems" />
+                                <menuitem id="menuitem.label.ecfolderbase.archiverecoverableitemsroot"
+                                          label="&menuitem.label.ecfolderbase.archiverecoverableitemsroot;"
+                                          value="archiverecoverableitemsroot" />
+                                <menuitem id="menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions"
+                                          label="&menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions;"
+                                          value="Archiverecoverableitemsdeletions" />
+                                <menuitem id="menuitem.label.ecfolderbase.Archiverecoverableitemsversions"
+                                          label="&menuitem.label.ecfolderbase.Archiverecoverableitemsversions;"
+                                          value="Archiverecoverableitemsversions" />
+                                <menuitem id="menuitem.label.ecfolderbase.Archiverecoverableitemspurges"
+                                          label="&menuitem.label.ecfolderbase.Archiverecoverableitemspurges;"
+                                          value="Archiverecoverableitemspurges" />
+                            </menupopup>
+                        </menulist>
+                    </row>
+                    <row id="exchWebService_folderpathrow"
+                         align="center"
+                         hidden="true">
+                        <label value="&ecfolderpath.label;"
+                               control="ecfolderpath" />
+                        <hbox align="center">
+                            <label id="exchWebService_folderpath"
+                                   value="/"
+                                   flex="1" />
+                            <button hidden="false"
+                                    id="exchWebService_folderbrowsebutton"
+                                    label="&button.label.folderbrowse;"
+                                    oncommand="tmpSettingsOverlay.exchWebServicesDoFolderBrowse();" />
+                        </hbox>
+                    </row>
+                    <row id="exchWebServices-UserAvailability"
+                         align="center"
+                         hidden="true">
+                        <label value="" />
+                        <label id="exchWebServices-UserAvailability-label"
+                               flex="1">
+                               &exchWebServices.UserAvailability.label;</label>
+                    </row>
+                    <row id="exchWebServices-SharedFolderID"
+                         align="center"
+                         hidden="true">
+                        <label value="&exchWebServices.SharedFolderID.label;" />
+                        <label id="exchWebServices-SharedFolderID-label"
+                               value="" />
+                    </row>
+                </rows>
+            </grid>
+        </groupbox>
+    </vbox>
 </overlay>
-
-
diff --git a/chrome/content/extra-messenger-preferences.xul b/chrome/content/extra-messenger-preferences.xul
index 122bf8bf..24ea4e9b 100644
--- a/chrome/content/extra-messenger-preferences.xul
+++ b/chrome/content/extra-messenger-preferences.xul
@@ -1,102 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE prefwindow SYSTEM "chrome://exchangecalendar/locale/extra-priority.dtd">  
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE 
+prefwindow SYSTEM "chrome://exchangecalendar/locale/extra-priority.dtd">
+<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/extras-preferences.css"?>
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/extras-preferences.css"?> 
-
-<overlay  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <prefwindow id="MailPreferences">            
-  <prefpane id="extra-pane" label="&prefwindow.title;" >
-    <preferences>
-      <preference id="extensions.extras.Iconify"
-		  name="extensions.extras.Iconify"
-		  type="bool"/> 
-      <preference id="extensions.extras.ShadeHigh"
-		  name="extensions.extras.ShadeHigh"
-		  type="bool"/>
-      <preference id="extensions.extras.ShadeLow"
-		  name="extensions.extras.ShadeLow"
-		  type="bool"/>
-	  <preference id="extensions.extras.tagImportant"
-          name="extensions.extras.tagImportant"
-          type="bool"/>
-      <preference id="extensions.extras.HighestColor"
-		  name="extensions.extras.HighestColor"
-		  type="unichar"/>
-      <preference id="extensions.extras.HighColor"
-		  name="extensions.extras.HighColor"
-		  type="unichar"/>
-      <preference id="extensions.extras.LowColor"
-		  name="extensions.extras.LowColor"
-		  type="unichar"/>
-      <preference id="extensions.extras.LowestColor"
-		  name="extensions.extras.LowestColor"
-		  type="unichar"/>
-  
-      
-    </preferences>
-    <tabbox flex="1">
-      <tabs>
-	<tab label="&general.label;"/>
- 	
-      </tabs>
-    <tabpanels  flex="1">
-    	<tabpanel  flex="1">
-    	  <vbox>
-    	    <checkbox id="iconify-checkbox"
-    		      preference="extensions.extras.Iconify"
-    		      label="&iconify.label;"/> 
-    	    <checkbox id="shade-high-checkbox"
-    		      preference="extensions.extras.ShadeHigh"
-    		      label="&shadeHigh.label;"/>
-    	    <checkbox id="shade-low-checkbox"
-    		      preference="extensions.extras.ShadeLow"
-    		      label="&shadeLow.label;"/>
-    	   <checkbox id="mark-imp-checkbox"
-                  preference="extensions.extras.tagImportant"
-                  label="&tagImportant.label;"/>
-     	  </vbox>
-    	   
-	      <hbox>
-          <groupbox flex="1">
-            <caption label="&pref.color;"/>
-            <hbox align="center" style="margin-top: 5px">
-              <label value="&highestColor.label;"   control="foregroundtextmenu"/>
-              <spacer flex="1"/>
-              <colorpicker type="button"   palettename="standard"
-                           preference="extensions.extras.HighestColor"/>
-            </hbox>
-            <hbox align="center" style="margin-top: 5px">
-              <label value="&lowestColor.label;"   control="unvisitedlinkmenu"/>
-              <spacer flex="1"/>
-              <colorpicker type="button"  palettename="standard"
-                           preference="extensions.extras.LowestColor"/>
-            </hbox>
-            <separator class="thin"/> 
-          </groupbox>
-    
-          <groupbox flex="1">
-            <caption label=" "/>
-            <hbox align="center" style="margin-top: 5px">
-              <label value="&highColor.label;"   control="backgroundmenu"/>
-              <spacer flex="1"/>
-              <colorpicker type="button"   palettename="standard"
-                           preference="extensions.extras.HighestColor"/>
-            </hbox>  
-            <hbox align="center" style="margin-top: 5px">
-              <label value="&lowColor.label;"   control="visitedlinkmenu"/>
-              <spacer flex="1"/>
-              <colorpicker type="button"   palettename="standard"
-                           preference="extensions.extras.LowestColor"/>
-            </hbox>
-            <separator class="thin"/>
-            <hbox align="center"> 
-            </hbox>
-          </groupbox>
-        </hbox>
-  	</tabpanel>
-	 
-      </tabpanels>
-    </tabbox>
-  </prefpane> 
-</prefwindow>
+    <prefwindow id="MailPreferences">
+        <prefpane id="extra-pane"
+                  label="&prefwindow.title;">
+            <preferences>
+                <preference id="extensions.extras.Iconify"
+                            name="extensions.extras.Iconify"
+                            type="bool" />
+                <preference id="extensions.extras.ShadeHigh"
+                            name="extensions.extras.ShadeHigh"
+                            type="bool" />
+                <preference id="extensions.extras.ShadeLow"
+                            name="extensions.extras.ShadeLow"
+                            type="bool" />
+                <preference id="extensions.extras.tagImportant"
+                            name="extensions.extras.tagImportant"
+                            type="bool" />
+                <preference id="extensions.extras.HighestColor"
+                            name="extensions.extras.HighestColor"
+                            type="unichar" />
+                <preference id="extensions.extras.HighColor"
+                            name="extensions.extras.HighColor"
+                            type="unichar" />
+                <preference id="extensions.extras.LowColor"
+                            name="extensions.extras.LowColor"
+                            type="unichar" />
+                <preference id="extensions.extras.LowestColor"
+                            name="extensions.extras.LowestColor"
+                            type="unichar" />
+            </preferences>
+            <tabbox flex="1">
+                <tabs>
+                    <tab label="&general.label;" />
+                </tabs>
+                <tabpanels flex="1">
+                    <tabpanel flex="1">
+                        <vbox>
+                            <checkbox id="iconify-checkbox"
+                                      preference="extensions.extras.Iconify"
+                                      label="&iconify.label;" />
+                            <checkbox id="shade-high-checkbox"
+                                      preference="extensions.extras.ShadeHigh"
+                                      label="&shadeHigh.label;" />
+                            <checkbox id="shade-low-checkbox"
+                                      preference="extensions.extras.ShadeLow"
+                                      label="&shadeLow.label;" />
+                            <checkbox id="mark-imp-checkbox"
+                                      preference="extensions.extras.tagImportant"
+                                      label="&tagImportant.label;" />
+                        </vbox>
+                        <hbox>
+                            <groupbox flex="1">
+                                <caption label="&pref.color;" />
+                                <hbox align="center"
+                                      style="margin-top: 5px">
+                                    <label value="&highestColor.label;"
+                                           control="foregroundtextmenu" />
+                                    <spacer flex="1" />
+                                    <colorpicker type="button"
+                                                 palettename="standard"
+                                                 preference="extensions.extras.HighestColor" />
+                                </hbox>
+                                <hbox align="center"
+                                      style="margin-top: 5px">
+                                    <label value="&lowestColor.label;"
+                                           control="unvisitedlinkmenu" />
+                                    <spacer flex="1" />
+                                    <colorpicker type="button"
+                                                 palettename="standard"
+                                                 preference="extensions.extras.LowestColor" />
+                                </hbox>
+                                <separator class="thin" />
+                            </groupbox>
+                            <groupbox flex="1">
+                                <caption label="" />
+                                <hbox align="center"
+                                      style="margin-top: 5px">
+                                    <label value="&highColor.label;"
+                                           control="backgroundmenu" />
+                                    <spacer flex="1" />
+                                    <colorpicker type="button"
+                                                 palettename="standard"
+                                                 preference="extensions.extras.HighestColor" />
+                                </hbox>
+                                <hbox align="center"
+                                      style="margin-top: 5px">
+                                    <label value="&lowColor.label;"
+                                           control="visitedlinkmenu" />
+                                    <spacer flex="1" />
+                                    <colorpicker type="button"
+                                                 palettename="standard"
+                                                 preference="extensions.extras.LowestColor" />
+                                </hbox>
+                                <separator class="thin" />
+                                <hbox align="center"></hbox>
+                            </groupbox>
+                        </hbox>
+                    </tabpanel>
+                </tabpanels>
+            </tabbox>
+        </prefpane>
+    </prefwindow>
 </overlay>
diff --git a/chrome/content/extra-suite-preferences.xul b/chrome/content/extra-suite-preferences.xul
index 3ce06dbe..b44eab34 100644
--- a/chrome/content/extra-suite-preferences.xul
+++ b/chrome/content/extra-suite-preferences.xul
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE prefwindow SYSTEM "chrome://exchangecalendar/locale/extra-priority.dtd">  
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE 
+prefwindow SYSTEM "chrome://exchangecalendar/locale/extra-priority.dtd">
+<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/extras-preferences.css"?>
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/extras-preferences.css"?> 
-
-<overlay  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	
-	 <treechildren id="prefsPanelChildren">
+    <treechildren id="prefsPanelChildren">
         <treeitem container="true"
                   id="extraPaneItem"
                   insertafter="exchangeWebServiceItem"
@@ -14,96 +13,104 @@
             <treechildren id="extraPaneChildren">
                 <treeitem id="extraPaneItem_preferences_treeitem_general"
                           label="&general.label;"
-                          prefpane="extraPaneItem_preferences_tab_general"/>  
+                          prefpane="extraPaneItem_preferences_tab_general" />
             </treechildren>
         </treeitem>
-    </treechildren> 
-    
+    </treechildren>
     <prefwindow id="prefDialog">
         <prefpane id="extraPane"
-                  label="&prefwindow.title;">
-        </prefpane>
+                  label="&prefwindow.title;"></prefpane>
         <prefpane id="extraPaneItem_preferences_tab_general"
-                      label="&general.label;"> 
+                  label="&general.label;">
             <vbox flex="1">
-            <preferences> 
-              <preference id="extensions.extras.Iconify"
-                  name="extensions.extras.Iconify"
-                  type="bool"/> 
-              <preference id="extensions.extras.ShadeHigh"
-                  name="extensions.extras.ShadeHigh"
-                  type="bool"/>
-              <preference id="extensions.extras.ShadeLow"
-                  name="extensions.extras.ShadeLow"
-                  type="bool"/>
-              <preference id="extensions.extras.tagImportant"
-                  name="extensions.extras.tagImportant"
-                  type="bool"/>
-              <preference id="extensions.extras.HighestColor"
-                  name="extensions.extras.HighestColor"
-                  type="unichar"/>
-              <preference id="extensions.extras.HighColor"
-                  name="extensions.extras.HighColor"
-                  type="unichar"/>
-              <preference id="extensions.extras.LowColor"
-                  name="extensions.extras.LowColor"
-                  type="unichar"/>
-              <preference id="extensions.extras.LowestColor"
-                  name="extensions.extras.LowestColor"
-                  type="unichar"/>  
-            </preferences>         
-            <vbox>
-                <checkbox id="iconify-checkbox"
-                      preference="extensions.extras.Iconify"
-                      label="&iconify.label;"/> 
-                <checkbox id="shade-high-checkbox"
-                      preference="extensions.extras.ShadeHigh"
-                      label="&shadeHigh.label;"/>
-                <checkbox id="shade-low-checkbox"
-                      preference="extensions.extras.ShadeLow"
-                      label="&shadeLow.label;"/>
-               <checkbox id="mark-imp-checkbox"
-                      preference="extensions.extras.tagImportant"
-                      label="&tagImportant.label;"/>
-            </vbox>        
-            <hbox>
-            <groupbox flex="1">
-            <caption label="&pref.color;"/>
-            <hbox align="center" style="margin-top: 5px">
-            <label value="&highestColor.label;"   control="foregroundtextmenu"/>
-            <spacer flex="1"/>
-            <colorpicker type="button"   palettename="standard"
-                             preference="extensions.extras.HighestColor"/>
-            </hbox>
-            <hbox align="center" style="margin-top: 5px">
-            <label value="&lowestColor.label;"   control="unvisitedlinkmenu"/>
-            <spacer flex="1"/>
-            <colorpicker type="button"  palettename="standard"
-                            preference="extensions.extras.LowestColor"/>
-            </hbox>
-            <separator class="thin"/> 
-            </groupbox>
-                    
-            <groupbox flex="1">
-            <caption label=" "/>
-            <hbox align="center" style="margin-top: 5px">
-            <label value="&highColor.label;"   control="backgroundmenu"/>
-            <spacer flex="1"/>
-            <colorpicker type="button"   palettename="standard"
-                           preference="extensions.extras.HighestColor"/>
-            </hbox>  
-            <hbox align="center" style="margin-top: 5px">
-            <label value="&lowColor.label;"   control="visitedlinkmenu"/>
-            <spacer flex="1"/>
-            <colorpicker type="button"   palettename="standard"
-                           preference="extensions.extras.LowestColor"/>
-            </hbox>
-            <separator class="thin"/>
-            <hbox align="center"> 
-            </hbox>
-            </groupbox>
-            </hbox>
-            </vbox> 
-        </prefpane>   
+                <preferences>
+                    <preference id="extensions.extras.Iconify"
+                                name="extensions.extras.Iconify"
+                                type="bool" />
+                    <preference id="extensions.extras.ShadeHigh"
+                                name="extensions.extras.ShadeHigh"
+                                type="bool" />
+                    <preference id="extensions.extras.ShadeLow"
+                                name="extensions.extras.ShadeLow"
+                                type="bool" />
+                    <preference id="extensions.extras.tagImportant"
+                                name="extensions.extras.tagImportant"
+                                type="bool" />
+                    <preference id="extensions.extras.HighestColor"
+                                name="extensions.extras.HighestColor"
+                                type="unichar" />
+                    <preference id="extensions.extras.HighColor"
+                                name="extensions.extras.HighColor"
+                                type="unichar" />
+                    <preference id="extensions.extras.LowColor"
+                                name="extensions.extras.LowColor"
+                                type="unichar" />
+                    <preference id="extensions.extras.LowestColor"
+                                name="extensions.extras.LowestColor"
+                                type="unichar" />
+                </preferences>
+                <vbox>
+                    <checkbox id="iconify-checkbox"
+                              preference="extensions.extras.Iconify"
+                              label="&iconify.label;" />
+                    <checkbox id="shade-high-checkbox"
+                              preference="extensions.extras.ShadeHigh"
+                              label="&shadeHigh.label;" />
+                    <checkbox id="shade-low-checkbox"
+                              preference="extensions.extras.ShadeLow"
+                              label="&shadeLow.label;" />
+                    <checkbox id="mark-imp-checkbox"
+                              preference="extensions.extras.tagImportant"
+                              label="&tagImportant.label;" />
+                </vbox>
+                <hbox>
+                    <groupbox flex="1">
+                        <caption label="&pref.color;" />
+                        <hbox align="center"
+                              style="margin-top: 5px">
+                            <label value="&highestColor.label;"
+                                   control="foregroundtextmenu" />
+                            <spacer flex="1" />
+                            <colorpicker type="button"
+                                         palettename="standard"
+                                         preference="extensions.extras.HighestColor" />
+                        </hbox>
+                        <hbox align="center"
+                              style="margin-top: 5px">
+                            <label value="&lowestColor.label;"
+                                   control="unvisitedlinkmenu" />
+                            <spacer flex="1" />
+                            <colorpicker type="button"
+                                         palettename="standard"
+                                         preference="extensions.extras.LowestColor" />
+                        </hbox>
+                        <separator class="thin" />
+                    </groupbox>
+                    <groupbox flex="1">
+                        <caption label="" />
+                        <hbox align="center"
+                              style="margin-top: 5px">
+                            <label value="&highColor.label;"
+                                   control="backgroundmenu" />
+                            <spacer flex="1" />
+                            <colorpicker type="button"
+                                         palettename="standard"
+                                         preference="extensions.extras.HighestColor" />
+                        </hbox>
+                        <hbox align="center"
+                              style="margin-top: 5px">
+                            <label value="&lowColor.label;"
+                                   control="visitedlinkmenu" />
+                            <spacer flex="1" />
+                            <colorpicker type="button"
+                                         palettename="standard"
+                                         preference="extensions.extras.LowestColor" />
+                        </hbox>
+                        <separator class="thin" />
+                        <hbox align="center"></hbox>
+                    </groupbox>
+                </hbox>
+            </vbox>
+        </prefpane>
     </prefwindow>
 </overlay>
diff --git a/chrome/content/folderPropsOverlay.xul b/chrome/content/folderPropsOverlay.xul
index e6a69426..2224ed95 100644
--- a/chrome/content/folderPropsOverlay.xul
+++ b/chrome/content/folderPropsOverlay.xul
@@ -1,232 +1,328 @@
 <?xml version="1.0"?>
- <!DOCTYPE dialog [ 
+<!DOCTYPE dialog
+[ 
     <!ENTITY % delegateFolder1DTD SYSTEM "chrome://exchangecalendar/locale/delegate-folder.dtd" > 
       %delegateFolder1DTD;
-]> 
+]>
 <!--
  * This code uses parts of the Microsoft Exchange Calendar Provider code on which the
  * "Exchange Data Provider for Lightning" was based.
  * The Initial Developer of the Microsoft Exchange Calendar Provider Code is property of Ericsson. 
  * All Rights Reserved.
  * ***** BEGIN LICENSE BLOCK *****/
---> 
-<overlay   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/javascript"   src="chrome://exchangecalendar/content/delegateFolder.js" />  
+-->
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <tabbox id="folderPropTabBox">
-      <tabs id="folderPropTabs"> 
-        <tab id="delegationTab" hidefor="movemail,pop3,rss,none,nntp" label="&delegatefolder.tab.name;"/>
-      </tabs>
-      <tabpanels id="folderPropTabPanels">
-	    <label id="fmessage" hidden="true" value="&delegatefolder.tab.msg.label;" />
-        <vbox id="delegationPanel" valign="start">  
-        <vbox>
-            <vbox>
-                <listbox id="delegatee" enableColumnDrag="true" resizable="true"
-                         onclick="tmpDelegateFolderSettings.showUserPermission();" height="100">
-                    <listhead>
-                        <listheader label="&label.delegatefolder.userboxcolumn1;"  resizable="true" flex="1" enableColumnDrag="true" />
-                        <listheader label="&label.delegatefolder.userboxcolumn2;"  resizable="true" flex="2" enableColumnDrag="true" />  
-                    </listhead>
-                    <listcols>
-                        <listcol flex="3" />
-                        <listcol flex="1" />
-                    </listcols>
-                </listbox>
-            </vbox> 
-        </vbox>  
-        <!--second box-->  
-        <vbox> 
-            <hbox><description class="separator"  /></hbox>  
-            <hbox> 
-            <groupbox id="delegatefolder.email-detailsgroupbox">
-                <caption label="&label.delegatefolder.userEmail;" />  
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/delegateFolder.js" />
+    <tabbox id="folderPropTabBox">
+        <tabs id="folderPropTabs">
+            <tab id="delegationTab"
+                 hidefor="movemail,pop3,rss,none,nntp"
+                 label="&delegatefolder.tab.name;" />
+        </tabs>
+        <tabpanels id="folderPropTabPanels">
+            <label id="fmessage"
+                   hidden="true"
+                   value="&delegatefolder.tab.msg.label;" />
+            <vbox id="delegationPanel"
+                  valign="start">
+                <vbox>
+                    <vbox>
+                        <listbox id="delegatee"
+                                 enableColumnDrag="true"
+                                 resizable="true"
+                                 onclick="tmpDelegateFolderSettings.showUserPermission();"
+                                 height="100">
+                            <listhead>
+                                <listheader label="&label.delegatefolder.userboxcolumn1;"
+                                            resizable="true"
+                                            flex="1"
+                                            enableColumnDrag="true" />
+                                <listheader label="&label.delegatefolder.userboxcolumn2;"
+                                            resizable="true"
+                                            flex="2"
+                                            enableColumnDrag="true" />
+                            </listhead>
+                            <listcols>
+                                <listcol flex="3" />
+                                <listcol flex="1" />
+                            </listcols>
+                        </listbox>
+                    </vbox>
+                </vbox>
+                <!--second box-->
                 <vbox>
                     <hbox>
-                         <textbox id="email"
-                          height="30" 
-                          flex="1"
-                          anonid="input"
-                          class="textbox-addressingWidget uri-element"
-                          type="autocomplete"
-                          autocompletesearch="ldap history"
-                          autocompletepopup="richPopup"
-                          noautofocus="true" 
-                          autocompletesearchparam="{}"
-                          timeout="300"
-                          maxrows="4"
-                          completedefaultindex="true"
-                          forcecomplete="true"
-                          minresultsforpopup="1"
-                          onblur=""
-                          ignoreblurwhilesearching="true"
-                          oninput="this.setAttribute('dirty', 'true');"
-                          ontextentered="" />  
-                    </hbox> 
-                    <hbox><description class="separator"  /></hbox>  
-                    <hbox>
-            	     <groupbox>
-                        <grid>
-                        <columns>
-                          <column flex="1"/>
-                          <column flex="2"/>
-                          <column flex="3"/>
-                        </columns>
-                        <rows> 
-                        <row>
-                            <button id="delegateCalendaractionadd" label="Add" onclick="tmpDelegateFolderSettings.addDelegate()" />  
-                            <button id="delegateCalendaractiondelete" label="Remove" onclick="tmpDelegateFolderSettings.removeDelegate()" />  
-                            <button id="delegateCalendaractionupdate" label="Update" onclick="tmpDelegateFolderSettings.updateDelegate()" /> 
-                        </row>
-                        </rows>
-                        </grid>
-                        </groupbox>
+                        <description class="separator" />
                     </hbox>
-                </vbox>
-            </groupbox>
-            </hbox>
-            
-            <hbox><description class="separator"/></hbox>   
-            <groupbox id="delegatefolder.permission-detailsgroupbox">
-                <caption label="&delegatefolder.permission.details.caption;" />   
-                <hbox>      
-                    <label control="permission" value="&label.delegatefolder.permissionLevel;" width="180" height="30"/> 
-                    <menulist align="center" id="menuPermissionLevel" onselect="tmpDelegateFolderSettings.permissionsSelectEvent(this.value);">
-                        <menupopup>  
-                            <menuitem label="&menuitem.delegatefolder.permission.author;"       value="Author"/>
-                            <menuitem label="&menuitem.delegatefolder.permission.editor;"       value="Editor"/>
-                            <menuitem label="&menuitem.delegatefolder.permission.reviewer;"     value="Reviewer"/>
-                            <menuitem label="&menuitem.delegatefolder.permission.none;"   selected="true"  value="None"/> 
-                            <menuitem label="&menuitem.delegatefolder.permission.owner;"        value="Owner" /> 
-                            <menuitem label="&menuitem.delegatefolder.permission.publishingEditor;"  value="PublishingEditor"/>
-                            <menuitem label="&menuitem.delegatefolder.permission.publishingAuthor;"  value="PublishingAuthor"/>
-                            <menuitem label="&menuitem.delegatefolder.permission.noneditingAuthor;"  value="NoneditingAuthor"/>
-                            <menuitem label="&menuitem.delegatefolder.permission.contributor;"  value="Contributor" /> 
-                            <menuitem label="&menuitem.delegatefolder.permission.custom;"  value="Custom" />  
-                        </menupopup>
-                    </menulist>
-                </hbox>   
-            </groupbox>
-            <groupbox>
-                      <caption label="Details:"/>
-                       <grid>
-                        <columns>
-                          <column flex="1"/>
-                          <column flex="1"/>
-                          <column flex="3"/>
-                        </columns>
-                        <rows>    
-                            <row>
-                            	<hbox>
-                            	<label control="permission"  value="&delegatefolder.permissions.cancreateitems;"/>
-                                </hbox>
-                                <hbox>
-                                    <radiogroup   control="permission" id="cancreateitems" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                <hbox>
-                                    <radio label="&delegatefolder.permissions.true;" value="true"/>
-                                    <radio label="&delegatefolder.permissions.false;" value="false"/>  
-                                </hbox> 
-                                </radiogroup>
-                                </hbox>
-                            </row>
-                            <row>
+                    <hbox>
+                        <groupbox id="delegatefolder.email-detailsgroupbox">
+
+                            <caption label="&label.delegatefolder.userEmail;" />
+                            <vbox>
                                 <hbox>
-                                <label control="permission"  value="&delegatefolder.permissions.cancreatesubfolders;" />
+                                    <textbox id="email"
+                                             height="30"
+                                             flex="1"
+                                             anonid="input"
+                                             class="textbox-addressingWidget uri-element"
+                                             type="autocomplete"
+                                             autocompletesearch="ldap history"
+                                             autocompletepopup="richPopup"
+                                             noautofocus="true"
+                                             autocompletesearchparam="{}"
+                                             timeout="300"
+                                             maxrows="4"
+                                             completedefaultindex="true"
+                                             forcecomplete="true"
+                                             minresultsforpopup="1"
+                                             onblur=""
+                                             ignoreblurwhilesearching="true"
+                                             oninput="this.setAttribute('dirty', 'true');"
+                                             ontextentered="" />
                                 </hbox>
                                 <hbox>
-                                    <radiogroup  control="permission" id="cancreatesubfolders" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                 <hbox>
-                                     <radio label="&delegatefolder.permissions.true;" value="true"/>
-                                    <radio label="&delegatefolder.permissions.false;" value="false"/>
-                                </hbox> 
-                             </radiogroup>
-                             </hbox> 
-                        	</row>
-                            <row>
-                            <hbox>
-                            <label control="permission"  value="&delegatefolder.permissions.isfolderowner;"/>
-                            </hbox>
-                            <hbox>
-                                <radiogroup  control="permission" id="isfolderowner" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                 <hbox>
-                                    <radio label="&delegatefolder.permissions.true;" value="true"/>
-                                    <radio label="&delegatefolder.permissions.false;" value="false"/>
-                                </hbox> 
-                             </radiogroup>  
-                            </hbox>
-                            </row>
-                            <row>
-                            <hbox>
-                            <label control="permission"  value="&delegatefolder.permissions.isfoldervisible;"/>
-                             </hbox>
-                             <hbox>
-                                <radiogroup  control="permission" id="isfoldervisible" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                <hbox>
-                                    <radio label="&delegatefolder.permissions.true;" value="true"/>
-                                    <radio label="&delegatefolder.permissions.false;" value="false"/>
-                                </hbox>
-                             </radiogroup>
-                             </hbox>  
-                            </row>
-                            <row>
-                            <hbox>
-                                <label control="permission"  value="&delegatefolder.permissions.isfoldercontact;"/>
+                                    <description class="separator" />
                                 </hbox>
                                 <hbox>
-                                    <radiogroup  control="permission" id="isfoldercontact" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                <hbox>
-                                     <radio label="&delegatefolder.permissions.true;" value="true"/>
-                                    <radio label="&delegatefolder.permissions.false;" value="false"/>
-                               </hbox> 
-                               </radiogroup> 
-                               </hbox> 
-                            </row>
-                            <row>
-                            <hbox>
-                                <label control="permission"  value="&delegatefolder.permissions.edititems;"/>
+                                    <groupbox>
+                                        <grid>
+                                            <columns>
+                                                <column flex="1" />
+                                                <column flex="2" />
+                                                <column flex="3" />
+                                            </columns>
+                                            <rows>
+                                                <row>
+                                                    <button id="delegateCalendaractionadd"
+                                                            label="Add"
+                                                            onclick="tmpDelegateFolderSettings.addDelegate()" />
+                                                    <button id="delegateCalendaractiondelete"
+                                                            label="Remove"
+                                                            onclick="tmpDelegateFolderSettings.removeDelegate()" />
+                                                    <button id="delegateCalendaractionupdate"
+                                                            label="Update"
+                                                            onclick="tmpDelegateFolderSettings.updateDelegate()" />
+                                                </row>
+                                            </rows>
+                                        </grid>
+                                    </groupbox>
                                 </hbox>
-                                <hbox>
-                                <radiogroup control="permission"  id="edititems" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                <hbox>
-                                    <radio label="&delegatefolder.permissions.none;" value="None"/>
-                                    <radio label="&delegatefolder.permissions.own;" value="Owned"/>
-                                    <radio label="&delegatefolder.permissions.all;" value="All"/> 
-                               </hbox> 
-                               </radiogroup>
-                               </hbox>  
-                            </row>
-                            <row>
-                            <hbox>
-                            <label control="permission"  value="&delegatefolder.permissions.deleteitems;"/>
-                            </hbox> 
-                            <hbox>
-                              <radiogroup  control="permission" id="deleteitems" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                <hbox>
-                                     <radio label="&delegatefolder.permissions.none;" value="None"/>
-                                    <radio label="&delegatefolder.permissions.own;" value="Owned"/>
-                                    <radio label="&delegatefolder.permissions.all;" value="All"/> 
-                               </hbox> 
-                               </radiogroup>
-                               </hbox>  
-                            </row> 
-                            <row>
-                            <hbox>
-                            <label control="permission"  value="&delegatefolder.permissions.readitems;"/>
-                            </hbox> 
-                            <hbox>                            
-                              <radiogroup  control="permission" id="readitems" onclick="tmpDelegateFolderSettings.setPermissionCustom();">
-                                <hbox>
-                                    <radio label="&delegatefolder.permissions.none;" value="None"/>
-                                    <radio label="&delegatefolder.permissions.full;" value="FullDetails"/>
-                                </hbox> 
-                                </radiogroup>
-                                </hbox>  
-                            </row>     
-                        </rows>
-                      </grid>
-                </groupbox>   
-        </vbox>
-        </vbox>
-      </tabpanels>
-  </tabbox>
-</overlay>     
\ No newline at end of file
+                            </vbox>
+                        </groupbox>
+                    </hbox>
+                    <hbox>
+                        <description class="separator" />
+                    </hbox>
+                    <groupbox id="delegatefolder.permission-detailsgroupbox">
+
+                        <caption label="&delegatefolder.permission.details.caption;" />
+                        <hbox>
+                            <label control="permission"
+                                   value="&label.delegatefolder.permissionLevel;"
+                                   width="180"
+                                   height="30" />
+                            <menulist align="center"
+                                      id="menuPermissionLevel"
+                                      onselect="tmpDelegateFolderSettings.permissionsSelectEvent(this.value);">
+
+                                <menupopup>
+                                    <menuitem label="&menuitem.delegatefolder.permission.author;"
+                                              value="Author" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.editor;"
+                                              value="Editor" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.reviewer;"
+                                              value="Reviewer" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.none;"
+                                              selected="true"
+                                              value="None" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.owner;"
+                                              value="Owner" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.publishingEditor;"
+                                              value="PublishingEditor" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.publishingAuthor;"
+                                              value="PublishingAuthor" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.noneditingAuthor;"
+                                              value="NoneditingAuthor" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.contributor;"
+                                              value="Contributor" />
+                                    <menuitem label="&menuitem.delegatefolder.permission.custom;"
+                                              value="Custom" />
+                                </menupopup>
+                            </menulist>
+                        </hbox>
+                    </groupbox>
+                    <groupbox>
+                        <caption label="Details:" />
+                        <grid>
+                            <columns>
+                                <column flex="1" />
+                                <column flex="1" />
+                                <column flex="3" />
+                            </columns>
+                            <rows>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.cancreateitems;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="cancreateitems"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.true;"
+                                                       value="true" />
+                                                <radio label="&delegatefolder.permissions.false;"
+                                                       value="false" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.cancreatesubfolders;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="cancreatesubfolders"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.true;"
+                                                       value="true" />
+                                                <radio label="&delegatefolder.permissions.false;"
+                                                       value="false" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.isfolderowner;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="isfolderowner"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.true;"
+                                                       value="true" />
+                                                <radio label="&delegatefolder.permissions.false;"
+                                                       value="false" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.isfoldervisible;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="isfoldervisible"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.true;"
+                                                       value="true" />
+                                                <radio label="&delegatefolder.permissions.false;"
+                                                       value="false" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.isfoldercontact;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="isfoldercontact"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.true;"
+                                                       value="true" />
+                                                <radio label="&delegatefolder.permissions.false;"
+                                                       value="false" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.edititems;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="edititems"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.none;"
+                                                       value="None" />
+                                                <radio label="&delegatefolder.permissions.own;"
+                                                       value="Owned" />
+                                                <radio label="&delegatefolder.permissions.all;"
+                                                       value="All" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.deleteitems;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="deleteitems"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.none;"
+                                                       value="None" />
+                                                <radio label="&delegatefolder.permissions.own;"
+                                                       value="Owned" />
+                                                <radio label="&delegatefolder.permissions.all;"
+                                                       value="All" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <hbox>
+                                        <label control="permission"
+                                               value="&delegatefolder.permissions.readitems;" />
+                                    </hbox>
+                                    <hbox>
+                                        <radiogroup control="permission"
+                                                    id="readitems"
+                                                    onclick="tmpDelegateFolderSettings.setPermissionCustom();">
+
+                                            <hbox>
+                                                <radio label="&delegatefolder.permissions.none;"
+                                                       value="None" />
+                                                <radio label="&delegatefolder.permissions.full;"
+                                                       value="FullDetails" />
+                                            </hbox>
+                                        </radiogroup>
+                                    </hbox>
+                                </row>
+                            </rows>
+                        </grid>
+                    </groupbox>
+                </vbox>
+            </vbox>
+        </tabpanels>
+    </tabbox>
+</overlay>
diff --git a/chrome/content/invitationResponse.xul b/chrome/content/invitationResponse.xul
index 3c15e656..2727a491 100644
--- a/chrome/content/invitationResponse.xul
+++ b/chrome/content/invitationResponse.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,66 +37,101 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
-    <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css" ?>
-
-        <!DOCTYPE dialog [
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css" ?>
+<!DOCTYPE dialog
+[
     
 <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/invitationResponse.dtd" > %dtd1; ]>
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="exchWebService_invitationResponse_dialog" title="&description.invitationResponse;" buttons="accept,cancel" buttonlabelaccept="&label.acceptbutton;" buttonlabelcancel="&label.cancelbutton;" ondialogaccept="return exchWebService.invitationResponse.onAccept();" onload="exchWebService.invitationResponse.onLoad();">
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/invitationResponse.js" />
-
-	<script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js" />
-	<script type="application/javascript" src="chrome://calendar/content/calUtils.js" />
-	<script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js" />
-
-	<vbox>
-		<grid>
-			<columns>
-				<column />
-				<column flex="1" />
-			</columns>
-			<rows>
-				<row>
-					<label value="&label.calendarName;" />
-					<label id="exchWebService_calendarName" />
-				</row>
-				<row>
-					<label value="&label.itemTitle;" />
-					<label id="exchWebService_itemTitle" />
-				</row>
-				<row>
-					<label value="&label.itemStart;" />
-					<label id="exchWebService_itemStart" />
-				</row>
-				<row>
-					<label value="&label.itemResponse;" />
-					<menulist label="(Make a choice)" id="exchWebService_itemResponse" value="1" oncommand="exchWebService.invitationResponse.doResponseChanged(this);">
-						<menupopup>
-							<menuitem label="&menuitem.label.ec-autorespond-answer.tentative;" value="TENTATIVE" />
-							<menuitem label="&menuitem.label.ec-autorespond-answer.accepted;" value="ACCEPTED" />
-							<menuitem label="&menuitem.label.ec-autorespond-answer.declined;" value="DECLINED" />
-						</menupopup>
-					</menulist>
-				</row>
-				<row>
-					<label value="&label.meetingOrganiser;" />
-					<label id="exchWebService_meetingOrganiser" />
-				</row>
-			</rows>
-		</grid>
-		<seperator/>
-		<checkbox id="exchWebService_propose_time_checkbox" label="&label.proposenewtime.title;" oncommand="exchWebService.invitationResponse.onCheckChanged(this);" checked="false" pack="start" />
-		<groupbox id="exchWebService_propose_groupbox">
-			<label value="&label.proposenewtime.start;" id="exchWebService_propose_start_label" control="exchWebService_propose_start" class="event-only" disable-on-readonly="true" />
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_invitationResponse_dialog"
+        title="&description.invitationResponse;"
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return exchWebService.invitationResponse.onAccept();"
+        onload="exchWebService.invitationResponse.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/invitationResponse.js" />
+    <script type="application/javascript"
+            src="chrome://calendar/content/calendar-ui-utils.js" />
+    <script type="application/javascript"
+            src="chrome://calendar/content/calUtils.js" />
+    <script type="application/javascript"
+            src="chrome://calendar/content/calApplicationUtils.js" />
+    <vbox>
+        <grid>
+            <columns>
+                <column />
+                <column flex="1" />
+            </columns>
+            <rows>
+                <row>
+                    <label value="&label.calendarName;" />
+                    <label id="exchWebService_calendarName" />
+                </row>
+                <row>
+                    <label value="&label.itemTitle;" />
+                    <label id="exchWebService_itemTitle" />
+                </row>
+                <row>
+                    <label value="&label.itemStart;" />
+                    <label id="exchWebService_itemStart" />
+                </row>
+                <row>
+                    <label value="&label.itemResponse;" />
+                    <menulist label="(Make a choice)"
+                              id="exchWebService_itemResponse"
+                              value="1"
+                              oncommand="exchWebService.invitationResponse.doResponseChanged(this);">
 
-			<datetimepicker id="exchWebService_propose_start" disable-on-readonly="true" class="event-only" disabled="true" />
-			<seperator/>
-			<label value="&label.proposenewtime.end;" id="exchWebService_propose_end_label" control="exchWebService_propose_end" class="event-only" disable-on-readonly="true" />
-			<datetimepicker id="exchWebService_propose_end" class="event-only" disable-on-readonly="true" disabled="true" />
-		</groupbox>
-		<seperator/>
-		<label value="&label.messageReponseBody;" />
-		<textbox id="exchWebService_messageReponseBody" multiline="true" label="messageResponseBody" rows="5" />
-	</vbox>
-</dialog>
\ No newline at end of file
+                        <menupopup>
+                            <menuitem label="&menuitem.label.ec-autorespond-answer.tentative;"
+                                      value="TENTATIVE" />
+                            <menuitem label="&menuitem.label.ec-autorespond-answer.accepted;"
+                                      value="ACCEPTED" />
+                            <menuitem label="&menuitem.label.ec-autorespond-answer.declined;"
+                                      value="DECLINED" />
+                        </menupopup>
+                    </menulist>
+                </row>
+                <row>
+                    <label value="&label.meetingOrganiser;" />
+                    <label id="exchWebService_meetingOrganiser" />
+                </row>
+            </rows>
+        </grid>
+        <seperator />
+        <checkbox id="exchWebService_propose_time_checkbox"
+                  label="&label.proposenewtime.title;"
+                  oncommand="exchWebService.invitationResponse.onCheckChanged(this);"
+                  checked="false"
+                  pack="start" />
+        <groupbox id="exchWebService_propose_groupbox">
+            <label value="&label.proposenewtime.start;"
+                   id="exchWebService_propose_start_label"
+                   control="exchWebService_propose_start"
+                   class="event-only"
+                   disable-on-readonly="true" />
+            <datetimepicker id="exchWebService_propose_start"
+                            disable-on-readonly="true"
+                            class="event-only"
+                            disabled="true" />
+            <seperator />
+            <label value="&label.proposenewtime.end;"
+                   id="exchWebService_propose_end_label"
+                   control="exchWebService_propose_end"
+                   class="event-only"
+                   disable-on-readonly="true" />
+            <datetimepicker id="exchWebService_propose_end"
+                            class="event-only"
+                            disable-on-readonly="true"
+                            disabled="true" />
+        </groupbox>
+        <seperator />
+        <label value="&label.messageReponseBody;" />
+        <textbox id="exchWebService_messageReponseBody"
+                 multiline="true"
+                 label="messageResponseBody"
+                 rows="5" />
+    </vbox>
+</dialog>
diff --git a/chrome/content/invite-style.xul b/chrome/content/invite-style.xul
index 58fa55d4..979d9e49 100644
--- a/chrome/content/invite-style.xul
+++ b/chrome/content/invite-style.xul
@@ -1,19 +1,26 @@
 <?xml version="1.0"?>
- 
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/invite-style.css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://exchangecalendar/locale/inviteStyle.dtd">
-
+<!DOCTYPE 
+overlay SYSTEM "chrome://exchangecalendar/locale/inviteStyle.dtd">
 <overlay xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-        <script src="chrome://exchangecalendar/content/invite-style.js"/>
-        <tree id="threadTree">
-                
-                <treecols id="threadCols">
-                        
-                      <treecol id="inviteCol"  name="inviteCol" class="treecol-image inviteColumnHeader"  persist="hidden ordinal width"    
-                                 label="&label.inviteCol;"   currentView="unthreaded" tooltiptext="&tooltip.inviteCol;" fixed="true" width="25" sort="inviteCol" sortActive="true" sortDirection="ascending"/>
-                      <splitter class="tree-splitter"/>
-                </treecols>
-        </tree>
-</overlay>
\ No newline at end of file
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <script src="chrome://exchangecalendar/content/invite-style.js" />
+    <tree id="threadTree">
+        <treecols id="threadCols">
+            <treecol id="inviteCol"
+                     name="inviteCol"
+                     class="treecol-image inviteColumnHeader"
+                     persist="hidden ordinal width"
+                     label="&label.inviteCol;"
+                     currentView="unthreaded"
+                     tooltiptext="&tooltip.inviteCol;"
+                     fixed="true"
+                     width="25"
+                     sort="inviteCol"
+                     sortActive="true"
+                     sortDirection="ascending" />
+            <splitter class="tree-splitter" />
+        </treecols>
+    </tree>
+</overlay>
diff --git a/chrome/content/lightning-item-iframe.xul b/chrome/content/lightning-item-iframe.xul
index dfe516a7..b798d33e 100644
--- a/chrome/content/lightning-item-iframe.xul
+++ b/chrome/content/lightning-item-iframe.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -30,15 +30,13 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <!-- CSS for the HTML content editor -->
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/itemBodyEditor.css"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
-
 <!-- Attachment overlay -->
 <?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
 
 <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
@@ -46,106 +44,99 @@
 <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/lightning-item-iframe.dtd" >
     %dtd1;
 ]>
-
 <overlay id="exchangecalendar-lightning-item-iframe.xul"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- Manage special Exchange items and provide attendee speicific dialog -->
-    <script type="application/javascript" src="chrome://exchangecalendar/content/lightning-item-iframe.js"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/lightning-item-iframe.js" />
     <!-- These rows correspond to the full form under the toolbar -->
     <rows id="event-grid-rows">
         <!-- If the current element is a Task and is an Exchange one, add a label to show the current owner of the task. -->
         <row id="exchWebService-owner-row"
-            insertafter="event-grid-title-row"
-            align="center"
-            collapsed="true" >
+             insertafter="event-grid-title-row"
+             align="center"
+             collapsed="true">
             <label value="&exchWebService.owner.label;" />
             <label id="exchWebService-owner-label"
-                value="" />
+                   value="" />
         </row>
-
         <!-- When other calendar is selected, we have to clean the current dialog if the new calendar is not an Exchange one -->
         <row id="event-grid-category-color-row">
             <hbox id="event-grid-category-box">
                 <menulist id="item-calendar"
-                    oncommand="exchToolsEventDialog.selectedCalendarChanged(this); tmpAttachment.selectedCalendarChanged(this);" />
+                          oncommand="exchToolsEventDialog.selectedCalendarChanged(this); tmpAttachment.selectedCalendarChanged(this);" />
             </hbox>
         </row>
-
         <!-- Exchange task details (hidden by defaults, displayed only by javascript) -->
         <separator id="exchWebService-details-separator"
-            insertafter="event-grid-todo-status-row"
-            class="groove"
-            hidden="true" />
-
+                   insertafter="event-grid-todo-status-row"
+                   class="groove"
+                   hidden="true" />
         <row id="exchWebService-details-row1"
-            insertafter="exchWebService-details-separator"
-            align="center"
-            collapsed="true" >
+             insertafter="exchWebService-details-separator"
+             align="center"
+             collapsed="true">
             <label value="&exchWebService.totalWork.label;"
-                disable-on-readonly="true" />
-
+                   disable-on-readonly="true" />
             <hbox align="center">
                 <textbox id="exchWebService-totalWork-count"
-                    type="number" increment="10" min="0" size="3"
-                    value="0"
-                    disable-on-readonly="true" />
-
+                         type="number"
+                         increment="10"
+                         min="0"
+                         size="3"
+                         value="0"
+                         disable-on-readonly="true" />
                 <label value="&exchWebService.mileage.label;"
-                    disable-on-readonly="true" />
-                <textbox id="exchWebService-mileage-count" value=""
-                    disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
+                <textbox id="exchWebService-mileage-count"
+                         value=""
+                         disable-on-readonly="true" />
             </hbox>
         </row>
-
         <row id="exchWebService-details-row2"
-            insertafter="exchWebService-details-row1"
-            align="center"
-            collapsed="true" >
+             insertafter="exchWebService-details-row1"
+             align="center"
+             collapsed="true">
             <label value="&exchWebService.actualWork.label;"
-                disable-on-readonly="true" />
-
+                   disable-on-readonly="true" />
             <hbox align="center">
                 <textbox id="exchWebService-actualWork-count"
-                    type="number" increment="10" min="0" size="3"
-                    value="0"
-                    disable-on-readonly="true" />
-
+                         type="number"
+                         increment="10"
+                         min="0"
+                         size="3"
+                         value="0"
+                         disable-on-readonly="true" />
                 <label value="&exchWebService.billingInformation.label;"
-                    disable-on-readonly="true"/>
+                       disable-on-readonly="true" />
                 <textbox id="exchWebService-billingInformation-count"
-                    value=""
-                    disable-on-readonly="true"/>
+                         value=""
+                         disable-on-readonly="true" />
             </hbox>
         </row>
-
         <row id="exchWebService-details-row3"
-            insertafter="exchWebService-details-row2"
-            align="center"
-            collapsed="true" >
+             insertafter="exchWebService-details-row2"
+             align="center"
+             collapsed="true">
             <label value="&exchWebService.companies.label;"
-                disable-on-readonly="true"/>
+                   disable-on-readonly="true" />
             <textbox id="exchWebService-companies-count"
-                value=""
-                disable-on-readonly="true"/>
+                     value=""
+                     disable-on-readonly="true" />
         </row>
     </rows>
-
     <tabbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="event-grid-tabbox">
-
+            id="event-grid-tabbox">
         <tabpanels id="event-grid-tabpanels">
             <!-- Add HTML text editor for Exchange tasks -->
             <tabpanel id="event-grid-tabpanel-description">
                 <itemBodyEditor id="exchWebService-body-editor"
-                    flex="1"
-                    insertafter="item-description"
-                    disable-on-readonly="true"
-                    collapsed="true"/>
+                                flex="1"
+                                insertafter="item-description"
+                                disable-on-readonly="true"
+                                collapsed="true" />
             </tabpanel>
-
         </tabpanels>
     </tabbox>
-
 </overlay>
diff --git a/chrome/content/lightningtimezoneOverlay.xul b/chrome/content/lightningtimezoneOverlay.xul
index 7fa2802d..54be6a7f 100644
--- a/chrome/content/lightningtimezoneOverlay.xul
+++ b/chrome/content/lightningtimezoneOverlay.xul
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script type="application/javascript" src="chrome://exchangecalendar/content/lightningtimezoneOverlay.js"/> 
+
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/lightningtimezoneOverlay.js" />
 </overlay>
diff --git a/chrome/content/manageEWSAccounts.xul b/chrome/content/manageEWSAccounts.xul
index e4982cbc..52cba075 100644
--- a/chrome/content/manageEWSAccounts.xul
+++ b/chrome/content/manageEWSAccounts.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,78 +23,105 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/manageEWSAccounts.css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/manageEWSAccounts.dtd" > %dtd1;
 ]>
-
-<overlay 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="manage-EWS-Accounts-dialog" >
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/manageEWSAccounts.js"/>
-
-	<hbox id="manage-EWS-Accounts-dialog-hbox">
-		<vbox>
-			<listbox id="exchWebService-manageEWSAccounts-accounts-listbox" flex="1" onselect="exchWebService.manageEWSAccounts.onSelect()"/>
-			<button oncommand="exchWebService.manageEWSAccounts.addNewAccount()" label="&exchWebService.manageEWSAccounts.newAccount.button;"/>
-			<button oncommand="exchWebService.manageEWSAccounts.removeAccount()" id="exchWebService_manageEWSAccounts_removeAccount_button" disabled="true" label="&exchWebService.manageEWSAccounts.removeAccount.button;" />
-		</vbox>
-		<vbox flex="1" id="exchWebService-account-settings">
-			<hbox>
-				<label value="&exchWebService.manageEWSAccounts.name.label;"/>
-				<textbox id="exchWebService_manageEWSAccounts_account_name" disabled="true" required="true"
-					 oninput="exchWebService.manageEWSAccounts.doNameChanged(this)"/>
-			</hbox>
-			<checkbox disabled="true" label="&exchWebService.manageEWSAccounts.autodiscover.label;" id="exchWebService_autodiscover" oncommand="exchWebService.manageEWSAccounts.doAutodiscoverChanged(this);"/>
-			<grid flex="1">
-			    <columns>
-			        <column/>
-			        <column/>
-			        <column flex="1"/>
-			    </columns>
-			    <rows>
-			        <row id="exchWebService_serverrow" align="center">
-			            <label value="Server URL:" control="ecserver"/>
-					<exchWebService-statusImage id="exchWebService_server_status"/>
-				    <vbox>
-			            	<textbox id="exchWebService_server"
-						disabled="true" 
-			                  	required="true" oninput="exchWebService.manageEWSAccounts.doServerChanged(this);" 
-						placeholder="https://ews.example.com/ews/exchange.asmx"/>
-				    </vbox>
-			        </row>
-			        <row id="exchWebService_mailboxrow" align="center" hidden="true">
-			            <label value="&exchWebService.manageEWSAccounts.mailbox.label;" control="ecmailbox"/>
-					<exchWebService-statusImage id="exchWebService_mailbox_status"/>
-					<hbox>
-				            	<textbox id="exchWebService_mailbox"
-							disabled="true" 
-				                     required="false" oninput="exchWebService.manageEWSAccounts.doMailboxChanged(this);" 
-							placeholder="yourname@example.com"/>
-						<label id="exchWebService_displayname" value="" flex="1"/>
-					</hbox>
-			        </row>
-			        <row align="center">
-			            <label value="&exchWebService.manageEWSAccounts.windowsuser.label;" control="ecwindowsuser"/>
-					<exchWebService-statusImage id="exchWebService_windowsuser_status"/>
-			            	<textbox id="exchWebService_windowsuser"
-						disabled="true" 
-						placeholder="domain\username OR username@fulldomain"
-			                     required="true" oninput="exchWebService.manageEWSAccounts.doUserChanged(this);"/>
-			        </row>
-
-			    </rows>
-			</grid>
-			<button id="exchWebService_autodiscovercheckbutton" label="&exchWebService.manageEWSAccounts.autodiscover.button;" oncommand="exchWebService.manageEWSAccounts.doAutodiscoverCheck();" hidden="true"/>
-			<button id="exchWebService_servercheckbutton" label="&exchWebService.manageEWSAccounts.servercheck.button;" oncommand="exchWebService.manageEWSAccounts.doCheckServer();" hidden="true"/>
-			<label id="exchWebService_manageEWSAccounts_message_label" value="" hidden="true"/>
-			<button id="exchWebService_manageEWSAccounts_save_button" oncommand="exchWebService.manageEWSAccounts.saveAccount()" hidden="true" label="&exchWebService.manageEWSAccounts.saveAccount.button;" />
-		</vbox>
-	</hbox>
-
-
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         id="manage-EWS-Accounts-dialog">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/manageEWSAccounts.js" />
+    <hbox id="manage-EWS-Accounts-dialog-hbox">
+        <vbox>
+            <listbox id="exchWebService-manageEWSAccounts-accounts-listbox"
+                     flex="1"
+                     onselect="exchWebService.manageEWSAccounts.onSelect()" />
+            <button oncommand="exchWebService.manageEWSAccounts.addNewAccount()"
+                    label="&exchWebService.manageEWSAccounts.newAccount.button;" />
+            <button oncommand="exchWebService.manageEWSAccounts.removeAccount()"
+                    id="exchWebService_manageEWSAccounts_removeAccount_button"
+                    disabled="true"
+                    label="&exchWebService.manageEWSAccounts.removeAccount.button;" />
+        </vbox>
+        <vbox flex="1"
+              id="exchWebService-account-settings">
+            <hbox>
+                <label value="&exchWebService.manageEWSAccounts.name.label;" />
+                <textbox id="exchWebService_manageEWSAccounts_account_name"
+                         disabled="true"
+                         required="true"
+                         oninput="exchWebService.manageEWSAccounts.doNameChanged(this)" />
+            </hbox>
+            <checkbox disabled="true"
+                      label="&exchWebService.manageEWSAccounts.autodiscover.label;"
+                      id="exchWebService_autodiscover"
+                      oncommand="exchWebService.manageEWSAccounts.doAutodiscoverChanged(this);" />
+            <grid flex="1">
+                <columns>
+                    <column />
+                    <column />
+                    <column flex="1" />
+                </columns>
+                <rows>
+                    <row id="exchWebService_serverrow"
+                         align="center">
+                        <label value="Server URL:"
+                               control="ecserver" />
+                        <exchWebService-statusImage id="exchWebService_server_status" />
+                        <vbox>
+                            <textbox id="exchWebService_server"
+                                     disabled="true"
+                                     required="true"
+                                     oninput="exchWebService.manageEWSAccounts.doServerChanged(this);"
+                                     placeholder="https://ews.example.com/ews/exchange.asmx" />
+                        </vbox>
+                    </row>
+                    <row id="exchWebService_mailboxrow"
+                         align="center"
+                         hidden="true">
+                        <label value="&exchWebService.manageEWSAccounts.mailbox.label;"
+                               control="ecmailbox" />
+                        <exchWebService-statusImage id="exchWebService_mailbox_status" />
+                        <hbox>
+                            <textbox id="exchWebService_mailbox"
+                                     disabled="true"
+                                     required="false"
+                                     oninput="exchWebService.manageEWSAccounts.doMailboxChanged(this);"
+                                     placeholder="yourname@example.com" />
+                            <label id="exchWebService_displayname"
+                                   value=""
+                                   flex="1" />
+                        </hbox>
+                    </row>
+                    <row align="center">
+                        <label value="&exchWebService.manageEWSAccounts.windowsuser.label;"
+                               control="ecwindowsuser" />
+                        <exchWebService-statusImage id="exchWebService_windowsuser_status" />
+                        <textbox id="exchWebService_windowsuser"
+                                 disabled="true"
+                                 placeholder="domain\username OR username@fulldomain"
+                                 required="true"
+                                 oninput="exchWebService.manageEWSAccounts.doUserChanged(this);" />
+                    </row>
+                </rows>
+            </grid>
+            <button id="exchWebService_autodiscovercheckbutton"
+                    label="&exchWebService.manageEWSAccounts.autodiscover.button;"
+                    oncommand="exchWebService.manageEWSAccounts.doAutodiscoverCheck();"
+                    hidden="true" />
+            <button id="exchWebService_servercheckbutton"
+                    label="&exchWebService.manageEWSAccounts.servercheck.button;"
+                    oncommand="exchWebService.manageEWSAccounts.doCheckServer();"
+                    hidden="true" />
+            <label id="exchWebService_manageEWSAccounts_message_label"
+                   value=""
+                   hidden="true" />
+            <button id="exchWebService_manageEWSAccounts_save_button"
+                    oncommand="exchWebService.manageEWSAccounts.saveAccount()"
+                    hidden="true"
+                    label="&exchWebService.manageEWSAccounts.saveAccount.button;" />
+        </vbox>
+    </hbox>
 </overlay>
diff --git a/chrome/content/manageEWSAccountsMenu.xul b/chrome/content/manageEWSAccountsMenu.xul
index 2726f7ac..96606ff3 100644
--- a/chrome/content/manageEWSAccountsMenu.xul
+++ b/chrome/content/manageEWSAccountsMenu.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,25 +23,23 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/manageEWSAccounts.dtd" > %dtd1;
 ]>
-
 <overlay id="manage_EWS_Accounts_menu"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript" src="chrome://exchangecalendar/content/manageEWSAccountsMenu.js"/>
-
-	<commandset id="calendar_commands">
-		<command id="exchWebService_manageEWSAccounts_showManager_command" oncommand="exchWebService.manageEWSAccountsMenu.showManager()"/>
-	</commandset>
-
-	<menupopup id="menu_EditPopup">
-		<menuitem id="exchWebService_manageEWSAccounts_menuitem" label="&exchWebService.manageEWSAccounts.menuitem;" command="exchWebService_manageEWSAccounts_showManager_command"/>
-	</menupopup>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/manageEWSAccountsMenu.js" />
+    <commandset id="calendar_commands">
+        <command id="exchWebService_manageEWSAccounts_showManager_command"
+                 oncommand="exchWebService.manageEWSAccountsMenu.showManager()" />
+    </commandset>
+    <menupopup id="menu_EditPopup">
+        <menuitem id="exchWebService_manageEWSAccounts_menuitem"
+                  label="&exchWebService.manageEWSAccounts.menuitem;"
+                  command="exchWebService_manageEWSAccounts_showManager_command" />
+    </menupopup>
 </overlay>
-
diff --git a/chrome/content/messenger-overlay-preferences.xul b/chrome/content/messenger-overlay-preferences.xul
index dab4981f..afdf48e1 100644
--- a/chrome/content/messenger-overlay-preferences.xul
+++ b/chrome/content/messenger-overlay-preferences.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,8 +36,8 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay [
+<!DOCTYPE overlay
+[
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
@@ -46,50 +45,47 @@
     %preferencesDTD;
     %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
-
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <prefwindow id="MailPreferences">
-        <prefpane id="exchangeWebService_paneAccounts" 
+        <prefpane id="exchangeWebService_paneAccounts"
                   label="&exchangeWebService.paneAccounts.title;"
                   onpaneload="exchWebService.manageEWSAccounts.onLoad(); exchWebService.debugPreferences.onLoad();">
+
             <preferences>
                 <preference id="extensions.1st-setup.preferences.selectedTabIndex"
                             name="extensions.1st-setup.preferences.selectedTabIndex"
-                            type="int"/>
+                            type="int" />
             </preferences>
-            <tabbox id="exchangeWebService_preferences_tabbox" 
-                    flex="1" 
+            <tabbox id="exchangeWebService_preferences_tabbox"
+                    flex="1"
                     onselect="">
                 <tabs>
-<!--                    <tab id="exchangeWebService_preferences_tab_accounts"
+                    <!--                    <tab id="exchangeWebService_preferences_tab_accounts"
                          label="&exchangeWebService.preferences.tab.accounts;" hidden="true"/> -->
                     <tab id="exchangeWebService_preferences_tab_debug"
-                         label="&exchangeWebService.preferences.tab.debug;"/>
+                         label="&exchangeWebService.preferences.tab.debug;" />
                     <tab id="exchangeWebService_preferences_tab_cache"
-                         label="&exchangeWebService.preferences.tab.cache;"/>
-		    <tab id="exchangeWebService_preferences_tab_others"
-                         label="&exchangeWebService.preferences.tab.others;"/>
+                         label="&exchangeWebService.preferences.tab.cache;" />
+                    <tab id="exchangeWebService_preferences_tab_others"
+                         label="&exchangeWebService.preferences.tab.others;" />
                 </tabs>
                 <tabpanels flex="1">
-<!--                    <tabpanel orient="vertical">
-        			<hbox id="manage-EWS-Accounts-dialog-hbox"/>
+                    <!--                    <tabpanel orient="vertical">
+                                <hbox id="manage-EWS-Accounts-dialog-hbox"/>
                     </tabpanel> -->
                     <tabpanel orient="vertical">
-        			<vbox id="exchangeWebService_debug_preferences_vbox"/>
+                        <vbox id="exchangeWebService_debug_preferences_vbox" />
                     </tabpanel>
                     <tabpanel orient="vertical">
-        			<vbox id="exchangeWebService_cache_preferences_vbox"/>
+                        <vbox id="exchangeWebService_cache_preferences_vbox" />
                     </tabpanel>
-		    <tabpanel orient="vertical">
-        			<vbox id="exchangeWebService_others_preferences_vbox"/>
+                    <tabpanel orient="vertical">
+                        <vbox id="exchangeWebService_others_preferences_vbox" />
                     </tabpanel>
                 </tabpanels>
             </tabbox>
         </prefpane>
-
     </prefwindow>
-
 </overlay>
diff --git a/chrome/content/messenger_task_delegation.xul b/chrome/content/messenger_task_delegation.xul
index fe31131d..8a9a6000 100644
--- a/chrome/content/messenger_task_delegation.xul
+++ b/chrome/content/messenger_task_delegation.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -30,40 +29,72 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay SYSTEM "chrome://exchangecalendar/locale/messenger_task_delegation.dtd"> 
-
+<!DOCTYPE 
+overlay SYSTEM "chrome://exchangecalendar/locale/messenger_task_delegation.dtd">
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
-
 <overlay id="exchWebService-calendar-task-delegation-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/messenger_task_delegation.js"/>
-
-	<rows id="calendar-task-details-rows">
-		<row id="exchWebService-task-delegation-owner" align="end">
-			<hbox pack="end">
-				<label value="&exchWebService.task.delegation.owner.name;" class="task-details-name"/>
-			</hbox>
-			<hbox align="end" flex="1">
-				<label id="exchWebService-task-delegation-owner-label" class="task-details-value" flex="1" crop="end"/>
-				<hbox pack="end" flex="1" align="end">
-					<toolbox id="exchWebService-task-delegation-toolbox" defaulticonsize="small" minwidth="50px" defaultlabelalign="end" defaultmode="full" mode="full" iconsize="small" labelalign="end">
-						<toolbar id="exchWebService-task-delegation-toolbar" align="start" mode="full" defaulticonsize="small" defaultmode="full" iconsize="small" defaultset="exchWebService-task-delegation-accept-button, exchWebService-task-delegation-decline-button" customizable="true">
-							<toolbarbutton id="exchWebService-task-delegation-accept-button" label="&exchWebService.task.delegation.accept.button;" class="toolbarbutton-1 msgHeaderView-button" removable="true" oncommand="tmpTaskDelegation.onAccept()"/>
-							<toolbarbutton id="exchWebService-task-delegation-decline-button" label="&exchWebService.task.delegation.decline.button;" class="toolbarbutton-1 msgHeaderView-button" removable="true" oncommand="tmpTaskDelegation.onReject()"/>
-						</toolbar>
-					</toolbox>
-				</hbox>
-			</hbox>
-		</row>
-		<row id="exchWebService-task-delegation-delegator">
-			<label value="&exchWebService.task.delegation.delegator.name;" class="task-details-name"/>
-			<label id="exchWebService-task-delegation-delegator-label" class="task-details-value"/>
-		</row>
-		<row id="exchWebService-task-delegation-lastUpdateDate">
-			<label value="&exchWebService.task.delegation.lastUpdateDate;" class="task-details-name"/>
-			<label id="exchWebService-task-delegation-lastUpdateDate-label" class="task-details-value"/>
-		</row>
-	</rows> 
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/messenger_task_delegation.js" />
+    <rows id="calendar-task-details-rows">
+        <row id="exchWebService-task-delegation-owner"
+             align="end">
+            <hbox pack="end">
+                <label value="&exchWebService.task.delegation.owner.name;"
+                       class="task-details-name" />
+            </hbox>
+            <hbox align="end"
+                  flex="1">
+                <label id="exchWebService-task-delegation-owner-label"
+                       class="task-details-value"
+                       flex="1"
+                       crop="end" />
+                <hbox pack="end"
+                      flex="1"
+                      align="end">
+                    <toolbox id="exchWebService-task-delegation-toolbox"
+                             defaulticonsize="small"
+                             minwidth="50px"
+                             defaultlabelalign="end"
+                             defaultmode="full"
+                             mode="full"
+                             iconsize="small"
+                             labelalign="end">
+                        <toolbar id="exchWebService-task-delegation-toolbar"
+                                 align="start"
+                                 mode="full"
+                                 defaulticonsize="small"
+                                 defaultmode="full"
+                                 iconsize="small"
+                                 defaultset="exchWebService-task-delegation-accept-button, exchWebService-task-delegation-decline-button"
+                                 customizable="true">
+                            <toolbarbutton id="exchWebService-task-delegation-accept-button"
+                                           label="&exchWebService.task.delegation.accept.button;"
+                                           class="toolbarbutton-1 msgHeaderView-button"
+                                           removable="true"
+                                           oncommand="tmpTaskDelegation.onAccept()" />
+                            <toolbarbutton id="exchWebService-task-delegation-decline-button"
+                                           label="&exchWebService.task.delegation.decline.button;"
+                                           class="toolbarbutton-1 msgHeaderView-button"
+                                           removable="true"
+                                           oncommand="tmpTaskDelegation.onReject()" />
+                        </toolbar>
+                    </toolbox>
+                </hbox>
+            </hbox>
+        </row>
+        <row id="exchWebService-task-delegation-delegator">
+            <label value="&exchWebService.task.delegation.delegator.name;"
+                   class="task-details-name" />
+            <label id="exchWebService-task-delegation-delegator-label"
+                   class="task-details-value" />
+        </row>
+        <row id="exchWebService-task-delegation-lastUpdateDate">
+            <label value="&exchWebService.task.delegation.lastUpdateDate;"
+                   class="task-details-name" />
+            <label id="exchWebService-task-delegation-lastUpdateDate-label"
+                   class="task-details-value" />
+        </row>
+    </rows>
 </overlay>
diff --git a/chrome/content/oofSettings.xul b/chrome/content/oofSettings.xul
index c5401850..1669cc60 100644
--- a/chrome/content/oofSettings.xul
+++ b/chrome/content/oofSettings.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,109 +36,124 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messengercompose/messengercompose.css"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/oofSettings.css"?>
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/oofSettings.dtd" > %dtd1;
 ]>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_oofSettings_dialog" 
-  title="&title.oofsettings;" 
-  buttons="cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return tmpOOFSettings.onSave();"
-	height="600px"
-	persist="width height"
->
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/oofSettings.js"/>
-
-	<commandset>
-		<command id="exchWebService_cmd_oof_scheduled" oncommand="tmpOOFSettings.doScheduledChanged();"/>
-	</commandset>
-
-	<hbox>
-		<label value="&label.oofsettings.title;"/>
-		<label id="exchWebService-oofSettings-title"/>
-		<label id="exchWebService-load-error-message"/>
-	</hbox>
-
-	<vbox id="vbox-exchWebService-oof-settings" disabled="true" flex="1">
-		<hbox align="center">
-			<label value="&label.oofstatus;"/>
-			<menulist label="(Make a choice)" id="exchWebService-oof-status" value="1">
-				<menupopup>
-					<menuitem label="&menuitem.label.exchWebService-oof-status.disabled;" value="Disabled"/>
-					<menuitem label="&menuitem.label.exchWebService-oof-status.enabled;" value ="Enabled"/>
-				</menupopup>
-			</menulist>
-		</hbox>
-		<hbox align="center">
-			<label value="&label.externalaudience;"/>
-
-			<menulist label="(Make a choice)" id="exchWebService-oof-externalaudience" value="1">
-				<menupopup>
-					<menuitem label="&menuitem.label.exchWebService-oof-externalaudience.none;" value="None"/>
-					<menuitem label="&menuitem.label.exchWebService-oof-externalaudience.known;" value ="Known"/>
-					<menuitem label="&menuitem.label.exchWebService-oof-externalaudience.all;" value ="All"/>
-				</menupopup>
-			</menulist>
-		</hbox>
-
-		<checkbox id="exchWebService-oof-scheduled" label="&checkbox.label.exchWebService-oof-scheduled;" command="exchWebService_cmd_oof_scheduled"/>
-		<vbox id="vbox-exchWebService-oof-scheduled-timeframe" disabled="false">
-			<grid>
-				<columns>
-					<column/>
-					<column/>
-					<column/>
-				</columns>
-				<rows>
-					<row  align="center">
-						<label value="&label.hbox-oof-scheduled-startTime;"/>
-						<datepicker id="exchWebService-oof-startdate" type="popup"/>
-						<timepicker id="exchWebService-oof-starttime" hideseconds="true"/>
-					</row>
-					<row  align="center">
-						<label value="&label.hbox-oof-scheduled-endTime;"/>
-						<datepicker id="exchWebService-oof-enddate" type="popup"/>
-						<timepicker id="exchWebService-oof-endtime" hideseconds="true"/>
-					</row>
-				</rows>
-			</grid>
-		</vbox>
-
-		<spacer/>
-
-		<tabbox flex="1">
-			<tabs>
-				<tab label="&button.label.internal;" selected="true" flex="1"/>
-				<tab label="&button.label.external;" flex="1"/>
-			</tabs>
-			<tabpanels flex="1">
-				<tabpanel id="exchWebService-internalreply" flex="1">
-					<vbox flex="1">
-						<label id="exchWebService-oof-label-internal" value="&label.internalreply;" />
-						<oofEditor id="exchWebService-oof-editor-internal" flex="1"/>
-					</vbox> 
-				</tabpanel>
-				<tabpanel id="exchWebService-externalreply" flex="1">
-					<vbox flex="1">
-						<label id="exchWebService-oof-label-external" value="&label.externalreply;" />
-						<oofEditor id="exchWebService-oof-editor-external" flex="1"/>
-					</vbox> 
-				</tabpanel>
-			</tabpanels>
-		</tabbox>
-
-	</vbox>
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_oofSettings_dialog"
+        title="&title.oofsettings;"
+        buttons="cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return tmpOOFSettings.onSave();"
+        height="600px"
+        persist="width height">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/oofSettings.js" />
+    <commandset>
+        <command id="exchWebService_cmd_oof_scheduled"
+                 oncommand="tmpOOFSettings.doScheduledChanged();" />
+    </commandset>
+    <hbox>
+        <label value="&label.oofsettings.title;" />
+        <label id="exchWebService-oofSettings-title" />
+        <label id="exchWebService-load-error-message" />
+    </hbox>
+    <vbox id="vbox-exchWebService-oof-settings"
+          disabled="true"
+          flex="1">
+        <hbox align="center">
+            <label value="&label.oofstatus;" />
+            <menulist label="(Make a choice)"
+                      id="exchWebService-oof-status"
+                      value="1">
+                <menupopup>
+                    <menuitem label="&menuitem.label.exchWebService-oof-status.disabled;"
+                              value="Disabled" />
+                    <menuitem label="&menuitem.label.exchWebService-oof-status.enabled;"
+                              value="Enabled" />
+                </menupopup>
+            </menulist>
+        </hbox>
+        <hbox align="center">
+            <label value="&label.externalaudience;" />
+            <menulist label="(Make a choice)"
+                      id="exchWebService-oof-externalaudience"
+                      value="1">
+                <menupopup>
+                    <menuitem label="&menuitem.label.exchWebService-oof-externalaudience.none;"
+                              value="None" />
+                    <menuitem label="&menuitem.label.exchWebService-oof-externalaudience.known;"
+                              value="Known" />
+                    <menuitem label="&menuitem.label.exchWebService-oof-externalaudience.all;"
+                              value="All" />
+                </menupopup>
+            </menulist>
+        </hbox>
+        <checkbox id="exchWebService-oof-scheduled"
+                  label="&checkbox.label.exchWebService-oof-scheduled;"
+                  command="exchWebService_cmd_oof_scheduled" />
+        <vbox id="vbox-exchWebService-oof-scheduled-timeframe"
+              disabled="false">
+            <grid>
+                <columns>
+                    <column />
+                    <column />
+                    <column />
+                </columns>
+                <rows>
+                    <row align="center">
+                        <label value="&label.hbox-oof-scheduled-startTime;" />
+                        <datepicker id="exchWebService-oof-startdate"
+                                    type="popup" />
+                        <timepicker id="exchWebService-oof-starttime"
+                                    hideseconds="true" />
+                    </row>
+                    <row align="center">
+                        <label value="&label.hbox-oof-scheduled-endTime;" />
+                        <datepicker id="exchWebService-oof-enddate"
+                                    type="popup" />
+                        <timepicker id="exchWebService-oof-endtime"
+                                    hideseconds="true" />
+                    </row>
+                </rows>
+            </grid>
+        </vbox>
+        <spacer />
+        <tabbox flex="1">
+            <tabs>
+                <tab label="&button.label.internal;"
+                     selected="true"
+                     flex="1" />
+                <tab label="&button.label.external;"
+                     flex="1" />
+            </tabs>
+            <tabpanels flex="1">
+                <tabpanel id="exchWebService-internalreply"
+                          flex="1">
+                    <vbox flex="1">
+                        <label id="exchWebService-oof-label-internal"
+                               value="&label.internalreply;" />
+                        <oofEditor id="exchWebService-oof-editor-internal"
+                                   flex="1" />
+                    </vbox>
+                </tabpanel>
+                <tabpanel id="exchWebService-externalreply"
+                          flex="1">
+                    <vbox flex="1">
+                        <label id="exchWebService-oof-label-external"
+                               value="&label.externalreply;" />
+                        <oofEditor id="exchWebService-oof-editor-external"
+                                   flex="1" />
+                    </vbox>
+                </tabpanel>
+            </tabpanels>
+        </tabbox>
+    </vbox>
 </dialog>
diff --git a/chrome/content/otherPreferences.xul b/chrome/content/otherPreferences.xul
index f737aa4a..f163216f 100644
--- a/chrome/content/otherPreferences.xul
+++ b/chrome/content/otherPreferences.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -39,8 +39,8 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay [
+<!DOCTYPE overlay
+[
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
@@ -48,130 +48,132 @@
     %preferencesDTD;
     %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
-
 <overlay id="exchangeWebService_cache_preferences_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script type="application/javascript" src="chrome://exchangecalendar/content/otherPreferences.js"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/otherPreferences.js" />
     <vbox id="exchangeWebService_others_preferences_vbox">
-
         <preferences>
             <preference id="extensions.1st-setup.others.retryCount"
                         name="extensions.1st-setup.others.retryCount"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.others.checkForNewAddOnVersion"
                         name="extensions.1st-setup.others.checkForNewAddOnVersion"
-                        type="bool"/>
-
+                        type="bool" />
             <preference id="extensions.1st-setup.others.warnAboutNewAddOnVersion"
                         name="extensions.1st-setup.others.warnAboutNewAddOnVersion"
-                        type="bool"/>
-                        
+                        type="bool" />
             <preference id="extensions.1st-setup.others.warnAboutPrereleaseVersion"
                         name="extensions.1st-setup.others.warnAboutPrereleaseVersion"
-                        type="bool"/>
-                        
+                        type="bool" />
             <preference id="extensions.1st-setup.exchangecalendar.loadbalancer.maxJobs"
                         name="extensions.1st-setup.exchangecalendar.loadbalancer.maxJobs"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.exchangecalendar.loadbalancer.sleepBetweenJobs"
                         name="extensions.1st-setup.exchangecalendar.loadbalancer.sleepBetweenJobs"
-                        type="int"/>
-
+                        type="int" />
             <preference id="extensions.1st-setup.others.userAgent"
                         name="extensions.1st-setup.others.userAgent"
-                        type="unichar"/>
-			<preference id="extensions.1st-setup.others.ntlmv1"
+                        type="unichar" />
+            <preference id="extensions.1st-setup.others.ntlmv1"
                         name="network.auth.force-generic-ntlm-v1"
-                        type="bool"/>
+                        type="bool" />
         </preferences>
-
         <groupbox id="exchangeWebService_others_prefs_groupbox">
-            <caption label="&exchangeWebService.preference.others.prefs.label;"/>
+            <caption label="&exchangeWebService.preference.others.prefs.label;" />
             <vbox>
-		    <hbox>
-			<label value="&exchangeWebService.preference.others.prefs.retryCount.label;"/>
-			<textbox id="exchangeWebService_preference_others_retryCount_textbox" 
-				preference="extensions.1st-setup.others.retryCount"
-				increment="1" min="0" max="9999" type="number"/>
-		    </hbox>
+                <hbox>
+                    <label value="&exchangeWebService.preference.others.prefs.retryCount.label;" />
+                    <textbox id="exchangeWebService_preference_others_retryCount_textbox"
+                             preference="extensions.1st-setup.others.retryCount"
+                             increment="1"
+                             min="0"
+                             max="9999"
+                             type="number" />
+                </hbox>
             </vbox>
-	</groupbox>
-
-        <groupbox id="exchangeWebService_others_prefs_groupbox1" hidden="true">
-            <caption label="&exchangeWebService.preference.loadbalancer.prefs.label;"/>
+        </groupbox>
+        <groupbox id="exchangeWebService_others_prefs_groupbox1"
+                  hidden="true">
+            <caption label="&exchangeWebService.preference.loadbalancer.prefs.label;" />
             <vbox>
-		    <hbox>
-			<label value="&exchangeWebService.preference.loadbalancer.prefs.maxJobs.label;"/>
-			<textbox id="exchangeWebService_preference_loadbalancer_prefs_maxJobs_textbox" 
-				preference="extensions.1st-setup.exchangecalendar.loadbalancer.maxJobs"
-				increment="1" min="0" max="9999" type="number"/>
-		    </hbox>
-		    <hbox>
-			<label value="&exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label;"/>
-			<textbox id="exchangeWebService_preference_loadbalancer_prefs_sleepBetweenJobs_textbox" 
-				preference="extensions.1st-setup.exchangecalendar.loadbalancer.sleepBetweenJobs"
-				increment="1" min="0" max="9999" type="number"/>
-			<label value="(ms)"/>
-		    </hbox>
+                <hbox>
+                    <label value="&exchangeWebService.preference.loadbalancer.prefs.maxJobs.label;" />
+                    <textbox id="exchangeWebService_preference_loadbalancer_prefs_maxJobs_textbox"
+                             preference="extensions.1st-setup.exchangecalendar.loadbalancer.maxJobs"
+                             increment="1"
+                             min="0"
+                             max="9999"
+                             type="number" />
+                </hbox>
+                <hbox>
+                    <label value="&exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label;" />
+                    <textbox id="exchangeWebService_preference_loadbalancer_prefs_sleepBetweenJobs_textbox"
+                             preference="extensions.1st-setup.exchangecalendar.loadbalancer.sleepBetweenJobs"
+                             increment="1"
+                             min="0"
+                             max="9999"
+                             type="number" />
+                    <label value="(ms)" />
+                </hbox>
             </vbox>
-	</groupbox>
-
+        </groupbox>
         <groupbox id="exchangeWebService_others_prefs_groupbox2">
-            <caption label="&exchangeWebService.preference.updateFunction.label;"/>
+            <caption label="&exchangeWebService.preference.updateFunction.label;" />
             <vbox>
-			<checkbox id="exchangeWebService_preference_others_checkForNewAddOnVersion"
-					preference="extensions.1st-setup.others.checkForNewAddOnVersion"
-					label="&exchangeWebService.preference.checkForUpdates.label;"/>
-
-			<checkbox id="exchangeWebService_preference_others_warnAboutNewAddOnVersion"
-					preference="extensions.1st-setup.others.warnAboutNewAddOnVersion"
-					label="&exchangeWebService.preference.warnForUpdates.label;"/>
-					
-			<checkbox id="exchangeWebService_preference_others_warnAboutPrereleaseVersion"
-                    preference="extensions.1st-setup.others.warnAboutPrereleaseVersion"
-                    label="&exchangeWebService.preference.warnForPrereleaseUpdates.label;"/> 
-					
+                <checkbox id="exchangeWebService_preference_others_checkForNewAddOnVersion"
+                          preference="extensions.1st-setup.others.checkForNewAddOnVersion"
+                          label="&exchangeWebService.preference.checkForUpdates.label;" />
+                <checkbox id="exchangeWebService_preference_others_warnAboutNewAddOnVersion"
+                          preference="extensions.1st-setup.others.warnAboutNewAddOnVersion"
+                          label="&exchangeWebService.preference.warnForUpdates.label;" />
+                <checkbox id="exchangeWebService_preference_others_warnAboutPrereleaseVersion"
+                          preference="extensions.1st-setup.others.warnAboutPrereleaseVersion"
+                          label="&exchangeWebService.preference.warnForPrereleaseUpdates.label;" />
             </vbox>
-	</groupbox>
-
+        </groupbox>
         <groupbox id="exchangeWebService_others_prefs_groupbox3">
-            <caption label="&exchangeWebService.preference.userAgent.label;"/>
-		<vbox>
-		    <hbox valign="center">
-				<label value="&exchangeWebService.preference.userAgent.label;"/>
-				<textbox id="exchangeWebService_preference_userAgent" 
-					preference="extensions.1st-setup.others.userAgent"
-					flex="1"/>
-		    </hbox>
-			<hbox>
-				<button id="exchangeWebService_preference_userAgent_addonDefault_button" label="Add-on Default" 
-					oncommand="tmpOtherPreferences.addOnDefault();"
-					flex="1"/>
-				<button id="exchangeWebService_preference_userAgent_mozillaDefault_button" label="Mozilla Default" 
-					oncommand="tmpOtherPreferences.mozillaDefault();"
-					flex="1"/>
-				<button id="exchangeWebService_preference_userAgent_ieDefault_button" label="IE Default" 
-					oncommand="tmpOtherPreferences.ieDefault();"
-					flex="1"/>
-			</hbox>
-		</vbox>
-	</groupbox>
-	<groupbox id="exchangeWebService_others_prefs_groupbox4">
-            <caption label="&exchangeWebService.preference.ntlmv1.label;"/>
-			<vbox>
-				<radiogroup id="exchangeWebService_preference_others_ntlmv1"
-						preference="extensions.1st-setup.others.ntlmv1"
-						label="&exchangeWebService.preference.ntlmv1.label;"> 
-					  <radio id="ntlm-true" value="true" label="&exchangeWebService.preference.ntlmv1.true.label;"/>
-					  <radio id="ntlm-false"  value="false" label="&exchangeWebService.preference.ntlmv1.false.label;" />
- 				</radiogroup>			
+            <caption label="&exchangeWebService.preference.userAgent.label;" />
+            <vbox>
+                <hbox valign="center">
+                    <label value="&exchangeWebService.preference.userAgent.label;" />
+                    <textbox id="exchangeWebService_preference_userAgent"
+                             preference="extensions.1st-setup.others.userAgent"
+                             flex="1" />
+                </hbox>
+                <hbox>
+                    <button id="exchangeWebService_preference_userAgent_addonDefault_button"
+                            label="Add-on Default"
+                            oncommand="tmpOtherPreferences.addOnDefault();"
+                            flex="1" />
+                    <button id="exchangeWebService_preference_userAgent_mozillaDefault_button"
+                            label="Mozilla Default"
+                            oncommand="tmpOtherPreferences.mozillaDefault();"
+                            flex="1" />
+                    <button id="exchangeWebService_preference_userAgent_ieDefault_button"
+                            label="IE Default"
+                            oncommand="tmpOtherPreferences.ieDefault();"
+                            flex="1" />
+                </hbox>
+            </vbox>
+        </groupbox>
+        <groupbox id="exchangeWebService_others_prefs_groupbox4">
+            <caption label="&exchangeWebService.preference.ntlmv1.label;" />
+            <vbox>
+                <radiogroup id="exchangeWebService_preference_others_ntlmv1"
+                            preference="extensions.1st-setup.others.ntlmv1"
+                            label="&exchangeWebService.preference.ntlmv1.label;">
+
+                    <radio id="ntlm-true"
+                           value="true"
+                           label="&exchangeWebService.preference.ntlmv1.true.label;" />
+                    <radio id="ntlm-false"
+                           value="false"
+                           label="&exchangeWebService.preference.ntlmv1.false.label;" />
+                </radiogroup>
             </vbox>
-	</groupbox>
+        </groupbox>
     </vbox>
 </overlay>
diff --git a/chrome/content/preInvitationResponse.xul b/chrome/content/preInvitationResponse.xul
index 190126b2..46b40fcb 100644
--- a/chrome/content/preInvitationResponse.xul
+++ b/chrome/content/preInvitationResponse.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,50 +36,60 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preInvitationResponse.dtd" > %dtd1;
 ]>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_preInvitationResponse_dialog" 
-  title="&dialog.exchWebService.preInvitationResponse.title;" 
-  buttons="accept,cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return exchWebService.preInvitationResponse.onAccept();"
-  onload="exchWebService.preInvitationResponse.onLoad();">
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/preInvitationResponse.js"/>
-
-	<vbox id="exchWebService_preInvitationResponse_vbox">
-		<grid>
-			<columns>
-				<column />
-				<column flex="1"/>
-			</columns>
-			<rows>
-			
-				<row>	<label value="&label.calendarName;"/> <label id="exchWebService_calendarName"/>	</row>
-				<row>	<label value="&label.itemTitle;"/> <label id="exchWebService_itemTitle"/>	</row>
-				<row>	<label value="&label.itemStart;"/> <label id="exchWebService_itemStart"/>	</row>
-				<row>	<label value="&label.itemResponse;"/> <label id="exchWebService_itemResponse"/>	</row> 				
-				<row>	<label value="&label.meetingOrganiser;"/> <label id="exchWebService_meetingOrganiser"/>	</row>
-
-			</rows>
-		</grid>
-
-		<seperator/>
-
-		<radiogroup id="exchWebService_preInvitationResponse_radio" value="sendnow">
-			<radio label="&radio.label.exchWebService.preInvitationResponse.edit;" value="edit"/>
-			<radio label="&radio.label.exchWebService.preInvitationResponse.sendnow;" value="sendnow" checked="true"/>
-			<radio label="&radio.label.exchWebService.preInvitationResponse.donotsend;" value="donotsend"/>
-		</radiogroup>
-	</vbox>
-
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_preInvitationResponse_dialog"
+        title="&dialog.exchWebService.preInvitationResponse.title;"
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return exchWebService.preInvitationResponse.onAccept();"
+        onload="exchWebService.preInvitationResponse.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/preInvitationResponse.js" />
+    <vbox id="exchWebService_preInvitationResponse_vbox">
+        <grid>
+            <columns>
+                <column />
+                <column flex="1" />
+            </columns>
+            <rows>
+                <row>
+                    <label value="&label.calendarName;" />
+                    <label id="exchWebService_calendarName" />
+                </row>
+                <row>
+                    <label value="&label.itemTitle;" />
+                    <label id="exchWebService_itemTitle" />
+                </row>
+                <row>
+                    <label value="&label.itemStart;" />
+                    <label id="exchWebService_itemStart" />
+                </row>
+                <row>
+                    <label value="&label.itemResponse;" />
+                    <label id="exchWebService_itemResponse" />
+                </row>
+                <row>
+                    <label value="&label.meetingOrganiser;" />
+                    <label id="exchWebService_meetingOrganiser" />
+                </row>
+            </rows>
+        </grid>
+        <seperator />
+        <radiogroup id="exchWebService_preInvitationResponse_radio"
+                    value="sendnow">
+            <radio label="&radio.label.exchWebService.preInvitationResponse.edit;"
+                   value="edit" />
+            <radio label="&radio.label.exchWebService.preInvitationResponse.sendnow;"
+                   value="sendnow"
+                   checked="true" />
+            <radio label="&radio.label.exchWebService.preInvitationResponse.donotsend;"
+                   value="donotsend" />
+        </radiogroup>
+    </vbox>
 </dialog>
diff --git a/chrome/content/priority-display.xul b/chrome/content/priority-display.xul
index 5642ce72..19d4b709 100644
--- a/chrome/content/priority-display.xul
+++ b/chrome/content/priority-display.xul
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/priority-display.css"?>
- 
 <overlay xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-        <script src="chrome://exchangecalendar/content/priority-display.js"/>
-        <tree id="threadTree">
-                <treecols id="threadCols">
-                <treecol id="priorityCol" name="priorityCol" persist="hidden ordinal width" fixed="true" width="23"
-                       class="treecol-image priorityColumnHeaderIcon" currentView="unthreaded"/>
-                        <splitter class="tree-splitter"/>
-                </treecols>
-        </tree>
+
+    <script src="chrome://exchangecalendar/content/priority-display.js" />
+    <tree id="threadTree">
+        <treecols id="threadCols">
+            <treecol id="priorityCol"
+                     name="priorityCol"
+                     persist="hidden ordinal width"
+                     fixed="true"
+                     width="23"
+                     class="treecol-image priorityColumnHeaderIcon"
+                     currentView="unthreaded" />
+            <splitter class="tree-splitter" />
+        </treecols>
+    </tree>
 </overlay>
diff --git a/chrome/content/progress_panel.xml b/chrome/content/progress_panel.xml
index ba5723aa..17581700 100644
--- a/chrome/content/progress_panel.xml
+++ b/chrome/content/progress_panel.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,102 +23,108 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <bindings id="exchWebService-progress-bindings"
-  xmlns="http://www.mozilla.org/xbl"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <binding id="exchangeProgressGrid">
-    <content>
-	<xul:grid>
-		<xul:columns>
-			<xul:column flex="1" align="right"/>
-			<xul:column />
-		</xul:columns>
-		<xul:rows anonid="exchWebServices.progress.rows">
-			<xul:row anonid="exchWebServices.server.progress.row">
-				<xul:label xbl:inherits="value=serverUrl" class="serverline-bold"/>
-				<xul:label anonid="serverCount" value="0" class="serverline-bold"/>
-			</xul:row>
-		</xul:rows>
-	</xul:grid>
-    </content>
-
-    <implementation>
-	<constructor><![CDATA[
-		this._calendars = {};
-		this._serverCount = 0;
-	]]></constructor>
-
-	<property name="serverCount">
-		<getter><![CDATA[
-			return this._serverCount;
-		]]></getter>
-		<setter><![CDATA[
-			this._serverCount = val;
-			document.getAnonymousElementByAttribute(this, "anonid", "serverCount").setAttribute("value", this._serverCount);
-		]]></setter>
-	</property>
-
-	<method name="addCalendar">
-		<parameter name="aCalendar" />
-		<parameter name="aCount" />
-		<body><![CDATA[
-			// See if we have this calendar
-			if (this._calendars[aCalendar]) {
-				this._calendars[aCalendar].count.setAttribute("value", aCount);
-				this._calendars[aCalendar].changed = true;
-				this._calendars[aCalendar].row.hidden = false;
-
-				this._serverCount += aCount - this._calendars[aCalendar].countValue;
-				this._calendars[aCalendar].countValue = aCount;
-			}
-			else {
-				this._calendars[aCalendar] = {};
-				this._calendars[aCalendar].row = createXULElement("row");
-				document.getAnonymousElementByAttribute(this, "anonid", "exchWebServices.progress.rows").appendChild(this._calendars[aCalendar].row);
-
-				this._calendars[aCalendar].label = createXULElement("label");
-				this._calendars[aCalendar].label.setAttribute("value", aCalendar);
-				//this._calendars[aCalendar].label.setAttribute("align", "right");
-				this._calendars[aCalendar].label.setAttribute("flex", "1");
-				this._calendars[aCalendar].row.appendChild(this._calendars[aCalendar].label);
-
-				this._calendars[aCalendar].count = createXULElement("label");
-				this._calendars[aCalendar].count.setAttribute("value", aCount);
-				this._calendars[aCalendar].countValue = aCount;
-				this._calendars[aCalendar].row.appendChild(this._calendars[aCalendar].count);
-
-				this._calendars[aCalendar].changed = true;
-
-				this._serverCount += aCount;
-			}
-		]]></body>
-	</method>
-
-	<method name="beforeUpdate">
-		<body><![CDATA[
-			for each(var calendar in this._calendars) {
-				calendar.changed = false;
-			}
-		]]></body>
-	</method>
-
-	<method name="afterUpdate">
-		<body><![CDATA[
-			for each(var calendar in this._calendars) {
-				if (calendar.changed === false) {
-					calendar.row.hidden = true;
-				}
-			}
-		]]></body>
-	</method>
-
-    </implementation>
-
-  </binding>
-
-
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:html="http://www.w3.org/1999/xhtml"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+    <binding id="exchangeProgressGrid">
+        <content>
+            <xul:grid>
+                <xul:columns>
+                    <xul:column flex="1"
+                                align="right" />
+                    <xul:column />
+                </xul:columns>
+                <xul:rows anonid="exchWebServices.progress.rows">
+                    <xul:row anonid="exchWebServices.server.progress.row">
+
+                        <xul:label xbl:inherits="value=serverUrl"
+                                   class="serverline-bold" />
+                        <xul:label anonid="serverCount"
+                                   value="0"
+                                   class="serverline-bold" />
+                    </xul:row>
+                </xul:rows>
+            </xul:grid>
+        </content>
+        <implementation>
+            <constructor>
+<![CDATA[
+                this._calendars = {};
+                this._serverCount = 0;
+        ]]>
+            </constructor>
+            <property name="serverCount">
+                <getter>
+<![CDATA[
+                        return this._serverCount;
+                ]]>
+                </getter>
+                <setter>
+<![CDATA[
+                        this._serverCount = val;
+                        document.getAnonymousElementByAttribute(this, "anonid", "serverCount").setAttribute("value", this._serverCount);
+                ]]>
+                </setter>
+            </property>
+            <method name="addCalendar">
+                <parameter name="aCalendar" />
+                <parameter name="aCount" />
+                <body>
+<![CDATA[
+                        // See if we have this calendar
+                        if (this._calendars[aCalendar]) {
+                                this._calendars[aCalendar].count.setAttribute("value", aCount);
+                                this._calendars[aCalendar].changed = true;
+                                this._calendars[aCalendar].row.hidden = false;
+
+                                this._serverCount += aCount - this._calendars[aCalendar].countValue;
+                                this._calendars[aCalendar].countValue = aCount;
+                        }
+                        else {
+                                this._calendars[aCalendar] = {};
+                                this._calendars[aCalendar].row = createXULElement("row");
+                                document.getAnonymousElementByAttribute(this, "anonid", "exchWebServices.progress.rows").appendChild(this._calendars[aCalendar].row);
+
+                                this._calendars[aCalendar].label = createXULElement("label");
+                                this._calendars[aCalendar].label.setAttribute("value", aCalendar);
+                                //this._calendars[aCalendar].label.setAttribute("align", "right");
+                                this._calendars[aCalendar].label.setAttribute("flex", "1");
+                                this._calendars[aCalendar].row.appendChild(this._calendars[aCalendar].label);
+
+                                this._calendars[aCalendar].count = createXULElement("label");
+                                this._calendars[aCalendar].count.setAttribute("value", aCount);
+                                this._calendars[aCalendar].countValue = aCount;
+                                this._calendars[aCalendar].row.appendChild(this._calendars[aCalendar].count);
+
+                                this._calendars[aCalendar].changed = true;
+
+                                this._serverCount += aCount;
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="beforeUpdate">
+                <body>
+<![CDATA[
+                        for each(var calendar in this._calendars) {
+                                calendar.changed = false;
+                        }
+                ]]>
+                </body>
+            </method>
+            <method name="afterUpdate">
+                <body>
+<![CDATA[
+                        for each(var calendar in this._calendars) {
+                                if (calendar.changed === false) {
+                                        calendar.row.hidden = true;
+                                }
+                        }
+                ]]>
+                </body>
+            </method>
+        </implementation>
+    </binding>
 </bindings>
diff --git a/chrome/content/progress_panel.xul b/chrome/content/progress_panel.xul
index d0c10b92..ab0ad57c 100644
--- a/chrome/content/progress_panel.xul
+++ b/chrome/content/progress_panel.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -30,34 +29,30 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/progress_panel.css"?>
-
 <overlay id="exchWebService-calendar-list-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecalendar/content/progress_panel.js"/>
-
-	<popupset>
-		<tooltip id="exchWebServicesprogresstip" orient="vertical">
-			<vbox id="exchWebServiceProgressvbox">
-			</vbox>
-		</tooltip>  
-	</popupset>
-
-  <statusbar id="status-bar">
-	<statusbarpanel id="exchWebService-progress-panel"
-			insertbefore="unreadMessageCount,totalMessageCount"
-			oncommand="myExchProgressPanel.openProgressDialog()"
-			hidden="true"
-			tooltip="exchWebServicesprogresstip">
-		<hbox id="exchWebService-progress-hbox">
-			<label id="exchWebService-progress-label"
-				onclick="myExchProgressPanel.openProgressDialog()" value="Test"/>
-			<image id="exchWebService-progress-image"/>
-		</hbox>
-	</statusbarpanel>
-  </statusbar>
-
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/progress_panel.js" />
+    <popupset>
+        <tooltip id="exchWebServicesprogresstip"
+                 orient="vertical">
+            <vbox id="exchWebServiceProgressvbox"></vbox>
+        </tooltip>
+    </popupset>
+    <statusbar id="status-bar">
+        <statusbarpanel id="exchWebService-progress-panel"
+                        insertbefore="unreadMessageCount,totalMessageCount"
+                        oncommand="myExchProgressPanel.openProgressDialog()"
+                        hidden="true"
+                        tooltip="exchWebServicesprogresstip">
+            <hbox id="exchWebService-progress-hbox">
+                <label id="exchWebService-progress-label"
+                       onclick="myExchProgressPanel.openProgressDialog()"
+                       value="Test" />
+                <image id="exchWebService-progress-image" />
+            </hbox>
+        </statusbarpanel>
+    </statusbar>
 </overlay>
diff --git a/chrome/content/rtews-overlay.xul b/chrome/content/rtews-overlay.xul
index b0d9ab0d..03e23941 100644
--- a/chrome/content/rtews-overlay.xul
+++ b/chrome/content/rtews-overlay.xul
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay SYSTEM "chrome://exchangecalendar/locale/rtews.dtd">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE 
+overlay SYSTEM "chrome://exchangecalendar/locale/rtews.dtd">
+<overlay id="rtews-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<overlay id="rtews-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">  
-	<script type="application/javascript" src="chrome://exchangecalendar/content/rtews.js"/>
-	<stringbundleset id="stringbundleset">
-		<stringbundle id="string-bundle" src="chrome://exchangecalendar/locale/rtews.properties"/>
-	</stringbundleset> 
-</overlay>
\ No newline at end of file
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/rtews.js" />
+    <stringbundleset id="stringbundleset">
+        <stringbundle id="string-bundle"
+                      src="chrome://exchangecalendar/locale/rtews.properties" />
+    </stringbundleset>
+</overlay>
diff --git a/chrome/content/selectEWSUrl.xul b/chrome/content/selectEWSUrl.xul
index f720257c..f76e9552 100644
--- a/chrome/content/selectEWSUrl.xul
+++ b/chrome/content/selectEWSUrl.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,35 +36,30 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/selectEWSUrl.dtd" > %dtd1;
 ]>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService-selectEWSurl-dialog" 
-  title="Select" 
-  buttons="accept,cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return exchWebService.selectEWSurl.onAccept();"
-  onload="exchWebService.selectEWSurl.onLoad();">
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/selectEWSUrl.js"/>
-
-	<vbox>
-		<description value="&description.selectews;"/>
-		<seperator/>
-
-		<label value="&label.selectews;" control="exchWebService_selectEWSurl_urllist"/>
-
-		<menulist label="(Make a choice)" id="exchWebService_selectEWSurl_urllist" value="1">
-			<menupopup/>
-		</menulist>
-	</vbox>
-
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService-selectEWSurl-dialog"
+        title="Select"
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return exchWebService.selectEWSurl.onAccept();"
+        onload="exchWebService.selectEWSurl.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/selectEWSUrl.js" />
+    <vbox>
+        <description value="&description.selectews;" />
+        <seperator />
+        <label value="&label.selectews;"
+               control="exchWebService_selectEWSurl_urllist" />
+        <menulist label="(Make a choice)"
+                  id="exchWebService_selectEWSurl_urllist"
+                  value="1">
+            <menupopup />
+        </menulist>
+    </vbox>
 </dialog>
diff --git a/chrome/content/sendUpdateTo.xul b/chrome/content/sendUpdateTo.xul
index 977047b4..4a2fb8b6 100644
--- a/chrome/content/sendUpdateTo.xul
+++ b/chrome/content/sendUpdateTo.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,36 +36,34 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/sendUpdateTo.dtd" > %dtd1;
 ]>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_sendUpdateTo_dialog" 
-  title="&title.sendupdateto;" 
-  buttons="accept"
-  buttonlabelaccept="&label.acceptbutton;"
-  ondialogaccept="return exchWebService.sendUpdateTo.onAccept();"
-  onload="exchWebService.sendUpdateTo.onLoad();">
-
-	<script type="application/javascript" src="chrome://exchangecalendar/content/sendUpdateTo.js"/>
-
-	<hbox>
-		<label value="&label.calendaritem.title;"/>
-		<label id="exchWebService_sendUpdateTo_calendaritem-title"/>
-	</hbox>
-
-	<vbox id="exchWebService_sendUpdateTo_vbox">
-		<radiogroup id="exchWebService_sendUpdateTo_radio-sendto">
-			<radio label="&radio.label.sendtonone;" value="sendtonone"/>
-			<radio label="&radio.label.sendtoall;" value="sendtoall" checked="true"/>
-			<radio label="&radio.label.sendtochanged;" value="sendtochanged"/>
-		</radiogroup>
-	</vbox>
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_sendUpdateTo_dialog"
+        title="&title.sendupdateto;"
+        buttons="accept"
+        buttonlabelaccept="&label.acceptbutton;"
+        ondialogaccept="return exchWebService.sendUpdateTo.onAccept();"
+        onload="exchWebService.sendUpdateTo.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/sendUpdateTo.js" />
+    <hbox>
+        <label value="&label.calendaritem.title;" />
+        <label id="exchWebService_sendUpdateTo_calendaritem-title" />
+    </hbox>
+    <vbox id="exchWebService_sendUpdateTo_vbox">
+        <radiogroup id="exchWebService_sendUpdateTo_radio-sendto">
+            <radio label="&radio.label.sendtonone;"
+                   value="sendtonone" />
+            <radio label="&radio.label.sendtoall;"
+                   value="sendtoall"
+                   checked="true" />
+            <radio label="&radio.label.sendtochanged;"
+                   value="sendtochanged" />
+        </radiogroup>
+    </vbox>
 </dialog>
diff --git a/chrome/content/sharedCalendarParser.xul b/chrome/content/sharedCalendarParser.xul
index 3848cfac..b129caa3 100644
--- a/chrome/content/sharedCalendarParser.xul
+++ b/chrome/content/sharedCalendarParser.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -37,35 +36,35 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/sharedCalendarParser.dtd" > %dtd1;
 ]>
-
 <?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/sharedCalendarParser.css"?>
-
 <overlay id="exchWebServiceMessengerOverlay"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/x-javascript"  src="chrome://exchangecalendar/content/sharedCalendarParser.js"/>
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <vbox id="messagepanebox">
-    <vbox position="1">
-      <vbox id="exchWebServiceSharedCalendarBox" collapsed="true" align="center" class="exchWebServiceSharedCalendarBox">
-	<hbox>
-		<image src="chrome://exchangecalendar/content/lightningexchangecalendar.png"/>
-		<vbox>
-			<label value="&exchWebService_vbox_label;"/>
-			<label id="exchWebServiceSharedCalendarLabel" value="test"/>
-		</vbox>
-	        <button id="exchWebServiceSharedCalendarAddButton"  label="&exchWebService_button_label_add_calendar;" oncommand="exchWebService.hdrView.doAddSharedCalendar();"/>
-	</hbox>
-
-      </vbox>
+    <script type="application/x-javascript"
+            src="chrome://exchangecalendar/content/sharedCalendarParser.js" />
+    <vbox id="messagepanebox">
+        <vbox position="1">
+            <vbox id="exchWebServiceSharedCalendarBox"
+                  collapsed="true"
+                  align="center"
+                  class="exchWebServiceSharedCalendarBox">
+                <hbox>
+                    <image src="chrome://exchangecalendar/content/lightningexchangecalendar.png" />
+                    <vbox>
+                        <label value="&exchWebService_vbox_label;" />
+                        <label id="exchWebServiceSharedCalendarLabel"
+                               value="test" />
+                    </vbox>
+                    <button id="exchWebServiceSharedCalendarAddButton"
+                            label="&exchWebService_button_label_add_calendar;"
+                            oncommand="exchWebService.hdrView.doAddSharedCalendar();" />
+                </hbox>
+            </vbox>
+        </vbox>
     </vbox>
-  </vbox>
-
 </overlay>
-
-
diff --git a/chrome/content/suite-overlay-preferences.xul b/chrome/content/suite-overlay-preferences.xul
index ba8dcf83..5a197195 100644
--- a/chrome/content/suite-overlay-preferences.xul
+++ b/chrome/content/suite-overlay-preferences.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -39,14 +38,12 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css"?>
-
 <?xul-overlay href="chrome://exchangecalendar/content/debugPreferences.xul"?>
 <?xul-overlay href="chrome://exchangecalendar/content/cachePreferences.xul"?>
 <?xul-overlay href="chrome://exchangecalendar/content/otherPreferences.xul"?>
-
-<!DOCTYPE overlay [
+<!DOCTYPE overlay
+[
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     %lightningDTD;
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
@@ -54,7 +51,6 @@
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd">
     %dtd1;
 ]>
-
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <treechildren id="prefsPanelChildren">
@@ -66,36 +62,37 @@
             <treechildren id="exchangeWebServiceChildren">
                 <treeitem id="exchangeWebService_preferences_treeitem_debug"
                           label="&exchangeWebService.preferences.tab.debug;"
-                          prefpane="exchangeWebService_preferences_tab_debug"/>
+                          prefpane="exchangeWebService_preferences_tab_debug" />
                 <treeitem id="exchangeWebService_preferences_treeitem_cache"
                           label="&exchangeWebService.preferences.tab.cache;"
-                          prefpane="exchangeWebService_preferences_tab_cache"/>
-		<treeitem id="exchangeWebService_preferences_treeitem_others"
+                          prefpane="exchangeWebService_preferences_tab_cache" />
+                <treeitem id="exchangeWebService_preferences_treeitem_others"
                           label="&exchangeWebService.preferences.tab.others;"
-                          prefpane="exchangeWebService_preferences_tab_others"/>
+                          prefpane="exchangeWebService_preferences_tab_others" />
             </treechildren>
         </treeitem>
     </treechildren>
-
     <prefwindow id="prefDialog">
         <prefpane id="paneExchangeWebService"
                   label="&exchangeWebService.paneAccounts.title;">
-        </prefpane>
+                  </prefpane>
         <prefpane id="exchangeWebService_preferences_tab_debug"
                   label="&exchangeWebService.preferences.tab.debug;"
                   onpaneload="exchWebService.debugPreferences.onLoad();">
-		<vbox id="exchangeWebService_debug_preferences_vbox"/>
+                  
+            <vbox id="exchangeWebService_debug_preferences_vbox" />
         </prefpane>
         <prefpane id="exchangeWebService_preferences_tab_cache"
                   label="&exchangeWebService.preferences.tab.cache;"
                   onpaneload="exchWebService.debugPreferences.onLoad();">
-		<vbox id="exchangeWebService_cache_preferences_vbox"/>
+                  
+            <vbox id="exchangeWebService_cache_preferences_vbox" />
         </prefpane>
-	<prefpane id="exchangeWebService_preferences_tab_others"
+        <prefpane id="exchangeWebService_preferences_tab_others"
                   label="&exchangeWebService.preferences.tab.others;"
                   onpaneload="exchWebService.debugPreferences.onLoad();">
-		<vbox id="exchangeWebService_others_preferences_vbox"/>
+                  
+            <vbox id="exchangeWebService_others_preferences_vbox" />
         </prefpane>
     </prefwindow>
-
 </overlay>
diff --git a/chrome/content/timezonePreference.xul b/chrome/content/timezonePreference.xul
index 80edcf63..0f2aa77e 100644
--- a/chrome/content/timezonePreference.xul
+++ b/chrome/content/timezonePreference.xul
@@ -1,24 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!DOCTYPE 
+overlay SYSTEM "chrome://exchangecalendar/locale/timezonePreference.dtd">
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<!DOCTYPE overlay SYSTEM "chrome://exchangecalendar/locale/timezonePreference.dtd">
-
-<overlay  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/javascript" src="chrome://exchangecalendar/content/timezonePreference.js"/> 
-
-    <vbox id="calPreferencesBoxTimezones"> 
+    <script type="application/javascript"
+            src="chrome://exchangecalendar/content/timezonePreference.js" />
+    <vbox id="calPreferencesBoxTimezones">
         <preferences>
             <preference id="calendar-timezone-local-auto"
                         name="calendar.timezone.local.auto"
                         type="bool"
                         onchange="return autoTimezone(this.value);" />
-        </preferences> 
-        <groupbox> 
-            <checkbox  disabled="true" id="checkbox-calendar-timezone-local-auto"
-                        preference="calendar-timezone-local-auto"
-                        label="&calendar.timezone.local.auto.label;"   /> 
-        </groupbox> 
+        </preferences>
+        <groupbox>
+            <checkbox disabled="true"
+                      id="checkbox-calendar-timezone-local-auto"
+                      preference="calendar-timezone-local-auto"
+                      label="&calendar.timezone.local.auto.label;" />
+        </groupbox>
     </vbox>
 </overlay>
diff --git a/email/chrome/content/am-exchangeWebServiceMail.xul b/email/chrome/content/am-exchangeWebServiceMail.xul
index c79e5120..1b9704b3 100644
--- a/email/chrome/content/am-exchangeWebServiceMail.xul
+++ b/email/chrome/content/am-exchangeWebServiceMail.xul
@@ -2,9 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-
 <!--
 <!DOCTYPE page [
 <!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd" >
@@ -14,15 +12,12 @@
 <!ENTITY % accountServerTopDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">%accountServerTopDTD;
 ]>
 -->
-
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       class="color-dialog"
       title="&accountTitle.label;"
       onload="">
-
-<!--      onload="parent.onPanelLoaded('am-newsblog.xul');"> -->
-
-<!--  <script type="application/javascript"
+    <!--      onload="parent.onPanelLoaded('am-newsblog.xul');"> -->
+    <!--  <script type="application/javascript"
           src="chrome://messenger/content/AccountManager.js"/>
   <script type="application/javascript"
           src="chrome://messenger-newsblog/content/am-newsblog.js"/>
@@ -33,12 +28,11 @@
   <script type="application/javascript"
           src="chrome://messenger/content/am-prefs.js"/>
 -->
-
-  <dialogheader id="am-exchangeWebServiceMail-title" defaultTitle="exchangeWebServiceMail defaulttitle"/>
-
-  <description class="secDesc">exchangeWebServiceMail description</description>
-
-<!--    <hbox align="center">
+    <dialogheader id="am-exchangeWebServiceMail-title"
+                  defaultTitle="exchangeWebServiceMail defaulttitle" />
+    <description class="secDesc">exchangeWebServiceMail
+    description</description>
+    <!--    <hbox align="center">
       <label value="&accountName.label;"
              accesskey="&accountName.accesskey;"
              control="server.prettyName"/>
diff --git a/install.rdf b/install.rdf
index 9ff17775..1128d8cd 100644
--- a/install.rdf
+++ b/install.rdf
@@ -1,52 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-    <em:version>4.0.0-beta5</em:version>
-    <em:targetApplication>
-      <Description>
-        <!-- Thunderbird -->
-        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>52.0.0</em:minVersion>
-        <em:maxVersion>52.*.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    <em:targetApplication>
-      <Description>
-        <!-- Seamonkey -->
-        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.49.*</em:minVersion>
-        <em:maxVersion>2.49.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    <em:unpack>true</em:unpack>
-    <em:name>Exchange Calendar</em:name>
-    <em:homepageURL>https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
-    <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
-    <em:creator>Michel Verbraak</em:creator>
-    <em:developer>ExchangeCalendar community</em:developer>
-    <em:translator>Michel Verbraak (nl)</em:translator>
-    <em:translator>Michel Verbraak (en-US)</em:translator>
-    <em:translator>Dominique Fillon (fr-FR)</em:translator>
-    <em:translator>Christian A. Meyer (de)</em:translator>
-    <em:translator>Björn Töpper (de)</em:translator>
-    <em:translator>Hiroshi Miura (ja-JP)</em:translator>
-    <em:translator>Alexey Sinitsyn (ru)</em:translator>
-    <em:translator>Alessandro Menti (it-IT)</em:translator>
-    <em:translator>Engin Özkan (tr)</em:translator>
-    <em:localized>
-        <Description>
-            <em:locale>en</em:locale>
-            <em:name>Exchange Calendar</em:name>
-            <em:description>Allows you to sync calendars, tasks, and contacts with Microsoft Exchange.</em:description>
-        </Description>
-    </em:localized>
-    <em:localized>
-        <Description>
-            <em:locale>fr</em:locale>
-            <em:name>Exchange Calendar</em:name>
-            <em:description>Vous permet de synchroniser les calendriers, tâches et contactes avec Microsoft Exchange.</em:description>
-        </Description>
-    </em:localized>
-  </Description>
+<?xml version="1.0" encoding="utf-8"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+    <Description about="urn:mozilla:install-manifest">
+        <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
+        <em:version>4.0.0-beta5</em:version>
+        <em:targetApplication>
+            <Description>
+                <!-- Thunderbird -->
+                <em:id>
+                {3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+                <em:minVersion>52.0.0</em:minVersion>
+                <em:maxVersion>52.*.*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+        <em:targetApplication>
+            <Description>
+                <!-- Seamonkey -->
+                <em:id>
+                {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+                <em:minVersion>2.49.*</em:minVersion>
+                <em:maxVersion>2.49.*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+        <em:unpack>true</em:unpack>
+        <em:name>Exchange Calendar</em:name>
+        <em:homepageURL>
+        https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
+        <em:iconURL>
+        chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
+        <em:creator>Michel Verbraak</em:creator>
+        <em:developer>ExchangeCalendar community</em:developer>
+        <em:translator>Michel Verbraak (nl)</em:translator>
+        <em:translator>Michel Verbraak (en-US)</em:translator>
+        <em:translator>Dominique Fillon (fr-FR)</em:translator>
+        <em:translator>Christian A. Meyer (de)</em:translator>
+        <em:translator>Björn Töpper (de)</em:translator>
+        <em:translator>Hiroshi Miura (ja-JP)</em:translator>
+        <em:translator>Alexey Sinitsyn (ru)</em:translator>
+        <em:translator>Alessandro Menti (it-IT)</em:translator>
+        <em:translator>Engin Özkan (tr)</em:translator>
+        <em:localized>
+            <Description>
+                <em:locale>en</em:locale>
+                <em:name>Exchange Calendar</em:name>
+                <em:description>Allows you to sync calendars,
+                tasks, and contacts with Microsoft
+                Exchange.</em:description>
+            </Description>
+        </em:localized>
+        <em:localized>
+            <Description>
+                <em:locale>fr</em:locale>
+                <em:name>Exchange Calendar</em:name>
+                <em:description>Vous permet de synchroniser les
+                calendriers, tâches et contactes avec Microsoft
+                Exchange.</em:description>
+            </Description>
+        </em:localized>
+    </Description>
 </RDF>
diff --git a/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.xul b/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.xul
index 4433b59f..2a19a1e1 100644
--- a/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.xul
+++ b/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,14 +23,13 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE window [
+<!DOCTYPE window
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecontacts/locale/addressbookOverlay.dtd" > %dtd1;
 ]>
-
 <overlay id="exchange-adcard-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecontacts/content/abCardOverlay.js"/>
-
+    <script type="application/javascript"
+            src="chrome://exchangecontacts/content/abCardOverlay.js" />
 </overlay>
diff --git a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.xul b/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.xul
index a94c81bf..b48092b1 100644
--- a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.xul
+++ b/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,46 +23,52 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE window [
+<!DOCTYPE window
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecontacts/locale/addressbookOverlay.dtd" > %dtd1;
 ]>
-
-<?xml-stylesheet href="chrome://exchangecontacts/content/addressbookOverlay.css" type="text/css"?> 
-
+<?xml-stylesheet href="chrome://exchangecontacts/content/addressbookOverlay.css" type="text/css"?>
 <overlay id="addressbook-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecontacts/content/addressbookOverlay.js"/>
-
-	<commandset>
-		<command id="cmd_deleteexchange"
-			oncommand="tmpAddressbookOverlay.doDeleteExchangeAccount();"/>
-	</commandset>
-
-	<menupopup id="menu_EditPopup">
-		<menuseparator id="menuseparator_deleteexchangecontact"  insertafter="menu_delete"/>
-		<menuitem id="menu_deleteexchangecontact"
-			label="&deleteExchangeCmd.label;"
-			command="cmd_deleteexchange" 
-			insertafter="menuseparator_deleteexchangecontact"
-			disabled="true"/>
-	</menupopup>
-
-	<menupopup id="dirTreeContext">
-		<menuitem id="dirTreeContext_deleteexchangecontact"
-			label="&deleteExchangeCmd.label;"
-			command="cmd_deleteexchange" 
-			insertafter="dirTreeContext-delete"
-			hidden="true"/>
-	</menupopup>
-
-	<toolbox id="ab-toolbox"> 
-		<toolbar id="ab-bar2" defaultset="button-newcard,button-newlist,exchangecontacts-separator1,button-addexchangeaccount,button-deleteexchangeaccount,separator,button-editcard,button-newmessage,separator,button-abdelete,spring,search-container">  
+    <script type="application/javascript"
+            src="chrome://exchangecontacts/content/addressbookOverlay.js" />
+    <commandset>
+        <command id="cmd_deleteexchange"
+                 oncommand="tmpAddressbookOverlay.doDeleteExchangeAccount();" />
+    </commandset>
+    <menupopup id="menu_EditPopup">
+        <menuseparator id="menuseparator_deleteexchangecontact"
+                       insertafter="menu_delete" />
+        <menuitem id="menu_deleteexchangecontact"
+                  label="&deleteExchangeCmd.label;"
+                  command="cmd_deleteexchange"
+                  insertafter="menuseparator_deleteexchangecontact"
+                  disabled="true" />
+    </menupopup>
+    <menupopup id="dirTreeContext">
+        <menuitem id="dirTreeContext_deleteexchangecontact"
+                  label="&deleteExchangeCmd.label;"
+                  command="cmd_deleteexchange"
+                  insertafter="dirTreeContext-delete"
+                  hidden="true" />
+    </menupopup>
+    <toolbox id="ab-toolbox">
+        <toolbar id="ab-bar2"
+                 defaultset="button-newcard,button-newlist,exchangecontacts-separator1,button-addexchangeaccount,button-deleteexchangeaccount,separator,button-editcard,button-newmessage,separator,button-abdelete,spring,search-container">
 
-			<toolbarseparator id="exchangecontacts-separator1"/>
-			<toolbarbutton id="button-addexchangeaccount" label="&toolbar.button.label.addaccount;" tooltiptext="&toolbar.button.tooltip.addaccount;" removable="true" oncommand="tmpAddressbookOverlay.doAddExchangeAccount();"/>
-			<toolbarbutton id="button-deleteexchangeaccount" label="&toolbar.button.label.deleteaccount;" tooltiptext="&toolbar.button.tooltip.deleteaccount;" removable="true" oncommand="tmpAddressbookOverlay.doDeleteExchangeAccount();" hidden="true"/>
-		</toolbar>
-	</toolbox> 
+            <toolbarseparator id="exchangecontacts-separator1" />
+            <toolbarbutton id="button-addexchangeaccount"
+                           label="&toolbar.button.label.addaccount;"
+                           tooltiptext="&toolbar.button.tooltip.addaccount;"
+                           removable="true"
+                           oncommand="tmpAddressbookOverlay.doAddExchangeAccount();" />
+            <toolbarbutton id="button-deleteexchangeaccount"
+                           label="&toolbar.button.label.deleteaccount;"
+                           tooltiptext="&toolbar.button.tooltip.deleteaccount;"
+                           removable="true"
+                           oncommand="tmpAddressbookOverlay.doDeleteExchangeAccount();"
+                           hidden="true" />
+        </toolbar>
+    </toolbox>
 </overlay>
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul b/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul
index 0ce794ed..e94b75d0 100644
--- a/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul
+++ b/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,41 +23,35 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
+<!DOCTYPE dialog
+[
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecontacts/locale/exchangeContactSettings.dtd" > %dtd1;
 ]>
 <?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
-
-<dialog 
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  id="exchWebService_ContactSettings_dialog" 
-  title="Exchange Contact Settings" 
-  buttons="accept,cancel"
-  buttonlabelaccept="&label.acceptbutton;"
-  buttonlabelcancel="&label.cancelbutton;"
-  ondialogaccept="return tmpExchangeContactSettings.onSave();"
-  onload="tmpExchangeContactSettings.onLoad();">
-
-	<script type="application/javascript" src="chrome://exchangecontacts/content/exchangeContactSettings.js"/>
-
-	<hbox>
-		<label value="&label.ecExchangeSettings.title;"/>
-		<textbox id="exchWebService_contact_description"/>
-	</hbox>
-
-	    <hbox>
-		<label value="&exchangeWebService.preference.contacts.pollinterval;"/>
-		<textbox id="exchangeWebService_preference_contacts_pollinterval" 
-			preference="extensions.1st-setup.core.debuglevel"
-			increment="1" min="1" type="number"/>
-	    </hbox>
-
-	<checkbox label="&exchWebService.add.globaladdresslist.label;" id="exchWebService-add-globaladdresslist"/>
-
-	<vbox id="exchWebService-exchange-settings">
-	</vbox>
-
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="exchWebService_ContactSettings_dialog"
+        title="Exchange Contact Settings"
+        buttons="accept,cancel"
+        buttonlabelaccept="&label.acceptbutton;"
+        buttonlabelcancel="&label.cancelbutton;"
+        ondialogaccept="return tmpExchangeContactSettings.onSave();"
+        onload="tmpExchangeContactSettings.onLoad();">
+    <script type="application/javascript"
+            src="chrome://exchangecontacts/content/exchangeContactSettings.js" />
+    <hbox>
+        <label value="&label.ecExchangeSettings.title;" />
+        <textbox id="exchWebService_contact_description" />
+    </hbox>
+    <hbox>
+        <label value="&exchangeWebService.preference.contacts.pollinterval;" />
+        <textbox id="exchangeWebService_preference_contacts_pollinterval"
+                 preference="extensions.1st-setup.core.debuglevel"
+                 increment="1"
+                 min="1"
+                 type="number" />
+    </hbox>
+    <checkbox label="&exchWebService.add.globaladdresslist.label;"
+              id="exchWebService-add-globaladdresslist" />
+    <vbox id="exchWebService-exchange-settings"></vbox>
 </dialog>
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.xul b/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.xul
index f62d1a64..fe9d73a5 100644
--- a/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.xul
+++ b/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.xul
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: GPL 3.0
@@ -24,11 +23,10 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-
-<!DOCTYPE overlay >
-
+<!DOCTYPE overlay>
 <overlay id="exchangeContactsInit"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/javascript" src="chrome://exchangecontacts/content/exchangeContactsInit.js"/>
+    <script type="application/javascript"
+            src="chrome://exchangecontacts/content/exchangeContactsInit.js" />
 </overlay>
diff --git a/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml b/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
index 2cb24b93..8a6a21a2 100644
--- a/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
+++ b/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
@@ -1,6627 +1,11198 @@
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
-  <s:Header>
-    <h:ServerVersionInfo MajorVersion="14" MinorVersion="1" MajorBuildNumber="289" MinorBuildNumber="6" Version="Exchange2010_SP1" xmlns:h="http://schemas.microsoft.com/exchange/services/2006/types" xmlns="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
-  </s:Header>
-  <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <m:GetServerTimeZonesResponse xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types">
-      <m:ResponseMessages>
-        <m:GetServerTimeZonesResponseMessage ResponseClass="Success">
-          <m:ResponseCode>NoError</m:ResponseCode>
-          <m:TimeZoneDefinitions>
-            <t:TimeZoneDefinition Name="(UTC-12:00) International Date Line West" Id="Dateline Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT12H" Name="Standard" Id="trule:Microsoft/Registry/Dateline Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Dateline Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-11:00) Coordinated Universal Time-11" Id="UTC-11">
-              <t:Periods>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/UTC-11/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/UTC-11/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-11:00) Midway Island, Samoa" Id="Samoa Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2009-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Standard"/>
-                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Daylight"/>
-                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2009-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2018-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2018-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2019-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2019-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2020-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2020-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-10:00) Hawaii" Id="Hawaiian Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT10H" Name="Standard" Id="trule:Microsoft/Registry/Hawaiian Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Hawaiian Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-09:00) Alaska" Id="Alaskan Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT9H" Name="Standard" Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Standard"/>
-                <t:Period Bias="PT8H" Name="Daylight" Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT9H" Name="Standard" Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Standard"/>
-                <t:Period Bias="PT8H" Name="Daylight" Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-08:00) Pacific Time (US &amp; Canada)" Id="Pacific Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT8H" Name="Standard" Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Standard"/>
-                <t:Period Bias="PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT8H" Name="Standard" Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Standard"/>
-                <t:Period Bias="PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-08:00) Tijuana, Baja California" Id="Pacific Standard Time (Mexico)">
-              <t:Periods>
-                <t:Period Bias="PT8H" Name="Standard" Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Standard"/>
-                <t:Period Bias="PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-07:00) Arizona" Id="US Mountain Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/US Mountain Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/US Mountain Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-07:00) Chihuahua, La Paz, Mazatlan" Id="Mountain Standard Time (Mexico)">
-              <t:Periods>
-                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Standard"/>
-                <t:Period Bias="PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-07:00) Mountain Time (US &amp; Canada)" Id="Mountain Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Standard"/>
-                <t:Period Bias="PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Standard"/>
-                <t:Period Bias="PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-06:00) Central America" Id="Central America Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central America Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central America Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-06:00) Central Time (US &amp; Canada)" Id="Central Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Standard Time/2006-Standard"/>
-                <t:Period Bias="PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Central Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Standard Time/2007-Standard"/>
-                <t:Period Bias="PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Central Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-06:00) Guadalajara, Mexico City, Monterrey" Id="Central Standard Time (Mexico)">
-              <t:Periods>
-                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Standard"/>
-                <t:Period Bias="PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-06:00) Saskatchewan" Id="Canada Central Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Canada Central Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Canada Central Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-05:00) Bogota, Lima, Quito" Id="SA Pacific Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/SA Pacific Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/SA Pacific Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-05:00) Eastern Time (US &amp; Canada)" Id="Eastern Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Standard"/>
-                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Standard"/>
-                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-05:00) Indiana (East)" Id="US Eastern Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/US Eastern Standard Time/2005-Standard"/>
-                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Standard"/>
-                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Standard"/>
-                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2005-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-04:30) Caracas" Id="Venezuela Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Venezuela Standard Time/2006-Standard"/>
-                <t:Period Bias="PT4H30M" Name="Standard" Id="trule:Microsoft/Registry/Venezuela Standard Time/2007-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Venezuela Standard Time/2006-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Venezuela Standard Time/2007-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-04:00) Asuncion" Id="Paraguay Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2018-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2018-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2019-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2019-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="12">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2020-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2020-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="13">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2021-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2021-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">12</t:To>
-                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">13</t:To>
-                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-04:00) Atlantic Time (Canada)" Id="Atlantic Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-04:00) Georgetown, La Paz, San Juan" Id="SA Western Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/SA Western Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/SA Western Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-04:00) Manaus" Id="Central Brazilian Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="12">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="13">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="14">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="15">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="16">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="17">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="18">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="19">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="20">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="21">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="22">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="23">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="24">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="25">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="26">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="27">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="28">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="29">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="30">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="31">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="32">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="33">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="34">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">12</t:To>
-                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">13</t:To>
-                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">14</t:To>
-                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">15</t:To>
-                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">16</t:To>
-                  <t:DateTime>2022-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">17</t:To>
-                  <t:DateTime>2023-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">18</t:To>
-                  <t:DateTime>2024-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">19</t:To>
-                  <t:DateTime>2025-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">20</t:To>
-                  <t:DateTime>2026-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">21</t:To>
-                  <t:DateTime>2027-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">22</t:To>
-                  <t:DateTime>2028-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">23</t:To>
-                  <t:DateTime>2029-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">24</t:To>
-                  <t:DateTime>2030-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">25</t:To>
-                  <t:DateTime>2031-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">26</t:To>
-                  <t:DateTime>2032-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">27</t:To>
-                  <t:DateTime>2033-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">28</t:To>
-                  <t:DateTime>2034-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">29</t:To>
-                  <t:DateTime>2035-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">30</t:To>
-                  <t:DateTime>2036-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">31</t:To>
-                  <t:DateTime>2037-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">32</t:To>
-                  <t:DateTime>2038-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">33</t:To>
-                  <t:DateTime>2039-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">34</t:To>
-                  <t:DateTime>2040-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-04:00) Santiago" Id="Pacific SA Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Standard"/>
-                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Daylight"/>
-                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-03:30) Newfoundland" Id="Newfoundland Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Standard"/>
-                <t:Period Bias="PT2H30M" Name="Daylight" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Standard"/>
-                <t:Period Bias="PT2H30M" Name="Daylight" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT1M</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT1M</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT1M</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT1M</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-03:00) Brasilia" Id="E. South America Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="12">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2018-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2018-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="13">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2019-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2019-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="14">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2020-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2020-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="15">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2021-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2021-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="16">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2022-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2022-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="17">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2023-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2023-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="18">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2024-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2024-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="19">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2025-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2025-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="20">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2026-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2026-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="21">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2027-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2027-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="22">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2028-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2028-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="23">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2029-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2029-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="24">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2030-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2030-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="25">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2031-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2031-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="26">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2032-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2032-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="27">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2033-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2033-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="28">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2034-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2034-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="29">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2035-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2035-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="30">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2036-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2036-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="31">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2037-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2037-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="32">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2038-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2038-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="33">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2039-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2039-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="34">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2040-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>2</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2040-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">12</t:To>
-                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">13</t:To>
-                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">14</t:To>
-                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">15</t:To>
-                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">16</t:To>
-                  <t:DateTime>2022-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">17</t:To>
-                  <t:DateTime>2023-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">18</t:To>
-                  <t:DateTime>2024-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">19</t:To>
-                  <t:DateTime>2025-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">20</t:To>
-                  <t:DateTime>2026-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">21</t:To>
-                  <t:DateTime>2027-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">22</t:To>
-                  <t:DateTime>2028-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">23</t:To>
-                  <t:DateTime>2029-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">24</t:To>
-                  <t:DateTime>2030-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">25</t:To>
-                  <t:DateTime>2031-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">26</t:To>
-                  <t:DateTime>2032-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">27</t:To>
-                  <t:DateTime>2033-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">28</t:To>
-                  <t:DateTime>2034-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">29</t:To>
-                  <t:DateTime>2035-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">30</t:To>
-                  <t:DateTime>2036-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">31</t:To>
-                  <t:DateTime>2037-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">32</t:To>
-                  <t:DateTime>2038-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">33</t:To>
-                  <t:DateTime>2039-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">34</t:To>
-                  <t:DateTime>2040-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-03:00) Buenos Aires" Id="Argentina Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2006-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Standard"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2010-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2006-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Monday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>12</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2010-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-03:00) Cayenne" Id="SA Eastern Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/SA Eastern Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/SA Eastern Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-03:00) Greenland" Id="Greenland Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2018-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2018-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2019-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2019-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="12">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2020-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2020-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="13">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2021-Daylight</t:To>
-                    <t:TimeOffset>PT22H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2021-Standard</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">12</t:To>
-                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">13</t:To>
-                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-03:00) Montevideo" Id="Montevideo Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Standard"/>
-                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Daylight"/>
-                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-02:00) Coordinated Universal Time-02" Id="UTC-02">
-              <t:Periods>
-                <t:Period Bias="PT2H" Name="Standard" Id="trule:Microsoft/Registry/UTC-02/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/UTC-02/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-02:00) Mid-Atlantic" Id="Mid-Atlantic Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT2H" Name="Standard" Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Standard"/>
-                <t:Period Bias="PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-01:00) Azores" Id="Azores Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT1H" Name="Standard" Id="trule:Microsoft/Registry/Azores Standard Time/1-Standard"/>
-                <t:Period Bias="PT0H" Name="Daylight" Id="trule:Microsoft/Registry/Azores Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Azores Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Azores Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC-01:00) Cape Verde Is." Id="Cape Verde Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT1H" Name="Standard" Id="trule:Microsoft/Registry/Cape Verde Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Cape Verde Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC) Casablanca" Id="Morocco Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2007-Standard"/>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Daylight"/>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Daylight"/>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Standard"/>
-                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Daylight"/>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2011-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2007-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>5</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>8</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>5</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>8</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>5</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>8</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2011-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC) Coordinated Universal Time" Id="UTC">
-              <t:Periods>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/UTC/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/UTC/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London" Id="GMT Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/GMT Standard Time/1-Standard"/>
-                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/GMT Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/GMT Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT1H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/GMT Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC) Monrovia, Reykjavik" Id="Greenwich Standard Time">
-              <t:Periods>
-                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Greenwich Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Greenwich Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" Id="W. Europe Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Standard"/>
-                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Europe Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Europe Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" Id="Central Europe Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Standard"/>
-                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Europe Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Europe Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" Id="Romance Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Romance Standard Time/1-Standard"/>
-                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Romance Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Romance Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Romance Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" Id="Central European Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Central European Standard Time/1-Standard"/>
-                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Central European Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central European Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central European Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+01:00) West Central Africa" Id="W. Central Africa Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/W. Central Africa Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Central Africa Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Windhoek" Id="Namibia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Standard"/>
-                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Daylight"/>
-                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Amman" Id="Jordan Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT1H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT1H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Athens, Bucharest, Istanbul" Id="GTB Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/GTB Standard Time/1-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/GTB Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/GTB Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/GTB Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT4H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Beirut" Id="Middle East Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2018-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2018-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2019-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2019-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2020-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2020-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="12">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2021-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2021-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">12</t:To>
-                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Cairo" Id="Egypt Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2005-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2005-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>8</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>8</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Damascus" Id="Syria Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2006-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2010-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2010-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2011-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2011-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2012-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2012-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2013-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2013-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2014-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2014-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2015-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2015-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2016-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2016-Daylight"/>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2017-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2017-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Wednesday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2011-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2011-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="6">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2012-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2012-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="7">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2013-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2013-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="8">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2014-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2014-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="9">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2015-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2015-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="10">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2016-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2016-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="11">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2017-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2017-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">6</t:To>
-                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">7</t:To>
-                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">8</t:To>
-                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">9</t:To>
-                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">10</t:To>
-                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">11</t:To>
-                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Harare, Pretoria" Id="South Africa Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/South Africa Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/South Africa Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" Id="FLE Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/FLE Standard Time/1-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/FLE Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/FLE Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/FLE Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT4H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Jerusalem" Id="Israel Standard Time">
-               <t:Periods>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2004-Standard"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2005-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2005-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2006-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2006-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2007-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2007-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2008-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2008-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2009-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2009-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2010-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2010-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2011-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2011-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2012-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2012-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2013-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2013-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2014-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2014-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2015-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2015-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2016-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2016-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2017-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2017-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2018-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2018-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2019-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2019-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2020-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2020-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2021-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2021-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2022-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2022-Daylight"/>
-                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2023-Standard"/>
-                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2023-Daylight"/>
-               </t:Periods>
-               <t:TransitionsGroups>
-                  <t:TransitionsGroup Id="0">
-                     <t:Transition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2004-Standard</t:To>
-                     </t:Transition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="1">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2005-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>4</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2005-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>2</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="2">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2006-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2006-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="3">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2007-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2007-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>9</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>3</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="4">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2008-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2008-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="5">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2009-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2009-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>9</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="6">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2010-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2010-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>9</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>2</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="7">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2011-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>4</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2011-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="8">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2012-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2012-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>9</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>4</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="9">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2013-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2013-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="10">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2014-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2014-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="11">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2015-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2015-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="12">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2016-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2016-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="13">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2017-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>4</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2017-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="14">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2018-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>4</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2018-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="15">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2019-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2019-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="16">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2020-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2020-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="17">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2021-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2021-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="18">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2022-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2022-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-                  <t:TransitionsGroup Id="19">
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2023-Daylight</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>3</t:Month>
-                        <t:DayOfWeek>Friday</t:DayOfWeek>
-                        <t:Occurrence>4</t:Occurrence>
-                     </t:RecurringDayTransition>
-                     <t:RecurringDayTransition>
-                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2023-Standard</t:To>
-                        <t:TimeOffset>PT2H</t:TimeOffset>
-                        <t:Month>10</t:Month>
-                        <t:DayOfWeek>Sunday</t:DayOfWeek>
-                        <t:Occurrence>-1</t:Occurrence>
-                     </t:RecurringDayTransition>
-                  </t:TransitionsGroup>
-               </t:TransitionsGroups>
-               <t:Transitions>
-                  <t:Transition>
-                     <t:To Kind="Group">0</t:To>
-                  </t:Transition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">1</t:To>
-                     <t:DateTime>2005-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">2</t:To>
-                     <t:DateTime>2006-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">3</t:To>
-                     <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">4</t:To>
-                     <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">5</t:To>
-                     <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">6</t:To>
-                     <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">7</t:To>
-                     <t:DateTime>2011-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">8</t:To>
-                     <t:DateTime>2012-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">9</t:To>
-                     <t:DateTime>2013-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">10</t:To>
-                     <t:DateTime>2014-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">11</t:To>
-                     <t:DateTime>2015-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">12</t:To>
-                     <t:DateTime>2016-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">13</t:To>
-                     <t:DateTime>2017-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">14</t:To>
-                     <t:DateTime>2018-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">15</t:To>
-                     <t:DateTime>2019-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">16</t:To>
-                     <t:DateTime>2020-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">17</t:To>
-                     <t:DateTime>2021-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">18</t:To>
-                     <t:DateTime>2022-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-                  <t:AbsoluteDateTransition>
-                     <t:To Kind="Group">19</t:To>
-                     <t:DateTime>2023-01-01T00:00:00</t:DateTime>
-                  </t:AbsoluteDateTransition>
-               </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+02:00) Minsk" Id="E. Europe Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Standard"/>
-                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. Europe Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. Europe Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+03:00) Baghdad" Id="Arabic Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Daylight"/>
-                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arabic Standard Time/2008-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT4H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT4H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Monday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2008-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+03:00) Kuwait, Riyadh" Id="Arab Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arab Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arab Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+03:00) Moscow, St. Petersburg, Volgograd" Id="Russian Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Russian Standard Time/1-Standard"/>
-                <t:Period Bias="-PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Russian Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Russian Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Russian Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+03:00) Nairobi" Id="E. Africa Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. Africa Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. Africa Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+03:30) Tehran" Id="Iran Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2005-Standard"/>
-                <t:Period Bias="-PT4H30M" Name="Daylight" Id="trule:Microsoft/Registry/Iran Standard Time/2005-Daylight"/>
-                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT4H30M" Name="Daylight" Id="trule:Microsoft/Registry/Iran Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT4H30M" Name="Daylight" Id="trule:Microsoft/Registry/Iran Standard Time/2009-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2005-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2005-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Tuesday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2006-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2007-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Monday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+03:00) Tbilisi" Id="Georgian Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Georgian Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Georgian Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+04:00) Abu Dhabi, Muscat" Id="Arabian Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Arabian Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Arabian Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+04:00) Baku" Id="Azerbaijan Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Standard"/>
-                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Azerbaijan Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT4H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Azerbaijan Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT5H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+04:00) Port Louis" Id="Mauritius Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2010-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2007-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Tuesday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2010-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+04:00) Yerevan" Id="Caucasus Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Standard"/>
-                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Caucasus Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Caucasus Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+04:30) Kabul" Id="Afghanistan Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT4H30M" Name="Standard" Id="trule:Microsoft/Registry/Afghanistan Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Afghanistan Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+05:00) Ekaterinburg" Id="Ekaterinburg Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Standard"/>
-                <t:Period Bias="-PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+05:00) Islamabad, Karachi" Id="Pakistan Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2010-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2007-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>5</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Tuesday</t:DayOfWeek>
-                    <t:Occurrence>2</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Saturday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2010-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+05:00) Tashkent" Id="West Asia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/West Asia Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/West Asia Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" Id="India Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT5H30M" Name="Standard" Id="trule:Microsoft/Registry/India Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/India Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+05:30) Sri Jayawardenepura" Id="Sri Lanka Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT5H30M" Name="Standard" Id="trule:Microsoft/Registry/Sri Lanka Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Sri Lanka Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+05:45) Kathmandu" Id="Nepal Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT5H45M" Name="Standard" Id="trule:Microsoft/Registry/Nepal Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Nepal Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+06:00) Almaty, Novosibirsk" Id="N. Central Asia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Standard"/>
-                <t:Period Bias="-PT7H" Name="Daylight" Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/N. Central Asia Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/N. Central Asia Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+06:00) Astana" Id="Central Asia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Asia Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Asia Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+06:00) Dhaka" Id="Bangladesh Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2010-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2008-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT23H</t:TimeOffset>
-                    <t:Month>6</t:Month>
-                    <t:DayOfWeek>Friday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT23H59M</t:TimeOffset>
-                    <t:Month>12</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2010-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+06:30) Yangon (Rangoon)" Id="Myanmar Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT6H30M" Name="Standard" Id="trule:Microsoft/Registry/Myanmar Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Myanmar Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+07:00) Bangkok, Hanoi, Jakarta" Id="SE Asia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT7H" Name="Standard" Id="trule:Microsoft/Registry/SE Asia Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/SE Asia Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+07:00) Krasnoyarsk" Id="North Asia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT7H" Name="Standard" Id="trule:Microsoft/Registry/North Asia Standard Time/1-Standard"/>
-                <t:Period Bias="-PT8H" Name="Daylight" Id="trule:Microsoft/Registry/North Asia Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" Id="China Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/China Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/China Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+08:00) Irkutsk, Ulaan Bataar" Id="North Asia East Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Standard"/>
-                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia East Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia East Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+08:00) Kuala Lumpur, Singapore" Id="Singapore Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/Singapore Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Singapore Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+08:00) Perth" Id="W. Australia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2005-Standard"/>
-                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Daylight"/>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2010-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2005-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>12</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="3">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="4">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="5">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2010-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">3</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">4</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">5</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+08:00) Taipei" Id="Taipei Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/Taipei Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Taipei Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+08:00) Ulaanbaatar" Id="Ulaanbaatar Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/Ulaanbaatar Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Ulaanbaatar Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+09:00) Osaka, Sapporo, Tokyo" Id="Tokyo Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT9H" Name="Standard" Id="trule:Microsoft/Registry/Tokyo Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Tokyo Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+09:00) Seoul" Id="Korea Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT9H" Name="Standard" Id="trule:Microsoft/Registry/Korea Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Korea Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+09:00) Yakutsk" Id="Yakutsk Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT9H" Name="Standard" Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Standard"/>
-                <t:Period Bias="-PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Yakutsk Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Yakutsk Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+09:30) Adelaide" Id="Cen. Australia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT10H30M" Name="Daylight" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT9H30M" Name="Standard" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT10H30M" Name="Daylight" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT9H30M" Name="Standard" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+09:30) Darwin" Id="AUS Central Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT9H30M" Name="Standard" Id="trule:Microsoft/Registry/AUS Central Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Central Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+10:00) Brisbane" Id="E. Australia Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/E. Australia Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/E. Australia Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+10:00) Canberra, Melbourne, Sydney" Id="AUS Eastern Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+10:00) Guam, Port Moresby" Id="West Pacific Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/West Pacific Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/West Pacific Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+10:00) Hobart" Id="Tasmania Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+10:00) Vladivostok" Id="Vladivostok Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Standard"/>
-                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Vladivostok Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Vladivostok Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+11:00) Magadan" Id="Magadan Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT11H" Name="Standard" Id="trule:Microsoft/Registry/Magadan Standard Time/1-Standard"/>
-                <t:Period Bias="-PT12H" Name="Daylight" Id="trule:Microsoft/Registry/Magadan Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Magadan Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Magadan Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+11:00) Magadan, Solomon Is., New Caledonia" Id="Central Pacific Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT11H" Name="Standard" Id="trule:Microsoft/Registry/Central Pacific Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Central Pacific Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+12:00) Auckland, Wellington" Id="New Zealand Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Daylight"/>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Standard"/>
-                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Daylight"/>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Standard"/>
-                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Daylight"/>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2006-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2006-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2007-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>3</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2007-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2008-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>4</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2008-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>9</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+12:00) Coordinated Universal Time+12" Id="UTC+12">
-              <t:Periods>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/UTC+12/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/UTC+12/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+12:00) Fiji, Marshall Is." Id="Fiji Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Fiji Standard Time/2008-Standard"/>
-                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Daylight"/>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Standard"/>
-                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Daylight"/>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2008-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="1">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2009-Standard</t:To>
-                    <t:TimeOffset>PT0H</t:TimeOffset>
-                    <t:Month>1</t:Month>
-                    <t:DayOfWeek>Thursday</t:DayOfWeek>
-                    <t:Occurrence>1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2009-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>11</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-                <t:TransitionsGroup Id="2">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2010-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2010-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>4</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">1</t:To>
-                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-                <t:AbsoluteDateTransition>
-                  <t:To Kind="Group">2</t:To>
-                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
-                </t:AbsoluteDateTransition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+12:00) Petropavlovsk-Kamchatsky" Id="Kamchatka Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Standard"/>
-                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Daylight"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Kamchatka Standard Time/1-Daylight</t:To>
-                    <t:TimeOffset>PT2H</t:TimeOffset>
-                    <t:Month>3</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                  <t:RecurringDayTransition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Kamchatka Standard Time/1-Standard</t:To>
-                    <t:TimeOffset>PT3H</t:TimeOffset>
-                    <t:Month>10</t:Month>
-                    <t:DayOfWeek>Sunday</t:DayOfWeek>
-                    <t:Occurrence>-1</t:Occurrence>
-                  </t:RecurringDayTransition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-            <t:TimeZoneDefinition Name="(UTC+13:00) Nuku'alofa" Id="Tonga Standard Time">
-              <t:Periods>
-                <t:Period Bias="-PT13H" Name="Standard" Id="trule:Microsoft/Registry/Tonga Standard Time/1-Standard"/>
-              </t:Periods>
-              <t:TransitionsGroups>
-                <t:TransitionsGroup Id="0">
-                  <t:Transition>
-                    <t:To Kind="Period">trule:Microsoft/Registry/Tonga Standard Time/1-Standard</t:To>
-                  </t:Transition>
-                </t:TransitionsGroup>
-              </t:TransitionsGroups>
-              <t:Transitions>
-                <t:Transition>
-                  <t:To Kind="Group">0</t:To>
-                </t:Transition>
-              </t:Transitions>
-            </t:TimeZoneDefinition>
-          </m:TimeZoneDefinitions>
-        </m:GetServerTimeZonesResponseMessage>
-      </m:ResponseMessages>
-    </m:GetServerTimeZonesResponse>
-  </s:Body>
-</s:Envelope>
+    <s:Header>
+        <h:ServerVersionInfo MajorVersion="14"
+                             MinorVersion="1"
+                             MajorBuildNumber="289"
+                             MinorBuildNumber="6"
+                             Version="Exchange2010_SP1"
+                             xmlns:h="http://schemas.microsoft.com/exchange/services/2006/types"
+                             xmlns="http://schemas.microsoft.com/exchange/services/2006/types"
+                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                             xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
+    </s:Header>
+    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+        <m:GetServerTimeZonesResponse xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages"
+                                      xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types">
+
+            <m:ResponseMessages>
+                <m:GetServerTimeZonesResponseMessage ResponseClass="Success">
 
+                    <m:ResponseCode>NoError</m:ResponseCode>
+                    <m:TimeZoneDefinitions>
+                        <t:TimeZoneDefinition Name="(UTC-12:00) International Date Line West"
+                                              Id="Dateline Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Dateline Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Dateline
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-11:00) Coordinated Universal Time-11"
+                                              Id="UTC-11">
+                            <t:Periods>
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/UTC-11/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/UTC-11/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-11:00) Midway Island, Samoa"
+                                              Id="Samoa Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2009-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Standard" />
+                                <t:Period Bias="PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Daylight" />
+                                <t:Period Bias="PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Samoa
+                                        Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-10:00) Hawaii"
+                                              Id="Hawaiian Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Hawaiian Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Hawaiian
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-09:00) Alaska"
+                                              Id="Alaskan Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT9H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Standard" />
+                                <t:Period Bias="PT8H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT9H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Standard" />
+                                <t:Period Bias="PT8H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Alaskan
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Alaskan
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Alaskan
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Alaskan
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-08:00) Pacific Time (US &amp; Canada)"
+                                              Id="Pacific Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Standard" />
+                                <t:Period Bias="PT7H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Standard" />
+                                <t:Period Bias="PT7H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-08:00) Tijuana, Baja California"
+                                              Id="Pacific Standard Time (Mexico)">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Standard" />
+                                <t:Period Bias="PT7H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        Standard Time
+                                        (Mexico)/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        Standard Time
+                                        (Mexico)/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-07:00) Arizona"
+                                              Id="US Mountain Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT7H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/US Mountain Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/US
+                                        Mountain Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-07:00) Chihuahua, La Paz, Mazatlan"
+                                              Id="Mountain Standard Time (Mexico)">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT7H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Standard" />
+                                <t:Period Bias="PT6H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mountain
+                                        Standard Time
+                                        (Mexico)/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mountain
+                                        Standard Time
+                                        (Mexico)/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-07:00) Mountain Time (US &amp; Canada)"
+                                              Id="Mountain Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT7H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Standard" />
+                                <t:Period Bias="PT6H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT7H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Standard" />
+                                <t:Period Bias="PT6H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mountain
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mountain
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mountain
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mountain
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-06:00) Central America"
+                                              Id="Central America Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central America Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        America Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-06:00) Central Time (US &amp; Canada)"
+                                              Id="Central Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Standard Time/2006-Standard" />
+                                <t:Period Bias="PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Standard Time/2007-Standard" />
+                                <t:Period Bias="PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-06:00) Guadalajara, Mexico City, Monterrey"
+                                              Id="Central Standard Time (Mexico)">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Standard" />
+                                <t:Period Bias="PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Standard Time
+                                        (Mexico)/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Standard Time
+                                        (Mexico)/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-06:00) Saskatchewan"
+                                              Id="Canada Central Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Canada Central Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Canada
+                                        Central Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-05:00) Bogota, Lima, Quito"
+                                              Id="SA Pacific Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/SA Pacific Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/SA
+                                        Pacific Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-05:00) Eastern Time (US &amp; Canada)"
+                                              Id="Eastern Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Standard" />
+                                <t:Period Bias="PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Standard" />
+                                <t:Period Bias="PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Eastern
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Eastern
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Eastern
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Eastern
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-05:00) Indiana (East)"
+                                              Id="US Eastern Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2005-Standard" />
+                                <t:Period Bias="PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Standard" />
+                                <t:Period Bias="PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Standard" />
+                                <t:Period Bias="PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/US
+                                        Eastern Standard
+                                        Time/2005-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/US
+                                        Eastern Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/US
+                                        Eastern Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/US
+                                        Eastern Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/US
+                                        Eastern Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2006-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-04:30) Caracas"
+                                              Id="Venezuela Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Venezuela Standard Time/2006-Standard" />
+                                <t:Period Bias="PT4H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Venezuela Standard Time/2007-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Venezuela
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Venezuela
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-04:00) Asuncion"
+                                              Id="Paraguay Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="12">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="13">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2021-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Paraguay
+                                        Standard
+                                        Time/2021-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">12</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">13</t:To>
+                                    <t:DateTime>
+                                    2021-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-04:00) Atlantic Time (Canada)"
+                                              Id="Atlantic Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Atlantic
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Atlantic
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Atlantic
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Atlantic
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-04:00) Georgetown, La Paz, San Juan"
+                                              Id="SA Western Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/SA Western Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/SA
+                                        Western Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-04:00) Manaus"
+                                              Id="Central Brazilian Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="12">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="13">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="14">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="15">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2021-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2021-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="16">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2022-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2022-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="17">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2023-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2023-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="18">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2024-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2024-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="19">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2025-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2025-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="20">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2026-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2026-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="21">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2027-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2027-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="22">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2028-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2028-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="23">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2029-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2029-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="24">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2030-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2030-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="25">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2031-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2031-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="26">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2032-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2032-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="27">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2033-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2033-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="28">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2034-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2034-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="29">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2035-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2035-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="30">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2036-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2036-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="31">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2037-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2037-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="32">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2038-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2038-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="33">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2039-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2039-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="34">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2040-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Brazilian Standard
+                                        Time/2040-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">12</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">13</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">14</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">15</t:To>
+                                    <t:DateTime>
+                                    2021-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">16</t:To>
+                                    <t:DateTime>
+                                    2022-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">17</t:To>
+                                    <t:DateTime>
+                                    2023-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">18</t:To>
+                                    <t:DateTime>
+                                    2024-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">19</t:To>
+                                    <t:DateTime>
+                                    2025-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">20</t:To>
+                                    <t:DateTime>
+                                    2026-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">21</t:To>
+                                    <t:DateTime>
+                                    2027-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">22</t:To>
+                                    <t:DateTime>
+                                    2028-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">23</t:To>
+                                    <t:DateTime>
+                                    2029-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">24</t:To>
+                                    <t:DateTime>
+                                    2030-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">25</t:To>
+                                    <t:DateTime>
+                                    2031-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">26</t:To>
+                                    <t:DateTime>
+                                    2032-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">27</t:To>
+                                    <t:DateTime>
+                                    2033-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">28</t:To>
+                                    <t:DateTime>
+                                    2034-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">29</t:To>
+                                    <t:DateTime>
+                                    2035-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">30</t:To>
+                                    <t:DateTime>
+                                    2036-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">31</t:To>
+                                    <t:DateTime>
+                                    2037-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">32</t:To>
+                                    <t:DateTime>
+                                    2038-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">33</t:To>
+                                    <t:DateTime>
+                                    2039-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">34</t:To>
+                                    <t:DateTime>
+                                    2040-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-04:00) Santiago"
+                                              Id="Pacific SA Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Daylight" />
+                                <t:Period Bias="PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pacific
+                                        SA Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-03:30) Newfoundland"
+                                              Id="Newfoundland Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Standard" />
+                                <t:Period Bias="PT2H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Standard" />
+                                <t:Period Bias="PT2H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Newfoundland
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT1M</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Newfoundland
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT1M</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Newfoundland
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT1M</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Newfoundland
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT1M</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-03:00) Brasilia"
+                                              Id="E. South America Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="12">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="13">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="14">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="15">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2021-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2021-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="16">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2022-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2022-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="17">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2023-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2023-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="18">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2024-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2024-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="19">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2025-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2025-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="20">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2026-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2026-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="21">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2027-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2027-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="22">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2028-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2028-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="23">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2029-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2029-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="24">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2030-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2030-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="25">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2031-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2031-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="26">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2032-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2032-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="27">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2033-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2033-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="28">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2034-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2034-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="29">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2035-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2035-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="30">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2036-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2036-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="31">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2037-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2037-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="32">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2038-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2038-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="33">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2039-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2039-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="34">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2040-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>2</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        South America Standard
+                                        Time/2040-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">12</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">13</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">14</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">15</t:To>
+                                    <t:DateTime>
+                                    2021-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">16</t:To>
+                                    <t:DateTime>
+                                    2022-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">17</t:To>
+                                    <t:DateTime>
+                                    2023-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">18</t:To>
+                                    <t:DateTime>
+                                    2024-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">19</t:To>
+                                    <t:DateTime>
+                                    2025-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">20</t:To>
+                                    <t:DateTime>
+                                    2026-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">21</t:To>
+                                    <t:DateTime>
+                                    2027-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">22</t:To>
+                                    <t:DateTime>
+                                    2028-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">23</t:To>
+                                    <t:DateTime>
+                                    2029-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">24</t:To>
+                                    <t:DateTime>
+                                    2030-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">25</t:To>
+                                    <t:DateTime>
+                                    2031-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">26</t:To>
+                                    <t:DateTime>
+                                    2032-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">27</t:To>
+                                    <t:DateTime>
+                                    2033-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">28</t:To>
+                                    <t:DateTime>
+                                    2034-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">29</t:To>
+                                    <t:DateTime>
+                                    2035-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">30</t:To>
+                                    <t:DateTime>
+                                    2036-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">31</t:To>
+                                    <t:DateTime>
+                                    2037-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">32</t:To>
+                                    <t:DateTime>
+                                    2038-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">33</t:To>
+                                    <t:DateTime>
+                                    2039-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">34</t:To>
+                                    <t:DateTime>
+                                    2040-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-03:00) Buenos Aires"
+                                              Id="Argentina Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2006-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Standard" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2010-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Monday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>12</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Argentina
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-03:00) Cayenne"
+                                              Id="SA Eastern Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/SA Eastern Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/SA
+                                        Eastern Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-03:00) Greenland"
+                                              Id="Greenland Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="12">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="13">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2021-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT22H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenland
+                                        Standard
+                                        Time/2021-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">12</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">13</t:To>
+                                    <t:DateTime>
+                                    2021-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-03:00) Montevideo"
+                                              Id="Montevideo Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Standard" />
+                                <t:Period Bias="PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Daylight" />
+                                <t:Period Bias="PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Montevideo
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Montevideo
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Montevideo
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Montevideo
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-02:00) Coordinated Universal Time-02"
+                                              Id="UTC-02">
+                            <t:Periods>
+                                <t:Period Bias="PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/UTC-02/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/UTC-02/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-02:00) Mid-Atlantic"
+                                              Id="Mid-Atlantic Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Standard" />
+                                <t:Period Bias="PT1H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mid-Atlantic
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mid-Atlantic
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-01:00) Azores"
+                                              Id="Azores Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Azores Standard Time/1-Standard" />
+                                <t:Period Bias="PT0H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Azores Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Azores
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Azores
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC-01:00) Cape Verde Is."
+                                              Id="Cape Verde Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Cape Verde Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Cape
+                                        Verde Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC) Casablanca"
+                                              Id="Morocco Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2007-Standard" />
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT1H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Daylight" />
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT1H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Daylight" />
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Standard" />
+                                <t:Period Bias="-PT1H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Daylight" />
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2011-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>5</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>8</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>5</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>8</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>5</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>8</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Morocco
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC) Coordinated Universal Time"
+                                              Id="UTC">
+                            <t:Periods>
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/UTC/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/UTC/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London"
+                                              Id="GMT Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/GMT Standard Time/1-Standard" />
+                                <t:Period Bias="-PT1H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/GMT Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/GMT
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT1H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/GMT
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC) Monrovia, Reykjavik"
+                                              Id="Greenwich Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="PT0H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Greenwich Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Greenwich
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"
+                                              Id="W. Europe Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Standard" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Europe Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Europe Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"
+                                              Id="Central Europe Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Standard" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Europe Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Europe Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+01:00) Brussels, Copenhagen, Madrid, Paris"
+                                              Id="Romance Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Romance Standard Time/1-Standard" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Romance Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Romance
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Romance
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb"
+                                              Id="Central European Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central European Standard Time/1-Standard" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Central European Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        European Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        European Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+01:00) West Central Africa"
+                                              Id="W. Central Africa Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Central Africa Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Central Africa Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Windhoek"
+                                              Id="Namibia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Standard" />
+                                <t:Period Bias="-PT1H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Daylight" />
+                                <t:Period Bias="-PT1H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Namibia
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Namibia
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Namibia
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Namibia
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Amman"
+                                              Id="Jordan Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Jordan
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Jordan
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT1H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Jordan
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Jordan
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT1H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Athens, Bucharest, Istanbul"
+                                              Id="GTB Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/GTB Standard Time/1-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/GTB Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/GTB
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/GTB
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT4H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Beirut"
+                                              Id="Middle East Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="12">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2021-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Middle
+                                        East Standard
+                                        Time/2021-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">12</t:To>
+                                    <t:DateTime>
+                                    2021-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Cairo"
+                                              Id="Egypt Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2005-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2005-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>8</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>8</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Egypt
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2006-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Damascus"
+                                              Id="Syria Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2010-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2010-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2011-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2011-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2012-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2012-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2013-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2013-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2014-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2014-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2015-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2015-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2016-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2016-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2017-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Syria Standard Time/2017-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Wednesday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Syria
+                                        Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Harare, Pretoria"
+                                              Id="South Africa Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/South Africa Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/South
+                                        Africa Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius"
+                                              Id="FLE Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/FLE Standard Time/1-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/FLE Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/FLE
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/FLE
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT4H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Jerusalem"
+                                              Id="Israel Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2004-Standard" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2005-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2005-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2010-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2010-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2011-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2011-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2012-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2012-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2013-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2013-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2014-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2014-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2015-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2015-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2016-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2016-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2017-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2017-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2018-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2018-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2019-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2019-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2020-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2020-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2021-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2021-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2022-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2022-Daylight" />
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2023-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Israel Standard Time/2023-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2004-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2005-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2005-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="6">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="7">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2011-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2011-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="8">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2012-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2012-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="9">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2013-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2013-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="10">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2014-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2014-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="11">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2015-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2015-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="12">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2016-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2016-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="13">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2017-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2017-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="14">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2018-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2018-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="15">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2019-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2019-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="16">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2020-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2020-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="17">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2021-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2021-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="18">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2022-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2022-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="19">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2023-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Israel
+                                        Standard
+                                        Time/2023-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2005-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2006-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">6</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">7</t:To>
+                                    <t:DateTime>
+                                    2011-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">8</t:To>
+                                    <t:DateTime>
+                                    2012-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">9</t:To>
+                                    <t:DateTime>
+                                    2013-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">10</t:To>
+                                    <t:DateTime>
+                                    2014-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">11</t:To>
+                                    <t:DateTime>
+                                    2015-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">12</t:To>
+                                    <t:DateTime>
+                                    2016-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">13</t:To>
+                                    <t:DateTime>
+                                    2017-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">14</t:To>
+                                    <t:DateTime>
+                                    2018-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">15</t:To>
+                                    <t:DateTime>
+                                    2019-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">16</t:To>
+                                    <t:DateTime>
+                                    2020-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">17</t:To>
+                                    <t:DateTime>
+                                    2021-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">18</t:To>
+                                    <t:DateTime>
+                                    2022-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">19</t:To>
+                                    <t:DateTime>
+                                    2023-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+02:00) Minsk"
+                                              Id="E. Europe Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT2H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Standard" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        Europe Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        Europe Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+03:00) Baghdad"
+                                              Id="Arabic Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2008-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arabic
+                                        Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arabic
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT4H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arabic
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arabic
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT4H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Monday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arabic
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+03:00) Kuwait, Riyadh"
+                                              Id="Arab Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Arab Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arab
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+03:00) Moscow, St. Petersburg, Volgograd"
+                                              Id="Russian Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Russian Standard Time/1-Standard" />
+                                <t:Period Bias="-PT4H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Russian Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Russian
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Russian
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+03:00) Nairobi"
+                                              Id="E. Africa Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT3H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. Africa Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        Africa Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+03:30) Tehran"
+                                              Id="Iran Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2005-Standard" />
+                                <t:Period Bias="-PT4H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2005-Daylight" />
+                                <t:Period Bias="-PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT4H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT3H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT4H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Iran Standard Time/2009-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2005-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2005-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Tuesday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2006-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Iran
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Monday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2006-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+03:00) Tbilisi"
+                                              Id="Georgian Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Georgian Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Georgian
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+04:00) Abu Dhabi, Muscat"
+                                              Id="Arabian Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Arabian Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Arabian
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+04:00) Baku"
+                                              Id="Azerbaijan Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Standard" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Azerbaijan
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT4H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Azerbaijan
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT5H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+04:00) Port Louis"
+                                              Id="Mauritius Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2010-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mauritius
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mauritius
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Tuesday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mauritius
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mauritius
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mauritius
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Mauritius
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+04:00) Yerevan"
+                                              Id="Caucasus Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT4H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Standard" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Caucasus
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Caucasus
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+04:30) Kabul"
+                                              Id="Afghanistan Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT4H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Afghanistan Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Afghanistan
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+05:00) Ekaterinburg"
+                                              Id="Ekaterinburg Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Standard" />
+                                <t:Period Bias="-PT6H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Ekaterinburg
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Ekaterinburg
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+05:00) Islamabad, Karachi"
+                                              Id="Pakistan Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT6H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT6H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2010-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pakistan
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pakistan
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>5</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pakistan
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pakistan
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Tuesday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        2</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pakistan
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M59.999S</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Saturday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Pakistan
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+05:00) Tashkent"
+                                              Id="West Asia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT5H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/West Asia Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/West
+                                        Asia Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi"
+                                              Id="India Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT5H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/India Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/India
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+05:30) Sri Jayawardenepura"
+                                              Id="Sri Lanka Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT5H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Sri Lanka Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Sri
+                                        Lanka Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+05:45) Kathmandu"
+                                              Id="Nepal Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT5H45M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Nepal Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Nepal
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+06:00) Almaty, Novosibirsk"
+                                              Id="N. Central Asia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Standard" />
+                                <t:Period Bias="-PT7H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/N.
+                                        Central Asia Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/N.
+                                        Central Asia Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+06:00) Astana"
+                                              Id="Central Asia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Asia Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Asia Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+06:00) Dhaka"
+                                              Id="Bangladesh Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT7H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT6H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2010-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Bangladesh
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Bangladesh
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT23H</t:TimeOffset>
+                                        <t:Month>6</t:Month>
+                                        <t:DayOfWeek>
+                                        Friday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Bangladesh
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT23H59M</t:TimeOffset>
+                                        <t:Month>12</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Bangladesh
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+06:30) Yangon (Rangoon)"
+                                              Id="Myanmar Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT6H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Myanmar Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Myanmar
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+07:00) Bangkok, Hanoi, Jakarta"
+                                              Id="SE Asia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT7H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/SE Asia Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/SE
+                                        Asia Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+07:00) Krasnoyarsk"
+                                              Id="North Asia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT7H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/North Asia Standard Time/1-Standard" />
+                                <t:Period Bias="-PT8H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/North Asia Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/North
+                                        Asia Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/North
+                                        Asia Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi"
+                                              Id="China Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/China Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/China
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+08:00) Irkutsk, Ulaan Bataar"
+                                              Id="North Asia East Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Standard" />
+                                <t:Period Bias="-PT9H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/North
+                                        Asia East Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/North
+                                        Asia East Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+08:00) Kuala Lumpur, Singapore"
+                                              Id="Singapore Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Singapore Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Singapore
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+08:00) Perth"
+                                              Id="W. Australia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2005-Standard" />
+                                <t:Period Bias="-PT9H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT9H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT9H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT9H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2010-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2005-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>12</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="3">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="4">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="5">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/W.
+                                        Australia Standard
+                                        Time/2010-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2006-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">3</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">4</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">5</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+08:00) Taipei"
+                                              Id="Taipei Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Taipei Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Taipei
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+08:00) Ulaanbaatar"
+                                              Id="Ulaanbaatar Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT8H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Ulaanbaatar Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Ulaanbaatar
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+09:00) Osaka, Sapporo, Tokyo"
+                                              Id="Tokyo Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT9H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Tokyo Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Tokyo
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+09:00) Seoul"
+                                              Id="Korea Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT9H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Korea Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Korea
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+09:00) Yakutsk"
+                                              Id="Yakutsk Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT9H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Standard" />
+                                <t:Period Bias="-PT10H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Yakutsk
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Yakutsk
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+09:30) Adelaide"
+                                              Id="Cen. Australia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT10H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT9H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT10H30M"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT9H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Cen.
+                                        Australia Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Cen.
+                                        Australia Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Cen.
+                                        Australia Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Cen.
+                                        Australia Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+09:30) Darwin"
+                                              Id="AUS Central Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT9H30M"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/AUS Central Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/AUS
+                                        Central Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+10:00) Brisbane"
+                                              Id="E. Australia Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/E. Australia Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/E.
+                                        Australia Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+10:00) Canberra, Melbourne, Sydney"
+                                              Id="AUS Eastern Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT11H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT11H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/AUS
+                                        Eastern Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/AUS
+                                        Eastern Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/AUS
+                                        Eastern Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/AUS
+                                        Eastern Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+10:00) Guam, Port Moresby"
+                                              Id="West Pacific Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/West Pacific Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/West
+                                        Pacific Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+10:00) Hobart"
+                                              Id="Tasmania Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT11H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT11H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Tasmania
+                                        Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Tasmania
+                                        Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Tasmania
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Tasmania
+                                        Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+10:00) Vladivostok"
+                                              Id="Vladivostok Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT10H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Standard" />
+                                <t:Period Bias="-PT11H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Vladivostok
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Vladivostok
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+11:00) Magadan"
+                                              Id="Magadan Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Magadan Standard Time/1-Standard" />
+                                <t:Period Bias="-PT12H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Magadan Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Magadan
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Magadan
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+11:00) Magadan, Solomon Is., New Caledonia"
+                                              Id="Central Pacific Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT11H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Central Pacific Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Central
+                                        Pacific Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+12:00) Auckland, Wellington"
+                                              Id="New Zealand Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT13H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Daylight" />
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Standard" />
+                                <t:Period Bias="-PT13H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Daylight" />
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Standard" />
+                                <t:Period Bias="-PT13H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Daylight" />
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/New
+                                        Zealand Standard
+                                        Time/2006-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/New
+                                        Zealand Standard
+                                        Time/2006-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/New
+                                        Zealand Standard
+                                        Time/2007-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        3</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/New
+                                        Zealand Standard
+                                        Time/2007-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/New
+                                        Zealand Standard
+                                        Time/2008-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>4</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/New
+                                        Zealand Standard
+                                        Time/2008-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>9</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2007-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2008-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+12:00) Coordinated Universal Time+12"
+                                              Id="UTC+12">
+                            <t:Periods>
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/UTC+12/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/UTC+12/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+12:00) Fiji, Marshall Is."
+                                              Id="Fiji Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2008-Standard" />
+                                <t:Period Bias="-PT13H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Daylight" />
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Standard" />
+                                <t:Period Bias="-PT13H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Daylight" />
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Fiji
+                                        Standard
+                                        Time/2008-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="1">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Fiji
+                                        Standard
+                                        Time/2009-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT0H</t:TimeOffset>
+                                        <t:Month>1</t:Month>
+                                        <t:DayOfWeek>
+                                        Thursday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Fiji
+                                        Standard
+                                        Time/2009-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>11</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                                <t:TransitionsGroup Id="2">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Fiji
+                                        Standard
+                                        Time/2010-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Fiji
+                                        Standard
+                                        Time/2010-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        4</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">1</t:To>
+                                    <t:DateTime>
+                                    2009-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                                <t:AbsoluteDateTransition>
+                                    <t:To Kind="Group">2</t:To>
+                                    <t:DateTime>
+                                    2010-01-01T00:00:00</t:DateTime>
+                                </t:AbsoluteDateTransition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+12:00) Petropavlovsk-Kamchatsky"
+                                              Id="Kamchatka Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT12H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Standard" />
+                                <t:Period Bias="-PT13H"
+                                          Name="Daylight"
+                                          Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Daylight" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Kamchatka
+                                        Standard
+                                        Time/1-Daylight</t:To>
+                                        <t:TimeOffset>
+                                        PT2H</t:TimeOffset>
+                                        <t:Month>3</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                    <t:RecurringDayTransition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Kamchatka
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                        <t:TimeOffset>
+                                        PT3H</t:TimeOffset>
+                                        <t:Month>10</t:Month>
+                                        <t:DayOfWeek>
+                                        Sunday</t:DayOfWeek>
+                                        <t:Occurrence>
+                                        -1</t:Occurrence>
+                                    </t:RecurringDayTransition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                        <t:TimeZoneDefinition Name="(UTC+13:00) Nuku'alofa"
+                                              Id="Tonga Standard Time">
+                                              
+                            <t:Periods>
+                                <t:Period Bias="-PT13H"
+                                          Name="Standard"
+                                          Id="trule:Microsoft/Registry/Tonga Standard Time/1-Standard" />
+                            </t:Periods>
+                            <t:TransitionsGroups>
+                                <t:TransitionsGroup Id="0">
+                                    <t:Transition>
+                                        <t:To Kind="Period">
+                                        trule:Microsoft/Registry/Tonga
+                                        Standard
+                                        Time/1-Standard</t:To>
+                                    </t:Transition>
+                                </t:TransitionsGroup>
+                            </t:TransitionsGroups>
+                            <t:Transitions>
+                                <t:Transition>
+                                    <t:To Kind="Group">0</t:To>
+                                </t:Transition>
+                            </t:Transitions>
+                        </t:TimeZoneDefinition>
+                    </m:TimeZoneDefinitions>
+                </m:GetServerTimeZonesResponseMessage>
+            </m:ResponseMessages>
+        </m:GetServerTimeZonesResponse>
+    </s:Body>
+</s:Envelope>

From c8eca664ec6768b681f11fb7b30fa173c94d2b48 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 24 Oct 2017 14:32:24 +0200
Subject: [PATCH 137/222] l10n: fix last commit about Transifex and set en as
 default locale

Last commit for Transifex has been made too fast and it has broken some localisations like fr-FR by applying "find and replace".
---
 chrome.manifest                                    | 14 ++++++++------
 .../exchangeAddressBook.manifest                   |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 3973e104..d1f5b9c6 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -43,17 +43,19 @@ overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/cont
 overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/content/folderPropsOverlay.xul
 overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/rtews-overlay.xul
 
-locale exchangecalendar nl locale/exchangecalendar/nl/
+
 locale exchangecalendar en locale/exchangecalendar/en/
-locale exchangecalendar en_US locale/exchangecalendar/en_US/
-locale exchangecalendar fr_FR locale/exchangecalendar/fr_FR/
+
+locale exchangecalendar nl locale/exchangecalendar/nl/
+locale exchangecalendar en-US locale/exchangecalendar/en_US/
+locale exchangecalendar fr-FR locale/exchangecalendar/fr_FR/
 locale exchangecalendar de locale/exchangecalendar/de/
-locale exchangecalendar ja_JP locale/exchangecalendar/ja_JP/
+locale exchangecalendar ja-JP locale/exchangecalendar/ja_JP/
 locale exchangecalendar sv locale/exchangecalendar/sv/
 locale exchangecalendar ru locale/exchangecalendar/ru/
-locale exchangecalendar it_IT locale/exchangecalendar/it_IT/
+locale exchangecalendar it-IT locale/exchangecalendar/it_IT/
 locale exchangecalendar tr locale/exchangecalendar/tr/
-locale exchangecalendar cs_CZ locale/exchangecalendar/cs_CZ/
+locale exchangecalendar cs-CZ locale/exchangecalendar/cs_CZ/
 
 manifest interfaces/exchangeCalendar/mivExchangeCalendar.manifest
 
diff --git a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
index 09479293..6a59ffbf 100644
--- a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
+++ b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
@@ -10,8 +10,9 @@ manifest exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
 manifest exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
 manifest exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
 
-locale exchangecontacts nl    locale/exchangecontacts/nl/
 locale exchangecontacts en    locale/exchangecontacts/en/
+
+locale exchangecontacts nl    locale/exchangecontacts/nl/
 locale exchangecontacts en-US locale/exchangecontacts/en_US/
 locale exchangecontacts fr-FR locale/exchangecontacts/fr_FR/
 locale exchangecontacts de    locale/exchangecontacts/de/

From 9045fd4cc8cb68faed66826cf86541eaf6e689eb Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 26 Oct 2017 21:21:05 +0200
Subject: [PATCH 138/222] Makefile: javascript beautifier end files with a
 newline

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 8e0b7db7..1fd8ffff 100644
--- a/Makefile
+++ b/Makefile
@@ -53,4 +53,5 @@ beautify-js:
 	find -name "*.js" -exec \
 		js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \
 		--operator-position after-newline --brace-style end-expand --replace \
+		--end-with-newline \
 		{} \;

From 380704b1eb231c524a841fb27328cff93d5d6210 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 26 Oct 2017 22:32:17 +0200
Subject: [PATCH 139/222] Makefile: beautify-xml doesn't wrap any more RDF
 files to keep em:description tag on one line

By default, Tidy defines a wrap at column 68.
---
 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1fd8ffff..94c2b398 100644
--- a/Makefile
+++ b/Makefile
@@ -44,11 +44,17 @@ dev: beautify build
 beautify: beautify-xml beautify-js
 
 beautify-xml:
-	find \( -name "*.xml" -o -name "*.rdf" -o -name "*.xul" \) -exec \
+	find \( -name "*.xml" -o -name "*.xul" \) -exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes \
-		 {} \;
+		{} \;
+	# For rdf files, we don't want to wrap lines to keep em:description on one line.
+	find -name "*.rdf" -exec \
+		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
+		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
+		--strict-tags-attributes no --write-back yes --wrap 0 \
+		{} \;
 beautify-js:
 	find -name "*.js" -exec \
 		js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \

From e2b586fd6761755eaaf29c4ed48a149a9cfbea17 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 26 Oct 2017 23:01:55 +0200
Subject: [PATCH 140/222] install.rdf: apply again the beautifier to remove the
 automatic wrap

---
 install.rdf | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/install.rdf b/install.rdf
index 1128d8cd..cb2dc3d2 100644
--- a/install.rdf
+++ b/install.rdf
@@ -7,8 +7,7 @@
         <em:targetApplication>
             <Description>
                 <!-- Thunderbird -->
-                <em:id>
-                {3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+                <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
                 <em:minVersion>52.0.0</em:minVersion>
                 <em:maxVersion>52.*.*</em:maxVersion>
             </Description>
@@ -16,18 +15,15 @@
         <em:targetApplication>
             <Description>
                 <!-- Seamonkey -->
-                <em:id>
-                {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
                 <em:minVersion>2.49.*</em:minVersion>
                 <em:maxVersion>2.49.*</em:maxVersion>
             </Description>
         </em:targetApplication>
         <em:unpack>true</em:unpack>
         <em:name>Exchange Calendar</em:name>
-        <em:homepageURL>
-        https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
-        <em:iconURL>
-        chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
+        <em:homepageURL>https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
+        <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
         <em:creator>Michel Verbraak</em:creator>
         <em:developer>ExchangeCalendar community</em:developer>
         <em:translator>Michel Verbraak (nl)</em:translator>
@@ -43,18 +39,14 @@
             <Description>
                 <em:locale>en</em:locale>
                 <em:name>Exchange Calendar</em:name>
-                <em:description>Allows you to sync calendars,
-                tasks, and contacts with Microsoft
-                Exchange.</em:description>
+                <em:description>Allows you to sync calendars, tasks, and contacts with Microsoft Exchange.</em:description>
             </Description>
         </em:localized>
         <em:localized>
             <Description>
                 <em:locale>fr</em:locale>
                 <em:name>Exchange Calendar</em:name>
-                <em:description>Vous permet de synchroniser les
-                calendriers, tâches et contactes avec Microsoft
-                Exchange.</em:description>
+                <em:description>Vous permet de synchroniser les calendriers, tâches et contactes avec Microsoft Exchange.</em:description>
             </Description>
         </em:localized>
     </Description>

From c6583376fcac66fde34955e3d5a16edbb077a824 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 26 Oct 2017 23:27:33 +0200
Subject: [PATCH 141/222] manifest: set alphabetical order for locale lines
 except the first one used by default

---
 chrome.manifest                                        | 10 +++++-----
 .../exchangeAddressBook/exchangeAddressBook.manifest   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index d1f5b9c6..91434d6c 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -46,16 +46,16 @@ overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/conte
 
 locale exchangecalendar en locale/exchangecalendar/en/
 
-locale exchangecalendar nl locale/exchangecalendar/nl/
+locale exchangecalendar cs-CZ locale/exchangecalendar/cs_CZ/
+locale exchangecalendar de locale/exchangecalendar/de/
 locale exchangecalendar en-US locale/exchangecalendar/en_US/
 locale exchangecalendar fr-FR locale/exchangecalendar/fr_FR/
-locale exchangecalendar de locale/exchangecalendar/de/
+locale exchangecalendar it-IT locale/exchangecalendar/it_IT/
 locale exchangecalendar ja-JP locale/exchangecalendar/ja_JP/
-locale exchangecalendar sv locale/exchangecalendar/sv/
+locale exchangecalendar nl locale/exchangecalendar/nl/
 locale exchangecalendar ru locale/exchangecalendar/ru/
-locale exchangecalendar it-IT locale/exchangecalendar/it_IT/
+locale exchangecalendar sv locale/exchangecalendar/sv/
 locale exchangecalendar tr locale/exchangecalendar/tr/
-locale exchangecalendar cs-CZ locale/exchangecalendar/cs_CZ/
 
 manifest interfaces/exchangeCalendar/mivExchangeCalendar.manifest
 
diff --git a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
index 6a59ffbf..f9eae155 100644
--- a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
+++ b/interfaces/exchangeAddressBook/exchangeAddressBook.manifest
@@ -12,10 +12,10 @@ manifest exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
 
 locale exchangecontacts en    locale/exchangecontacts/en/
 
-locale exchangecontacts nl    locale/exchangecontacts/nl/
+locale exchangecontacts de    locale/exchangecontacts/de/
 locale exchangecontacts en-US locale/exchangecontacts/en_US/
 locale exchangecontacts fr-FR locale/exchangecontacts/fr_FR/
-locale exchangecontacts de    locale/exchangecontacts/de/
 locale exchangecontacts ja-JP locale/exchangecontacts/ja_JP/
-locale exchangecontacts sv    locale/exchangecontacts/sv/
+locale exchangecontacts nl    locale/exchangecontacts/nl/
 locale exchangecontacts ru    locale/exchangecontacts/ru/
+locale exchangecontacts sv    locale/exchangecontacts/sv/

From 2dd95c4162f2395bc96fd43983d7b834b7031cb5 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 28 Oct 2017 00:21:07 +0200
Subject: [PATCH 142/222] Beautify automatically all JavaScript code with
 command 'make beautify-js'

---
 chrome/content/OutOfOfficeMenu.js             |   130 +-
 chrome/content/addressingWidgetOverlay.js     |    36 +-
 chrome/content/adutils.js                     |   492 +-
 chrome/content/attachments-view.js            |  1166 +-
 chrome/content/browseFolder.js                |   680 +-
 chrome/content/calendar-calendars-list.js     |   421 +-
 chrome/content/calendar-common-sets.js        |   153 +-
 .../content/calendar-event-dialog-reminder.js |   201 +-
 chrome/content/calendar-event-dialog.js       |    91 +-
 chrome/content/calendar-properties-dialog.js  |    66 +-
 chrome/content/calendar-summary-dialog.js     |  1260 +-
 chrome/content/calendar-task-view.js          |   178 +-
 chrome/content/check4lightning.js             |   409 +-
 chrome/content/debugPreferences.js            |    61 +-
 chrome/content/delegateCalendar.js            |  1752 +-
 chrome/content/delegateFolder.js              |  1451 +-
 chrome/content/ecCalendarCreation.js          |   351 +-
 chrome/content/exchangeCloneSettings.js       |   117 +-
 chrome/content/exchangeSettings.js            |   724 +-
 chrome/content/exchangeSettingsOverlay.js     |  1850 +-
 chrome/content/invitationResponse.js          |   186 +-
 chrome/content/invite-style.js                |   476 +-
 chrome/content/lightning-item-iframe.js       |   556 +-
 chrome/content/lightningtimezoneOverlay.js    |   133 +-
 chrome/content/manageEWSAccounts.js           |   787 +-
 chrome/content/manageEWSAccountsMenu.js       |    16 +-
 chrome/content/messenger_task_delegation.js   |   245 +-
 chrome/content/msgHdrUtils.js                 |   379 +-
 chrome/content/offlineCacheSettings.js        |   265 +-
 chrome/content/oofSettings.js                 |   387 +-
 chrome/content/otherPreferences.js            |    82 +-
 chrome/content/preInvitationResponse.js       |    52 +-
 chrome/content/priority-display.js            |   379 +-
 chrome/content/progress_panel.js              |   316 +-
 chrome/content/rtews.js                       |  2043 +-
 chrome/content/selectEWSUrl.js                |    66 +-
 chrome/content/sendUpdateTo.js                |    16 +-
 chrome/content/sharedCalendarParser.js        |   199 +-
 chrome/content/timezonePreference.js          |    54 +-
 components/ecExchangeRequest.js               |  3073 +--
 components/ecFunctions.js                     |   214 +-
 components/erAddDelegateRequest.js            |   249 +-
 components/erAutoDiscover.js                  |   288 +-
 components/erAutoDiscoverySOAP.js             |   328 +-
 components/erBrowseFolder.js                  |   256 +-
 components/erConvertID.js                     |   177 +-
 components/erCreateAttachment.js              |   292 +-
 components/erCreateItem.js                    |   196 +-
 components/erDeleteAttachment.js              |   176 +-
 components/erDeleteItem.js                    |   286 +-
 components/erExpandDL.js                      |   188 +-
 components/erFindCalendarItems.js             |   479 +-
 components/erFindContacts.js                  |   292 +-
 components/erFindFolder.js                    |   306 +-
 components/erFindFollowupItems.js             |   173 +-
 components/erFindInboxFolder.js               |   305 +-
 components/erFindItems.js                     |   278 +-
 components/erFindMasterOccurrences.js         |   531 +-
 components/erFindOccurrences.js               |   422 +-
 components/erFindTaskItems.js                 |   146 +-
 components/erForewardItem.js                  |   203 +-
 components/erGetAttachments.js                |   183 +-
 components/erGetContacts.js                   |   212 +-
 components/erGetDelegateRequest.js            |   292 +-
 components/erGetEvents.js                     |   168 +-
 components/erGetFolder.js                     |   224 +-
 components/erGetFolderPermission.js           |   365 +-
 components/erGetItems.js                      |   770 +-
 components/erGetMasterOccurrenceId.js         |   144 +-
 components/erGetMeetingRequestByUID.js        |   272 +-
 components/erGetOccurrenceIndex.js            |   292 +-
 components/erGetTimeZones.js                  |   150 +-
 components/erGetUserAvailability.js           |   254 +-
 components/erGetUserOofSettings.js            |   202 +-
 components/erPrimarySMTPCheck.js              |   204 +-
 components/erRemoveDelegateRequest.js         |   197 +-
 components/erResolveNames.js                  |   234 +-
 components/erSendMeetingRespons.js            |   244 +-
 components/erSetUserOofSettings.js            |   166 +-
 components/erSubscribe.js                     |   242 +-
 components/erSyncContactsFolder.js            |   335 +-
 components/erSyncFolderItems.js               |   426 +-
 components/erSyncInbox.js                     |   346 +-
 components/erUnsubscribe.js                   |   160 +-
 components/erUpdateDelegateRequest.js         |   257 +-
 components/erUpdateFolderPermission.js        |   229 +-
 components/erUpdateItem.js                    |   263 +-
 components/exchangeAbFunctions.js             |   511 +-
 components/soapFunctions.js                   |   119 +-
 defaults/preferences/debug.js                 |     8 +-
 defaults/preferences/rtews.prefs.js           |     2 +-
 defaults/preferences/update.js                |     2 +-
 .../mivExchangeMsgAccountManagerExtension.js  |   110 +-
 .../mivExchangeMsgIncomingServer.js           |  2035 +-
 .../mivExchangeMsgProtocolInfo.js             |   208 +-
 .../mivExchangeAccountManager.js              |   363 +-
 .../chrome/content/abCardOverlay.js           |   172 +-
 .../chrome/content/addressbookOverlay.js      |   435 +-
 .../chrome/content/exchangeContactSettings.js |   166 +-
 .../chrome/content/exchangeContactsInit.js    |    35 +-
 .../exchangeAbCard/mivExchangeAbCard.js       |  1087 +-
 .../exchangeAbDirFactory.js                   |    75 +-
 .../exchangeAbDistListDirectory.js            |  2723 +-
 .../exchangeAbFolderDirectory.js              |  2882 +--
 .../exchangeAbRootDirectory.js                |  1583 +-
 .../exchangeAttendee/mivExchangeAttendee.js   |   606 +-
 .../mivExchangeAuthPrompt2.js                 |  1511 +-
 .../mivExchangeAuthPromptProvider.js          |   119 +-
 .../mivExchangeAutoCompleteResult.js          |   519 +-
 .../mivExchangeAutoCompleteSearch.js          |   374 +-
 .../mivExchangeBadCertListener2.js            |   248 +-
 .../exchangeBaseItem/mivExchangeBaseItem.js   |  7657 +++---
 .../exchangeCalendar/mivExchangeCalendar.js   | 21566 ++++++++--------
 interfaces/exchangeEvent/mivExchangeEvent.js  |  1212 +-
 .../mivExchangeItemsManager.js                |   400 +-
 .../mivExchangeLightningNotifier.js           |   140 +-
 .../mivExchangeLoadBalancer.js                |   653 +-
 .../mivExchangeRecurrenceInfo.js              |   857 +-
 .../mivExchangeStatistics.js                  |   324 +-
 .../exchangeTimeZones/mivExchangeTimeZone.js  |   756 +-
 .../exchangeTimeZones/mivExchangeTimeZones.js |   832 +-
 interfaces/exchangeTodo/mivExchangeTodo.js    |  2230 +-
 interfaces/global/mivFunctions.js             |  1725 +-
 interfaces/updater/mivUpdater.js              |   822 +-
 interfaces/xml2json/xml2json.js               |  1789 +-
 interfaces/xml2jxon/mivIxml2jxon.js           |  1925 +-
 interfaces/xml2jxon/mivNameSpaces.js          |   180 +-
 interfaces/xml2jxon/mivTagNames.js            |    79 +-
 128 files changed, 46509 insertions(+), 46446 deletions(-)

diff --git a/chrome/content/OutOfOfficeMenu.js b/chrome/content/OutOfOfficeMenu.js
index 78766ab8..547629e9 100644
--- a/chrome/content/OutOfOfficeMenu.js
+++ b/chrome/content/OutOfOfficeMenu.js
@@ -42,76 +42,83 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 //if (! exchWebService) var exchWebService = {};
 
-function exchToolsMenu(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchToolsMenu(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchToolsMenu.prototype = {
 
-//exchWebService.outOfOfficeMenu = {
-
-	isLoaded: false,
-
-	showHide: function _showHide(){
-		var myCal = getSelectedCalendar();
-		var calType= myCal.type;
-		var menuItem = this._document.getElementById("exchangecalendar-OutOfOfficeMenu");
-		if (myCal && calType=="exchangecalendar"){
-			menuItem.setAttribute("hidden", false);
-		}
-		else{
-			menuItem.setAttribute("hidden", true);
-		}
-	},
-
-	showHideonTools: function _showHideonTools(){
-		var myCal = getSelectedCalendar();
-		var calType= myCal.type;
-		var menuItem = this._document.getElementById("exchangecalendar-tools-OutOfOfficeMenu");
-		if (myCal && calType=="exchangecalendar"){
-			menuItem.setAttribute("hidden", false);
-		}
-		else{
-			menuItem.setAttribute("hidden", true);
-		}
-	},
-
-	openOutofOfficeDialog: function _openOutofOfficeDialog(){
-		var myCal = getSelectedCalendar();		
-		var aResult = "";
-		aResult = { calendar: myCal, answer: ""};
-		this._window.openDialog("chrome://exchangecalendar/content/oofSettings.xul",
-			"oofSettings",
-			"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-			aResult); 
-	
-	},
-
-	onLoad: function _onLoad()
-	{
-		if (!this.isLoaded) {
-			this.isLoaded = true;
-//			window.removeEventListener("load", exchWebService.outOfOfficeMenu.onLoad, true);
-			var self = this;
-			this._document.getElementById("taskPopup").addEventListener("popupshowing", function(){ self.showHideonTools();}, true);
-			this._document.getElementById("menu_Event_Task_Popup").addEventListener("popupshowing", function(){ self.showHide();}, true);
-		}
-	},
-
-	showAboutMemory: function _showAboutMemory(aVerbose)
-	{
-		openContentTab(aVerbose ? "about:memory?verbose" : "about:memory", "tab", "www.1st-setup.nl");
-	},
+    //exchWebService.outOfOfficeMenu = {
+
+    isLoaded: false,
+
+    showHide: function _showHide() {
+        var myCal = getSelectedCalendar();
+        var calType = myCal.type;
+        var menuItem = this._document.getElementById("exchangecalendar-OutOfOfficeMenu");
+        if (myCal && calType == "exchangecalendar") {
+            menuItem.setAttribute("hidden", false);
+        }
+        else {
+            menuItem.setAttribute("hidden", true);
+        }
+    },
+
+    showHideonTools: function _showHideonTools() {
+        var myCal = getSelectedCalendar();
+        var calType = myCal.type;
+        var menuItem = this._document.getElementById("exchangecalendar-tools-OutOfOfficeMenu");
+        if (myCal && calType == "exchangecalendar") {
+            menuItem.setAttribute("hidden", false);
+        }
+        else {
+            menuItem.setAttribute("hidden", true);
+        }
+    },
+
+    openOutofOfficeDialog: function _openOutofOfficeDialog() {
+        var myCal = getSelectedCalendar();
+        var aResult = "";
+        aResult = {
+            calendar: myCal,
+            answer: ""
+        };
+        this._window.openDialog("chrome://exchangecalendar/content/oofSettings.xul",
+            "oofSettings",
+            "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+            aResult);
+
+    },
+
+    onLoad: function _onLoad() {
+        if (!this.isLoaded) {
+            this.isLoaded = true;
+            //			window.removeEventListener("load", exchWebService.outOfOfficeMenu.onLoad, true);
+            var self = this;
+            this._document.getElementById("taskPopup").addEventListener("popupshowing", function () {
+                self.showHideonTools();
+            }, true);
+            this._document.getElementById("menu_Event_Task_Popup").addEventListener("popupshowing", function () {
+                self.showHide();
+            }, true);
+        }
+    },
+
+    showAboutMemory: function _showAboutMemory(aVerbose) {
+        openContentTab(aVerbose ? "about:memory?verbose" : "about:memory", "tab", "www.1st-setup.nl");
+    },
 
 }
 
 var tmpToolsMenu = new exchToolsMenu(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpToolsMenu.onLoad(); }, true);
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpToolsMenu.onLoad();
+}, true);
 
 //window.addEventListener("load", exchWebService.outOfOfficeMenu.onLoad, true);
 
@@ -122,4 +129,3 @@ window.addEventListener("load", function () { window.removeEventListener("load",
 		openContentTab("about:memory", "tab", "www.1st-setup.nl");
 	},
 }*/
-
diff --git a/chrome/content/addressingWidgetOverlay.js b/chrome/content/addressingWidgetOverlay.js
index 78a4259d..bf720f13 100644
--- a/chrome/content/addressingWidgetOverlay.js
+++ b/chrome/content/addressingWidgetOverlay.js
@@ -20,29 +20,29 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-function exchAddressingWidgetOverlay(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchAddressingWidgetOverlay(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchAddressingWidgetOverlay.prototype = {
-	onLoad: function _onLoad()
-	{
-		// Add the exchangeAutoComplete option.
-		if (this._document.getElementById("addressCol2#1")) {
-			var autocompletesearch = this._document.getElementById("addressCol2#1").getAttribute("autocompletesearch");
-			if (autocompletesearch.indexOf("exchangeAutoCompleteSearch") == -1) {
-				this._document.getElementById("addressCol2#1").setAttribute("autocompletesearch", autocompletesearch + " exchangeAutoCompleteSearch");
-			}
-		}
-	},
+    onLoad: function _onLoad() {
+        // Add the exchangeAutoComplete option.
+        if (this._document.getElementById("addressCol2#1")) {
+            var autocompletesearch = this._document.getElementById("addressCol2#1").getAttribute("autocompletesearch");
+            if (autocompletesearch.indexOf("exchangeAutoCompleteSearch") == -1) {
+                this._document.getElementById("addressCol2#1").setAttribute("autocompletesearch", autocompletesearch + " exchangeAutoCompleteSearch");
+            }
+        }
+    },
 }
 
 
 var tmpAddressingWidgetOverlay = new exchAddressingWidgetOverlay(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpAddressingWidgetOverlay.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpAddressingWidgetOverlay.onLoad();
+}, true);
diff --git a/chrome/content/adutils.js b/chrome/content/adutils.js
index 11cd0b08..3efa904f 100644
--- a/chrome/content/adutils.js
+++ b/chrome/content/adutils.js
@@ -3,9 +3,9 @@ var gLdapConnection;
 var gLdapOperation;
 
 var gPrefs = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefBranch);
+    .getService(Components.interfaces.nsIPrefBranch);
 var gConsole = Components.classes["@mozilla.org/consoleservice;1"]
-                                .getService(Components.interfaces.nsIConsoleService);
+    .getService(Components.interfaces.nsIConsoleService);
 // global arrays (or arrays) to hold data of manager and direct reports
 // will be of the form...
 // [[signum1, displayname1, phone1, office1, title1][signum2, displayname2, phone2, office2, title2]]
@@ -19,40 +19,48 @@ var managersignum;
 var searchemail;
 var Cc = Components.classes;
 var Ci = Components.interfaces;
-var Cu = Components.utils; 
-var calWinId=window.arguments[0].calendar.id;
+var Cu = Components.utils;
+var calWinId = window.arguments[0].calendar.id;
 
 var calPreferences = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calWinId+".");  
+    .getService(Ci.nsIPrefService)
+    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calWinId + ".");
 var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-          				.getService(Ci.mivFunctions); 
-searchemail=globalFunctions.safeGetCharPref(calPreferences, "ecMailbox");
-var calendarEmail=searchemail;
+    .getService(Ci.mivFunctions);
+searchemail = globalFunctions.safeGetCharPref(calPreferences, "ecMailbox");
+var calendarEmail = searchemail;
 
 //mapping of AD attributes to address book elements
 //for people:
-var peopleAttribMapping = [["givenName", "FirstName"]
-                          ,["sn", "LastName"]
-                          ,["displayName", "DisplayName"]
-                          ,["mailNickname","NickName"] //re-label to signum
-                          ,["mail","PrimaryEmail"]
-                          ,["homePhone","Relationship"] //new item added in ericssoncontactcard.xul
-                          ,["telephoneNumber","WorkPhone"]
-                          ,["otherTelephone","PagerNumber"] //re-label to ECN Number
-                          ,["mobile","CellularNumber"]
-                          ,["title","JobTitle"]
-                          ,["department","Department"]
-                          ,["company","Company"]
-                          ,["streetAddress","WorkAddress"]
-                          ,["l","WorkCity"] //city
-                          ,["st","WorkState"]    //state
-                          ,["postalCode","WorkZipCode"]
-                          ,["co","WorkCountry"]  //country
-                          ,["physicalDeliveryOfficeName","WebPage1"] //re-label Web Page to Office
-                          ,["info","Notes"]
-                          ,["facsimileTelephoneNumber","FaxNumber"]
-                          ];
+var peopleAttribMapping = [
+    ["givenName", "FirstName"],
+    ["sn", "LastName"],
+    ["displayName", "DisplayName"],
+    ["mailNickname", "NickName"] //re-label to signum
+    ,
+    ["mail", "PrimaryEmail"],
+    ["homePhone", "Relationship"] //new item added in ericssoncontactcard.xul
+    ,
+    ["telephoneNumber", "WorkPhone"],
+    ["otherTelephone", "PagerNumber"] //re-label to ECN Number
+    ,
+    ["mobile", "CellularNumber"],
+    ["title", "JobTitle"],
+    ["department", "Department"],
+    ["company", "Company"],
+    ["streetAddress", "WorkAddress"],
+    ["l", "WorkCity"] //city
+    ,
+    ["st", "WorkState"] //state
+    ,
+    ["postalCode", "WorkZipCode"],
+    ["co", "WorkCountry"] //country
+    ,
+    ["physicalDeliveryOfficeName", "WebPage1"] //re-label Web Page to Office
+    ,
+    ["info", "Notes"],
+    ["facsimileTelephoneNumber", "FaxNumber"]
+];
 
 var additionalPeopleAttribs = ["manager", "directReports"];
 
@@ -62,41 +70,39 @@ var additionalPeopleAttribs = ["manager", "directReports"];
 var otherPeopleDisplayAttribs = ["displayName", "mail", "telephoneNumber", "mobile", "otherTelephone", "physicalDeliveryOfficeName", "title"];
 var otherPeopleCheckAttribs = ["manager"];
 
-                               //this is where it all starts
+//this is where it all starts
 //identify AD server and initiate async connection
 //use callback functions in ldapListener object to process data returned.
 
 
-function ldapInit(){
-	var adServer; 
-	var container = document.getElementById("teamcontainer"); 
-	try{
-		adServer = gPrefs.getCharPref("mail.identity.id1.directoryServer"); 
-	}
-	catch(e){	
- 		 container.hidden=true;
-	}
-	finally{ 
- 	}
- 
+function ldapInit() {
+    var adServer;
+    var container = document.getElementById("teamcontainer");
+    try {
+        adServer = gPrefs.getCharPref("mail.identity.id1.directoryServer");
+    }
+    catch (e) {
+        container.hidden = true;
+    }
+    finally {}
+
     var adURL = gPrefs.getCharPref(adServer + ".uri");
     var adBindDN = gPrefs.getCharPref(adServer + ".auth.dn");
     //gConsole.logStringMessage("AD URL: " + adURL + " Bind DN: " + adBindDN);
 
-	gLdapServerURL = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService).newURI(adURL, null, null).QueryInterface(Components.interfaces.nsILDAPURL);
-	gLdapServerURL.dn = adBindDN;
+    gLdapServerURL = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService).newURI(adURL, null, null).QueryInterface(Components.interfaces.nsILDAPURL);
+    gLdapServerURL.dn = adBindDN;
 
     gLdapConnection = Components.classes["@mozilla.org/network/ldap-connection;1"].createInstance().QueryInterface(Components.interfaces.nsILDAPConnection);
-	gLdapConnection.init(gLdapServerURL,gLdapServerURL.dn,new ldapListener(),null,Components.interfaces.nsILDAPConnection.VERSION3 );
- 
-}
- 
-function ldapListener(){
+    gLdapConnection.init(gLdapServerURL, gLdapServerURL.dn, new ldapListener(), null, Components.interfaces.nsILDAPConnection.VERSION3);
+
 }
 
+function ldapListener() {}
+
 ldapListener.prototype.QueryInterface =
-    function(iid) {
-        if (iid.equals(Components.interfaces.nsISupports) || iid.equals(Components.interfaces.nsILDAPMessageListener)){
+    function (iid) {
+        if (iid.equals(Components.interfaces.nsISupports) || iid.equals(Components.interfaces.nsILDAPMessageListener)) {
             //gConsole.logStringMessage("Inside QueryInterface");
             return this;
         }
@@ -104,111 +110,108 @@ ldapListener.prototype.QueryInterface =
     }
 
 
-ldapListener.prototype.onLDAPMessage = function(aMessage){
+ldapListener.prototype.onLDAPMessage = function (aMessage) {
 
-         //gConsole.logStringMessage("Inside onLDAPMessage; Operation: " + aMessage.operation + " Type: " + aMessage.type);
-        var mailID = searchemail ;
-        if (aMessage.type === Components.interfaces.nsILDAPMessage.RES_BIND){
-            //0x61 Result of a bind operation.
-            //gConsole.logStringMessage("starting search...");
-            searchUserByEmail(mailID);
-        }
-        else if (aMessage.type === Components.interfaces.nsILDAPMessage.RES_SEARCH_ENTRY){
-            //first check if this is a person, or a DL, or something else
-            //this is why the mandatoryAttrib check is important in searchUser
-            var objectClassValues = aMessage.getValues("objectClass", {});
-            if (objectClassValues.indexOf("person") > -1){
-                //check if the data returned is for the person on the card
-                let mailValues = aMessage.getValues("mail", {});
-                if (mailValues.indexOf(mailID) > -1){
-                    //yep is for the card, start populating card values
-                    //populateCard(aMessage);
-                    //aMessage should also have manager and reportee details
-                    //send out request to AD for manager and reportee...
-                	if( searchemail== calendarEmail )
-                    {
-                		sendRequestForManagerInfo(aMessage);
-                    }
-                    sendRequestForReporteeInfo(aMessage);
+    //gConsole.logStringMessage("Inside onLDAPMessage; Operation: " + aMessage.operation + " Type: " + aMessage.type);
+    var mailID = searchemail;
+    if (aMessage.type === Components.interfaces.nsILDAPMessage.RES_BIND) {
+        //0x61 Result of a bind operation.
+        //gConsole.logStringMessage("starting search...");
+        searchUserByEmail(mailID);
+    }
+    else if (aMessage.type === Components.interfaces.nsILDAPMessage.RES_SEARCH_ENTRY) {
+        //first check if this is a person, or a DL, or something else
+        //this is why the mandatoryAttrib check is important in searchUser
+        var objectClassValues = aMessage.getValues("objectClass", {});
+        if (objectClassValues.indexOf("person") > -1) {
+            //check if the data returned is for the person on the card
+            let mailValues = aMessage.getValues("mail", {});
+            if (mailValues.indexOf(mailID) > -1) {
+                //yep is for the card, start populating card values
+                //populateCard(aMessage);
+                //aMessage should also have manager and reportee details
+                //send out request to AD for manager and reportee...
+                if (searchemail == calendarEmail) {
+                    sendRequestForManagerInfo(aMessage);
                 }
-                else{
-                    //its either the manager or the reportees
-                    let retAttribs = aMessage.getAttributes({});
-                    if (retAttribs.indexOf("manager") > -1){
-                        //manager found!!
-                        let retValues = aMessage.getValues("manager", {});
-                        let retValue = retValues[0] //pick up the first entry; should be more than one in any case
+                sendRequestForReporteeInfo(aMessage);
+            }
+            else {
+                //its either the manager or the reportees
+                let retAttribs = aMessage.getAttributes({});
+                if (retAttribs.indexOf("manager") > -1) {
+                    //manager found!!
+                    let retValues = aMessage.getValues("manager", {});
+                    let retValue = retValues[0] //pick up the first entry; should be more than one in any case
                         //break the string down to get the signum
-                        let mgrSignum = getSignumFromCNString(retValue);
-                        //check if manager of the record recieved is same the one for the current contact card
-                        if (mgrSignum === managersignum ){
-                            //direct reportee found
-                            processDirectReportData(aMessage);
-                        }
-                        else{
-                            //manager found
-                        	if( searchemail==calendarEmail)
-                            {
-                        		processManagerData(aMessage);
-                        	}
+                    let mgrSignum = getSignumFromCNString(retValue);
+                    //check if manager of the record recieved is same the one for the current contact card
+                    if (mgrSignum === managersignum) {
+                        //direct reportee found
+                        processDirectReportData(aMessage);
+                    }
+                    else {
+                        //manager found
+                        if (searchemail == calendarEmail) {
+                            processManagerData(aMessage);
                         }
                     }
-                    else{
-                        //reached Hans Vestberg
-                    	if( searchemail==calendarEmail)
-                        {
+                }
+                else {
+                    //reached Hans Vestberg
+                    if (searchemail == calendarEmail) {
                         processManagerData(aMessage);
-                        }
                     }
                 }
             }
-            else if (objectClassValues.indexOf("group") > -1){
-                //this is a distributionlist
-               // populateCard(aMessage);
-            }
-            else{
-                //this is neither a person nor a list
-                //lets just spit out the details
-               // aMessageBreakup(amessage);
-            }
         }
-        else if ( aMessage.type === Components.interfaces.nsILDAPMessage.RES_SEARCH_RESULT ){
-            //gConsole.logStringMessage("Inside onLDAPMessage; Operation: " + aMessage.operation + " Type: " + aMessage.type);
-            //aMessageBreakup(amessage);
-            //tried messagebreakup... nothing is returned. We can safely ignore this... i hope!
+        else if (objectClassValues.indexOf("group") > -1) {
+            //this is a distributionlist
+            // populateCard(aMessage);
         }
-        else{
-            //not sure what happened!!
-            //log since we get a message other than one of the above
-            gConsole.logStringMessage("Inside onLDAPMessage; Operation: " + aMessage.operation + " Type: " + aMessage.type);
+        else {
+            //this is neither a person nor a list
+            //lets just spit out the details
+            // aMessageBreakup(amessage);
         }
-        return
     }
+    else if (aMessage.type === Components.interfaces.nsILDAPMessage.RES_SEARCH_RESULT) {
+        //gConsole.logStringMessage("Inside onLDAPMessage; Operation: " + aMessage.operation + " Type: " + aMessage.type);
+        //aMessageBreakup(amessage);
+        //tried messagebreakup... nothing is returned. We can safely ignore this... i hope!
+    }
+    else {
+        //not sure what happened!!
+        //log since we get a message other than one of the above
+        gConsole.logStringMessage("Inside onLDAPMessage; Operation: " + aMessage.operation + " Type: " + aMessage.type);
+    }
+    return
+}
 
 //following function is basically used to breakdown the aMessage
 //for debugging etc
-function aMessageBreakup(aMessage){
+function aMessageBreakup(aMessage) {
     var retValues = []
     var retAttribs = []
     retAttribs = aMessage.getAttributes({});
     gConsole.logStringMessage("numAttribs recd: " + retAttribs.length);
-    for (let ctr = 0; ctr < retAttribs.length; ctr ++){
+    for (let ctr = 0; ctr < retAttribs.length; ctr++) {
         gConsole.logStringMessage("Value at pos: " + ctr + " is: " + retAttribs[ctr]);
         retValues = aMessage.getValues(retAttribs[ctr], {});
         gConsole.logStringMessage("numValues: " + retValues.length);
-        for (let ctr2 = 0; ctr2 < retValues.length; ctr2 ++){
+        for (let ctr2 = 0; ctr2 < retValues.length; ctr2++) {
             gConsole.logStringMessage("Value at pos: " + ctr2 + " is: " + retValues[ctr2]);
         }
     }
 }
 
 ldapListener.prototype.onLDAPInit =
-	function(aConn, aStatus){
-        if (aStatus === 0){
+    function (aConn, aStatus) {
+        if (aStatus === 0) {
             //all ok, procedding with bind operation
             kickOffBind()
         }
-        else{
+        else {
             //oops!! something wrong, log it and get out!
             gConsole.logStringMessage("Inside onLDAPInit. Status is:" + aStatus);
         }
@@ -216,53 +219,52 @@ ldapListener.prototype.onLDAPInit =
     }
 
 
-function getLDAPOperation(){
-	gLdapOperation = Components.classes["@mozilla.org/network/ldap-operation;1"].createInstance().QueryInterface(Components.interfaces.nsILDAPOperation);
-	gLdapOperation.init(gLdapConnection, new ldapListener(), null);
+function getLDAPOperation() {
+    gLdapOperation = Components.classes["@mozilla.org/network/ldap-operation;1"].createInstance().QueryInterface(Components.interfaces.nsILDAPOperation);
+    gLdapOperation.init(gLdapConnection, new ldapListener(), null);
 }
 
 
-function kickOffBind(){
-	try{
+function kickOffBind() {
+    try {
         getLDAPOperation();
         var passwd = getPassword();
-        if (passwd !== ""){
+        if (passwd !== "") {
             gLdapOperation.simpleBind(passwd);
         }
-	}
-    catch(e){
+    }
+    catch (e) {
         gConsole.logStringMessage("Error in Bind: " + e);
     }
-	return;
+    return;
 }
 
 
-function searchUser(searchString, wantedAttribs){
+function searchUser(searchString, wantedAttribs) {
     var maxEntriesWanted = 300;
     //ensure the mandatory attribs are in the list of wantedAttribs... this is important!!
-    for (let ctr = 0; ctr < mandatoryAttribs.length; ctr++){
-        if (wantedAttribs.indexOf(mandatoryAttribs[ctr]) === -1){
+    for (let ctr = 0; ctr < mandatoryAttribs.length; ctr++) {
+        if (wantedAttribs.indexOf(mandatoryAttribs[ctr]) === -1) {
             //do nothing and return
             return;
         }
     }
     getLDAPOperation();
-    if(gLdapOperation)
-    {
-    	gLdapOperation.searchExt("DC=ericsson,DC=se", gLdapServerURL.scope, searchString, wantedAttribs, 0, maxEntriesWanted);
+    if (gLdapOperation) {
+        gLdapOperation.searchExt("DC=ericsson,DC=se", gLdapServerURL.scope, searchString, wantedAttribs, 0, maxEntriesWanted);
     }
 }
 
 
 //use this function to get details of the main entry on the contact card
-function searchUserByEmail(mailID){
+function searchUserByEmail(mailID) {
     //start building a list of attrib to be retrieved.
     //do a slice as we do not want a shallow copy as we will be adding more elements to this
     var wantedAttribs = mandatoryAttribs.slice(0);
-    for (let ctr = 0; ctr < peopleAttribMapping.length; ctr++){
+    for (let ctr = 0; ctr < peopleAttribMapping.length; ctr++) {
         let len = wantedAttribs.push(peopleAttribMapping[ctr][0]);
     }
-    for (let ctr = 0; ctr < additionalPeopleAttribs.length; ctr++){
+    for (let ctr = 0; ctr < additionalPeopleAttribs.length; ctr++) {
         let len = wantedAttribs.push(additionalPeopleAttribs[ctr]);
     }
 
@@ -272,14 +274,14 @@ function searchUserByEmail(mailID){
 
 
 //use this function to get details of manager and direct reports of the main entry on the contact card
-function searchUserBySignum(signum){
+function searchUserBySignum(signum) {
     //start building a list of attrib to be retrieved.
     //do a slice as we do not want a shallow copy as we will be adding more elements to this
     var wantedAttribs = mandatoryAttribs.slice(0);
-    for (let ctr = 0; ctr < otherPeopleDisplayAttribs.length; ctr++){
+    for (let ctr = 0; ctr < otherPeopleDisplayAttribs.length; ctr++) {
         let len = wantedAttribs.push(otherPeopleDisplayAttribs[ctr]);
     }
-    for (let ctr = 0; ctr < otherPeopleCheckAttribs.length; ctr++){
+    for (let ctr = 0; ctr < otherPeopleCheckAttribs.length; ctr++) {
         let len = wantedAttribs.push(otherPeopleCheckAttribs[ctr]);
     }
     var searchString = "(&(cn=" + signum + "))";
@@ -287,14 +289,14 @@ function searchUserBySignum(signum){
 }
 
 
-function sendRequestForManagerInfo(aMessage){
+function sendRequestForManagerInfo(aMessage) {
     //see if manager attrib is present
     var retAttribs = aMessage.getAttributes({});
-    if (retAttribs.indexOf("manager") > -1){
+    if (retAttribs.indexOf("manager") > -1) {
         //manager found!!
         let retValues = aMessage.getValues("manager", {});
         let retValue = retValues[0] //pick up the first entry; should be more than one in any case
-        //break the string down to get the signum
+            //break the string down to get the signum
         let mgrSignum = getSignumFromCNString(retValue);
         searchUserBySignum(mgrSignum);
         //gConsole.logStringMessage("Manager: " + mgrSignum);
@@ -302,13 +304,13 @@ function sendRequestForManagerInfo(aMessage){
 }
 
 
-function sendRequestForReporteeInfo(aMessage){
+function sendRequestForReporteeInfo(aMessage) {
     //see if directReports attrib is present
     var retAttribs = aMessage.getAttributes({});
-    if (retAttribs.indexOf("directReports") > -1){
+    if (retAttribs.indexOf("directReports") > -1) {
         //direct reports found!!
         let retValues = aMessage.getValues("directReports", {});
-        for (let ctr = 0; ctr < retValues.length; ctr++){
+        for (let ctr = 0; ctr < retValues.length; ctr++) {
             let empSignum = getSignumFromCNString(retValues[ctr]);
             searchUserBySignum(empSignum);
             //gConsole.logStringMessage("Direct Report: " + empSignum);
@@ -316,11 +318,11 @@ function sendRequestForReporteeInfo(aMessage){
     }
 }
 
-function getSignumFromCNString(strEmp){
+function getSignumFromCNString(strEmp) {
     //used to convert string like CN=erahver,OU=CA,OU=User,OU=P001,OU=ID,OU=Data,DC=ericsson,DC=se into erahver
     var signum = "";
     let signumStart = strEmp.indexOf("CN=") + 3;
-    if (signumStart > -1){
+    if (signumStart > -1) {
         let signumEnd = strEmp.indexOf(",", signumStart);
         signum = strEmp.substr(signumStart, signumEnd - signumStart)
     }
@@ -329,31 +331,31 @@ function getSignumFromCNString(strEmp){
 
 //get the user password for the ericsson email account
 //we are screwed if the server is no longer mail.internal.ericsson.com!!
-function getPassword(){
+function getPassword() {
     var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                        .getService(Components.interfaces.nsIXULAppInfo);
+        .getService(Components.interfaces.nsIXULAppInfo);
     var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                               .getService(Components.interfaces.nsIVersionComparator);
+        .getService(Components.interfaces.nsIVersionComparator);
     var passwd = "";
     var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
-                        .getService(Components.interfaces.nsIMsgAccountManager);
+        .getService(Components.interfaces.nsIMsgAccountManager);
     var accounts = acctMgr.accounts;
-    if (versionChecker.compare(appInfo.version, "20.0") >= 0){
-	for (var i = 0; i < accounts.length; i++) {
-	    var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);
-      
-	        passwd = account.incomingServer.password;
-                return passwd;
-           
+    if (versionChecker.compare(appInfo.version, "20.0") >= 0) {
+        for (var i = 0; i < accounts.length; i++) {
+            var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);
+
+            passwd = account.incomingServer.password;
+            return passwd;
+
         }
     }
-    else{
-	for (let i = 0; i < accounts.Count(); i++) {
-	    let account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
-	  
-		passwd = account.incomingServer.password;
-                return passwd;
-            
+    else {
+        for (let i = 0; i < accounts.Count(); i++) {
+            let account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
+
+            passwd = account.incomingServer.password;
+            return passwd;
+
         }
     }
     return passwd;
@@ -361,22 +363,22 @@ function getPassword(){
 
 //extract first value from aMessage corresponding to attrib
 //Note: the _first_ value will be returned, do not use this function if aMessaage has more than one value for attrib
-function getValueFromAttrib(aMessage, attrib){
+function getValueFromAttrib(aMessage, attrib) {
     //gConsole.logStringMessage("Attrib: " + attrib);
     var attribValue = ""
-    try{
+    try {
         var attribValues = aMessage.getValues(attrib, {})
         attribValue = attribValues[0];
     }
-    catch(exp){
+    catch (exp) {
         //could not find the attribute, use a blank string instead
         attribValue = ""
     }
     return attribValue
 }
- 
 
-function processDirectReportData(aMessage){
+
+function processDirectReportData(aMessage) {
     // create local array of resource to look like inner array (below) and then push to global reporteeDtls
     // [[signum1, displayname1, phone1, office1, title1][signum2, displayname2, phone2, office2, title2]]
     // based on ["displayName", "mail", "telephoneNumber", "mobile", "otherTelephone", "physicalDeliveryOfficeName", "title"]
@@ -385,9 +387,9 @@ function processDirectReportData(aMessage){
 
     var signum = getValueFromAttrib(aMessage, "cn");
     reporteeData.push(signum);
-    var displayName= getValueFromAttrib(aMessage, "displayName");
+    var displayName = getValueFromAttrib(aMessage, "displayName");
     reporteeData.push(displayName);
-    var mail= getValueFromAttrib(aMessage, "mail");
+    var mail = getValueFromAttrib(aMessage, "mail");
     reporteeData.push(mail);
     var phone1 = getValueFromAttrib(aMessage, "telephoneNumber");
     var phone2 = getValueFromAttrib(aMessage, "mobile");
@@ -398,42 +400,48 @@ function processDirectReportData(aMessage){
     reporteeData.push(office);
     var title = getValueFromAttrib(aMessage, "title");
     reporteeData.push(title);
-   // dump("\nccccccccc reporteeData " + reporteeData );
-   
+    // dump("\nccccccccc reporteeData " + reporteeData );
+
     var tree = document.getElementById("team");
-    var cboxitem = document.createElement("treeitem"); 
+    var cboxitem = document.createElement("treeitem");
     cboxrow = document.createElement("treerow");
-    
+
     //add checkbox
     var cboxcell = document.createElement("treecell");
-    
-    cboxcell.setAttribute("value","false");
-    cboxcell.setAttribute("editable",true);  
-    cboxcell.setAttribute("name", "checkbox"  );  
- 	 cboxrow.appendChild(cboxcell); 
- 	  
- 	 //add user
+
+    cboxcell.setAttribute("value", "false");
+    cboxcell.setAttribute("editable", true);
+    cboxcell.setAttribute("name", "checkbox");
+    cboxrow.appendChild(cboxcell);
+
+    //add user
     cboxcell = document.createElement("treecell");
-    cboxcell.setAttribute("label", displayName ); 
-    cboxcell.setAttribute("name", "name"  ); 
-    cboxcell.setAttribute("value", mail  ); 
-    cboxcell.setAttribute("editable",false);
- 	 cboxrow.appendChild(cboxcell); 
-	 cboxitem.appendChild(cboxrow); 
+    cboxcell.setAttribute("label", displayName);
+    cboxcell.setAttribute("name", "name");
+    cboxcell.setAttribute("value", mail);
+    cboxcell.setAttribute("editable", false);
+    cboxrow.appendChild(cboxcell);
+    cboxitem.appendChild(cboxrow);
     tree.appendChild(cboxitem);
-    
-    
-    reporteeDtls.push(reporteeData); 
-   // document.getElementById('reporteeTree').view = reporteesTreeView;
+
+
+    reporteeDtls.push(reporteeData);
+    // document.getElementById('reporteeTree').view = reporteesTreeView;
 }
 
 //simply add all numbers to an array and then covert it into a string
-function concatPhoneNumbers(phone1, phone2, phone3){
+function concatPhoneNumbers(phone1, phone2, phone3) {
     var phonearray = [];
     var temp;
-    if (phone1 != "") {temp = phonearray.push(phone1);}
-    if (phone2 != "") {temp = phonearray.push(phone2);}
-    if (phone3 != "") {temp = phonearray.push(phone3);}
+    if (phone1 != "") {
+        temp = phonearray.push(phone1);
+    }
+    if (phone2 != "") {
+        temp = phonearray.push(phone2);
+    }
+    if (phone3 != "") {
+        temp = phonearray.push(phone3);
+    }
     return phonearray.toString();
 }
 
@@ -441,14 +449,14 @@ function concatPhoneNumbers(phone1, phone2, phone3){
 //should merge the two functions...
 //...the main reason for not doing this now is because the xul/dom should have unique element ids
 //...we can merge if we have the same ids for both the manager tree and the reportee tree
-function processManagerData(aMessage){
+function processManagerData(aMessage) {
     var managerData = [];
 
     var signum = getValueFromAttrib(aMessage, "cn");
     managerData.push(signum);
-    var displayName= getValueFromAttrib(aMessage, "displayName");
+    var displayName = getValueFromAttrib(aMessage, "displayName");
     managerData.push(displayName);
-    var mail= getValueFromAttrib(aMessage, "mail");
+    var mail = getValueFromAttrib(aMessage, "mail");
     managerData.push(mail);
     var phone1 = getValueFromAttrib(aMessage, "telephoneNumber");
     var phone2 = getValueFromAttrib(aMessage, "mobile");
@@ -459,50 +467,48 @@ function processManagerData(aMessage){
     managerData.push(office);
     var title = getValueFromAttrib(aMessage, "title");
     managerData.push(title);
-  //  dump("\nccccccccc managerData " + managerData );
-   
-    document.getElementById("teamheader").setAttribute("label","Team: " + displayName);
-    
-    
-    var tree =  document.getElementById("team");
-    var cboxitem =  document.createElement("treeitem"); 
-    cboxrow =  document.createElement("treerow");
-    
+    //  dump("\nccccccccc managerData " + managerData );
+
+    document.getElementById("teamheader").setAttribute("label", "Team: " + displayName);
+
+
+    var tree = document.getElementById("team");
+    var cboxitem = document.createElement("treeitem");
+    cboxrow = document.createElement("treerow");
+
     //add checkbox
     var cboxcell = document.createElement("treecell");
-    
-    cboxcell.setAttribute("value","false");
-    cboxcell.setAttribute("editable",true);  
-    cboxcell.setAttribute("name", "checkbox"  );  
- 	 cboxrow.appendChild(cboxcell); 
- 	  
- 	 //add user
+
+    cboxcell.setAttribute("value", "false");
+    cboxcell.setAttribute("editable", true);
+    cboxcell.setAttribute("name", "checkbox");
+    cboxrow.appendChild(cboxcell);
+
+    //add user
     cboxcell = document.createElement("treecell");
-    cboxcell.setAttribute("label", displayName ); 
-    cboxcell.setAttribute("name", "name"  );
-    cboxcell.setAttribute("cycler","true");
-    cboxcell.setAttribute("tooltiptext", mail  ); 
-    cboxcell.setAttribute("value", mail  ); 
-    cboxcell.setAttribute("editable",false);
- 	 cboxrow.appendChild(cboxcell); 
-	 cboxitem.appendChild(cboxrow); 
+    cboxcell.setAttribute("label", displayName);
+    cboxcell.setAttribute("name", "name");
+    cboxcell.setAttribute("cycler", "true");
+    cboxcell.setAttribute("tooltiptext", mail);
+    cboxcell.setAttribute("value", mail);
+    cboxcell.setAttribute("editable", false);
+    cboxrow.appendChild(cboxcell);
+    cboxitem.appendChild(cboxrow);
     tree.appendChild(cboxitem);
-    
-    
+
+
     managerDtls.push(managerData);
-    managersignum=signum;
-    searchemail=mail;
-    searchUserByEmail(searchemail); 
+    managersignum = signum;
+    searchemail = mail;
+    searchUserByEmail(searchemail);
 }
- 
-function stopFetching()
-{
-    if (gLdapOperation){
+
+function stopFetching() {
+    if (gLdapOperation) {
         try {
             gLdapOperation.abandon();
         }
-        catch (e) {
-        }
+        catch (e) {}
     }
     return true;
-} 
\ No newline at end of file
+}
diff --git a/chrome/content/attachments-view.js b/chrome/content/attachments-view.js
index 60cda393..fcbad2db 100644
--- a/chrome/content/attachments-view.js
+++ b/chrome/content/attachments-view.js
@@ -34,587 +34,607 @@ var Cc = Components.classes;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://exchangecalendar/erGetAttachments.js");
 
-function exchAttachments(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchAttachments(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchAttachments.prototype = {
-	_initialized: false,
-
-	addAttachmentDialog: function _addAttachmentDialog()
-	{
-		const nsIFilePicker = Ci.nsIFilePicker;
-		var fp = Cc["@mozilla.org/filepicker;1"]
-		            .createInstance(nsIFilePicker);
-
-		var title = "Select attachment";
-
-		fp.init(this._window, title, nsIFilePicker.modeOpen);
-
-		var ret = fp.show();
-
-		if (ret == nsIFilePicker.returnOK) {
-			this.globalFunctions.LOG("[["+fp.fileURL.spec+"]]");
-
-			// Create attachment for item.
-			var newAttachment = createAttachment();
-			newAttachment.uri = fp.fileURL.clone();
-			this.addAttachment(newAttachment);
-		}
-
-	},
-
-	addAttachment: function _addAttachment(aAttachment, isFirst)
-	{
-		if ((isFirst === undefined) || (isFirst === null)) isFirst = false;
-
-		// We currently only support uri attachments
-		var ext2file = { exe: "document-binary.png",
-				 xls: "document-excel.png",
-				 xlsx: "document-excel.png",
-				 csv: "document-excel-csv.png",
-				 fls: "document-flash-movie.png",
-				 gif: "document-image.png",
-				 jpg: "document-image.png",
-				 jpeg: "document-image.png",
-				 png: "document-image.png",
-				 pdf: "document-pdf.png",
-				 ps: "document-photoshop.png",
-				 php: "document-php.png",
-				 txt: "document-text.png",
-				 tex: "document-tex.png",
-				 doc: "document-word.png",
-				 docx: "document-word.png",
-				 ppt: "document-powerpoint.png",
-				 pptx: "document-powerpoint.png",
-				 pfx: "certificate.png",
-				 crt: "certificate.png",
-				 pkcs12: "certificate.png",
-				 };
-
-		this.globalFunctions.LOG("exchWebService.attachments.addAttachment");
-		if (aAttachment.uri) {
-			let documentLink = this._document.getElementById("attachment-link");
-			let item = documentLink.appendChild(createXULElement("listitem"));
-			item.setAttribute("crop", "end");
-			item.setAttribute("class", "listitem-iconic");
-
-			var extension = "";
-			var stringForExtension = "";
-
-			let getParams = this.globalFunctions.splitUriGetParams(aAttachment.uri);
-			if (getParams) {
-				// Set listitem attributes
-				var fileSize = getParams.size;
-				var sizeStr = "b";
-				if (fileSize > (10*1024)) { 
-					fileSize = fileSize / 1024;
-					sizeStr = "Kb";
-				}
-				if (fileSize > (10*1024)) { 
-					fileSize = fileSize / 1024;
-					sizeStr = "Mb";
-				}
-				if (fileSize > (10*1024)) { 
-					fileSize = fileSize / 1024;
-					sizeStr = "Gb";
-				}
-				if (sizeStr != "b") {
-					item.setAttribute("label", getParams.name+" ("+Number(fileSize).toFixed(1)+" "+sizeStr+")");
-				}
-				else {
-					if (fileSize == "") {
-						item.setAttribute("label", getParams.name);
-					}
-					else {
-						item.setAttribute("label", getParams.name+" ("+fileSize+")");
-					}
-				}
-				
-				stringForExtension =  getParams.name;
-
-			}
-			else {
-				this.globalFunctions.LOG("DID NOT FIND VALID get FIELDS FOR ATTACHMENT");
-				if (aAttachment.uri.spec.indexOf("file://") > -1) {
-					this.globalFunctions.LOG("Attachment is a local file:"+aAttachment.uri.spec);
-					// We have a local file url
-					item.setAttribute("label", decodeURIComponent(aAttachment.uri.path));
-					stringForExtension = decodeURIComponent(aAttachment.uri.path);
-				}
-				else {
-					this.globalFunctions.LOG("It is not a valid local file spec");
-					return;
-				}
-			}
-
-			var counter = stringForExtension.length;
-			while ((counter > 0) && (stringForExtension.substr(counter-1,1) != ".")) {
-				extension = stringForExtension.substr(counter-1,1) + extension;
-				counter--;
-			}
-			this.globalFunctions.LOG(" == extension:"+extension);
-
-			if (ext2file[extension]) {
-				item.setAttribute("image", "chrome://exchangecalendar-common/skin/images/" + ext2file[extension]);
-			} else {
-				item.setAttribute("image", "chrome://exchangecalendar-common/skin/images/document--exclamation.png");
-			}
-
-			// full attachment object is stored here
-			item.attachment = aAttachment;
-			try {
-				gAttachMap[aAttachment.hashId] = aAttachment;
-			} catch(er) {}
-
-			// Update the number of rows and save our attachment globally
-			if (documentLink.itemCount < 3) {
-				documentLink.rows = documentLink.itemCount;
-			}
-			else {
-				documentLink.rows = 3;
-			}
-
-			this.showAttachmentListbox();
-
-		}
-
-	},
-
-	deleteAttachment: function deleteAttachment()
-	{
-		var documentLink = this._document.getElementById("attachment-link");
-		if ((documentLink.selectedItem) && (documentLink.selectedItem.attachment)) {
-			delete gAttachMap[documentLink.selectedItem.attachment.hashId];
-			documentLink.removeItemAt(documentLink.selectedIndex);
-		}
-	},
-
-	showAttachmentListbox: function _showAttachmentListbox()
-	{
-		if (this.attachmentListboxVisible) return;
-
-		this.attachmentListboxVisible = true;
-
-		// calendar-event-dialog (show our attachment view)
-		try {
-			this._document.getElementById("exchWebService-attachments-row").removeAttribute("collapsed");
-		}
-		catch (ex) {}
-		// calendar-summary-dialog (show our attachment view)
-		try {
-			this._document.getElementById("exchWebService-attachment-summary-space").hidden=false;
-			this._document.getElementById("exchWebService-attachment-summary-caption").hidden=false;
-			this._document.getElementById("exchWebService-attachment-summary-box").hidden=false;
-			this._document.getElementById("item-description-box").hidden=false;
-
-		}
-		catch (ex) {}
-
-		this._window.sizeToContent();
-	},
-
-	removeItemsFromListbox: function _removeItemsFromListbox()
-	{
-		var documentLink = this._document.getElementById("attachment-link");
-		while (documentLink.itemCount > 0) {
-			this.globalFunctions.LOG(" == Removing item from listbox");
-			documentLink.removeItemAt(0);
-		}
-	},
-
-	/**
-	 * Receives asynchronous messages from the parent context that contains the iframe.
-	 *
-	 * @param {MessageEvent} aEvent  Contains the message being received
-	 */
-	receiveMessage: function _receiveMessage(aEvent) {
-		let validOrigin = gTabmail ? "chrome://messenger" : "chrome://calendar";
-		if (aEvent.origin !== validOrigin) {
-			return;
-		}
-		switch (aEvent.data.command) {
-			case "exchWebService_addAttachmentDialog": this.addAttachmentDialog(); break;
-		}
-	},
-
-	onLoad: function _onLoad()
-	{
-		if(this._initialized){
-			return;
-		}
-
-		var self = this;
-
-		if (this._document.getElementById("calendar-task-tree")) {
-			this.globalFunctions.LOG("  -- calendar-task-tree --");
-			this._document.getElementById("calendar-task-tree").addEventListener("select", function(){ self.onSelectTask();}, true);
-			return;
-		}
-
-		var args = this._window.arguments[0];
-		var item = args.calendarEvent;
-
-		this.attachmentListboxVisible = false;
-
-		// We can't update toolbar from iframe
-		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
-			this.globalFunctions.LOG("  -- It is an Exchange Calendar event:"+item.title);
-
-			if (this._document.getElementById("event-grid-attachment-row")) {
-				this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", true);
-			}
-
-			// Modify context menu for the attachment list inside the "Attachment" panel
-			let attachmentListbox = this._document.getElementById("attachment-link");
-
-			attachmentListbox.setAttribute("context", "exchWebService-attachment-popup") ;
-			attachmentListbox.setAttribute("onkeypress", function (aEvent) { self.onKeyPress(aEvent);  }) ;
-			attachmentListbox.setAttribute("onclick", function (aEvent) { self.onSelect(aEvent);  }) ;
-			attachmentListbox.setAttribute("ondblclick", function (aEvent) { self.onDblClick(aEvent); }) ;
-
-			this.addAttachmentsFromItem(item);
-		} else {
-			if (this._document.getElementById("event-grid-attachment-row")) {
-				this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", false);
-			}
-
-			// Modify context menu for the attachment list inside the "Attachment" panel
-			let attachmentListbox = this._document.getElementById("attachment-link");
-
-			attachmentListbox.setAttribute("context", "attachment-popup") ;
-			attachmentListbox.setAttribute("onkeypress", "attachmentLinkKeyPress(event)") ;
-			attachmentListbox.setAttribute("onclick", "attachmentClick(event);") ;
-			attachmentListbox.setAttribute("ondblclick", "attachmentDblClick(event)") ;
-		}
-
-		// Add message listener to be able to receive message from parent window or tab
-		window.addEventListener("message", function(aEvent) { self.receiveMessage(aEvent); }, false);
-
-		this._initialized = true;
-	},
-
-	addAttachmentsFromItem: function _addAttachmentsFromItem(aItem)
-	{
-		try {
-			this.removeItemsFromListbox();
-		}
-		catch(ex) {this.globalFunctions.LOG("exchWebService.attachments.addAttachmentsFromItem: foutje:"+ex);}
-		this.globalFunctions.LOG("exchWebService.attachments.addAttachmentsFromItem: title:"+aItem.title);
-		var attachments = aItem.getAttachments({});
-		if (attachments.length > 0) {
-			this.globalFunctions.LOG("  -- We have attachments:"+attachments.length+" ("+this.globalFunctions.STACKshort()+")");
-			var first = true;
-			for (var index in attachments) {
-				this.globalFunctions.LOG("  -- processing attachment: "+index);
-//dump("aAttachment.uri:"+attachments[index].uri.spec+"\n");
-				if (attachments[index].uri.spec.indexOf("isinline=true") == -1) {
-					this.addAttachment(attachments[index], first);
-					if (first) {
-						first = false;
-					}
-				}
-			}
-
-			this.globalFunctions.LOG("  -- processed attachment.");
-		}
-		else {
-			this.globalFunctions.LOG("No attachments");
-		}
-	},
-
-	onKeyPress: function _onKeyPress(aEvent)
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.onKeyPress");
-		const kKE = Components.interfaces.nsIDOMKeyEvent;
-		switch (aEvent.keyCode) {
-			case kKE.DOM_VK_BACK_SPACE:
-			case kKE.DOM_VK_DELETE:
-				if (this._document.getElementById("calendar-task-details-attachment-rows")) break;
-
-				this.globalFunctions.LOG("exchWebService.attachments.onKeyPress: Delete");
-				this.deleteAttachment();
-				break;
-			case 13: 
-			case kKE.DOM_VK_ENTER:
-				this.globalFunctions.LOG("exchWebService.attachments.onKeyPress: Enter");
-				this.openAttachment();
-				break;
-			default:
-				this.globalFunctions.LOG("exchWebService.attachments.onKeyPress: unknown:"+aEvent.keyCode);
-
-		}
-	},
-
-	onDblClick: function _onDblClick(aEvent)
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.onDblClick");
-		this.openAttachment();
-	},
-
-	onSelectTask: function _onSelectTask()
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.onSelectTask");
-
-		var taskTree = this._document.getElementById("calendar-task-tree");
-		var item = taskTree.currentTask;
-		var displayElement=function(id,flag) {
+    _initialized: false,
+
+    addAttachmentDialog: function _addAttachmentDialog() {
+        const nsIFilePicker = Ci.nsIFilePicker;
+        var fp = Cc["@mozilla.org/filepicker;1"]
+            .createInstance(nsIFilePicker);
+
+        var title = "Select attachment";
+
+        fp.init(this._window, title, nsIFilePicker.modeOpen);
+
+        var ret = fp.show();
+
+        if (ret == nsIFilePicker.returnOK) {
+            this.globalFunctions.LOG("[[" + fp.fileURL.spec + "]]");
+
+            // Create attachment for item.
+            var newAttachment = createAttachment();
+            newAttachment.uri = fp.fileURL.clone();
+            this.addAttachment(newAttachment);
+        }
+
+    },
+
+    addAttachment: function _addAttachment(aAttachment, isFirst) {
+        if ((isFirst === undefined) || (isFirst === null)) isFirst = false;
+
+        // We currently only support uri attachments
+        var ext2file = {
+            exe: "document-binary.png",
+            xls: "document-excel.png",
+            xlsx: "document-excel.png",
+            csv: "document-excel-csv.png",
+            fls: "document-flash-movie.png",
+            gif: "document-image.png",
+            jpg: "document-image.png",
+            jpeg: "document-image.png",
+            png: "document-image.png",
+            pdf: "document-pdf.png",
+            ps: "document-photoshop.png",
+            php: "document-php.png",
+            txt: "document-text.png",
+            tex: "document-tex.png",
+            doc: "document-word.png",
+            docx: "document-word.png",
+            ppt: "document-powerpoint.png",
+            pptx: "document-powerpoint.png",
+            pfx: "certificate.png",
+            crt: "certificate.png",
+            pkcs12: "certificate.png",
+        };
+
+        this.globalFunctions.LOG("exchWebService.attachments.addAttachment");
+        if (aAttachment.uri) {
+            let documentLink = this._document.getElementById("attachment-link");
+            let item = documentLink.appendChild(createXULElement("listitem"));
+            item.setAttribute("crop", "end");
+            item.setAttribute("class", "listitem-iconic");
+
+            var extension = "";
+            var stringForExtension = "";
+
+            let getParams = this.globalFunctions.splitUriGetParams(aAttachment.uri);
+            if (getParams) {
+                // Set listitem attributes
+                var fileSize = getParams.size;
+                var sizeStr = "b";
+                if (fileSize > (10 * 1024)) {
+                    fileSize = fileSize / 1024;
+                    sizeStr = "Kb";
+                }
+                if (fileSize > (10 * 1024)) {
+                    fileSize = fileSize / 1024;
+                    sizeStr = "Mb";
+                }
+                if (fileSize > (10 * 1024)) {
+                    fileSize = fileSize / 1024;
+                    sizeStr = "Gb";
+                }
+                if (sizeStr != "b") {
+                    item.setAttribute("label", getParams.name + " (" + Number(fileSize).toFixed(1) + " " + sizeStr + ")");
+                }
+                else {
+                    if (fileSize == "") {
+                        item.setAttribute("label", getParams.name);
+                    }
+                    else {
+                        item.setAttribute("label", getParams.name + " (" + fileSize + ")");
+                    }
+                }
+
+                stringForExtension = getParams.name;
+
+            }
+            else {
+                this.globalFunctions.LOG("DID NOT FIND VALID get FIELDS FOR ATTACHMENT");
+                if (aAttachment.uri.spec.indexOf("file://") > -1) {
+                    this.globalFunctions.LOG("Attachment is a local file:" + aAttachment.uri.spec);
+                    // We have a local file url
+                    item.setAttribute("label", decodeURIComponent(aAttachment.uri.path));
+                    stringForExtension = decodeURIComponent(aAttachment.uri.path);
+                }
+                else {
+                    this.globalFunctions.LOG("It is not a valid local file spec");
+                    return;
+                }
+            }
+
+            var counter = stringForExtension.length;
+            while ((counter > 0) && (stringForExtension.substr(counter - 1, 1) != ".")) {
+                extension = stringForExtension.substr(counter - 1, 1) + extension;
+                counter--;
+            }
+            this.globalFunctions.LOG(" == extension:" + extension);
+
+            if (ext2file[extension]) {
+                item.setAttribute("image", "chrome://exchangecalendar-common/skin/images/" + ext2file[extension]);
+            }
+            else {
+                item.setAttribute("image", "chrome://exchangecalendar-common/skin/images/document--exclamation.png");
+            }
+
+            // full attachment object is stored here
+            item.attachment = aAttachment;
+            try {
+                gAttachMap[aAttachment.hashId] = aAttachment;
+            }
+            catch (er) {}
+
+            // Update the number of rows and save our attachment globally
+            if (documentLink.itemCount < 3) {
+                documentLink.rows = documentLink.itemCount;
+            }
+            else {
+                documentLink.rows = 3;
+            }
+
+            this.showAttachmentListbox();
+
+        }
+
+    },
+
+    deleteAttachment: function deleteAttachment() {
+        var documentLink = this._document.getElementById("attachment-link");
+        if ((documentLink.selectedItem) && (documentLink.selectedItem.attachment)) {
+            delete gAttachMap[documentLink.selectedItem.attachment.hashId];
+            documentLink.removeItemAt(documentLink.selectedIndex);
+        }
+    },
+
+    showAttachmentListbox: function _showAttachmentListbox() {
+        if (this.attachmentListboxVisible) return;
+
+        this.attachmentListboxVisible = true;
+
+        // calendar-event-dialog (show our attachment view)
+        try {
+            this._document.getElementById("exchWebService-attachments-row").removeAttribute("collapsed");
+        }
+        catch (ex) {}
+        // calendar-summary-dialog (show our attachment view)
+        try {
+            this._document.getElementById("exchWebService-attachment-summary-space").hidden = false;
+            this._document.getElementById("exchWebService-attachment-summary-caption").hidden = false;
+            this._document.getElementById("exchWebService-attachment-summary-box").hidden = false;
+            this._document.getElementById("item-description-box").hidden = false;
+
+        }
+        catch (ex) {}
+
+        this._window.sizeToContent();
+    },
+
+    removeItemsFromListbox: function _removeItemsFromListbox() {
+        var documentLink = this._document.getElementById("attachment-link");
+        while (documentLink.itemCount > 0) {
+            this.globalFunctions.LOG(" == Removing item from listbox");
+            documentLink.removeItemAt(0);
+        }
+    },
+
+    /**
+     * Receives asynchronous messages from the parent context that contains the iframe.
+     *
+     * @param {MessageEvent} aEvent  Contains the message being received
+     */
+    receiveMessage: function _receiveMessage(aEvent) {
+        let validOrigin = gTabmail ? "chrome://messenger" : "chrome://calendar";
+        if (aEvent.origin !== validOrigin) {
+            return;
+        }
+        switch (aEvent.data.command) {
+        case "exchWebService_addAttachmentDialog":
+            this.addAttachmentDialog();
+            break;
+        }
+    },
+
+    onLoad: function _onLoad() {
+        if (this._initialized) {
+            return;
+        }
+
+        var self = this;
+
+        if (this._document.getElementById("calendar-task-tree")) {
+            this.globalFunctions.LOG("  -- calendar-task-tree --");
+            this._document.getElementById("calendar-task-tree").addEventListener("select", function () {
+                self.onSelectTask();
+            }, true);
+            return;
+        }
+
+        var args = this._window.arguments[0];
+        var item = args.calendarEvent;
+
+        this.attachmentListboxVisible = false;
+
+        // We can't update toolbar from iframe
+        if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
+            this.globalFunctions.LOG("  -- It is an Exchange Calendar event:" + item.title);
+
+            if (this._document.getElementById("event-grid-attachment-row")) {
+                this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", true);
+            }
+
+            // Modify context menu for the attachment list inside the "Attachment" panel
+            let attachmentListbox = this._document.getElementById("attachment-link");
+
+            attachmentListbox.setAttribute("context", "exchWebService-attachment-popup");
+            attachmentListbox.setAttribute("onkeypress", function (aEvent) {
+                self.onKeyPress(aEvent);
+            });
+            attachmentListbox.setAttribute("onclick", function (aEvent) {
+                self.onSelect(aEvent);
+            });
+            attachmentListbox.setAttribute("ondblclick", function (aEvent) {
+                self.onDblClick(aEvent);
+            });
+
+            this.addAttachmentsFromItem(item);
+        }
+        else {
+            if (this._document.getElementById("event-grid-attachment-row")) {
+                this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", false);
+            }
+
+            // Modify context menu for the attachment list inside the "Attachment" panel
+            let attachmentListbox = this._document.getElementById("attachment-link");
+
+            attachmentListbox.setAttribute("context", "attachment-popup");
+            attachmentListbox.setAttribute("onkeypress", "attachmentLinkKeyPress(event)");
+            attachmentListbox.setAttribute("onclick", "attachmentClick(event);");
+            attachmentListbox.setAttribute("ondblclick", "attachmentDblClick(event)");
+        }
+
+        // Add message listener to be able to receive message from parent window or tab
+        window.addEventListener("message", function (aEvent) {
+            self.receiveMessage(aEvent);
+        }, false);
+
+        this._initialized = true;
+    },
+
+    addAttachmentsFromItem: function _addAttachmentsFromItem(aItem) {
+        try {
+            this.removeItemsFromListbox();
+        }
+        catch (ex) {
+            this.globalFunctions.LOG("exchWebService.attachments.addAttachmentsFromItem: foutje:" + ex);
+        }
+        this.globalFunctions.LOG("exchWebService.attachments.addAttachmentsFromItem: title:" + aItem.title);
+        var attachments = aItem.getAttachments({});
+        if (attachments.length > 0) {
+            this.globalFunctions.LOG("  -- We have attachments:" + attachments.length + " (" + this.globalFunctions.STACKshort() + ")");
+            var first = true;
+            for (var index in attachments) {
+                this.globalFunctions.LOG("  -- processing attachment: " + index);
+                //dump("aAttachment.uri:"+attachments[index].uri.spec+"\n");
+                if (attachments[index].uri.spec.indexOf("isinline=true") == -1) {
+                    this.addAttachment(attachments[index], first);
+                    if (first) {
+                        first = false;
+                    }
+                }
+            }
+
+            this.globalFunctions.LOG("  -- processed attachment.");
+        }
+        else {
+            this.globalFunctions.LOG("No attachments");
+        }
+    },
+
+    onKeyPress: function _onKeyPress(aEvent) {
+        this.globalFunctions.LOG("exchWebService.attachments.onKeyPress");
+        const kKE = Components.interfaces.nsIDOMKeyEvent;
+        switch (aEvent.keyCode) {
+        case kKE.DOM_VK_BACK_SPACE:
+        case kKE.DOM_VK_DELETE:
+            if (this._document.getElementById("calendar-task-details-attachment-rows")) break;
+
+            this.globalFunctions.LOG("exchWebService.attachments.onKeyPress: Delete");
+            this.deleteAttachment();
+            break;
+        case 13:
+        case kKE.DOM_VK_ENTER:
+            this.globalFunctions.LOG("exchWebService.attachments.onKeyPress: Enter");
+            this.openAttachment();
+            break;
+        default:
+            this.globalFunctions.LOG("exchWebService.attachments.onKeyPress: unknown:" + aEvent.keyCode);
+
+        }
+    },
+
+    onDblClick: function _onDblClick(aEvent) {
+        this.globalFunctions.LOG("exchWebService.attachments.onDblClick");
+        this.openAttachment();
+    },
+
+    onSelectTask: function _onSelectTask() {
+        this.globalFunctions.LOG("exchWebService.attachments.onSelectTask");
+
+        var taskTree = this._document.getElementById("calendar-task-tree");
+        var item = taskTree.currentTask;
+        var displayElement = function (id, flag) {
             setBooleanAttribute(id, "hidden", !flag);
             return flag;
         }
-		if (displayElement("calendar-task-details-container", item != null) &&
-            displayElement("calendar-task-view-splitter", item != null)) { 
-			
-		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
-			// calendar-task-view (hide existing attachment view)
-			//this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: it is an Exchange task 1.");
-			try {
-				this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("hidden", "true");
-				this._document.getElementById("calendar-task-details-attachment-rows").removeAttribute("flex");
-				this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("width","0px");
-			}
-			catch (ex) {this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje:");}
-
-			//this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: it is an Exchange task 2.");
-
-			try {
-				this._document.getElementById("exchWebService-attachments-row").setAttribute("collapsed", "false");
-			}
-			catch (ex) {this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje Y:");}
-
-			try {
-				this.addAttachmentsFromItem(item);
-			}
-			catch(ex) { this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje2:"+ex);}
-			//this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: it is an Exchange task 3.");
-		}
-		else {
-			try {
-				this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("hidden", "false");
-				this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("flex", "1");
-				this._document.getElementById("calendar-task-details-attachment-rows").removeAttribute("width");
-			}
-			catch (ex) {this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje X:");}
-
-			try {
-				this._document.getElementById("exchWebService-attachments-row").setAttribute("collapsed", "true");
-			}
-			catch (ex) {this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje Y:");}
-			this.attachmentListboxVisible = false;
-		}
-		}
-	},
-
-	onSelect: function _onSelect(aEvent)
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.onSelect");
-
-		let documentLink = this._document.getElementById("attachment-link");
-
-		var isReadOnly = "true";
-		if ((this._document.getElementById("calendar-event-dialog")) || (this._document.getElementById("calendar-task-dialog"))) {
-			isReadOnly = "false";
-		}
-
-		var calendar = getCurrentCalendar();
-		if (calendar.readOnly) {
-			isReadOnly = "true";
-		}		
-
-		if ((documentLink.selectedItem) && (documentLink.selectedItem.attachment)) {
-			var attURI = documentLink.selectedItem.attachment.uri;
-			if (attURI.spec.indexOf("file://") == 0) {
-					this.globalFunctions.LOG("exchWebService.attachments.onSelect: localfile");
-					this._document.getElementById("exchWebService-attachment-popup-open").setAttribute("disabled", "false");
-					this._document.getElementById("exchWebService_openAttachment").setAttribute("disabled", "false");
-					this._document.getElementById("exchWebService-attachment-popup-save").setAttribute("disabled", "true");
-					this._document.getElementById("exchWebService_saveAttachment").setAttribute("disabled", "true");
-					this._document.getElementById("exchWebService-attachment-popup-delete").setAttribute("disabled", isReadOnly);
-					this._document.getElementById("exchWebService_deleteAttachment").setAttribute("disabled", isReadOnly);
-			}
-			else {
-				if (attURI.spec.indexOf("http") == 0) {
-					this.globalFunctions.LOG("exchWebService.attachments.onSelect: remotefile");
-					this._document.getElementById("exchWebService-attachment-popup-open").setAttribute("disabled", "false");
-					this._document.getElementById("exchWebService_openAttachment").setAttribute("disabled", "false");
-					this._document.getElementById("exchWebService-attachment-popup-save").setAttribute("disabled", "false");
-					this._document.getElementById("exchWebService_saveAttachment").setAttribute("disabled", "false");
-					this._document.getElementById("exchWebService-attachment-popup-delete").setAttribute("disabled", isReadOnly);
-					this._document.getElementById("exchWebService_deleteAttachment").setAttribute("disabled", isReadOnly);
-				}
-				else {
-					this.globalFunctions.LOG("exchWebService.attachments.onSelect: Unknown attachment URI. Cannot open:"+attURI.spec);
-					this._document.getElementById("exchWebService-attachment-popup-open").setAttribute("disabled", "true");
-					this._document.getElementById("exchWebService-attachment-popup-save").setAttribute("disabled", "true");
-				}
-			}
-		}
-	},
-
-	openAttachment: function _openAttachment()
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.openAttachment");
-		let documentLink = this._document.getElementById("attachment-link");
-
-		if (documentLink.selectedItem.attachment) {
-			var attURI = documentLink.selectedItem.attachment.uri;
-			if (attURI.spec.indexOf("file://") == 0) {
-					this.openLocalAttachment(documentLink.selectedItem.attachment);
-			}
-			else {
-				if (attURI.spec.indexOf("http") == 0) {
-					this.downloadAttachment(documentLink.selectedItem.attachment, false);
-				}
-				else {
-					this.globalFunctions.LOG("exchWebService.attachments.openAttachment: Unknown attachment URI. Cannot open:"+attURI.spec);
-				}
-			}
-		}
-	},
-
-	saveAttachment: function _saveAttachment()
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.saveAttachment");
-		let documentLink = this._document.getElementById("attachment-link");
-		this.downloadAttachment(documentLink.selectedItem.attachment, true);
-	},
-
-	openLocalAttachment: function _openLocalAttachment(aAttachment)
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.openLocalAttachment");
-		if (! aAttachment) { return; }
-
-		var URL = aAttachment.uri;  
-
-		this.globalFunctions.LOG(" == Going to open:"+URL.prePath + URL.path);
-
-		var externalLoader = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
-				.getService(Ci.nsIExternalProtocolService);
-
-		try {
-			externalLoader.loadUrl(URL);
-		}
-		catch (ex) { this.globalFunctions.LOG(" == ERROR:"+ex); }
-	},
-
-	downloadAttachment: function _downloadAttachment(aAttachment, doSave)
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.downloadAttachment");
-		if (! aAttachment) { return; }
-
-		var self = this;
-
-		let getParams = this.globalFunctions.splitUriGetParams(aAttachment.uri);
-
-		var prefs = "extensions.exchangecalendar@extensions.1st-setup.nl."+getParams.calendarid+".";
-
-		var serverUrl = this.globalFunctions.safeGetCharPref(null, prefs+"ecServer", "");
-		var username = this.globalFunctions.safeGetCharPref(null, prefs+"ecUser", "");
-		var domain = this.globalFunctions.safeGetCharPref(null, prefs+"ecDomain", "");
-		if (username.indexOf("@") == -1) {
-			if (domain != "") {
-				username = domain+"\\"+username;
-			}
-		}
-
-		var tmpObject = new erGetAttachmentsRequest(
-			{user: username, 
-			 serverUrl:  serverUrl ,
-			 attachmentIds: [getParams.id],
-			 doSave: doSave}, self.onDownloadAttachmentOk, self.onDownloadAttachmentError);
-
-	},
-
-	onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments)
-	{
-		var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
-
-		globalFunctions.LOG("exchWebService.attachments.onDownloadAttachmentOk:"+aAttachments.length);
-
-		if (aAttachments.length > 0) {
-			for (var index in aAttachments) {
-				globalFunctions.LOG(" == Going to decode:"+aAttachments[index].name);
-				globalFunctions.LOG(" == content:"+aAttachments[index].content.length+" bytes");  
-				var fileData = window.atob(aAttachments[index].content);
-				globalFunctions.LOG(" == Decoded:"+aAttachments[index].name);
-
-				if (aExchangeRequest.argument.doSave) {
-					var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-					fp.init(window, "Save", Ci.nsIFilePicker.modeSave);
-					fp.defaultString = aAttachments[index].name;
-					var result = fp.show();
-					if (result == Ci.nsIFilePicker.returnCancel) {
-						// User canceled. // Maybe we should have an option for only this attachment or all. Now for all.
-					
-						return;
-					}
-					var file = fp.file;
-				}
-				else {
-					var file = Cc["@mozilla.org/file/directory_service;1"].  
-							getService(Ci.nsIProperties).  
-							get("TmpD", Ci.nsIFile);  
-					file.append(aAttachments[index].name);  
-				}
-				//file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);  
-				// do whatever you need to the created file  
-				globalFunctions.LOG(" == new tmp filename:"+file.path);  
-
-				var stream = Cc["@mozilla.org/network/safe-file-output-stream;1"].  
-						createInstance(Ci.nsIFileOutputStream);  
-				stream.init(file, 0x04 | 0x08 | 0x20, 384, 0); // readwrite, create, truncate  
-              
-				globalFunctions.LOG(" == writing file:"+file.path);  
-				globalFunctions.LOG(" == writing:"+fileData.length+" bytes");  
-				stream.write(fileData, fileData.length);  
-				if (stream instanceof Ci.nsISafeOutputStream) {  
-					stream.finish();  
-				} else {  
-					stream.close();  
-				}
-
-				// Dispose of the converted data in memory;
-				//delete fileData;
-
-				globalFunctions.LOG(" == written file:"+file.path);  
-				globalFunctions.LOG(" == written:"+fileData.length+" bytes");  
-
-				if (! aExchangeRequest.argument.doSave) {
-					// file is nsIFile  
-					var ios = Cc["@mozilla.org/network/io-service;1"].  
-							getService(Ci.nsIIOService);  
-					var URL = ios.newFileURI(file);  
-	
-					globalFunctions.LOG(" == Going to open:"+URL.prePath + URL.path);
-
-					var externalLoader = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
-							.getService(Ci.nsIExternalProtocolService);
-
-					try {
-						externalLoader.loadUrl(URL);
-					}
-					catch (ex) { globalFunctions.LOG(" == ERROR:"+ex); }
-				}
-			}
-		}
-	},
-
-	onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg)
-	{
-		var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
-		globalFunctions.LOG("exchWebService.attachments.onDownloadAttachmentError: aCode:"+aCode+", aMsg:"+aMsg);
-	},
+        if (displayElement("calendar-task-details-container", item != null)
+            && displayElement("calendar-task-view-splitter", item != null)) {
+
+            if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
+                // calendar-task-view (hide existing attachment view)
+                //this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: it is an Exchange task 1.");
+                try {
+                    this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("hidden", "true");
+                    this._document.getElementById("calendar-task-details-attachment-rows").removeAttribute("flex");
+                    this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("width", "0px");
+                }
+                catch (ex) {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje:");
+                }
+
+                //this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: it is an Exchange task 2.");
+
+                try {
+                    this._document.getElementById("exchWebService-attachments-row").setAttribute("collapsed", "false");
+                }
+                catch (ex) {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje Y:");
+                }
+
+                try {
+                    this.addAttachmentsFromItem(item);
+                }
+                catch (ex) {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje2:" + ex);
+                }
+                //this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: it is an Exchange task 3.");
+            }
+            else {
+                try {
+                    this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("hidden", "false");
+                    this._document.getElementById("calendar-task-details-attachment-rows").setAttribute("flex", "1");
+                    this._document.getElementById("calendar-task-details-attachment-rows").removeAttribute("width");
+                }
+                catch (ex) {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje X:");
+                }
+
+                try {
+                    this._document.getElementById("exchWebService-attachments-row").setAttribute("collapsed", "true");
+                }
+                catch (ex) {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelectTask: Foutje Y:");
+                }
+                this.attachmentListboxVisible = false;
+            }
+        }
+    },
 
-}
+    onSelect: function _onSelect(aEvent) {
+        this.globalFunctions.LOG("exchWebService.attachments.onSelect");
 
-var tmpAttachment = new exchAttachments(document, window);
-window.addEventListener("load", function _onLoad() { tmpAttachment.onLoad(); }, false);
+        let documentLink = this._document.getElementById("attachment-link");
+
+        var isReadOnly = "true";
+        if ((this._document.getElementById("calendar-event-dialog")) || (this._document.getElementById("calendar-task-dialog"))) {
+            isReadOnly = "false";
+        }
 
+        var calendar = getCurrentCalendar();
+        if (calendar.readOnly) {
+            isReadOnly = "true";
+        }
+
+        if ((documentLink.selectedItem) && (documentLink.selectedItem.attachment)) {
+            var attURI = documentLink.selectedItem.attachment.uri;
+            if (attURI.spec.indexOf("file://") == 0) {
+                this.globalFunctions.LOG("exchWebService.attachments.onSelect: localfile");
+                this._document.getElementById("exchWebService-attachment-popup-open").setAttribute("disabled", "false");
+                this._document.getElementById("exchWebService_openAttachment").setAttribute("disabled", "false");
+                this._document.getElementById("exchWebService-attachment-popup-save").setAttribute("disabled", "true");
+                this._document.getElementById("exchWebService_saveAttachment").setAttribute("disabled", "true");
+                this._document.getElementById("exchWebService-attachment-popup-delete").setAttribute("disabled", isReadOnly);
+                this._document.getElementById("exchWebService_deleteAttachment").setAttribute("disabled", isReadOnly);
+            }
+            else {
+                if (attURI.spec.indexOf("http") == 0) {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelect: remotefile");
+                    this._document.getElementById("exchWebService-attachment-popup-open").setAttribute("disabled", "false");
+                    this._document.getElementById("exchWebService_openAttachment").setAttribute("disabled", "false");
+                    this._document.getElementById("exchWebService-attachment-popup-save").setAttribute("disabled", "false");
+                    this._document.getElementById("exchWebService_saveAttachment").setAttribute("disabled", "false");
+                    this._document.getElementById("exchWebService-attachment-popup-delete").setAttribute("disabled", isReadOnly);
+                    this._document.getElementById("exchWebService_deleteAttachment").setAttribute("disabled", isReadOnly);
+                }
+                else {
+                    this.globalFunctions.LOG("exchWebService.attachments.onSelect: Unknown attachment URI. Cannot open:" + attURI.spec);
+                    this._document.getElementById("exchWebService-attachment-popup-open").setAttribute("disabled", "true");
+                    this._document.getElementById("exchWebService-attachment-popup-save").setAttribute("disabled", "true");
+                }
+            }
+        }
+    },
+
+    openAttachment: function _openAttachment() {
+        this.globalFunctions.LOG("exchWebService.attachments.openAttachment");
+        let documentLink = this._document.getElementById("attachment-link");
+
+        if (documentLink.selectedItem.attachment) {
+            var attURI = documentLink.selectedItem.attachment.uri;
+            if (attURI.spec.indexOf("file://") == 0) {
+                this.openLocalAttachment(documentLink.selectedItem.attachment);
+            }
+            else {
+                if (attURI.spec.indexOf("http") == 0) {
+                    this.downloadAttachment(documentLink.selectedItem.attachment, false);
+                }
+                else {
+                    this.globalFunctions.LOG("exchWebService.attachments.openAttachment: Unknown attachment URI. Cannot open:" + attURI.spec);
+                }
+            }
+        }
+    },
+
+    saveAttachment: function _saveAttachment() {
+        this.globalFunctions.LOG("exchWebService.attachments.saveAttachment");
+        let documentLink = this._document.getElementById("attachment-link");
+        this.downloadAttachment(documentLink.selectedItem.attachment, true);
+    },
+
+    openLocalAttachment: function _openLocalAttachment(aAttachment) {
+        this.globalFunctions.LOG("exchWebService.attachments.openLocalAttachment");
+        if (!aAttachment) {
+            return;
+        }
 
+        var URL = aAttachment.uri;
+
+        this.globalFunctions.LOG(" == Going to open:" + URL.prePath + URL.path);
+
+        var externalLoader = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
+            .getService(Ci.nsIExternalProtocolService);
+
+        try {
+            externalLoader.loadUrl(URL);
+        }
+        catch (ex) {
+            this.globalFunctions.LOG(" == ERROR:" + ex);
+        }
+    },
+
+    downloadAttachment: function _downloadAttachment(aAttachment, doSave) {
+        this.globalFunctions.LOG("exchWebService.attachments.downloadAttachment");
+        if (!aAttachment) {
+            return;
+        }
+
+        var self = this;
+
+        let getParams = this.globalFunctions.splitUriGetParams(aAttachment.uri);
+
+        var prefs = "extensions.exchangecalendar@extensions.1st-setup.nl." + getParams.calendarid + ".";
+
+        var serverUrl = this.globalFunctions.safeGetCharPref(null, prefs + "ecServer", "");
+        var username = this.globalFunctions.safeGetCharPref(null, prefs + "ecUser", "");
+        var domain = this.globalFunctions.safeGetCharPref(null, prefs + "ecDomain", "");
+        if (username.indexOf("@") == -1) {
+            if (domain != "") {
+                username = domain + "\\" + username;
+            }
+        }
+
+        var tmpObject = new erGetAttachmentsRequest({
+            user: username,
+            serverUrl: serverUrl,
+            attachmentIds: [getParams.id],
+            doSave: doSave
+        }, self.onDownloadAttachmentOk, self.onDownloadAttachmentError);
+
+    },
+
+    onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments) {
+        var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+            .getService(Ci.mivFunctions);
+
+        globalFunctions.LOG("exchWebService.attachments.onDownloadAttachmentOk:" + aAttachments.length);
+
+        if (aAttachments.length > 0) {
+            for (var index in aAttachments) {
+                globalFunctions.LOG(" == Going to decode:" + aAttachments[index].name);
+                globalFunctions.LOG(" == content:" + aAttachments[index].content.length + " bytes");
+                var fileData = window.atob(aAttachments[index].content);
+                globalFunctions.LOG(" == Decoded:" + aAttachments[index].name);
+
+                if (aExchangeRequest.argument.doSave) {
+                    var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+                    fp.init(window, "Save", Ci.nsIFilePicker.modeSave);
+                    fp.defaultString = aAttachments[index].name;
+                    var result = fp.show();
+                    if (result == Ci.nsIFilePicker.returnCancel) {
+                        // User canceled. // Maybe we should have an option for only this attachment or all. Now for all.
+
+                        return;
+                    }
+                    var file = fp.file;
+                }
+                else {
+                    var file = Cc["@mozilla.org/file/directory_service;1"].
+                    getService(Ci.nsIProperties).
+                    get("TmpD", Ci.nsIFile);
+                    file.append(aAttachments[index].name);
+                }
+                //file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);  
+                // do whatever you need to the created file  
+                globalFunctions.LOG(" == new tmp filename:" + file.path);
+
+                var stream = Cc["@mozilla.org/network/safe-file-output-stream;1"].
+                createInstance(Ci.nsIFileOutputStream);
+                stream.init(file, 0x04 | 0x08 | 0x20, 384, 0); // readwrite, create, truncate  
+
+                globalFunctions.LOG(" == writing file:" + file.path);
+                globalFunctions.LOG(" == writing:" + fileData.length + " bytes");
+                stream.write(fileData, fileData.length);
+                if (stream instanceof Ci.nsISafeOutputStream) {
+                    stream.finish();
+                }
+                else {
+                    stream.close();
+                }
+
+                // Dispose of the converted data in memory;
+                //delete fileData;
+
+                globalFunctions.LOG(" == written file:" + file.path);
+                globalFunctions.LOG(" == written:" + fileData.length + " bytes");
+
+                if (!aExchangeRequest.argument.doSave) {
+                    // file is nsIFile  
+                    var ios = Cc["@mozilla.org/network/io-service;1"].
+                    getService(Ci.nsIIOService);
+                    var URL = ios.newFileURI(file);
+
+                    globalFunctions.LOG(" == Going to open:" + URL.prePath + URL.path);
+
+                    var externalLoader = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
+                        .getService(Ci.nsIExternalProtocolService);
+
+                    try {
+                        externalLoader.loadUrl(URL);
+                    }
+                    catch (ex) {
+                        globalFunctions.LOG(" == ERROR:" + ex);
+                    }
+                }
+            }
+        }
+    },
+
+    onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg) {
+        var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+            .getService(Ci.mivFunctions);
+        globalFunctions.LOG("exchWebService.attachments.onDownloadAttachmentError: aCode:" + aCode + ", aMsg:" + aMsg);
+    },
+
+}
+
+var tmpAttachment = new exchAttachments(document, window);
+window.addEventListener("load", function _onLoad() {
+    tmpAttachment.onLoad();
+}, false);
diff --git a/chrome/content/browseFolder.js b/chrome/content/browseFolder.js
index 43bd0c9b..4ec588e7 100644
--- a/chrome/content/browseFolder.js
+++ b/chrome/content/browseFolder.js
@@ -46,366 +46,372 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/erBrowseFolder.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 function exchWebService_browseTreeView(aProperties) {
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
-
-	this.globalFunctions.LOG("browseTreeView 1");
-
-	this.ecProperties= {};
-	this.ecProperties["user"] = aProperties.user;
-	this.ecProperties["mailbox"] = aProperties.mailbox;
-	this.ecProperties["folderBase"] = aProperties.folderBase;
-	this.ecProperties["serverUrl"] = aProperties.serverUrl;
-	this.ecProperties["folderID"] = aProperties.folderID;
-	this.ecProperties["changeKey"] = aProperties.changeKey;
-
-	this.ecProperties["foldername"] = "/";
-	this.ecProperties["level"] = 0;
-	this.ecProperties["isContainer"] = true;
-	this.ecProperties["isContainerOpen"] = false;
-	this.ecProperties["isContainerEmpty"] = false;
-	this.ecProperties["children"] = [];
-	this.ecProperties["folderClass"] = aProperties.folderBase;
-	
-	this.folders = new Array();
-	this.folders.push(this.ecProperties);
-
-	this.getChildFolders(this.ecProperties);
-
-	this.globalFunctions.LOG("browseTreeView 2");
-				
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
+
+    this.globalFunctions.LOG("browseTreeView 1");
+
+    this.ecProperties = {};
+    this.ecProperties["user"] = aProperties.user;
+    this.ecProperties["mailbox"] = aProperties.mailbox;
+    this.ecProperties["folderBase"] = aProperties.folderBase;
+    this.ecProperties["serverUrl"] = aProperties.serverUrl;
+    this.ecProperties["folderID"] = aProperties.folderID;
+    this.ecProperties["changeKey"] = aProperties.changeKey;
+
+    this.ecProperties["foldername"] = "/";
+    this.ecProperties["level"] = 0;
+    this.ecProperties["isContainer"] = true;
+    this.ecProperties["isContainerOpen"] = false;
+    this.ecProperties["isContainerEmpty"] = false;
+    this.ecProperties["children"] = [];
+    this.ecProperties["folderClass"] = aProperties.folderBase;
+
+    this.folders = new Array();
+    this.folders.push(this.ecProperties);
+
+    this.getChildFolders(this.ecProperties);
+
+    this.globalFunctions.LOG("browseTreeView 2");
+
 };
 
 exchWebService_browseTreeView.prototype = {
 
-  treeBox: null,  
-  
-  get rowCount()                     { return this.folders.length; },  
-  setTree: function(treeBox)         { this.treeBox = treeBox; },  
-
-	getCellText: function(idx, column) 
-	{
-		switch (column.id) {
-			case "exchWebService_foldername":
-				return this.folders[idx].foldername;
-				break;
-			case "exchWebService_folderclass":
-				return this.folders[idx].folderClass;
-				break;
-		}
-	},  
-
-  isContainer: function(idx)         { return this.folders[idx].isContainer; },  
-  isContainerOpen: function(idx)     { return this.folders[idx].isContainerOpen; },  
-  isContainerEmpty: function(idx)    { return this.folders[idx].isContainerEmpty; },  
-  isSeparator: function(idx)         { return false; },  
-  isSorted: function()               { return false; },  
-  isEditable: function(idx, column)  { return false; },  
-  
-	getParentIndex: function _getParentIndex(idx)
-	{
-//		if (this.isContainer(idx)) return -1;  
-		for (var t = idx - 1; t >= 0 ; t--) {  
-			if (this.isContainer(t)) return t;  
-		}  
-		return -1;
-	},  
-
-	getLevel: function _getLevel(idx) 
-	{
-		return this.folders[idx].level;  
-	},  
-
-	hasNextSibling: function _hasNextSibling(idx, after)
-	{
-		var thisLevel = this.getLevel(idx);  
-		for (var t = after + 1; t < this.folders.length; t++) {  
-			var nextLevel = this.getLevel(t);  
-			if (nextLevel == thisLevel) return true;  
-			if (nextLevel < thisLevel) break;  
-		}  
-		return false;  
-	}, 
- 
-	openFolder: function(idx) 
-	{
-		var insertedRows = 0;
-		var index = idx+1;
-		for each(var child in this.folders[idx].children) {
-			this.folders.splice(index, 0, child);  // Add one
-
-			if ((child.isContainer) && (child.isContainerOpen)) {
-				// We have to add the children of this child. and so on.
-				var childRowCount = this.openFolder(index);
-				insertedRows = insertedRows + childRowCount;
-				index = index + childRowCount; 
-			}
-			insertedRows++;
-			index++;
-		}
-		this.folders[idx].isContainerOpen = true;
-		return insertedRows;
-	},
-
-	toggleOpenState: function _toggleOpenState(idx) 
-	{
-		if (this.folders[idx].isContainer) {
-			if (this.folders[idx].isContainerOpen) {
-				// Closing the container.
-				var removedRows = 0;
-				var index = idx+1;
-				while ((index < this.folders.length) && (this.folders[index].level > this.folders[idx].level)) {
-					this.folders.splice(index, 1);  // Remove one
-					removedRows++;
-				}
-				this.folders[idx].isContainerOpen = false;
-				this.treeBox.rowCountChanged(idx + 1, -removedRows);
-			}
-			else {
-				// Opening the container.
-				if (this.folders[idx].children.length > 0) {
-					var insertedRows = this.openFolder(idx);
-					this.treeBox.rowCountChanged(idx + 1, insertedRows);
-				}
-				else {
-					this.folders[idx].isContainerOpen = true;
-					this.getChildFolders(this.folders[idx]);
-				}
-			}
-		}
-		this.treeBox.invalidateRow(idx); 
-
-	},  
-  
-	getImageSrc: function(idx, column) 
-	{
-		if (column.id == "exchWebService_foldername") {
-			switch (this.folders[idx].folderClass) {
-				case "IPF.Appointment":
-					return "chrome://exchangecalendar-common/skin/images/calendar-month.png"; 
-					break;
-				case "IPF.Note":
-					return "chrome://exchangecalendar-common/skin/images/mail.png"; 
-					break;
-				case "IPF.Contact":
-					return "chrome://exchangecalendar-common/skin/images/address-book.png"; 
-					break;
-				case "IPF.Configuration":
-					return "chrome://exchangecalendar-common/skin/images/wrench-screwdriver.png"; 
-					break;
-				case "IPF.Note.OutlookHomepage":
-				case "IPF.Note.SocialConnector.FeedItems":
-					return "chrome://exchangecalendar-common/skin/images/feed.png"; 
-					break;
-				case "IPF.Task":
-					return "chrome://exchangecalendar-common/skin/images/task.png"; 
-					break;
-				case "IPF.StickyNote":
-					return "chrome://exchangecalendar-common/skin/images/sticky-notes.png"; 
-					break;
-				case "IPF.Journal":
-					return "chrome://exchangecalendar-common/skin/images/blog.png"; 
-					break;
-
-			}
-
-			if (this.folders[idx].isContainerOpen) {
-				return "chrome://exchangecalendar-common/skin/images/folder-open.png"; 
-			}
-
-			return "chrome://exchangecalendar-common/skin/images/folder.png"; 
-		}
-	},
-  
-  getProgressMode : function(idx,column) {},  
-  getCellValue: function(idx, column) {},  
-  cycleHeader: function(col, elem) {},  
-  selectionChanged: function() {},  
-  cycleCell: function(idx, column) {},  
-  performAction: function(action) {},  
-  performActionOnCell: function(action, index, column) {},  
-  getRowProperties: function(idx, prop) {},  
-  getCellProperties: function(idx, column, prop) {},  
-  getColumnProperties: function(column, element, prop) {},  
-
-	getItemIndex: function _getItemIndex(aItem)
-	{
-		var index = 0;
-		while ((index < this.folders.length) && (this.folders[index].folderID != aItem.folderID)) {
-			index++;
-		}
-
-		if ((index < this.folders.length) && (this.folders[index].folderID == aItem.folderID)) {
-			return index;
-		}
-
-		return -1;
-	},
-
-	getChildFolders: function _getChildFolders(aParent)
-	{
-		var self = this;
-		this.globalFunctions.LOG("getChildFolders");
-
-		window.setCursor("wait");
-		
-		var tmpObject = new erBrowseFolderRequest(aParent, 
-							function(erBrowseFolderRequest, childFolders) { self.browseFolderOk(erBrowseFolderRequest, childFolders);}, 
-							function(erBrowseFolderRequest, aCode, aMsg) { self.browseFolderError(erBrowseFolderRequest, aCode, aMsg);});
-	},
-
-	addChild: function _addChild(aParent, aChild)
-	{
-		this.globalFunctions.LOG("addChild:"+aChild.foldername);
-
-		if ((aParent.isContainer) && (aParent.isContainerOpen)) {
-			// Set index of child and update index of following items
-			var parentIndex = this.getItemIndex(aParent);
-			if (parentIndex > -1) {
-				this.folders.splice(parentIndex+aParent.children.length+1, 0, aChild);
-	      			this.treeBox.rowCountChanged(parentIndex+aParent.children.length+1, 1);  
-			}
-		}
-
-		aChild.parent = aParent;
-		aParent.children.push(aChild);
-
-	},
-
-	browseFolderOk: function _browseFolderOk(erBrowseFolderRequest, childFolders)
-	{
-		var parentIndex = this.getItemIndex(erBrowseFolderRequest.argument);
-		if (parentIndex > -1) {
-			var parent = this.folders[parentIndex];
-			for each(var folder in childFolders) {
-				this.addChild(parent, folder);
-			}
-		}
-		window.setCursor("auto");
-	},
-
-	browseFolderError: function _browseFolderError(erUpdateItemRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("browseFolderError");
-		window.setCursor("auto");
-	},
-
-	getFullPathByIndex: function _getFullPathByIndex(aIndex)
-	{
-		var result = "";
-		var currentNode = this.folders[aIndex];
-		while (currentNode) {
-			if (result != "") {
-				if (currentNode.foldername != "/") {
-					result = this.globalFunctions.encodeFolderSpecialChars(currentNode.foldername) + "/" + result;
-				}
-				else {
-					// We reached the top root.
-					result = currentNode.foldername + result;
-				}
-			}
-			else {
-				if (currentNode.foldername != "/") {
-					result = this.globalFunctions.encodeFolderSpecialChars(currentNode.foldername);
-				}
-				else {
-					result = currentNode.foldername;
-				}
-			}
-			currentNode = currentNode.parent;
-		}
-
-		return result;
-	},
-
-	getFullPathByItem: function _getFullPathByItem(aItem)
-	{
-		var index = this.getItemIndex(aItem);
-		if (index > -1) {
-			return this.getFullPathByIndex(index);
-		}
-		else {
-			return "";
-		}
-	},
-
-	// TODO: finish this so we can open up the right node. Remember we are running async.
-	setFullPath: function _setFullPath(aPath)
-	{
-		var paths = aPath.split("/");
-		var pathindex = 0;
-
-		var folderIndex = 0;
-		var startFolder = this.folders[0];
-		while ((folderIndex < startFolder.children.length) && (pathindex < paths.length)) {
-			if (startFolder.children[folderIndex].foldername == paths[pathindex]) {
-				var itemIndex = this.getItemIndex(startFolder);
-				if (itemIndex > -1) {
-					this.toggleOpenState();
-				}
-				startFolder = startFolder.children[folderIndex];
-				folderIndex = 0;
-				index++;
-			}
-			else {
-				folderIndex++;
-			}
-		}
-	},
+    treeBox: null,
+
+    get rowCount() {
+        return this.folders.length;
+    },
+    setTree: function (treeBox) {
+        this.treeBox = treeBox;
+    },
+
+    getCellText: function (idx, column) {
+        switch (column.id) {
+        case "exchWebService_foldername":
+            return this.folders[idx].foldername;
+            break;
+        case "exchWebService_folderclass":
+            return this.folders[idx].folderClass;
+            break;
+        }
+    },
+
+    isContainer: function (idx) {
+        return this.folders[idx].isContainer;
+    },
+    isContainerOpen: function (idx) {
+        return this.folders[idx].isContainerOpen;
+    },
+    isContainerEmpty: function (idx) {
+        return this.folders[idx].isContainerEmpty;
+    },
+    isSeparator: function (idx) {
+        return false;
+    },
+    isSorted: function () {
+        return false;
+    },
+    isEditable: function (idx, column) {
+        return false;
+    },
+
+    getParentIndex: function _getParentIndex(idx) {
+        //		if (this.isContainer(idx)) return -1;  
+        for (var t = idx - 1; t >= 0; t--) {
+            if (this.isContainer(t)) return t;
+        }
+        return -1;
+    },
+
+    getLevel: function _getLevel(idx) {
+        return this.folders[idx].level;
+    },
+
+    hasNextSibling: function _hasNextSibling(idx, after) {
+        var thisLevel = this.getLevel(idx);
+        for (var t = after + 1; t < this.folders.length; t++) {
+            var nextLevel = this.getLevel(t);
+            if (nextLevel == thisLevel) return true;
+            if (nextLevel < thisLevel) break;
+        }
+        return false;
+    },
+
+    openFolder: function (idx) {
+        var insertedRows = 0;
+        var index = idx + 1;
+        for each(var child in this.folders[idx].children) {
+            this.folders.splice(index, 0, child); // Add one
+
+            if ((child.isContainer) && (child.isContainerOpen)) {
+                // We have to add the children of this child. and so on.
+                var childRowCount = this.openFolder(index);
+                insertedRows = insertedRows + childRowCount;
+                index = index + childRowCount;
+            }
+            insertedRows++;
+            index++;
+        }
+        this.folders[idx].isContainerOpen = true;
+        return insertedRows;
+    },
+
+    toggleOpenState: function _toggleOpenState(idx) {
+        if (this.folders[idx].isContainer) {
+            if (this.folders[idx].isContainerOpen) {
+                // Closing the container.
+                var removedRows = 0;
+                var index = idx + 1;
+                while ((index < this.folders.length) && (this.folders[index].level > this.folders[idx].level)) {
+                    this.folders.splice(index, 1); // Remove one
+                    removedRows++;
+                }
+                this.folders[idx].isContainerOpen = false;
+                this.treeBox.rowCountChanged(idx + 1, -removedRows);
+            }
+            else {
+                // Opening the container.
+                if (this.folders[idx].children.length > 0) {
+                    var insertedRows = this.openFolder(idx);
+                    this.treeBox.rowCountChanged(idx + 1, insertedRows);
+                }
+                else {
+                    this.folders[idx].isContainerOpen = true;
+                    this.getChildFolders(this.folders[idx]);
+                }
+            }
+        }
+        this.treeBox.invalidateRow(idx);
+
+    },
+
+    getImageSrc: function (idx, column) {
+        if (column.id == "exchWebService_foldername") {
+            switch (this.folders[idx].folderClass) {
+            case "IPF.Appointment":
+                return "chrome://exchangecalendar-common/skin/images/calendar-month.png";
+                break;
+            case "IPF.Note":
+                return "chrome://exchangecalendar-common/skin/images/mail.png";
+                break;
+            case "IPF.Contact":
+                return "chrome://exchangecalendar-common/skin/images/address-book.png";
+                break;
+            case "IPF.Configuration":
+                return "chrome://exchangecalendar-common/skin/images/wrench-screwdriver.png";
+                break;
+            case "IPF.Note.OutlookHomepage":
+            case "IPF.Note.SocialConnector.FeedItems":
+                return "chrome://exchangecalendar-common/skin/images/feed.png";
+                break;
+            case "IPF.Task":
+                return "chrome://exchangecalendar-common/skin/images/task.png";
+                break;
+            case "IPF.StickyNote":
+                return "chrome://exchangecalendar-common/skin/images/sticky-notes.png";
+                break;
+            case "IPF.Journal":
+                return "chrome://exchangecalendar-common/skin/images/blog.png";
+                break;
+
+            }
+
+            if (this.folders[idx].isContainerOpen) {
+                return "chrome://exchangecalendar-common/skin/images/folder-open.png";
+            }
+
+            return "chrome://exchangecalendar-common/skin/images/folder.png";
+        }
+    },
+
+    getProgressMode: function (idx, column) {},
+    getCellValue: function (idx, column) {},
+    cycleHeader: function (col, elem) {},
+    selectionChanged: function () {},
+    cycleCell: function (idx, column) {},
+    performAction: function (action) {},
+    performActionOnCell: function (action, index, column) {},
+    getRowProperties: function (idx, prop) {},
+    getCellProperties: function (idx, column, prop) {},
+    getColumnProperties: function (column, element, prop) {},
+
+    getItemIndex: function _getItemIndex(aItem) {
+        var index = 0;
+        while ((index < this.folders.length) && (this.folders[index].folderID != aItem.folderID)) {
+            index++;
+        }
+
+        if ((index < this.folders.length) && (this.folders[index].folderID == aItem.folderID)) {
+            return index;
+        }
+
+        return -1;
+    },
+
+    getChildFolders: function _getChildFolders(aParent) {
+        var self = this;
+        this.globalFunctions.LOG("getChildFolders");
+
+        window.setCursor("wait");
+
+        var tmpObject = new erBrowseFolderRequest(aParent,
+            function (erBrowseFolderRequest, childFolders) {
+                self.browseFolderOk(erBrowseFolderRequest, childFolders);
+            },
+            function (erBrowseFolderRequest, aCode, aMsg) {
+                self.browseFolderError(erBrowseFolderRequest, aCode, aMsg);
+            });
+    },
+
+    addChild: function _addChild(aParent, aChild) {
+        this.globalFunctions.LOG("addChild:" + aChild.foldername);
+
+        if ((aParent.isContainer) && (aParent.isContainerOpen)) {
+            // Set index of child and update index of following items
+            var parentIndex = this.getItemIndex(aParent);
+            if (parentIndex > -1) {
+                this.folders.splice(parentIndex + aParent.children.length + 1, 0, aChild);
+                this.treeBox.rowCountChanged(parentIndex + aParent.children.length + 1, 1);
+            }
+        }
+
+        aChild.parent = aParent;
+        aParent.children.push(aChild);
+
+    },
+
+    browseFolderOk: function _browseFolderOk(erBrowseFolderRequest, childFolders) {
+        var parentIndex = this.getItemIndex(erBrowseFolderRequest.argument);
+        if (parentIndex > -1) {
+            var parent = this.folders[parentIndex];
+            for each(var folder in childFolders) {
+                this.addChild(parent, folder);
+            }
+        }
+        window.setCursor("auto");
+    },
+
+    browseFolderError: function _browseFolderError(erUpdateItemRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("browseFolderError");
+        window.setCursor("auto");
+    },
+
+    getFullPathByIndex: function _getFullPathByIndex(aIndex) {
+        var result = "";
+        var currentNode = this.folders[aIndex];
+        while (currentNode) {
+            if (result != "") {
+                if (currentNode.foldername != "/") {
+                    result = this.globalFunctions.encodeFolderSpecialChars(currentNode.foldername) + "/" + result;
+                }
+                else {
+                    // We reached the top root.
+                    result = currentNode.foldername + result;
+                }
+            }
+            else {
+                if (currentNode.foldername != "/") {
+                    result = this.globalFunctions.encodeFolderSpecialChars(currentNode.foldername);
+                }
+                else {
+                    result = currentNode.foldername;
+                }
+            }
+            currentNode = currentNode.parent;
+        }
+
+        return result;
+    },
+
+    getFullPathByItem: function _getFullPathByItem(aItem) {
+        var index = this.getItemIndex(aItem);
+        if (index > -1) {
+            return this.getFullPathByIndex(index);
+        }
+        else {
+            return "";
+        }
+    },
+
+    // TODO: finish this so we can open up the right node. Remember we are running async.
+    setFullPath: function _setFullPath(aPath) {
+        var paths = aPath.split("/");
+        var pathindex = 0;
+
+        var folderIndex = 0;
+        var startFolder = this.folders[0];
+        while ((folderIndex < startFolder.children.length) && (pathindex < paths.length)) {
+            if (startFolder.children[folderIndex].foldername == paths[pathindex]) {
+                var itemIndex = this.getItemIndex(startFolder);
+                if (itemIndex > -1) {
+                    this.toggleOpenState();
+                }
+                startFolder = startFolder.children[folderIndex];
+                folderIndex = 0;
+                index++;
+            }
+            else {
+                folderIndex++;
+            }
+        }
+    },
 };
 
 
-function exchBrowseFolder(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchBrowseFolder(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchBrowseFolder.prototype = {
 
-	folderBrowserTreeView: null,
+    folderBrowserTreeView: null,
 
-	onAccept: function _onAccept()
-	{
-		this._window.arguments[0].answer = "select";
+    onAccept: function _onAccept() {
+        this._window.arguments[0].answer = "select";
 
-		var treeIndex = this._document.getElementById('exchWebService_foldertree').currentIndex;
-		this._window.arguments[0].fullPath = this.folderBrowserTreeView.getFullPathByIndex(treeIndex);
-		this._window.arguments[0].selectedFolder = this.folderBrowserTreeView.folders[treeIndex];
+        var treeIndex = this._document.getElementById('exchWebService_foldertree').currentIndex;
+        this._window.arguments[0].fullPath = this.folderBrowserTreeView.getFullPathByIndex(treeIndex);
+        this._window.arguments[0].selectedFolder = this.folderBrowserTreeView.folders[treeIndex];
 
-		this.globalFunctions.LOG("onAccept");
+        this.globalFunctions.LOG("onAccept");
 
-		return true;
-	},
+        return true;
+    },
 
-	onLoad: function _onLoad()
-	{
-		this.globalFunctions.LOG("onLoad");
-		var parentFolder = this._window.arguments[0].parentFolder;
-		this.globalFunctions.LOG("parentFolder.user:"+parentFolder.user);
+    onLoad: function _onLoad() {
+        this.globalFunctions.LOG("onLoad");
+        var parentFolder = this._window.arguments[0].parentFolder;
+        this.globalFunctions.LOG("parentFolder.user:" + parentFolder.user);
 
-		try {
-			this.folderBrowserTreeView = new exchWebService_browseTreeView(parentFolder);
-		} catch(err) { this.globalFunctions.LOG("ERROR:"+err);}
+        try {
+            this.folderBrowserTreeView = new exchWebService_browseTreeView(parentFolder);
+        }
+        catch (err) {
+            this.globalFunctions.LOG("ERROR:" + err);
+        }
 
-		this._document.getElementById('exchWebService_foldertree').treeBoxObject.view = this.folderBrowserTreeView;
-	},
+        this._document.getElementById('exchWebService_foldertree').treeBoxObject.view = this.folderBrowserTreeView;
+    },
 
-	doOnSelect: function _doOnSelect() 
-	{
-		var treeIndex = this._document.getElementById('exchWebService_foldertree').currentIndex;
-	
-		this._document.getElementById('exchWebService_currentSelectedPath').value = this.folderBrowserTreeView.getFullPathByIndex(treeIndex);
-	},
+    doOnSelect: function _doOnSelect() {
+        var treeIndex = this._document.getElementById('exchWebService_foldertree').currentIndex;
+
+        this._document.getElementById('exchWebService_currentSelectedPath').value = this.folderBrowserTreeView.getFullPathByIndex(treeIndex);
+    },
 }
 
 var tmpBrowseFolder = new exchBrowseFolder(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpBrowseFolder.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpBrowseFolder.onLoad();
+}, true);
diff --git a/chrome/content/calendar-calendars-list.js b/chrome/content/calendar-calendars-list.js
index d9ec96cf..35518438 100644
--- a/chrome/content/calendar-calendars-list.js
+++ b/chrome/content/calendar-calendars-list.js
@@ -39,228 +39,239 @@ var Cu = Components.utils;
 var Cr = Components.results;
 var components = Components;
 
-function exchCalPopUpMenu(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchCalPopUpMenu(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchCalPopUpMenu.prototype = {
 
-	editExchangeSettings: function _editExchangeSettings()
-	{
-		var myCal = getSelectedCalendar();
-		var aResult = "";
-		if (myCal) {
-			var aResult = { calendar: myCal, answer: ""};
-			this._window.openDialog("chrome://exchangecalendar/content/exchangeSettings.xul",
-				"exchangeSettings",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
-				aResult); 
-		}
-	},
+    editExchangeSettings: function _editExchangeSettings() {
+        var myCal = getSelectedCalendar();
+        var aResult = "";
+        if (myCal) {
+            var aResult = {
+                calendar: myCal,
+                answer: ""
+            };
+            this._window.openDialog("chrome://exchangecalendar/content/exchangeSettings.xul",
+                "exchangeSettings",
+                "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
+                aResult);
+        }
+    },
 
-	editOofSettings: function _editOofSettings()
-	{
-		var myCal = getSelectedCalendar();
-		var aResult = "";
-		if (myCal) {
-			var aResult = { calendar: myCal, answer: ""};
-			this._window.openDialog("chrome://exchangecalendar/content/oofSettings.xul",
-				"oofSettings",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-				aResult); 
-		}
-	},
+    editOofSettings: function _editOofSettings() {
+        var myCal = getSelectedCalendar();
+        var aResult = "";
+        if (myCal) {
+            var aResult = {
+                calendar: myCal,
+                answer: ""
+            };
+            this._window.openDialog("chrome://exchangecalendar/content/oofSettings.xul",
+                "oofSettings",
+                "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+                aResult);
+        }
+    },
 
-	checkForExchangeCalendar: function _checkForExchangeCalendar()
-	{
-		var myCal = getSelectedCalendar();
-		if (myCal) {
-			if (myCal.type == "exchangecalendar") {
-				this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").hidden = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").disabled = false;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").disabled = false;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").disabled = false;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").hidden = false;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").hidden = false;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").hidden = false;
-				myCal.getProperty("exchWebService.checkFolderPath");
-			}
-			else if (myCal.type == "exchange") {
-				this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").disabled = false;
-				this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").hidden = false;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").hidden = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").hidden = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").hidden = true;
-			}
-			else {
-				this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").disabled = true;
-				this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").hidden = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").hidden = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").hidden = true;
-				this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").hidden = true;
-			}
-		}
-	},
+    checkForExchangeCalendar: function _checkForExchangeCalendar() {
+        var myCal = getSelectedCalendar();
+        if (myCal) {
+            if (myCal.type == "exchangecalendar") {
+                this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").hidden = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").disabled = false;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").disabled = false;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").disabled = false;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").hidden = false;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").hidden = false;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").hidden = false;
+                myCal.getProperty("exchWebService.checkFolderPath");
+            }
+            else if (myCal.type == "exchange") {
+                this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").disabled = false;
+                this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").hidden = false;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").hidden = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").hidden = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").hidden = true;
+            }
+            else {
+                this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").disabled = true;
+                this._document.getElementById("exchWebService-list-calendars-context-convertFromOldAddOn").hidden = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-edit").hidden = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-oof-settings").hidden = true;
+                this._document.getElementById("exchWebService-list-calendars-context-exchange-clone-settings").hidden = true;
+            }
+        }
+    },
 
-	convertSettings: function _convertSettings()
-	{
-		var myCal = getSelectedCalendar();
-		var uuid= myCal.id;
+    convertSettings: function _convertSettings() {
+        var myCal = getSelectedCalendar();
+        var uuid = myCal.id;
 
-		var currentPrefs = Cc["@mozilla.org/preferences-service;1"]
-	                    .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+uuid+".");
-		
-		// Get the name of the calendar. Is for in the prompt.
-		var calName = this.globalFunctions.safeGetCharPref(currentPrefs,"name", "");
-								
-		var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].  
-			getService(Ci.nsIPromptService);  
-		
-		// Get mail address from imip identity key
-		var identity = this.globalFunctions.safeGetCharPref(currentPrefs,"imip.identity.key", "");
-		if (identity != "") {
-			var exchWebServicesIdentityprefs = Cc["@mozilla.org/preferences-service;1"]
-        	            .getService(Ci.nsIPrefService)
-			    .getBranch("mail.identity."+identity+".");
+        var currentPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry." + uuid + ".");
 
-			var mailbox = { value: exchWebServicesIdentityprefs.getCharPref("useremail")};
-		}
-		else {
-			var mailbox = { value: "someone@somewhere.com"};
-		}
+        // Get the name of the calendar. Is for in the prompt.
+        var calName = this.globalFunctions.safeGetCharPref(currentPrefs, "name", "");
 
-		if (prompts.prompt(null, "Convert Calendar", "Do you want to convert this calendar '"+calName+"' to the new Exchange 2007/2010 Calendar and Tasks add-on? If YES please enter the primarySMTP emailaddress:", mailbox, "", {}))  {
-	
-			// We have a entry for the old Exchange Provider.
-		
-			// We need to get the uri
-			var uri = this.globalFunctions.safeGetCharPref(currentPrefs,"uri", "");
-			if (uri != "") {
-				// We have a uri. Check for domainname and username.
-				var ioService = Components.classes["@mozilla.org/network/io-service;1"]  
-							.getService(Components.interfaces.nsIIOService);  
-				var tmpURI = ioService.newURI(decodeURIComponent(uri), null, null); 
-				var username = decodeURIComponent(tmpURI.username);
-				if (username.indexOf("\\") > -1) {
-					var domainname = username.substr(0, username.indexOf("\\"));
-					username = username.substr(username.indexOf("\\")+1);
-				}
-				this.globalFunctions.LOG("username:"+username);
-				this.globalFunctions.LOG("domainname:"+domainname);
-				this.globalFunctions.LOG("url:"+tmpURI.scheme+"://"+tmpURI.hostPort+tmpURI.path);
-								
-				var newPrefs = Cc["@mozilla.org/preferences-service;1"]
-					                    .getService(Ci.nsIPrefService)
-							    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+uuid+".");
-				newPrefs.setCharPref("ecChangeKey", "");
-				newPrefs.setCharPref("ecDisplayname", "");
-				if (domainname) {
-					newPrefs.setCharPref("ecDomain", domainname);
-				}
-				else {
-					newPrefs.setCharPref("ecDomain", "");
-				}
-				newPrefs.setCharPref("ecFolderID", "");
-				newPrefs.setCharPref("ecFolderbase", "calendar");
-				newPrefs.setCharPref("ecFolderpath", "/");
-				newPrefs.setCharPref("ecMailbox", mailbox.value); // We have to ask this in a prompt
-				newPrefs.setCharPref("ecServer", tmpURI.scheme+"://"+tmpURI.hostPort+tmpURI.path);
-				newPrefs.setCharPref("ecUser", username);
-		
-				currentPrefs.setCharPref("type", "exchangecalendar");
-				currentPrefs.setCharPref("refreshInterval", "1");
+        var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].
+        getService(Ci.nsIPromptService);
 
-				Application.restart();
-			}
-			else {
-				this.globalFunctions.LOG(calName+": Wrong empty uri.");
-			}
-		}
-		else {
-			this.globalFunctions.LOG("migrateFromOldExchangeProvider: Calendar '"+calName+"' is skipped.");
-		}
-	},
+        // Get mail address from imip identity key
+        var identity = this.globalFunctions.safeGetCharPref(currentPrefs, "imip.identity.key", "");
+        if (identity != "") {
+            var exchWebServicesIdentityprefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("mail.identity." + identity + ".");
 
-	cloneSettings: function _cloneSettings()
-	{
-		var myCal = getSelectedCalendar();
-		var aResult = "";
-		if (myCal) {
-			var aResult = { calendar: myCal, answer: ""};
-			this._window.openDialog("chrome://exchangecalendar/content/exchangeCloneSettings.xul",
-				"exchangeCloneSettings",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
-				aResult); 
+            var mailbox = {
+                value: exchWebServicesIdentityprefs.getCharPref("useremail")
+            };
+        }
+        else {
+            var mailbox = {
+                value: "someone@somewhere.com"
+            };
+        }
 
-			if (aResult.answer == "saved") {
-				// Tell the Calendar Manager we have a new calendar.
-				this.globalFunctions.addCalendarById(aResult.newCalId);
-			}
-		}
-	},
+        if (prompts.prompt(null, "Convert Calendar", "Do you want to convert this calendar '" + calName + "' to the new Exchange 2007/2010 Calendar and Tasks add-on? If YES please enter the primarySMTP emailaddress:", mailbox, "", {})) {
 
-	delegateCalendarSettings: function _delegateCalendarSettings()
-	{  
-		var myCal = getSelectedCalendar();
-		var aResult = "";
-		if (myCal) {
-			var aResult = { calendar: myCal, answer: ""};
-			this._window.openDialog("chrome://exchangecalendar/content/delegateCalendar.xul",
-				"delegateCalendarSettings",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
-				aResult);   
-		}
-	},
-	
-	onLoad: function _onLoad()
-	{
-		//this._document.getElementById("calendar-list-tree-widget").setAttribute("type", "exchange");
-	},
+            // We have a entry for the old Exchange Provider.
 
-	tooltipShowing: function _tooltipShowing(aEvent)
-	{
-		let tree = document.getElementById("calendar-list-tree-widget");
-		let calendar = tree.getCalendarFromEvent(aEvent);
-		let tooltipText = false;
-		if ((calendar) && (calendar.type == "exchangecalendar")) {
-			let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
-			if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
-				if (calendar.readOnly) {
-					tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnectedReadOnly", [calendar.name, calendar.connectionStateDescription], "exchangecalendar");
-				}
-				else {
-					tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnected", [calendar.name, calendar.connectionStateDescription], "exchangecalendar");
-				}
-			} else {
-				if (calendar.readOnly) {
-					tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnectedReadOnly", [calendar.name], "exchangecalendar");
-				}
-				else {
-					tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnected", [calendar.name], "exchangecalendar");
-				}
-			}
-			setElementValue("calendar-list-tooltip", tooltipText, "label");
-		}
-		if (tooltipText) {
-			return (tooltipText != false);
-		}
-		return calendarListTooltipShowing(aEvent);
-	},
+            // We need to get the uri
+            var uri = this.globalFunctions.safeGetCharPref(currentPrefs, "uri", "");
+            if (uri != "") {
+                // We have a uri. Check for domainname and username.
+                var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                    .getService(Components.interfaces.nsIIOService);
+                var tmpURI = ioService.newURI(decodeURIComponent(uri), null, null);
+                var username = decodeURIComponent(tmpURI.username);
+                if (username.indexOf("\\") > -1) {
+                    var domainname = username.substr(0, username.indexOf("\\"));
+                    username = username.substr(username.indexOf("\\") + 1);
+                }
+                this.globalFunctions.LOG("username:" + username);
+                this.globalFunctions.LOG("domainname:" + domainname);
+                this.globalFunctions.LOG("url:" + tmpURI.scheme + "://" + tmpURI.hostPort + tmpURI.path);
+
+                var newPrefs = Cc["@mozilla.org/preferences-service;1"]
+                    .getService(Ci.nsIPrefService)
+                    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + uuid + ".");
+                newPrefs.setCharPref("ecChangeKey", "");
+                newPrefs.setCharPref("ecDisplayname", "");
+                if (domainname) {
+                    newPrefs.setCharPref("ecDomain", domainname);
+                }
+                else {
+                    newPrefs.setCharPref("ecDomain", "");
+                }
+                newPrefs.setCharPref("ecFolderID", "");
+                newPrefs.setCharPref("ecFolderbase", "calendar");
+                newPrefs.setCharPref("ecFolderpath", "/");
+                newPrefs.setCharPref("ecMailbox", mailbox.value); // We have to ask this in a prompt
+                newPrefs.setCharPref("ecServer", tmpURI.scheme + "://" + tmpURI.hostPort + tmpURI.path);
+                newPrefs.setCharPref("ecUser", username);
+
+                currentPrefs.setCharPref("type", "exchangecalendar");
+                currentPrefs.setCharPref("refreshInterval", "1");
+
+                Application.restart();
+            }
+            else {
+                this.globalFunctions.LOG(calName + ": Wrong empty uri.");
+            }
+        }
+        else {
+            this.globalFunctions.LOG("migrateFromOldExchangeProvider: Calendar '" + calName + "' is skipped.");
+        }
+    },
+
+    cloneSettings: function _cloneSettings() {
+        var myCal = getSelectedCalendar();
+        var aResult = "";
+        if (myCal) {
+            var aResult = {
+                calendar: myCal,
+                answer: ""
+            };
+            this._window.openDialog("chrome://exchangecalendar/content/exchangeCloneSettings.xul",
+                "exchangeCloneSettings",
+                "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
+                aResult);
+
+            if (aResult.answer == "saved") {
+                // Tell the Calendar Manager we have a new calendar.
+                this.globalFunctions.addCalendarById(aResult.newCalId);
+            }
+        }
+    },
+
+    delegateCalendarSettings: function _delegateCalendarSettings() {
+        var myCal = getSelectedCalendar();
+        var aResult = "";
+        if (myCal) {
+            var aResult = {
+                calendar: myCal,
+                answer: ""
+            };
+            this._window.openDialog("chrome://exchangecalendar/content/delegateCalendar.xul",
+                "delegateCalendarSettings",
+                "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
+                aResult);
+        }
+    },
+
+    onLoad: function _onLoad() {
+        //this._document.getElementById("calendar-list-tree-widget").setAttribute("type", "exchange");
+    },
+
+    tooltipShowing: function _tooltipShowing(aEvent) {
+        let tree = document.getElementById("calendar-list-tree-widget");
+        let calendar = tree.getCalendarFromEvent(aEvent);
+        let tooltipText = false;
+        if ((calendar) && (calendar.type == "exchangecalendar")) {
+            let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
+            if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
+                if (calendar.readOnly) {
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnectedReadOnly", [calendar.name, calendar.connectionStateDescription], "exchangecalendar");
+                }
+                else {
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnected", [calendar.name, calendar.connectionStateDescription], "exchangecalendar");
+                }
+            }
+            else {
+                if (calendar.readOnly) {
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnectedReadOnly", [calendar.name], "exchangecalendar");
+                }
+                else {
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnected", [calendar.name], "exchangecalendar");
+                }
+            }
+            setElementValue("calendar-list-tooltip", tooltipText, "label");
+        }
+        if (tooltipText) {
+            return (tooltipText != false);
+        }
+        return calendarListTooltipShowing(aEvent);
+    },
 
 }
 
 var tmpCalPopUpMenu = new exchCalPopUpMenu(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpCalPopUpMenu.onLoad(); }, true);
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpCalPopUpMenu.onLoad();
+}, true);
diff --git a/chrome/content/calendar-common-sets.js b/chrome/content/calendar-common-sets.js
index 1bfb66b6..a9417bfa 100644
--- a/chrome/content/calendar-common-sets.js
+++ b/chrome/content/calendar-common-sets.js
@@ -47,89 +47,88 @@ Cu.import("resource://exchangecalendar/erForewardItem.js");
 
 //if (! exchWebService) var exchWebService = {};
 
-function exchForewardEvent(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchForewardEvent(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchForewardEvent.prototype = {
 
-//exchWebService.forewardEvent = {
-	currentView: function _currentView() {
-		    return this._document.getElementById("view-deck").selectedPanel;
-	},
-
-	onForEve : function _onForEve(){		
-		var item = this.currentView().getSelectedItems({})[0];
-		var calendar = item.calendar;
-		var args = new Object();
-		args.startTime = item.startDate;
-		args.endTime = item.endDate;
-		args.organizer = item.organizer;
-		args.item = item;
-		args.attendees =item.organizer;
-		args.calendar =calendar;
-		args.onOk = this.callOnRightClick;
-		args.opener="exchWebService-onForEve";
-		
-		dump("\nxxxxxxx args"+JSON.stringify(args));
-		
-		this._window.openDialog("chrome://calendar/content/calendar-event-dialog-attendees.xul","_blank", "chrome,titlebar,modal,resizable",args);
-
-	},
-
-	callOnRightClick : function(attendee,organizer,startTime,endTime){		
-		var item = tmpForewardEvent.currentView().getSelectedItems({})[0];
-		var calendar = item.calendar;
-		var calId = calendar.id;
-		var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");
-		var tmpObject = new erForewardItemRequest(
-			{user: tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecDomain")+"\\"+tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecUser"), 
-			 mailbox: tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
-			 serverUrl: tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecServer"), item: item, attendees: attendee, 
-			changeKey :  item.changeKey, description : item.getProperty("description")}, 		
-			tmpForewardEvent.erForewardItemRequestOK, tmpForewardEvent.erForewardItemRequestError);
-		return true;
-	},
-
-	erForewardItemRequestOK : function _erForewardItemRequestOK(aForewardItemRequest, aResp)
-	{
-		if(aResp){
-			var title="Forwarding Event";
-			var msg=aResp;
-			 var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
-			  var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
-			                      getService(Components.interfaces.nsIWindowWatcher).
-			                      openWindow(null, 'chrome://global/content/alerts/alert.xul',
-			                                  '_blank', 'chrome,titlebar=no,popup=yes', null);
-			  win.arguments = [image,  title, msg, true, ''];
-			  
-		}
-	},
-
-	erForewardItemRequestError: function _erForewardItemRequestError(aForewardItemRequest, aCode, aMsg)
-	{
-		alert(aCode+":"+aMsg);
-	},
-
-	checkAllowForwardItem: function _checkAllowForwardItem()
-	{
-		var item = this.currentView().getSelectedItems({})[0];
-		if ((item.calendar.type == "exchangecalendar") && (item.responseObjects.ForwardItem)) {
-			this._document.getElementById("calendar-item-forward").hidden = false;
-		}
-		else {
-			this._document.getElementById("calendar-item-forward").hidden = true;
-		}
-	},
+    //exchWebService.forewardEvent = {
+    currentView: function _currentView() {
+        return this._document.getElementById("view-deck").selectedPanel;
+    },
+
+    onForEve: function _onForEve() {
+        var item = this.currentView().getSelectedItems({})[0];
+        var calendar = item.calendar;
+        var args = new Object();
+        args.startTime = item.startDate;
+        args.endTime = item.endDate;
+        args.organizer = item.organizer;
+        args.item = item;
+        args.attendees = item.organizer;
+        args.calendar = calendar;
+        args.onOk = this.callOnRightClick;
+        args.opener = "exchWebService-onForEve";
+
+        dump("\nxxxxxxx args" + JSON.stringify(args));
+
+        this._window.openDialog("chrome://calendar/content/calendar-event-dialog-attendees.xul", "_blank", "chrome,titlebar,modal,resizable", args);
+
+    },
+
+    callOnRightClick: function (attendee, organizer, startTime, endTime) {
+        var item = tmpForewardEvent.currentView().getSelectedItems({})[0];
+        var calendar = item.calendar;
+        var calId = calendar.id;
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+        var tmpObject = new erForewardItemRequest({
+                user: tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecDomain") + "\\" + tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),
+                mailbox: tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
+                serverUrl: tmpForewardEvent.globalFunctions.safeGetCharPref(calPrefs, "ecServer"),
+                item: item,
+                attendees: attendee,
+                changeKey: item.changeKey,
+                description: item.getProperty("description")
+            },
+            tmpForewardEvent.erForewardItemRequestOK, tmpForewardEvent.erForewardItemRequestError);
+        return true;
+    },
+
+    erForewardItemRequestOK: function _erForewardItemRequestOK(aForewardItemRequest, aResp) {
+        if (aResp) {
+            var title = "Forwarding Event";
+            var msg = aResp;
+            var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+            var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
+            getService(Components.interfaces.nsIWindowWatcher).
+            openWindow(null, 'chrome://global/content/alerts/alert.xul',
+                '_blank', 'chrome,titlebar=no,popup=yes', null);
+            win.arguments = [image, title, msg, true, ''];
+
+        }
+    },
+
+    erForewardItemRequestError: function _erForewardItemRequestError(aForewardItemRequest, aCode, aMsg) {
+        alert(aCode + ":" + aMsg);
+    },
+
+    checkAllowForwardItem: function _checkAllowForwardItem() {
+        var item = this.currentView().getSelectedItems({})[0];
+        if ((item.calendar.type == "exchangecalendar") && (item.responseObjects.ForwardItem)) {
+            this._document.getElementById("calendar-item-forward").hidden = false;
+        }
+        else {
+            this._document.getElementById("calendar-item-forward").hidden = true;
+        }
+    },
 
 }
 
 var tmpForewardEvent = new exchForewardEvent(document, window);
-
diff --git a/chrome/content/calendar-event-dialog-reminder.js b/chrome/content/calendar-event-dialog-reminder.js
index 6ab7f812..cee64e6f 100644
--- a/chrome/content/calendar-event-dialog-reminder.js
+++ b/chrome/content/calendar-event-dialog-reminder.js
@@ -33,111 +33,112 @@ var Cc = Components.classes;
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
-function exchChangeCalendarPropertiesReminder(aDocument, aWindow, aArgument)
-{
-	this._document = aDocument;
-	this._window = aWindow;
-	this._argument = aArgument;
+function exchChangeCalendarPropertiesReminder(aDocument, aWindow, aArgument) {
+    this._document = aDocument;
+    this._window = aWindow;
+    this._argument = aArgument;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchChangeCalendarPropertiesReminder.prototype = {
-	onLoad : function _onLoad(){
-
-		if ((!cal.isEvent(this._argument.item)) && (this._argument.calendar.type == "exchangecalendar")) {
-			this._document.getElementById("reminder-relative-box").hidden = true;
-
-			//this._document.getElementById("reminder-relative-radio").checked = false;
-			this._document.getElementById("reminder-relative-radio").disabled = true;
-
-			//this._document.getElementById("reminder-absolute-radio").checked = true;
-			this._document.getElementById("reminder-absolute-radio").hidden = true;
-			this._document.getElementById("reminder-relation-radiogroup").selectedElement = this._document.getElementById("reminder-absolute-radio");
-		}
-
-dump(" WHAT is this:"+this._argument.calendar.type+"\n");
-
-		if ((cal.isEvent(this._argument.item)) && (this._argument.calendar.type == "exchangecalendar")) {
-			this._document.getElementById("reminder-relation-origin").hidden = true;
-			this._document.getElementById("exchWebService-reminder-relation-origin").hidden = false;
-		}
-
-		if (this._argument.calendar.type == "exchangecalendar") {
-			this._document.getElementById("reminder-actions-caption").hidden = true;
-			this._document.getElementById("reminder-actions-menulist").hidden = true;
-		}
-	},
-
-	onNewReminder: function _onNewReminder() {
-		if ((!cal.isEvent(this._argument.item)) && (this._argument.calendar.type == "exchangecalendar")) {
-			let itemType = (isEvent(this._argument.item) ? "event" : "todo");
-			let listbox = this._document.getElementById("reminder-listbox");
-
-			let reminder = cal.createAlarm();
-			let alarmlen = getPrefSafe("calendar.alarms." + itemType + "alarmlen", 15);
-
-			// Default is an absolute DISPLAY alarm, |alarmlen| minutes before the event.
-			// If DISPLAY is not supported by the provider, then pick the provider's
-			// first alarm type.
-			var absDate = this._document.getElementById("reminder-absolute-date");
-			reminder.related = reminder.ALARM_RELATED_ABSOLUTE;
-			reminder.alarmDate = cal.jsDateToDateTime(absDate.value,
-		                                              this._argument.timezone);
-			//reminder.offset = 0;
-			if ("DISPLAY" in allowedActionsMap) {
-				reminder.action = "DISPLAY";
-			} else {
-				let calendar = this._argument.calendar
-				let actions = calendar.getProperty("capabilities.alarms.actionValues") || [];
-				reminder.action = actions[0];
-			}
-
-			// Set up the listbox
-			let listitem = setupListItem(null, reminder, this._argument.item);
-			listbox.appendChild(listitem);
-			listbox.selectItem(listitem);
-
-			// Since we've added an item, its safe to always enable the button
-			enableElement("reminder-remove-button");
-
-			// Set up the enabled state and max reminders
-			setupRadioEnabledState();
-			setupMaxReminders();
-		}
-		else {
-			if ((this._document.getElementById("reminder-listbox").itemCount == 0) || (this._argument.calendar.type != "exchangecalendar")) {
-					onNewReminder();
-			}
-		}
-
-		if (this._argument.calendar.type == "exchangecalendar") {
-			disableElement("reminder-relation-origin");
-			disableElement("reminder-new-button");
-		}
-	},
-
-	onReminderUnitChange: function _onReminderUnitChange(event)
-	{
-		updateReminder(event);
-		if (this._argument.calendar.type == "exchangecalendar") {
-			disableElement("reminder-relation-origin");
-			disableElement("reminder-new-button");
-		}
-	},
-
-	onReminderLengthChange: function _onReminderLengthChange(event)
-	{
-		updateReminder(event);
-		if (this._argument.calendar.type == "exchangecalendar") {
-			disableElement("reminder-relation-origin");
-			disableElement("reminder-new-button");
-		}
-	},
+    onLoad: function _onLoad() {
+
+        if ((!cal.isEvent(this._argument.item)) && (this._argument.calendar.type == "exchangecalendar")) {
+            this._document.getElementById("reminder-relative-box").hidden = true;
+
+            //this._document.getElementById("reminder-relative-radio").checked = false;
+            this._document.getElementById("reminder-relative-radio").disabled = true;
+
+            //this._document.getElementById("reminder-absolute-radio").checked = true;
+            this._document.getElementById("reminder-absolute-radio").hidden = true;
+            this._document.getElementById("reminder-relation-radiogroup").selectedElement = this._document.getElementById("reminder-absolute-radio");
+        }
+
+        dump(" WHAT is this:" + this._argument.calendar.type + "\n");
+
+        if ((cal.isEvent(this._argument.item)) && (this._argument.calendar.type == "exchangecalendar")) {
+            this._document.getElementById("reminder-relation-origin").hidden = true;
+            this._document.getElementById("exchWebService-reminder-relation-origin").hidden = false;
+        }
+
+        if (this._argument.calendar.type == "exchangecalendar") {
+            this._document.getElementById("reminder-actions-caption").hidden = true;
+            this._document.getElementById("reminder-actions-menulist").hidden = true;
+        }
+    },
+
+    onNewReminder: function _onNewReminder() {
+        if ((!cal.isEvent(this._argument.item)) && (this._argument.calendar.type == "exchangecalendar")) {
+            let itemType = (isEvent(this._argument.item) ? "event" : "todo");
+            let listbox = this._document.getElementById("reminder-listbox");
+
+            let reminder = cal.createAlarm();
+            let alarmlen = getPrefSafe("calendar.alarms." + itemType + "alarmlen", 15);
+
+            // Default is an absolute DISPLAY alarm, |alarmlen| minutes before the event.
+            // If DISPLAY is not supported by the provider, then pick the provider's
+            // first alarm type.
+            var absDate = this._document.getElementById("reminder-absolute-date");
+            reminder.related = reminder.ALARM_RELATED_ABSOLUTE;
+            reminder.alarmDate = cal.jsDateToDateTime(absDate.value,
+                this._argument.timezone);
+            //reminder.offset = 0;
+            if ("DISPLAY" in allowedActionsMap) {
+                reminder.action = "DISPLAY";
+            }
+            else {
+                let calendar = this._argument.calendar
+                let actions = calendar.getProperty("capabilities.alarms.actionValues") || [];
+                reminder.action = actions[0];
+            }
+
+            // Set up the listbox
+            let listitem = setupListItem(null, reminder, this._argument.item);
+            listbox.appendChild(listitem);
+            listbox.selectItem(listitem);
+
+            // Since we've added an item, its safe to always enable the button
+            enableElement("reminder-remove-button");
+
+            // Set up the enabled state and max reminders
+            setupRadioEnabledState();
+            setupMaxReminders();
+        }
+        else {
+            if ((this._document.getElementById("reminder-listbox").itemCount == 0) || (this._argument.calendar.type != "exchangecalendar")) {
+                onNewReminder();
+            }
+        }
+
+        if (this._argument.calendar.type == "exchangecalendar") {
+            disableElement("reminder-relation-origin");
+            disableElement("reminder-new-button");
+        }
+    },
+
+    onReminderUnitChange: function _onReminderUnitChange(event) {
+        updateReminder(event);
+        if (this._argument.calendar.type == "exchangecalendar") {
+            disableElement("reminder-relation-origin");
+            disableElement("reminder-new-button");
+        }
+    },
+
+    onReminderLengthChange: function _onReminderLengthChange(event) {
+        updateReminder(event);
+        if (this._argument.calendar.type == "exchangecalendar") {
+            disableElement("reminder-relation-origin");
+            disableElement("reminder-new-button");
+        }
+    },
 }
 
 var tmpChangeCalendarPropertiesReminder = new exchChangeCalendarPropertiesReminder(document, window, window.arguments[0]);
-window.addEventListener("load", function _onLoad() { window.removeEventListener("load",arguments.callee,false); tmpChangeCalendarPropertiesReminder.onLoad(); }, true);
+window.addEventListener("load", function _onLoad() {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpChangeCalendarPropertiesReminder.onLoad();
+}, true);
diff --git a/chrome/content/calendar-event-dialog.js b/chrome/content/calendar-event-dialog.js
index 8695b604..fca993e9 100644
--- a/chrome/content/calendar-event-dialog.js
+++ b/chrome/content/calendar-event-dialog.js
@@ -4,56 +4,57 @@ var Cc = Components.classes;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-function exchCalendarEventDialog(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchCalendarEventDialog(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchCalendarEventDialog.prototype = {
 
-	/*
-	 * setup menu window and button toolbars when editing an Exchange item
-	 */
-	onLoad: function _onLoad()
-	{
-		let args = this._window.arguments[0];
-		let item = args.calendarEvent;
-
-		// We can't update toolbar from iframe
-		if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
-
-			let eventToolbar = this._document.getElementById("event-toolbar");
-
-			// If the standard add url button was enabled, hidde it and show exchangecalendar attachment
-			let currentSet = eventToolbar.getAttribute("currentset");
-			if (currentSet.indexOf("button-url") === 1
-					&& currentSet.indexOf("exchWebService-add-attachment-button") === -1) {
-				currentSet = currentSet.replace("button-url", "exchWebService-add-attachment-button");
-			}
-
-			// Switch toolbar buttons display
-			this._document.getElementById("button-url").hidden = true;
-			this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
-
-			// Switch window menu display
-			this._document.getElementById("options-attachments-menu").collapsed = true;
-			this._document.getElementById("exchWebService-options-attachments").collapsed = false;
-
-		} else {
-			// Switch toolbar buttons display
-			this._document.getElementById("button-url").hidden = false;
-			this._document.getElementById("exchWebService-add-attachment-button").hidden = true;
-
-			// Switch window menu display
-			this._document.getElementById("options-attachments-menu").collapsed = false;
-			this._document.getElementById("exchWebService-options-attachments").collapsed = true;
-		}
-	},
+    /*
+     * setup menu window and button toolbars when editing an Exchange item
+     */
+    onLoad: function _onLoad() {
+        let args = this._window.arguments[0];
+        let item = args.calendarEvent;
+
+        // We can't update toolbar from iframe
+        if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
+
+            let eventToolbar = this._document.getElementById("event-toolbar");
+
+            // If the standard add url button was enabled, hidde it and show exchangecalendar attachment
+            let currentSet = eventToolbar.getAttribute("currentset");
+            if (currentSet.indexOf("button-url") === 1
+                && currentSet.indexOf("exchWebService-add-attachment-button") === -1) {
+                currentSet = currentSet.replace("button-url", "exchWebService-add-attachment-button");
+            }
+
+            // Switch toolbar buttons display
+            this._document.getElementById("button-url").hidden = true;
+            this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
+
+            // Switch window menu display
+            this._document.getElementById("options-attachments-menu").collapsed = true;
+            this._document.getElementById("exchWebService-options-attachments").collapsed = false;
+
+        }
+        else {
+            // Switch toolbar buttons display
+            this._document.getElementById("button-url").hidden = false;
+            this._document.getElementById("exchWebService-add-attachment-button").hidden = true;
+
+            // Switch window menu display
+            this._document.getElementById("options-attachments-menu").collapsed = false;
+            this._document.getElementById("exchWebService-options-attachments").collapsed = true;
+        }
+    },
 }
 
 var ewsCalendarEventDialog = new exchCalendarEventDialog(document, window);
-window.addEventListener("load", function () { ewsCalendarEventDialog.onLoad(); }, false);
+window.addEventListener("load", function () {
+    ewsCalendarEventDialog.onLoad();
+}, false);
diff --git a/chrome/content/calendar-properties-dialog.js b/chrome/content/calendar-properties-dialog.js
index 76befad9..6f662c46 100644
--- a/chrome/content/calendar-properties-dialog.js
+++ b/chrome/content/calendar-properties-dialog.js
@@ -31,46 +31,46 @@ var Cu = Components.utils;
 var Ci = Components.interfaces;
 var Cc = Components.classes;
 
-function exchChangeCalendarProperties(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchChangeCalendarProperties(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchChangeCalendarProperties.prototype = {
 
-	onLoad : function _onLoad(){
-		var aCalendar = this._window.arguments[0].calendar;
-		if(aCalendar.type == "exchangecalendar"){
-			this._document.getElementById("calendar-cache-row").setAttribute("collapsed",true);
-			if (aCalendar.getProperty("exchWebService.useOfflineCache")){
-					this._document.getElementById("exchange-cache").checked=aCalendar.getProperty("exchWebService.useOfflineCache");
-				
-			}
-			this._document.getElementById("calendar-refreshInterval-row").hidden = true;
-		}
-		else{
-			this._document.getElementById("calendar-refreshInterval-row").hidden = false;
+    onLoad: function _onLoad() {
+        var aCalendar = this._window.arguments[0].calendar;
+        if (aCalendar.type == "exchangecalendar") {
+            this._document.getElementById("calendar-cache-row").setAttribute("collapsed", true);
+            if (aCalendar.getProperty("exchWebService.useOfflineCache")) {
+                this._document.getElementById("exchange-cache").checked = aCalendar.getProperty("exchWebService.useOfflineCache");
 
-			this._document.getElementById("exchange-cache-row").setAttribute("collapsed",true);
-		}
-	},
+            }
+            this._document.getElementById("calendar-refreshInterval-row").hidden = true;
+        }
+        else {
+            this._document.getElementById("calendar-refreshInterval-row").hidden = false;
 
-	changeCachePref : function _changeCachePref()
-	{
-		var aCalendar = this._window.arguments[0].calendar;
-		if(this._document.getElementById("exchange-cache").checked){
-			aCalendar.setProperty("exchWebService.useOfflineCache", true);
-		}
-		else{
-			aCalendar.setProperty("exchWebService.useOfflineCache", false);	
-		}
-	},
+            this._document.getElementById("exchange-cache-row").setAttribute("collapsed", true);
+        }
+    },
+
+    changeCachePref: function _changeCachePref() {
+        var aCalendar = this._window.arguments[0].calendar;
+        if (this._document.getElementById("exchange-cache").checked) {
+            aCalendar.setProperty("exchWebService.useOfflineCache", true);
+        }
+        else {
+            aCalendar.setProperty("exchWebService.useOfflineCache", false);
+        }
+    },
 }
 
 var tmpChangeCalendarProperties = new exchChangeCalendarProperties(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpChangeCalendarProperties.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpChangeCalendarProperties.onLoad();
+}, true);
diff --git a/chrome/content/calendar-summary-dialog.js b/chrome/content/calendar-summary-dialog.js
index 253c2be2..cd144436 100644
--- a/chrome/content/calendar-summary-dialog.js
+++ b/chrome/content/calendar-summary-dialog.js
@@ -47,653 +47,655 @@ Cu.import("resource://exchangecalendar/erForewardItem.js");
 
 //if (! exchWebService) var exchWebService = {};
 
-function exchEventSummaryBrowserProgressListener(aDialog)
-{
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
-	this.dialog = aDialog;
+function exchEventSummaryBrowserProgressListener(aDialog) {
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
+    this.dialog = aDialog;
 }
 
 exchEventSummaryBrowserProgressListener.prototype = {
 
-	QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
-						Ci.nsIWebProgressListener,
-						Ci.nsISupports]),
-
-	GetWeakReference: function _GetWeakReference()
-	{
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("GetWeakReference");
-		return null;
-	},
-
-//void onLocationChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI aLocation, [optional] in unsigned long aFlags);
-	onLocationChange: function _onLocationChange(aWebProgress, aRequest, aLocation, aFlags)
-	{
-			var flagStr = "("+aFlags+")";
-			if (aFlags & 0x1) flagStr += ",LOCATION_CHANGE_SAME_DOCUMENT";
-			if (aFlags & 0x2) flagStr += ",LOCATION_CHANGE_ERROR_PAGE";
-			if (aLocation) {
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("onLocationChange: aLocation.spec:"+aLocation.spec+", aFlags:"+flagStr);
-			}
-			else {
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("onLocationChange: aLocation:"+aLocation+", aFlags:"+flagStr);
-			}
-	},
-
-//void onProgressChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress);
-	onProgressChange: function _onProgressChange(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress)
-	{
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("onProgressChange: aCurSelfProgress:"+aCurSelfProgress+", aMaxSelfProgress:"+aMaxSelfProgress+", aCurTotalProgress:"+aCurTotalProgress+", aMaxTotalProgress:"+aMaxTotalProgress);
-			if ((aCurSelfProgress == aMaxSelfProgress) && (this.dialog)) {
-				//this.dialog.removeTmpFile(); // Will be done by the DOMContentLoaded event.
-			}
-	},
-
-//void onSecurityChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aState);
-	onSecurityChange: function _onSecurityChange(aWebProgress, aRequest, aState)
-	{
-			var flagStr = "("+aState+")";
-			if (aState & 0x1) flagStr += ",STATE_IS_BROKEN";
-			if (aState & 0x2) flagStr += ",STATE_IS_SECURE";
-			if (aState & 0x4) flagStr += ",STATE_IS_INSECURE";
-			if (aState & 0x10000) flagStr += ",STATE_SECURE_MED";
-			if (aState & 0x20000) flagStr += ",STATE_SECURE_LOW";
-			if (aState & 0x40000) flagStr += ",STATE_SECURE_HIGH";
-			if (aState & 0x100000) flagStr += ",STATE_IDENTITY_EV_TOPLEVEL";
-			
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("onSecurityChange: aState:"+flagStr);
-	},
-
-//void onStateChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus);
-	onStateChange: function _onStateChange(aWebProgress, aRequest, aStateFlags, aStatus)
-	{
-			var flagStr = "("+aStateFlags+")";
-			if (aStateFlags & 0x1) flagStr += ",STATE_START";
-			if (aStateFlags & 0x2) flagStr += ",STATE_REDIRECTING";
-			if (aStateFlags & 0x4) flagStr += ",STATE_TRANSFERRING";
-			if (aStateFlags & 0x8) flagStr += ",STATE_NEGOTIATING";
-			if (aStateFlags & 0x10) flagStr += ",STATE_STOP";
-			if (aStateFlags & 0x10000) flagStr += ",STATE_IS_REQUEST";
-			if (aStateFlags & 0x20000) flagStr += ",STATE_IS_DOCUMENT";
-			if (aStateFlags & 0x40000) flagStr += ",STATE_IS_NETWORK";
-			if (aStateFlags & 0x80000) flagStr += ",STATE_IS_WINDOW";
-			if (aStateFlags & 0x1000000) flagStr += ",STATE_RESTORING";
-
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("onStateChange: aStateFlags:"+flagStr+", aStatus:"+aStatus);
-
-	},
-
-//void onStatusChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage);
-	onStatusChange: function _onStatusChange(aWebProgress, aRequest, aStatus, aMessage)
-	{
-			Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService).logStringMessage("onStatusChange: aStatus:"+aStatus+", aMessage:"+aMessage);
-	},
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
+        Ci.nsIWebProgressListener,
+        Ci.nsISupports
+    ]),
+
+    GetWeakReference: function _GetWeakReference() {
+        Cc["@mozilla.org/consoleservice;1"]
+            .getService(Ci.nsIConsoleService).logStringMessage("GetWeakReference");
+        return null;
+    },
+
+    //void onLocationChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI aLocation, [optional] in unsigned long aFlags);
+    onLocationChange: function _onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
+        var flagStr = "(" + aFlags + ")";
+        if (aFlags & 0x1) flagStr += ",LOCATION_CHANGE_SAME_DOCUMENT";
+        if (aFlags & 0x2) flagStr += ",LOCATION_CHANGE_ERROR_PAGE";
+        if (aLocation) {
+            Cc["@mozilla.org/consoleservice;1"]
+                .getService(Ci.nsIConsoleService).logStringMessage("onLocationChange: aLocation.spec:" + aLocation.spec + ", aFlags:" + flagStr);
+        }
+        else {
+            Cc["@mozilla.org/consoleservice;1"]
+                .getService(Ci.nsIConsoleService).logStringMessage("onLocationChange: aLocation:" + aLocation + ", aFlags:" + flagStr);
+        }
+    },
+
+    //void onProgressChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress);
+    onProgressChange: function _onProgressChange(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress) {
+        Cc["@mozilla.org/consoleservice;1"]
+            .getService(Ci.nsIConsoleService).logStringMessage("onProgressChange: aCurSelfProgress:" + aCurSelfProgress + ", aMaxSelfProgress:" + aMaxSelfProgress + ", aCurTotalProgress:" + aCurTotalProgress + ", aMaxTotalProgress:" + aMaxTotalProgress);
+        if ((aCurSelfProgress == aMaxSelfProgress) && (this.dialog)) {
+            //this.dialog.removeTmpFile(); // Will be done by the DOMContentLoaded event.
+        }
+    },
+
+    //void onSecurityChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aState);
+    onSecurityChange: function _onSecurityChange(aWebProgress, aRequest, aState) {
+        var flagStr = "(" + aState + ")";
+        if (aState & 0x1) flagStr += ",STATE_IS_BROKEN";
+        if (aState & 0x2) flagStr += ",STATE_IS_SECURE";
+        if (aState & 0x4) flagStr += ",STATE_IS_INSECURE";
+        if (aState & 0x10000) flagStr += ",STATE_SECURE_MED";
+        if (aState & 0x20000) flagStr += ",STATE_SECURE_LOW";
+        if (aState & 0x40000) flagStr += ",STATE_SECURE_HIGH";
+        if (aState & 0x100000) flagStr += ",STATE_IDENTITY_EV_TOPLEVEL";
+
+        Cc["@mozilla.org/consoleservice;1"]
+            .getService(Ci.nsIConsoleService).logStringMessage("onSecurityChange: aState:" + flagStr);
+    },
+
+    //void onStateChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus);
+    onStateChange: function _onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
+        var flagStr = "(" + aStateFlags + ")";
+        if (aStateFlags & 0x1) flagStr += ",STATE_START";
+        if (aStateFlags & 0x2) flagStr += ",STATE_REDIRECTING";
+        if (aStateFlags & 0x4) flagStr += ",STATE_TRANSFERRING";
+        if (aStateFlags & 0x8) flagStr += ",STATE_NEGOTIATING";
+        if (aStateFlags & 0x10) flagStr += ",STATE_STOP";
+        if (aStateFlags & 0x10000) flagStr += ",STATE_IS_REQUEST";
+        if (aStateFlags & 0x20000) flagStr += ",STATE_IS_DOCUMENT";
+        if (aStateFlags & 0x40000) flagStr += ",STATE_IS_NETWORK";
+        if (aStateFlags & 0x80000) flagStr += ",STATE_IS_WINDOW";
+        if (aStateFlags & 0x1000000) flagStr += ",STATE_RESTORING";
+
+        Cc["@mozilla.org/consoleservice;1"]
+            .getService(Ci.nsIConsoleService).logStringMessage("onStateChange: aStateFlags:" + flagStr + ", aStatus:" + aStatus);
+
+    },
+
+    //void onStatusChange(in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage);
+    onStatusChange: function _onStatusChange(aWebProgress, aRequest, aStatus, aMessage) {
+        Cc["@mozilla.org/consoleservice;1"]
+            .getService(Ci.nsIConsoleService).logStringMessage("onStatusChange: aStatus:" + aStatus + ", aMessage:" + aMessage);
+    },
 
 
 }
 
-function exchEventSummaryDialog(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchEventSummaryDialog(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer); 
+    this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer);
 
-	this.imageCache = {};
+    this.imageCache = {};
 }
 
 exchEventSummaryDialog.prototype = {
 
-	showOptionalAttendees: function _showOptionalAttendees()
-	{
-		var args = this._window.arguments[0];
-	        var item = args.calendarEvent;
-		var attendees = item.getAttendees({});
-                var optionalAttendeeList = new Array();
-		var requiredAttendeeList = new Array();
-                for each (var attendee in attendees) {
-			if(attendee.role == "OPT-PARTICIPANT")
-			{			
-				optionalAttendeeList.push(attendee);
-			}
-			else 
-			{
-				requiredAttendeeList.push(attendee); 
-			}      
+    showOptionalAttendees: function _showOptionalAttendees() {
+        var args = this._window.arguments[0];
+        var item = args.calendarEvent;
+        var attendees = item.getAttendees({});
+        var optionalAttendeeList = new Array();
+        var requiredAttendeeList = new Array();
+        for each(var attendee in attendees) {
+            if (attendee.role == "OPT-PARTICIPANT") {
+                optionalAttendeeList.push(attendee);
+            }
+            else {
+                requiredAttendeeList.push(attendee);
+            }
+        }
+
+
+
+        if (requiredAttendeeList && requiredAttendeeList.length) {
+            this._document.getElementById("required-attendee-spacer").removeAttribute("hidden");
+            this._document.getElementById("required-attendee-caption").removeAttribute("hidden");
+            this._document.getElementById("item-required-attendee").removeAttribute("hidden");
+            this.displayAttendees(requiredAttendeeList, "item-required-attendee-listbox");
+        }
+
+        if (optionalAttendeeList && optionalAttendeeList.length) {
+            this._document.getElementById("item-optional-attendee").removeAttribute("hidden");
+            this._document.getElementById("optional-attendee-spacer").removeAttribute("hidden");
+            this._document.getElementById("optional-attendee-caption").removeAttribute("hidden");
+            this.displayAttendees(optionalAttendeeList, "item-optional-attendee-listbox");
+        }
+
+        // hide existing attendees box
+        var item_attendees_box = this._document.getElementById("item-attendees");
+
+        var children = item_attendees_box.children;
+        children[0].setAttribute("hidden", true);
+        children[1].setAttribute("hidden", true);
+        children[2].setAttribute("hidden", true);
+        children[3].setAttribute("hidden", true);
+
+    },
+
+    displayAttendees: function _displayAttendees(attendees, listBox) {
+        var listbox = this._document.getElementById(listBox);
+        var itemNode = listbox.getElementsByTagName("listitem")[0];
+        var num_items = Math.ceil(attendees.length / 2) - 1;
+        while (num_items--) {
+            var newNode = itemNode.cloneNode(true);
+            listbox.appendChild(newNode);
+        }
+        var list = listbox.getElementsByTagName("listitem");
+        var page = 0;
+        var line = 0;
+        for each(var attendee in attendees) {
+                var itemNode = list[line];
+                var listcell = itemNode.getElementsByTagName("listcell")[page];
+                if (attendee.commonName && attendee.commonName.length) {
+                    listcell.setAttribute("label", attendee.commonName);
+                }
+                else {
+                    listcell.setAttribute("label", attendee.toString());
+                }
+                listcell.setAttribute("tooltiptext", attendee.toString());
+                listcell.setAttribute("status", attendee.participationStatus);
+                listcell.removeAttribute("hidden");
+
+                page++;
+                if (page > 1) {
+                    page = 0;
+                    line++;
                 }
 
-		
-		
-		if(requiredAttendeeList && requiredAttendeeList.length){
-			this._document.getElementById("required-attendee-spacer").removeAttribute("hidden");  
-			this._document.getElementById("required-attendee-caption").removeAttribute("hidden");  			
-			this._document.getElementById("item-required-attendee").removeAttribute("hidden");   
-			this.displayAttendees(requiredAttendeeList, "item-required-attendee-listbox"); 
-		}
-
-                if(optionalAttendeeList && optionalAttendeeList.length){ 
-			this._document.getElementById("item-optional-attendee").removeAttribute("hidden");
-			this._document.getElementById("optional-attendee-spacer").removeAttribute("hidden");  
-			this._document.getElementById("optional-attendee-caption").removeAttribute("hidden");                 	
-			this.displayAttendees(optionalAttendeeList, "item-optional-attendee-listbox");
-		}
-
-		// hide existing attendees box
-		var item_attendees_box = this._document.getElementById("item-attendees");
-		
-		var children = item_attendees_box.children;
-		children[0].setAttribute("hidden", true);
-		children[1].setAttribute("hidden", true);
-		children[2].setAttribute("hidden", true);
-		children[3].setAttribute("hidden", true);
-                
-  	},
-
-	displayAttendees: function _displayAttendees(attendees, listBox)
-	{		
-         		var listbox = this._document.getElementById(listBox);
-			var itemNode = listbox.getElementsByTagName("listitem")[0];
-         		var num_items = Math.ceil(attendees.length/2)-1;
-         		while (num_items--) {
-             			var newNode = itemNode.cloneNode(true);
-             			listbox.appendChild(newNode);
-         		}
-         		var list = listbox.getElementsByTagName("listitem");
-         		var page = 0;
-         		var line = 0;
-         		for each (var attendee in attendees) {
-					var itemNode = list[line];
-             				var listcell = itemNode.getElementsByTagName("listcell")[page];
-             				if (attendee.commonName && attendee.commonName.length) {
-                 				listcell.setAttribute("label", attendee.commonName);
-             				} else {
-                 				listcell.setAttribute("label",  attendee.toString());
-             				}
-             				listcell.setAttribute("tooltiptext", attendee.toString());
-             				listcell.setAttribute("status", attendee.participationStatus);
-             				listcell.removeAttribute("hidden");
-
-	             			page++;
-	             			if (page > 1) {
-               				page = 0;
-               				line++;
-					}
-				
-             		} //end of for
-         	
-	},	
-
-//exchWebService.forewardEvent2 = {
-	onForward : function _onForward()
-	{	
-		var args = this._window.arguments[0];
-		var item = args.calendarEvent;
-		item =item.clone();
-		var calendar = item.calendar;
-		var args = new Object();
-		args.startTime = item.startDate;
-		args.endTime = item.endDate;
-		args.organizer = item.organizer;
-		args.item = item;
-		args.attendees =item.organizer;
-		args.calendar =calendar;
-		var self = this;
-		args.onOk = function(attendee,organizer,startTime,endTime) { self.callOnOk(attendee,organizer,startTime,endTime);};
-		args.opener="exchWebService-onForward";
-		this._window.openDialog("chrome://calendar/content/calendar-event-dialog-attendees.xul","_blank", "chrome,titlebar,modal,resizable",args);
-		
-	},	
-	
-	callOnOk : function(attendee,organizer,startTime,endTime){
-		
-		var args = this._window.arguments[0];
-		var item = args.calendarEvent;
-		var calendar = item.calendar;
-		var calId = calendar.id;
-		var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");
-		
-		var self = this;
-		var tmpObject = new erForewardItemRequest(
-			{user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"), 
-			mailbox: this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
-			serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"), 
-			item: item, 
-			attendees: attendee}, 
-			function(aForewardItemRequest, aResp){self.erForewardItemRequestOK(aForewardItemRequest, aResp);}, 
-			function(aForewardItemRequest, aCode, aMsg){self.erForewardItemRequestError(aForewardItemRequest, aCode, aMsg);});		
-	},
-
-	erForewardItemRequestOK : function _erForewardItemRequestOK(aForewardItemRequest, aResp)
-	{
-		alert(aResp);
-	},
-
-	erForewardItemRequestError: function _erForewardItemRequestError(aForewardItemRequest, aCode, aMsg)
-	{
-		alert(aCode+":"+aMsg);
-	},
-
-	removeTmpFile: function _removeTmpFile()
-	{
-		if ((this.tmpFile) && (this.tmpFile.exists())) {
-			//dump("Removing tmp file:"+this.tmpFile.path+"\n");
-			this.tmpFile.remove(false);
-		}
-	},
-
-	saveToFile: function _saveToFile(aContent, aItem)
-	{
-		var file = Cc["@mozilla.org/file/directory_service;1"]
-				.getService(Ci.nsIProperties)
-				.get("ProfD", Ci.nsIFile);
-		file.append("exchange-data");
-		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Ci.nsIFile.DIRECTORY_TYPE, this.globalFunctions.fromOctal("0777"));  
-		}
-
-		file.append("tmp");
-		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Ci.nsIFile.DIRECTORY_TYPE, this.globalFunctions.fromOctal("0777"));  
-		}
-
-		file.append(this.globalFunctions.getUUID()+".html");
-
-		if (file.exists()) {
-			file.remove(false);
-		}
-
-//		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, this.globalFunctions.fromOctal("0777"));  
-
-		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].  
-				 createInstance(Components.interfaces.nsIFileOutputStream);  
-		foStream.init(file, 0x02 | 0x08 | 0x20, this.globalFunctions.fromOctal("0777"), 0);  
-
-		var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
-				createInstance(Components.interfaces.nsIConverterOutputStream);
-		converter.init(foStream, "UTF-8", 0, 0);
-		converter.writeString(aContent);
-		converter.close(); // this closes foStream
-		  
-		this.tmpFile = file;
-		return file;
-	},
-
-	onMouseOver: function _onMouseOver(event)
-	{
-		var ceParams = this.hrefAndLinkNodeForClickEvent(event);
-		if (!ceParams)	{
-			return true;
-		}
-
-		var href = ceParams.href;
-
-		//dump("onMouseEnter: href='"+href+"'\n");
-		this.mouseEnterHRef = href;
-		//this._document.getElementById("exchWebService-summary-description-label").value = href;
-		this._document.getElementById("exchWebService-body-editor").setAttribute("tooltiptext", href);
-		event.preventDefault();
-		return true;
-	},
-
-	onMouseOut: function _onMouseOut(event)
-	{
-		var ceParams = this.hrefAndLinkNodeForClickEvent(event);
-		if (!ceParams)	{
-			return true;
-		}
-
-		var href = ceParams.href;
-
-		if (href != this.mouseEnterHRef) {
-			return true;
-		}
-
-		//dump("onMouseLeave: href='"+href+"'\n");
-		this._document.getElementById("exchWebService-body-editor").removeAttribute("tooltiptext");
-		event.preventDefault();
-		return true;
-	},
-
-	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	{
-		var args = this._window.arguments[0];
-		var item = args.calendarEvent;
-
-		this.loadBalancer.addToQueue({ calendar: item.calendar,
-				 ecRequest:aRequest,
-				 arguments: aArgument,
-				 cbOk: aCbOk,
-				 cbError: aCbError,
-				 listener: aListener});
-	},
-
-	loadInlineAttachment: function _loadInLineAttachment(aAttachmentId, aCalendarId, inlineCount)
-	{
-		var prefs = "extensions.exchangecalendar@extensions.1st-setup.nl."+aCalendarId+".";
-
-		var serverUrl = this.globalFunctions.safeGetCharPref(null, prefs+"ecServer", "");
-		var username = this.globalFunctions.safeGetCharPref(null, prefs+"ecUser", "");
-		var domain = this.globalFunctions.safeGetCharPref(null, prefs+"ecDomain", "");
-		if (username.indexOf("@") == -1) {
-			if (domain != "") {
-				username = domain+"\\"+username;
-			}
-		}
-
-		var self = this;
-		this.addToQueue(erGetAttachmentsRequest,
-			{user: username, 
-			 serverUrl:  serverUrl ,
-			 attachmentIds: [aAttachmentId]}, 
-			function(aExchangeRequest, aAttachments){self.onDownloadAttachmentOk(aExchangeRequest, aAttachments, inlineCount);}, 
-			function(aExchangeRequest, aCode, aMsg) {self.onDownloadAttachmentError(aExchangeRequest, aCode, aMsg, inlineCount);},
-			null);
-	},
-
-	loadImage: function _loadImage(aImageNode, aAttachment)
-	{
-		this.globalFunctions.LOG(" == Going to decode:"+aAttachment.name);
-		this.globalFunctions.LOG(" == content:"+aAttachment.content.length+" bytes");  
-		var fileData = window.atob(aAttachment.content);
-		this.globalFunctions.LOG(" == Decoded:"+aAttachment.name);
-
-		var file = Cc["@mozilla.org/file/directory_service;1"].  
-				getService(Ci.nsIProperties).  
-				get("TmpD", Ci.nsIFile); 
-		var tmpName = this.globalFunctions.getUUID();
-		file.append(tmpName);  
-
-		//file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);  
-		// do whatever you need to the created file  
-		this.globalFunctions.LOG(" == new tmp filename:"+file.path);  
-
-		var stream = Cc["@mozilla.org/network/safe-file-output-stream;1"].  
-				createInstance(Ci.nsIFileOutputStream);  
-		stream.init(file, 0x04 | 0x08 | 0x20, 384, 0); // readwrite, create, truncate  
-
-		this.globalFunctions.LOG(" == writing file:"+file.path);  
-		this.globalFunctions.LOG(" == writing:"+fileData.length+" bytes");  
-		stream.write(fileData, fileData.length);  
-		if (stream instanceof Ci.nsISafeOutputStream) {  
-			stream.finish();  
-		}
-		// Dispose of the converted data in memory;
-		//delete fileData;
-
-		this.globalFunctions.LOG(" == written file:"+file.path);  
-		this.globalFunctions.LOG(" == written:"+fileData.length+" bytes");  
-
-		if (aImageNode) {
-			this.globalFunctions.LOG(" == Telling image to load file.");
-			aImageNode.src = "file://"+file.path;
-			this.imageCache[aAttachment.id] = file;
-//dump("2. broswer innerhtml:"+this._document.getElementById("exchWebService-body-editor").contentDocument.body.outerHTML+"\n");
-		}
-		else {
-//dump(" loadImage: no aImageNoded\n");
-		}
-	},
-
-	onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments, inlineCount)
-	{
-		this.globalFunctions.LOG("exchWebService.attachments.onDownloadAttachmentOk:"+aAttachments.length);
-
-		this.inlineImages = this._document.getElementById("exchWebService-body-editor").contentDocument.images;
-//dump("1. broswer innerhtml:"+this._document.getElementById("exchWebService-body-editor").contentDocument.body.outerHTML+"\n");
-//dump("this.inlineImages.length:"+this.inlineImages.length+"\n");
-
-		if (aAttachments.length > 0) {
-			for (var index in aAttachments) {
-				if (aAttachments[index].contentId) {
-				// Find the image this attachment is for.
-					for (var i = 0; i < this.inlineImages.length; i++) {
-						if (this.inlineImages[i].hasAttribute("src")) {
-							var contentId = this.inlineImages[i].getAttribute("src")
-							dump("img src:"+contentId+"\n");
-							if (contentId.indexOf("cid:") == 0) {
-								// We have a contentId as image source. Lets see if we have a matching inline attachment.
-								dump("We have a contentId as image source. Lets see if we have a matching inline attachment.\n");
-								contentId = contentId.substr(4);
-								if (contentId == aAttachments[index].contentId) {
-									this.loadImage(this.inlineImages[i], aAttachments[index]);
-								}
-							}
-						}
-					}
-				}
-				else {
-					if (inlineCount < this.inlineImages.length) {
-						this.loadImage(this.inlineImages[inlineCount], aAttachments[index]);
-					}
-					else {
-						dump("inlineCount > this.inlineImages.length\n");
-						dump("Attachment has no contentId:"+JSON.stringify(aAttachments[index].attachment)+"\n\n");
-					}
-				}		
-			}
-		}
-	},
-
-	onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg, aNode)
-	{
-		this.globalFunctions.LOG("onDownloadAttachmentError: aCode:"+aCode+", aMsg:"+aMsg);
-	},
-
-	onLoadedData: function _onLoadedData(aStr)
-	{
-		this._document.getElementById("exchWebService-body-editor").removeEventListener("DOMContentLoaded",arguments.callee,true);
-		//dump("onLoadedData:\n");
-		this.removeTmpFile();
-
-		// Lets see if we have images.
-		var args = this._window.arguments[0];
-		var item = args.calendarEvent;
-		var attachments = item.getAttachments({});
-//dump("attachments.length:"+attachments.length+"\n");
-		var inlineAttachments = {};
-		var inlineCount = 0;
-		for (var i = 0; i < attachments.length; i++) {
-//dump(" -- uri:"+attachments[i].uri.spec+"\n");
-			let getParams = this.globalFunctions.splitUriGetParams(attachments[i].uri);
-
-			if (getParams.isinline == "true") {
-				dump(" -- attachment is inline\n");
-				this.loadInlineAttachment(getParams.id, getParams.calendarid, inlineCount);
-				inlineCount++;
-			}
-		}		
-
-//dump("item.mimeContent:"+item.mimeContent+"\n\n");
-//dump("item.exchangeXML:"+item.exchangeXML+"\n\n");
-	},
-
-	browserLoad: function _browserLoad(aStr, aItem)
-	{
-		this._document.getElementById("exchWebService-body-editor").removeEventListener("load",this.browserLoadFunction,true);
-		//dump("browserLoad:\n");
-		var self = this;
-		this._document.getElementById("exchWebService-body-editor").addEventListener("DOMContentLoaded", function(aEvent){ self.onLoadedData(aEvent);}, true);
-		var tmpListener = new exchEventSummaryBrowserProgressListener(this);
-try{
-		this._document.getElementById("exchWebService-body-editor").addProgressListener(tmpListener, 0x1ff);
-		var filename = this.saveToFile(aItem.body, aItem);
-		this._document.getElementById("exchWebService-body-editor").loadURI("file://" + filename.path, null,"utf-8");
-}catch(err){dump("browserLoad: loadURI err:"+err+"\n");}
-
-		this._document.getElementById("exchWebService-body-editor").addEventListener("mouseover", function(aEvent){ self.onMouseOver(aEvent);}, false);
-		this._document.getElementById("exchWebService-body-editor").addEventListener("mouseout", function(aEvent){ self.onMouseOut(aEvent);}, false);
-	},
-
-	onLoad: function _onLoad()
-	{
-		//dump("onLoad\n");
-                this.showOptionalAttendees();
-		if (this._document.getElementById("calendar-event-summary-dialog")) {
-			//this._window.removeEventListener("load", this.onLoad, false);
-			var args = this._window.arguments[0];
-			var item = args.calendarEvent;
-			var calendar = item.calendar;
-			var tmpButtons = this._document.getElementById("calendar-event-summary-dialog").getAttribute("buttons");
-			if (calendar.getProperty("exchWebService.offlineOrNotConnected")) {
-				var tmpArray = tmpButtons.split(",");
-				var newArray = [];
-				for (var index in tmpArray) {
-					if (tmpArray[index] != "extra1") {
-						newArray.push(tmpArray[index]);
-					}
-				}
-				this._document.getElementById("calendar-event-summary-dialog").buttons = newArray.join(",");
-			}
-			else {
-				if ((item.calendar.type == "exchangecalendar") && (item.responseObjects) && (item.responseObjects.ForwardItem)) {
-					this._document.getElementById("calendar-event-summary-dialog").buttons += ",extra1";
-				}
-			}
-
-			//Cc["@mozilla.org/consoleservice;1"]
-	                //     .getService(Ci.nsIConsoleService).logStringMessage(item.exchangeXML);
-//dump("summary.dialog: item.exchangeXML:"+item.exchangeXML+"\n");
-			if (item.bodyType == "HTML") {
-				if (this._document.getElementById("item-description")) {
-					this._document.getElementById("item-description").parentNode.appendChild(this._document.getElementById("exchWebService-body-editor"));
-					this._document.getElementById("item-description").hidden = true;
-				}
-				if (this._document.getElementById("exchWebService-body-editor")) {
-					this._document.getElementById("item-description-box").hidden = false;
-					this._document.getElementById("exchWebService-body-editor").hidden = false;
-					//this._document.getElementById("exchWebService-body-editor").content = item.body;
-
-					// We Wait until the browser object has been loaded completely.
-					var self = this;
-					this.browserLoadFunction = function(aEvent){ self.browserLoad(aEvent, item);}
-					this._document.getElementById("exchWebService-body-editor").addEventListener("load", this.browserLoadFunction, true);
-				}
-			}
-			else {
-				if (this._document.getElementById("item-description")) {
-					this._document.getElementById("item-description").hidden = false;
-				}
-				if (this._document.getElementById("exchWebService-body-editor")) {
-					this._document.getElementById("exchWebService-body-editor").hidden = true;
-				}
-			}
-		}
-	},
-
-	hrefAndLinkNodeForClickEvent: function _hrefAndLinkNodeForClickEvent(event)
-	{
-		var href = "";
-		var isKeyCommand = (event.type == "command");
-		var linkNode = isKeyCommand ? this._document.commandDispatcher.focusedElement
-				        : event.originalTarget;
-
-		while (linkNode instanceof Element) {
-			if (linkNode instanceof HTMLAnchorElement ||
-			  linkNode instanceof HTMLAreaElement ||
-			  linkNode instanceof HTMLLinkElement) {
-				href = linkNode.href;
-				if (href)
-				  break;
-			}
-			// Try MathML href
-			else if (linkNode.namespaceURI == "http://www.w3.org/1998/Math/MathML" &&
-			       linkNode.hasAttribute("href")) {
-				href = linkNode.getAttribute("href");
-				href = makeURLAbsolute(linkNode.baseURI, href);
-				break;
-			}
-			// Try simple XLink
-			else if (linkNode.hasAttributeNS("http://www.w3.org/1999/xlink", "href")) {
-				href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
-				href = makeURLAbsolute(linkNode.baseURI, href);
-				break;
-			}
-			linkNode = linkNode.parentNode;
-		}
-
-		return href ? {href: href, linkNode: linkNode} : null;
-	},
-
-	onClick: function _onClick(event)
-	{
-		// Following is copied from mailWindow.js script for emails.
-		var ceParams = this.hrefAndLinkNodeForClickEvent(event);
-		if (!ceParams && !event.button)	{
-			var target = event.target;
-			// is this an image that we might want to scale?
-			if (target instanceof Components.interfaces.nsIImageLoadingContent) {
-				// make sure it loaded successfully
-				var req = target.getRequest(Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST);
-				if (!req || req.imageStatus & Components.interfaces.imgIRequest.STATUS_ERROR)
-				return true;
-				// is it an inline attachment?
-				if (/^moz-attached-image/.test(target.className)) {
-					if (target.hasAttribute("isshrunk"))
-					{
-						// currently shrunk to fit, so unshrink it
-						target.removeAttribute("isshrunk");
-						target.removeAttribute("shrinktofit");
-						target.setAttribute("overflowing", "true");
-					}
-					else if (target.hasAttribute("overflowing"))
-					{
-						// user wants to shrink now
-						target.setAttribute("isshrunk", "true");
-						target.setAttribute("shrinktofit", "true");
-						target.removeAttribute("overflowing");
-					}
-				}
-			}
-			return true;
-		}
-
-		if (!ceParams) return true;
-
-		var href = ceParams.href;
-
-		try {
-			var extProtService = Cc["@mozilla.org/uriloader/external-protocol-service;1"].getService();
-			extProtService = extProtService.QueryInterface(Ci.nsIExternalProtocolService);
-			var scheme = href.substring(0, href.indexOf(":"));
-			if (extProtService.isExposedProtocol(scheme)) {
-				var ioService = Cc["@mozilla.org/network/io-service;1"]
-					  .getService(Ci.nsIIOService);
-				extProtService.loadUrl(ioService.newURI(href, null, null));
-			}
-		} 
-		catch (ex) {
-			alert("Do not know how to handle this reference:"+href);
-		}
-
-		event.preventDefault();
-		return true;
-	},
-
-	unLoad: function _unLoad(aEvent)
-	{
-		//dump("unLoading window:"+aEvent.type+"\n");
-		for each(var cachedImage in this.imageCache) {
-			cachedImage.remove(false);
-		}
-	},
+            } //end of for
+
+    },
+
+    //exchWebService.forewardEvent2 = {
+    onForward: function _onForward() {
+        var args = this._window.arguments[0];
+        var item = args.calendarEvent;
+        item = item.clone();
+        var calendar = item.calendar;
+        var args = new Object();
+        args.startTime = item.startDate;
+        args.endTime = item.endDate;
+        args.organizer = item.organizer;
+        args.item = item;
+        args.attendees = item.organizer;
+        args.calendar = calendar;
+        var self = this;
+        args.onOk = function (attendee, organizer, startTime, endTime) {
+            self.callOnOk(attendee, organizer, startTime, endTime);
+        };
+        args.opener = "exchWebService-onForward";
+        this._window.openDialog("chrome://calendar/content/calendar-event-dialog-attendees.xul", "_blank", "chrome,titlebar,modal,resizable", args);
+
+    },
+
+    callOnOk: function (attendee, organizer, startTime, endTime) {
+
+        var args = this._window.arguments[0];
+        var item = args.calendarEvent;
+        var calendar = item.calendar;
+        var calId = calendar.id;
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+        var self = this;
+        var tmpObject = new erForewardItemRequest({
+                user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),
+                mailbox: this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
+                serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"),
+                item: item,
+                attendees: attendee
+            },
+            function (aForewardItemRequest, aResp) {
+                self.erForewardItemRequestOK(aForewardItemRequest, aResp);
+            },
+            function (aForewardItemRequest, aCode, aMsg) {
+                self.erForewardItemRequestError(aForewardItemRequest, aCode, aMsg);
+            });
+    },
+
+    erForewardItemRequestOK: function _erForewardItemRequestOK(aForewardItemRequest, aResp) {
+        alert(aResp);
+    },
+
+    erForewardItemRequestError: function _erForewardItemRequestError(aForewardItemRequest, aCode, aMsg) {
+        alert(aCode + ":" + aMsg);
+    },
+
+    removeTmpFile: function _removeTmpFile() {
+        if ((this.tmpFile) && (this.tmpFile.exists())) {
+            //dump("Removing tmp file:"+this.tmpFile.path+"\n");
+            this.tmpFile.remove(false);
+        }
+    },
+
+    saveToFile: function _saveToFile(aContent, aItem) {
+        var file = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Ci.nsIProperties)
+            .get("ProfD", Ci.nsIFile);
+        file.append("exchange-data");
+        if (!file.exists() || !file.isDirectory()) {
+            file.create(Ci.nsIFile.DIRECTORY_TYPE, this.globalFunctions.fromOctal("0777"));
+        }
+
+        file.append("tmp");
+        if (!file.exists() || !file.isDirectory()) {
+            file.create(Ci.nsIFile.DIRECTORY_TYPE, this.globalFunctions.fromOctal("0777"));
+        }
+
+        file.append(this.globalFunctions.getUUID() + ".html");
+
+        if (file.exists()) {
+            file.remove(false);
+        }
+
+        //		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, this.globalFunctions.fromOctal("0777"));  
+
+        var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
+        createInstance(Components.interfaces.nsIFileOutputStream);
+        foStream.init(file, 0x02 | 0x08 | 0x20, this.globalFunctions.fromOctal("0777"), 0);
+
+        var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
+        createInstance(Components.interfaces.nsIConverterOutputStream);
+        converter.init(foStream, "UTF-8", 0, 0);
+        converter.writeString(aContent);
+        converter.close(); // this closes foStream
+
+        this.tmpFile = file;
+        return file;
+    },
+
+    onMouseOver: function _onMouseOver(event) {
+        var ceParams = this.hrefAndLinkNodeForClickEvent(event);
+        if (!ceParams) {
+            return true;
+        }
+
+        var href = ceParams.href;
+
+        //dump("onMouseEnter: href='"+href+"'\n");
+        this.mouseEnterHRef = href;
+        //this._document.getElementById("exchWebService-summary-description-label").value = href;
+        this._document.getElementById("exchWebService-body-editor").setAttribute("tooltiptext", href);
+        event.preventDefault();
+        return true;
+    },
+
+    onMouseOut: function _onMouseOut(event) {
+        var ceParams = this.hrefAndLinkNodeForClickEvent(event);
+        if (!ceParams) {
+            return true;
+        }
+
+        var href = ceParams.href;
+
+        if (href != this.mouseEnterHRef) {
+            return true;
+        }
+
+        //dump("onMouseLeave: href='"+href+"'\n");
+        this._document.getElementById("exchWebService-body-editor").removeAttribute("tooltiptext");
+        event.preventDefault();
+        return true;
+    },
+
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        var args = this._window.arguments[0];
+        var item = args.calendarEvent;
+
+        this.loadBalancer.addToQueue({
+            calendar: item.calendar,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+
+    loadInlineAttachment: function _loadInLineAttachment(aAttachmentId, aCalendarId, inlineCount) {
+        var prefs = "extensions.exchangecalendar@extensions.1st-setup.nl." + aCalendarId + ".";
+
+        var serverUrl = this.globalFunctions.safeGetCharPref(null, prefs + "ecServer", "");
+        var username = this.globalFunctions.safeGetCharPref(null, prefs + "ecUser", "");
+        var domain = this.globalFunctions.safeGetCharPref(null, prefs + "ecDomain", "");
+        if (username.indexOf("@") == -1) {
+            if (domain != "") {
+                username = domain + "\\" + username;
+            }
+        }
+
+        var self = this;
+        this.addToQueue(erGetAttachmentsRequest, {
+                user: username,
+                serverUrl: serverUrl,
+                attachmentIds: [aAttachmentId]
+            },
+            function (aExchangeRequest, aAttachments) {
+                self.onDownloadAttachmentOk(aExchangeRequest, aAttachments, inlineCount);
+            },
+            function (aExchangeRequest, aCode, aMsg) {
+                self.onDownloadAttachmentError(aExchangeRequest, aCode, aMsg, inlineCount);
+            },
+            null);
+    },
+
+    loadImage: function _loadImage(aImageNode, aAttachment) {
+        this.globalFunctions.LOG(" == Going to decode:" + aAttachment.name);
+        this.globalFunctions.LOG(" == content:" + aAttachment.content.length + " bytes");
+        var fileData = window.atob(aAttachment.content);
+        this.globalFunctions.LOG(" == Decoded:" + aAttachment.name);
+
+        var file = Cc["@mozilla.org/file/directory_service;1"].
+        getService(Ci.nsIProperties).
+        get("TmpD", Ci.nsIFile);
+        var tmpName = this.globalFunctions.getUUID();
+        file.append(tmpName);
+
+        //file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);  
+        // do whatever you need to the created file  
+        this.globalFunctions.LOG(" == new tmp filename:" + file.path);
+
+        var stream = Cc["@mozilla.org/network/safe-file-output-stream;1"].
+        createInstance(Ci.nsIFileOutputStream);
+        stream.init(file, 0x04 | 0x08 | 0x20, 384, 0); // readwrite, create, truncate  
+
+        this.globalFunctions.LOG(" == writing file:" + file.path);
+        this.globalFunctions.LOG(" == writing:" + fileData.length + " bytes");
+        stream.write(fileData, fileData.length);
+        if (stream instanceof Ci.nsISafeOutputStream) {
+            stream.finish();
+        }
+        // Dispose of the converted data in memory;
+        //delete fileData;
+
+        this.globalFunctions.LOG(" == written file:" + file.path);
+        this.globalFunctions.LOG(" == written:" + fileData.length + " bytes");
+
+        if (aImageNode) {
+            this.globalFunctions.LOG(" == Telling image to load file.");
+            aImageNode.src = "file://" + file.path;
+            this.imageCache[aAttachment.id] = file;
+            //dump("2. broswer innerhtml:"+this._document.getElementById("exchWebService-body-editor").contentDocument.body.outerHTML+"\n");
+        }
+        else {
+            //dump(" loadImage: no aImageNoded\n");
+        }
+    },
+
+    onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments, inlineCount) {
+        this.globalFunctions.LOG("exchWebService.attachments.onDownloadAttachmentOk:" + aAttachments.length);
+
+        this.inlineImages = this._document.getElementById("exchWebService-body-editor").contentDocument.images;
+        //dump("1. broswer innerhtml:"+this._document.getElementById("exchWebService-body-editor").contentDocument.body.outerHTML+"\n");
+        //dump("this.inlineImages.length:"+this.inlineImages.length+"\n");
+
+        if (aAttachments.length > 0) {
+            for (var index in aAttachments) {
+                if (aAttachments[index].contentId) {
+                    // Find the image this attachment is for.
+                    for (var i = 0; i < this.inlineImages.length; i++) {
+                        if (this.inlineImages[i].hasAttribute("src")) {
+                            var contentId = this.inlineImages[i].getAttribute("src")
+                            dump("img src:" + contentId + "\n");
+                            if (contentId.indexOf("cid:") == 0) {
+                                // We have a contentId as image source. Lets see if we have a matching inline attachment.
+                                dump("We have a contentId as image source. Lets see if we have a matching inline attachment.\n");
+                                contentId = contentId.substr(4);
+                                if (contentId == aAttachments[index].contentId) {
+                                    this.loadImage(this.inlineImages[i], aAttachments[index]);
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    if (inlineCount < this.inlineImages.length) {
+                        this.loadImage(this.inlineImages[inlineCount], aAttachments[index]);
+                    }
+                    else {
+                        dump("inlineCount > this.inlineImages.length\n");
+                        dump("Attachment has no contentId:" + JSON.stringify(aAttachments[index].attachment) + "\n\n");
+                    }
+                }
+            }
+        }
+    },
+
+    onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg, aNode) {
+        this.globalFunctions.LOG("onDownloadAttachmentError: aCode:" + aCode + ", aMsg:" + aMsg);
+    },
+
+    onLoadedData: function _onLoadedData(aStr) {
+        this._document.getElementById("exchWebService-body-editor").removeEventListener("DOMContentLoaded", arguments.callee, true);
+        //dump("onLoadedData:\n");
+        this.removeTmpFile();
+
+        // Lets see if we have images.
+        var args = this._window.arguments[0];
+        var item = args.calendarEvent;
+        var attachments = item.getAttachments({});
+        //dump("attachments.length:"+attachments.length+"\n");
+        var inlineAttachments = {};
+        var inlineCount = 0;
+        for (var i = 0; i < attachments.length; i++) {
+            //dump(" -- uri:"+attachments[i].uri.spec+"\n");
+            let getParams = this.globalFunctions.splitUriGetParams(attachments[i].uri);
+
+            if (getParams.isinline == "true") {
+                dump(" -- attachment is inline\n");
+                this.loadInlineAttachment(getParams.id, getParams.calendarid, inlineCount);
+                inlineCount++;
+            }
+        }
+
+        //dump("item.mimeContent:"+item.mimeContent+"\n\n");
+        //dump("item.exchangeXML:"+item.exchangeXML+"\n\n");
+    },
+
+    browserLoad: function _browserLoad(aStr, aItem) {
+        this._document.getElementById("exchWebService-body-editor").removeEventListener("load", this.browserLoadFunction, true);
+        //dump("browserLoad:\n");
+        var self = this;
+        this._document.getElementById("exchWebService-body-editor").addEventListener("DOMContentLoaded", function (aEvent) {
+            self.onLoadedData(aEvent);
+        }, true);
+        var tmpListener = new exchEventSummaryBrowserProgressListener(this);
+        try {
+            this._document.getElementById("exchWebService-body-editor").addProgressListener(tmpListener, 0x1ff);
+            var filename = this.saveToFile(aItem.body, aItem);
+            this._document.getElementById("exchWebService-body-editor").loadURI("file://" + filename.path, null, "utf-8");
+        }
+        catch (err) {
+            dump("browserLoad: loadURI err:" + err + "\n");
+        }
+
+        this._document.getElementById("exchWebService-body-editor").addEventListener("mouseover", function (aEvent) {
+            self.onMouseOver(aEvent);
+        }, false);
+        this._document.getElementById("exchWebService-body-editor").addEventListener("mouseout", function (aEvent) {
+            self.onMouseOut(aEvent);
+        }, false);
+    },
+
+    onLoad: function _onLoad() {
+        //dump("onLoad\n");
+        this.showOptionalAttendees();
+        if (this._document.getElementById("calendar-event-summary-dialog")) {
+            //this._window.removeEventListener("load", this.onLoad, false);
+            var args = this._window.arguments[0];
+            var item = args.calendarEvent;
+            var calendar = item.calendar;
+            var tmpButtons = this._document.getElementById("calendar-event-summary-dialog").getAttribute("buttons");
+            if (calendar.getProperty("exchWebService.offlineOrNotConnected")) {
+                var tmpArray = tmpButtons.split(",");
+                var newArray = [];
+                for (var index in tmpArray) {
+                    if (tmpArray[index] != "extra1") {
+                        newArray.push(tmpArray[index]);
+                    }
+                }
+                this._document.getElementById("calendar-event-summary-dialog").buttons = newArray.join(",");
+            }
+            else {
+                if ((item.calendar.type == "exchangecalendar") && (item.responseObjects) && (item.responseObjects.ForwardItem)) {
+                    this._document.getElementById("calendar-event-summary-dialog").buttons += ",extra1";
+                }
+            }
+
+            //Cc["@mozilla.org/consoleservice;1"]
+            //     .getService(Ci.nsIConsoleService).logStringMessage(item.exchangeXML);
+            //dump("summary.dialog: item.exchangeXML:"+item.exchangeXML+"\n");
+            if (item.bodyType == "HTML") {
+                if (this._document.getElementById("item-description")) {
+                    this._document.getElementById("item-description").parentNode.appendChild(this._document.getElementById("exchWebService-body-editor"));
+                    this._document.getElementById("item-description").hidden = true;
+                }
+                if (this._document.getElementById("exchWebService-body-editor")) {
+                    this._document.getElementById("item-description-box").hidden = false;
+                    this._document.getElementById("exchWebService-body-editor").hidden = false;
+                    //this._document.getElementById("exchWebService-body-editor").content = item.body;
+
+                    // We Wait until the browser object has been loaded completely.
+                    var self = this;
+                    this.browserLoadFunction = function (aEvent) {
+                        self.browserLoad(aEvent, item);
+                    }
+                    this._document.getElementById("exchWebService-body-editor").addEventListener("load", this.browserLoadFunction, true);
+                }
+            }
+            else {
+                if (this._document.getElementById("item-description")) {
+                    this._document.getElementById("item-description").hidden = false;
+                }
+                if (this._document.getElementById("exchWebService-body-editor")) {
+                    this._document.getElementById("exchWebService-body-editor").hidden = true;
+                }
+            }
+        }
+    },
+
+    hrefAndLinkNodeForClickEvent: function _hrefAndLinkNodeForClickEvent(event) {
+        var href = "";
+        var isKeyCommand = (event.type == "command");
+        var linkNode = isKeyCommand ? this._document.commandDispatcher.focusedElement
+            : event.originalTarget;
+
+        while (linkNode instanceof Element) {
+            if (linkNode instanceof HTMLAnchorElement
+                || linkNode instanceof HTMLAreaElement
+                || linkNode instanceof HTMLLinkElement) {
+                href = linkNode.href;
+                if (href)
+                    break;
+            }
+            // Try MathML href
+            else if (linkNode.namespaceURI == "http://www.w3.org/1998/Math/MathML"
+                && linkNode.hasAttribute("href")) {
+                href = linkNode.getAttribute("href");
+                href = makeURLAbsolute(linkNode.baseURI, href);
+                break;
+            }
+            // Try simple XLink
+            else if (linkNode.hasAttributeNS("http://www.w3.org/1999/xlink", "href")) {
+                href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
+                href = makeURLAbsolute(linkNode.baseURI, href);
+                break;
+            }
+            linkNode = linkNode.parentNode;
+        }
+
+        return href ? {
+            href: href,
+            linkNode: linkNode
+        } : null;
+    },
+
+    onClick: function _onClick(event) {
+        // Following is copied from mailWindow.js script for emails.
+        var ceParams = this.hrefAndLinkNodeForClickEvent(event);
+        if (!ceParams && !event.button) {
+            var target = event.target;
+            // is this an image that we might want to scale?
+            if (target instanceof Components.interfaces.nsIImageLoadingContent) {
+                // make sure it loaded successfully
+                var req = target.getRequest(Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST);
+                if (!req || req.imageStatus & Components.interfaces.imgIRequest.STATUS_ERROR)
+                    return true;
+                // is it an inline attachment?
+                if (/^moz-attached-image/.test(target.className)) {
+                    if (target.hasAttribute("isshrunk")) {
+                        // currently shrunk to fit, so unshrink it
+                        target.removeAttribute("isshrunk");
+                        target.removeAttribute("shrinktofit");
+                        target.setAttribute("overflowing", "true");
+                    }
+                    else if (target.hasAttribute("overflowing")) {
+                        // user wants to shrink now
+                        target.setAttribute("isshrunk", "true");
+                        target.setAttribute("shrinktofit", "true");
+                        target.removeAttribute("overflowing");
+                    }
+                }
+            }
+            return true;
+        }
+
+        if (!ceParams) return true;
+
+        var href = ceParams.href;
+
+        try {
+            var extProtService = Cc["@mozilla.org/uriloader/external-protocol-service;1"].getService();
+            extProtService = extProtService.QueryInterface(Ci.nsIExternalProtocolService);
+            var scheme = href.substring(0, href.indexOf(":"));
+            if (extProtService.isExposedProtocol(scheme)) {
+                var ioService = Cc["@mozilla.org/network/io-service;1"]
+                    .getService(Ci.nsIIOService);
+                extProtService.loadUrl(ioService.newURI(href, null, null));
+            }
+        }
+        catch (ex) {
+            alert("Do not know how to handle this reference:" + href);
+        }
+
+        event.preventDefault();
+        return true;
+    },
+
+    unLoad: function _unLoad(aEvent) {
+        //dump("unLoading window:"+aEvent.type+"\n");
+        for each(var cachedImage in this.imageCache) {
+            cachedImage.remove(false);
+        }
+    },
 }
 
 //this._window.addEventListener("load", exchWebService.forewardEvent2.onLoad, false);
 var tmpEventSummaryDialog = new exchEventSummaryDialog(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpEventSummaryDialog.onLoad(); }, true);
-window.addEventListener("DOMWindowClose", function (aEvent) { window.removeEventListener("DOMWindowClose",arguments.callee,false); tmpEventSummaryDialog.unLoad(aEvent); }, true);
-
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpEventSummaryDialog.onLoad();
+}, true);
+window.addEventListener("DOMWindowClose", function (aEvent) {
+    window.removeEventListener("DOMWindowClose", arguments.callee, false);
+    tmpEventSummaryDialog.unLoad(aEvent);
+}, true);
diff --git a/chrome/content/calendar-task-view.js b/chrome/content/calendar-task-view.js
index 01b3187d..5764c393 100644
--- a/chrome/content/calendar-task-view.js
+++ b/chrome/content/calendar-task-view.js
@@ -1,6 +1,6 @@
 /*
  * Owner:Ericsson
- */ 
+ */
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
@@ -9,101 +9,99 @@ var components = Components;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource:///modules/gloda/public.js")
-Cu.import("resource:///modules/MailUtils.js"); 
+Cu.import("resource:///modules/MailUtils.js");
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://calendar/modules/calXMLUtils.jsm");
 
 const globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    .getService(Ci.mivFunctions);
 const gMessenger = Cc["@mozilla.org/messenger;1"].createInstance(Ci.nsIMessenger);
-function displayElement(id,flag) {
-            setBooleanAttribute(id, "hidden", !flag);
-            return flag;
-        }
-function taskHtmlDetailsView(event){
 
-		function msgHdrToNeckoURL(aMsgHdr, gMessenger) {
-	         var uri = aMsgHdr.folder.getUriForMsg(aMsgHdr);
-	         var neckoURL = {};
-	         var msgService = gMessenger.messageServiceFromURI(uri);
-	         msgService.GetUrlForUri(uri, neckoURL, null);
-	         return neckoURL.value;
-		}  
-		
-		function showMail(url)	{
-	       	if(!url){
-	       		return;
-	       	}  
-			ele.hidden = true;  
-			ele2.hidden = false;  
-			ele2.setAttribute("src","about:blank");
-			ele2.setAttribute("src",url); 
+function displayElement(id, flag) {
+    setBooleanAttribute(id, "hidden", !flag);
+    return flag;
+}
+
+function taskHtmlDetailsView(event) {
+
+    function msgHdrToNeckoURL(aMsgHdr, gMessenger) {
+        var uri = aMsgHdr.folder.getUriForMsg(aMsgHdr);
+        var neckoURL = {};
+        var msgService = gMessenger.messageServiceFromURI(uri);
+        msgService.GetUrlForUri(uri, neckoURL, null);
+        return neckoURL.value;
+    }
+
+    function showMail(url) {
+        if (!url) {
+            return;
         }
+        ele.hidden = true;
+        ele2.hidden = false;
+        ele2.setAttribute("src", "about:blank");
+        ele2.setAttribute("src", url);
+    }
 
-       function IsImapMessage(messageUri)  {
-         return (/^imap-message:/.test(messageUri));
-       } 
-       
-		if(event){ 
-		taskDetailsView.onSelect(event); 
-		var item = document.getElementById("calendar-task-tree").currentTask;	        
-		if (displayElement("calendar-task-details-container", item != null) &&
-            displayElement("calendar-task-view-splitter", item != null)) { 
-			if( item.calendar.type == "exchangecalendar" ){ 
-			   //Html manipulations
-			   var ele =  document.getElementById("calendar-task-details-description"); 
-			   var ele2 = document.getElementById("exchService-task-details-description"); 
+    function IsImapMessage(messageUri) {
+        return (/^imap-message:/.test(messageUri));
+    }
 
-				//remove existing task view 
-				//ele.parentNode.removeChild(ele);
-				if(item.itemClass == "IPM.Task"){
-					  ele2.hidden = true; 
-					  ele.hidden = false; 
-				}
-				else if(item.itemClass == "IPM.Note")
-				{ 			 
-					//imap://mail.internal.ericsson.com:993/fetch%3EUID%3E/INBOX%3E9459
-					//globalFunctions.LOG("MessageId " + item.messageId );  
-					var queryListener = {
-						/* called when new items are returned by the database query or freshly indexed */
-						onItemsAdded : function queryListener_onItemsAdded(aItems, aCollection) {
-						},
-						/* called when items that are already in our collection get re-indexed */
-						onItemsModified : function queryListener_onItemsModified(aItems, aCollection) {
-						},
-						/* called when items that are in our collection are purged from the system */
-						onItemsRemoved : function queryListener_onItemsRemoved(aItems, aCollection) {
-						},
-						/* called when our database query completes */
-							onQueryCompleted : function queryListener_onQueryCompleted(aCollection) {
-								try {
-									 for (var j = 0; j < aCollection.items.length; j++) {  
-										var msgUri = aCollection.items[j].folderMessageURI; 
-										var msgHdr = gMessenger.msgHdrFromURI(msgUri); 
-	 
-										if(IsImapMessage(msgUri)){    
-											var url = msgHdrToNeckoURL(msgHdr,gMessenger).spec;
-											showMail(url);
-										} 
-									 } 
-								} 
-								catch (e) {
-									dump("\nexception " +e);
-							}
-						}
-					}; 
-					var messageId = item.messageId.replace('<', '').replace('>', '');  
-					if( messageId ){
-								var query = Gloda.newQuery(Gloda.NOUN_MESSAGE);
-								query.headerMessageID(messageId);
-								var collection = query.getCollection(queryListener);
-					}
-				}  
-		}
-		else {
-			document.getElementById("exchService-task-details-description").hidden = true;
-			document.getElementById("calendar-task-details-description").hidden = false;
-		} 
-	  }
-   }
-} 
\ No newline at end of file
+    if (event) {
+        taskDetailsView.onSelect(event);
+        var item = document.getElementById("calendar-task-tree").currentTask;
+        if (displayElement("calendar-task-details-container", item != null)
+            && displayElement("calendar-task-view-splitter", item != null)) {
+            if (item.calendar.type == "exchangecalendar") {
+                //Html manipulations
+                var ele = document.getElementById("calendar-task-details-description");
+                var ele2 = document.getElementById("exchService-task-details-description");
+
+                //remove existing task view 
+                //ele.parentNode.removeChild(ele);
+                if (item.itemClass == "IPM.Task") {
+                    ele2.hidden = true;
+                    ele.hidden = false;
+                }
+                else if (item.itemClass == "IPM.Note") {
+                    //imap://mail.internal.ericsson.com:993/fetch%3EUID%3E/INBOX%3E9459
+                    //globalFunctions.LOG("MessageId " + item.messageId );  
+                    var queryListener = {
+                        /* called when new items are returned by the database query or freshly indexed */
+                        onItemsAdded: function queryListener_onItemsAdded(aItems, aCollection) {},
+                        /* called when items that are already in our collection get re-indexed */
+                        onItemsModified: function queryListener_onItemsModified(aItems, aCollection) {},
+                        /* called when items that are in our collection are purged from the system */
+                        onItemsRemoved: function queryListener_onItemsRemoved(aItems, aCollection) {},
+                        /* called when our database query completes */
+                        onQueryCompleted: function queryListener_onQueryCompleted(aCollection) {
+                            try {
+                                for (var j = 0; j < aCollection.items.length; j++) {
+                                    var msgUri = aCollection.items[j].folderMessageURI;
+                                    var msgHdr = gMessenger.msgHdrFromURI(msgUri);
+
+                                    if (IsImapMessage(msgUri)) {
+                                        var url = msgHdrToNeckoURL(msgHdr, gMessenger).spec;
+                                        showMail(url);
+                                    }
+                                }
+                            }
+                            catch (e) {
+                                dump("\nexception " + e);
+                            }
+                        }
+                    };
+                    var messageId = item.messageId.replace('<', '').replace('>', '');
+                    if (messageId) {
+                        var query = Gloda.newQuery(Gloda.NOUN_MESSAGE);
+                        query.headerMessageID(messageId);
+                        var collection = query.getCollection(queryListener);
+                    }
+                }
+            }
+            else {
+                document.getElementById("exchService-task-details-description").hidden = true;
+                document.getElementById("calendar-task-details-description").hidden = false;
+            }
+        }
+    }
+}
diff --git a/chrome/content/check4lightning.js b/chrome/content/check4lightning.js
index 68cec5ef..35e14682 100644
--- a/chrome/content/check4lightning.js
+++ b/chrome/content/check4lightning.js
@@ -33,212 +33,221 @@ var Cu = Components.utils;
 
 Cu.import("resource:///modules/mailServices.js");
 
-function exchCheck4Lightning(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchCheck4Lightning(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchCheck4Lightning.prototype = {
 
-	lightningIsInstalled: -1,
-	// -1 = Check for Lightning has not yet run.
-	// 0 = Lightning is not installed.
-	// 1 = Lightning is installed but not active.
-	// 2 = Lightning is installed and active.
-	checkingIfLightnigIsInstalled: false,
-
-	updateCheckDone: false,
-
-	lightningAlertTimer: Cc["@mozilla.org/timer;1"]
-					.createInstance(Ci.nsITimer),
-	lightningAlertTimer2: Cc["@mozilla.org/timer;1"]
-					.createInstance(Ci.nsITimer),
-
-	lightningAlertCallback: function _lightningAlertCallback() 
-	{
-		this.globalFunctions.LOG("lightningAlertCallback.");
-
-		var prefB = Cc["@mozilla.org/preferences-service;1"].
-				getService(Ci.nsIPrefBranch);
-		var promptStr = "";
-		var promptTitle = "";
-
-		switch (this.lightningIsInstalled) {
-			case 0:
-				promptTitle = "Lightning is not installed.";
-				promptStr = "Please install the Lightning Add-on if you wish\nto use the Exchange 2007/2010 Calendar and Tasks add-on.";
-				break;
-			case 1:
-				promptTitle = "Lightning is not active.";
-				promptStr = "Please activate the Lightning Add-on if you wish\nto use the Exchange 2007/2010 Calendar and Tasks add-on.";
-				break;
-		}
-
-		if (!this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.lightningCheck.showWarning", true)) {
-			this.globalFunctions.LOG("lightningAlertCallback: Not showing warning dialog:"+promptStr);
-			return;
-		}
-
-		var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].  
-			getService(Ci.nsIPromptService);  
-
-		var answer = { value: false };
-		prompts.alertCheck(null, promptTitle, promptStr, "Do not show this prompt anymore.", answer); 
-		this.globalFunctions.LOG("lightningAlertCallback. Answer:"+answer.value); 		
-
-		prefB.setBoolPref("extensions.1st-setup.lightningCheck.showWarning", !answer.value);
-
-		switch (this.lightningIsInstalled) {
-			case 0:
-				openContentTab("https://addons.mozilla.org/en-US/thunderbird/addon/lightning/", "tab", "addons.mozilla.org");
-				break;
-			case 1:
-				openContentTab("about:addons", "tab", "addons.mozilla.org");
-				break;
-		}
-
-		this.checkingIfLightnigIsInstalled = false;
-	},
-
-	checkLightningIsInstalledCallback: function _checkLightningIsInstalledCallback(aAddOn)
-	{
-		if (!aAddOn) {
-			this.lightningIsInstalled = 0;
-		}
-		else {
-			this.lightningIsInstalled = 1;
-			this.globalFunctions.LOG("Lightning is installed.");
-		}
-
-		var self = this;
-		if (this.lightningIsInstalled == 0) {
-			// Lightning is not installed. Try to install it.
-			this.globalFunctions.WARN("Lightning is not installed.");
-			this.lightningAlertTimer.initWithCallback(function (){ self.lightningAlertCallback();}, 1500, this.lightningAlertTimer.TYPE_ONE_SHOT);
-
-		}
-		else {
-			// Ligntning is installed check if it is enabled.
-			try {
-				this.globalFunctions.LOG("Lightning was installed from:"+aAddOn.sourceURI.prePath+aAddOn.sourceURI.path);
-			}
-			catch(er) {
-				this.globalFunctions.LOG("Lightning was installed from unknown source. Probably manualy outside the AddOnManager.");
-			}
-			if (aAddOn.isActive) {
-				this.lightningIsInstalled = 2;
-			}
-			else {
-				// Not Active.  
-				this.globalFunctions.WARN("Lightning is not active.1");
-				this.lightningAlertTimer.initWithCallback(function (){ self.lightningAlertCallback();}, 1500, this.lightningAlertTimer.TYPE_ONE_SHOT);
-			}
-		}
-	},
-
-	checkLightningIsInstalled: function _checkLightningIsInstalled()
-	{
-		if (this.lightningIsInstalled > 1) {
-			// Lightning is allready installed.
-			return;
-		}
-
-		if (this.checkingIfLightnigIsInstalled) {
-			return;
-		}
-
-		this.checkingIfLightnigIsInstalled = true;
-
-		if (this.lightningIsInstalled == -1) {
-			Cu.import("resource://gre/modules/AddonManager.jsm");
-		}
-		var self = this;
-		AddonManager.getAddonByID("{e2fda1a4-762b-4020-b5ad-a41df1933103}", function(aAddon){ self.checkLightningIsInstalledCallback(aAddon);});
-	},
-
-	onLoad: function _onLoad(event) {
-
-		// We preload the exchange Address book
-		var rootDir = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://");
-		var folders = rootDir.childNodes;
-
-		this.checkLightningIsInstalled();
-			
-		if ((this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.others.checkForNewAddOnVersion", true, true)) && (!this.updateCheckDone)) {
-			var updatecheck = Cc["@1st-setup.nl/checkers/updater;1"]
-						       .getService(Ci.mivUpdater);
-			var self = this;
-			updatecheck.checkForUpdate("exchangecalendar@extensions.1st-setup.nl" , function(aResult){ self.updaterCallBack(aResult);});
-			this.updateCheckDone = true;
-		}
-	},
-
-	updaterCallBack: function _updaterCallBack(aResult)
-	{
-		 
- 				if (aResult.versionChanged <= 0) {
- 					if(aResult.error){
- 					this.globalFunctions.LOG("updaterCallBack: Unable to fetch from url");
- 					}
-					this.globalFunctions.LOG("updaterCallBack: No new version available.");
-				}
-				else {
-					this.globalFunctions.LOG("updaterCallBack: New version available.");
-					this.globalFunctions.LOG("updaterCallBack: ++ Version:"+aResult.updateDetails.newVersion);
-					this.globalFunctions.LOG("updaterCallBack: ++ URL:"+aResult.updateDetails.updateURL);
-					var self = this;
-					if (this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.others.warnAboutNewAddOnVersion", true, true)) {
-//						this.lightningAlertTimer2.initWithCallback(function(aResult){ self.lightningAlertCallback2(aResult);}, 15000, this.lightningAlertTimer2.TYPE_ONE_SHOT);
-						this.lightningAlertTimer2.initWithCallback(function(){ self.lightningAlertCallback2(aResult);}, 15000, this.lightningAlertTimer2.TYPE_ONE_SHOT);
-					}
-				}
-	},
-
-	lightningAlertCallback2: function _lightningAlertCallback2(aResult) 
-	{
-		this.globalFunctions.LOG("lightningAlertCallback2.");
-
-		var prefB = Cc["@mozilla.org/preferences-service;1"].
-				getService(Ci.nsIPrefBranch);
-		var promptStr = "There is an update available for the Exchange Calendar and Tasks provider on the main website.";
-		promptStr += "\n\nDo you want to install this newer version: "+aResult.updateDetails.newVersion;
-		promptStr += "\nCurrent version is: "+aResult.addon.version;
-		if (aResult.updateDetails.msg != "") {
-			promptStr += "\n\nChanges:\n"+aResult.updateDetails.msg;
-		}
-		promptStr += '\n\nOr read the info on '+aResult.updateDetails.infoURL;
-		var promptTitle = "Update available";
-
-		var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].  
-			getService(Ci.nsIPromptService);  
-
-		var answer = { value: false };
-
-		var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_YES +
-				prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_NO +
-				prompts.BUTTON_POS_2 * prompts.BUTTON_TITLE_IS_STRING;
-
-		var button = prompts.confirmEx(null, promptTitle, promptStr, flags, "", "", "Info", "Do not show this prompt anymore.", answer);
-
-		this.globalFunctions.LOG("lightningAlertCallback2. button:"+button); 		
-		prefB.setBoolPref("extensions.1st-setup.others.warnAboutNewAddOnVersion", !answer.value);
-
-		if (button == 0) {
-			aResult.updater.installNewVersion(aResult, true);
-		}
-		if (button == 2) {
-			openContentTab(aResult.updateDetails.infoURL, "tab", "www.1st-setup.nl");
-		}
-
-	},
+    lightningIsInstalled: -1,
+    // -1 = Check for Lightning has not yet run.
+    // 0 = Lightning is not installed.
+    // 1 = Lightning is installed but not active.
+    // 2 = Lightning is installed and active.
+    checkingIfLightnigIsInstalled: false,
+
+    updateCheckDone: false,
+
+    lightningAlertTimer: Cc["@mozilla.org/timer;1"]
+        .createInstance(Ci.nsITimer),
+    lightningAlertTimer2: Cc["@mozilla.org/timer;1"]
+        .createInstance(Ci.nsITimer),
+
+    lightningAlertCallback: function _lightningAlertCallback() {
+        this.globalFunctions.LOG("lightningAlertCallback.");
+
+        var prefB = Cc["@mozilla.org/preferences-service;1"].
+        getService(Ci.nsIPrefBranch);
+        var promptStr = "";
+        var promptTitle = "";
+
+        switch (this.lightningIsInstalled) {
+        case 0:
+            promptTitle = "Lightning is not installed.";
+            promptStr = "Please install the Lightning Add-on if you wish\nto use the Exchange 2007/2010 Calendar and Tasks add-on.";
+            break;
+        case 1:
+            promptTitle = "Lightning is not active.";
+            promptStr = "Please activate the Lightning Add-on if you wish\nto use the Exchange 2007/2010 Calendar and Tasks add-on.";
+            break;
+        }
+
+        if (!this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.lightningCheck.showWarning", true)) {
+            this.globalFunctions.LOG("lightningAlertCallback: Not showing warning dialog:" + promptStr);
+            return;
+        }
+
+        var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].
+        getService(Ci.nsIPromptService);
+
+        var answer = {
+            value: false
+        };
+        prompts.alertCheck(null, promptTitle, promptStr, "Do not show this prompt anymore.", answer);
+        this.globalFunctions.LOG("lightningAlertCallback. Answer:" + answer.value);
+
+        prefB.setBoolPref("extensions.1st-setup.lightningCheck.showWarning", !answer.value);
+
+        switch (this.lightningIsInstalled) {
+        case 0:
+            openContentTab("https://addons.mozilla.org/en-US/thunderbird/addon/lightning/", "tab", "addons.mozilla.org");
+            break;
+        case 1:
+            openContentTab("about:addons", "tab", "addons.mozilla.org");
+            break;
+        }
+
+        this.checkingIfLightnigIsInstalled = false;
+    },
+
+    checkLightningIsInstalledCallback: function _checkLightningIsInstalledCallback(aAddOn) {
+        if (!aAddOn) {
+            this.lightningIsInstalled = 0;
+        }
+        else {
+            this.lightningIsInstalled = 1;
+            this.globalFunctions.LOG("Lightning is installed.");
+        }
+
+        var self = this;
+        if (this.lightningIsInstalled == 0) {
+            // Lightning is not installed. Try to install it.
+            this.globalFunctions.WARN("Lightning is not installed.");
+            this.lightningAlertTimer.initWithCallback(function () {
+                self.lightningAlertCallback();
+            }, 1500, this.lightningAlertTimer.TYPE_ONE_SHOT);
+
+        }
+        else {
+            // Ligntning is installed check if it is enabled.
+            try {
+                this.globalFunctions.LOG("Lightning was installed from:" + aAddOn.sourceURI.prePath + aAddOn.sourceURI.path);
+            }
+            catch (er) {
+                this.globalFunctions.LOG("Lightning was installed from unknown source. Probably manualy outside the AddOnManager.");
+            }
+            if (aAddOn.isActive) {
+                this.lightningIsInstalled = 2;
+            }
+            else {
+                // Not Active.  
+                this.globalFunctions.WARN("Lightning is not active.1");
+                this.lightningAlertTimer.initWithCallback(function () {
+                    self.lightningAlertCallback();
+                }, 1500, this.lightningAlertTimer.TYPE_ONE_SHOT);
+            }
+        }
+    },
+
+    checkLightningIsInstalled: function _checkLightningIsInstalled() {
+        if (this.lightningIsInstalled > 1) {
+            // Lightning is allready installed.
+            return;
+        }
+
+        if (this.checkingIfLightnigIsInstalled) {
+            return;
+        }
+
+        this.checkingIfLightnigIsInstalled = true;
+
+        if (this.lightningIsInstalled == -1) {
+            Cu.import("resource://gre/modules/AddonManager.jsm");
+        }
+        var self = this;
+        AddonManager.getAddonByID("{e2fda1a4-762b-4020-b5ad-a41df1933103}", function (aAddon) {
+            self.checkLightningIsInstalledCallback(aAddon);
+        });
+    },
+
+    onLoad: function _onLoad(event) {
+
+        // We preload the exchange Address book
+        var rootDir = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://");
+        var folders = rootDir.childNodes;
+
+        this.checkLightningIsInstalled();
+
+        if ((this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.others.checkForNewAddOnVersion", true, true)) && (!this.updateCheckDone)) {
+            var updatecheck = Cc["@1st-setup.nl/checkers/updater;1"]
+                .getService(Ci.mivUpdater);
+            var self = this;
+            updatecheck.checkForUpdate("exchangecalendar@extensions.1st-setup.nl", function (aResult) {
+                self.updaterCallBack(aResult);
+            });
+            this.updateCheckDone = true;
+        }
+    },
+
+    updaterCallBack: function _updaterCallBack(aResult) {
+
+        if (aResult.versionChanged <= 0) {
+            if (aResult.error) {
+                this.globalFunctions.LOG("updaterCallBack: Unable to fetch from url");
+            }
+            this.globalFunctions.LOG("updaterCallBack: No new version available.");
+        }
+        else {
+            this.globalFunctions.LOG("updaterCallBack: New version available.");
+            this.globalFunctions.LOG("updaterCallBack: ++ Version:" + aResult.updateDetails.newVersion);
+            this.globalFunctions.LOG("updaterCallBack: ++ URL:" + aResult.updateDetails.updateURL);
+            var self = this;
+            if (this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.others.warnAboutNewAddOnVersion", true, true)) {
+                //						this.lightningAlertTimer2.initWithCallback(function(aResult){ self.lightningAlertCallback2(aResult);}, 15000, this.lightningAlertTimer2.TYPE_ONE_SHOT);
+                this.lightningAlertTimer2.initWithCallback(function () {
+                    self.lightningAlertCallback2(aResult);
+                }, 15000, this.lightningAlertTimer2.TYPE_ONE_SHOT);
+            }
+        }
+    },
+
+    lightningAlertCallback2: function _lightningAlertCallback2(aResult) {
+        this.globalFunctions.LOG("lightningAlertCallback2.");
+
+        var prefB = Cc["@mozilla.org/preferences-service;1"].
+        getService(Ci.nsIPrefBranch);
+        var promptStr = "There is an update available for the Exchange Calendar and Tasks provider on the main website.";
+        promptStr += "\n\nDo you want to install this newer version: " + aResult.updateDetails.newVersion;
+        promptStr += "\nCurrent version is: " + aResult.addon.version;
+        if (aResult.updateDetails.msg != "") {
+            promptStr += "\n\nChanges:\n" + aResult.updateDetails.msg;
+        }
+        promptStr += '\n\nOr read the info on ' + aResult.updateDetails.infoURL;
+        var promptTitle = "Update available";
+
+        var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].
+        getService(Ci.nsIPromptService);
+
+        var answer = {
+            value: false
+        };
+
+        var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_YES
+            + prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_NO
+            + prompts.BUTTON_POS_2 * prompts.BUTTON_TITLE_IS_STRING;
+
+        var button = prompts.confirmEx(null, promptTitle, promptStr, flags, "", "", "Info", "Do not show this prompt anymore.", answer);
+
+        this.globalFunctions.LOG("lightningAlertCallback2. button:" + button);
+        prefB.setBoolPref("extensions.1st-setup.others.warnAboutNewAddOnVersion", !answer.value);
+
+        if (button == 0) {
+            aResult.updater.installNewVersion(aResult, true);
+        }
+        if (button == 2) {
+            openContentTab(aResult.updateDetails.infoURL, "tab", "www.1st-setup.nl");
+        }
+
+    },
 
 }
 
 var tmpCheck4Lightning = new exchCheck4Lightning(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpCheck4Lightning.onLoad(); }, true);
-
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpCheck4Lightning.onLoad();
+}, true);
diff --git a/chrome/content/debugPreferences.js b/chrome/content/debugPreferences.js
index 679e56ce..cf308ece 100644
--- a/chrome/content/debugPreferences.js
+++ b/chrome/content/debugPreferences.js
@@ -40,7 +40,7 @@ var Cu = Components.utils;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.debugPreferences = {
 
@@ -48,7 +48,7 @@ exchWebService.debugPreferences = {
     browseDebugFile: function _browseDebugFile() {
         const nsIFilePicker = Ci.nsIFilePicker;
         var fp = Cc["@mozilla.org/filepicker;1"]
-                    .createInstance(nsIFilePicker);
+            .createInstance(nsIFilePicker);
 
         var title = "Open log file";
 
@@ -57,41 +57,38 @@ exchWebService.debugPreferences = {
         var ret = fp.show();
 
         if (ret == nsIFilePicker.returnOK) {
-		exchWebService.commonFunctions.LOG("[["+fp.file.path+"]]");
+            exchWebService.commonFunctions.LOG("[[" + fp.file.path + "]]");
             document.getElementById("extensions.1st-setup.debug.file").value = fp.file.path;
-//		exchWebService.commonFunctions.LOG("[["+fp.fileURL.spec.replace("file://", "")+"]]");
-//            document.getElementById("extensions.1st-setup.debug.file").value = fp.fileURL.spec.replace("file://", "");
-	    this.readLogLocation();
+            //		exchWebService.commonFunctions.LOG("[["+fp.fileURL.spec.replace("file://", "")+"]]");
+            //            document.getElementById("extensions.1st-setup.debug.file").value = fp.fileURL.spec.replace("file://", "");
+            this.readLogLocation();
         }
 
     },
 
-	onLoad: function _onLoad()
-	{
-		this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox1"), !document.getElementById("extensions.1st-setup.debug.log").value);
-		this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox2"), !document.getElementById("extensions.1st-setup.debug.log").value);
-	},
-
-	disableChildren: function _disableChildren(aObject, aStatus)
-	{
-		var children = aObject.children;
-		for (var i=0; i < children.length; i++) {
-			children[i].disabled = aStatus;
-			this.disableChildren(children[i], aStatus);
-		}
-	},
-
-	debugLogChanged: function _debugLogChanged(aCheckBox)
-	{
-		if (aCheckBox.checked) {
-			this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox1"), false);
-			this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox2"), false);
-		}
-		else {
-			this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox1"), true);
-			this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox2"), true);
-		}
-	},
+    onLoad: function _onLoad() {
+        this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox1"), !document.getElementById("extensions.1st-setup.debug.log").value);
+        this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox2"), !document.getElementById("extensions.1st-setup.debug.log").value);
+    },
+
+    disableChildren: function _disableChildren(aObject, aStatus) {
+        var children = aObject.children;
+        for (var i = 0; i < children.length; i++) {
+            children[i].disabled = aStatus;
+            this.disableChildren(children[i], aStatus);
+        }
+    },
+
+    debugLogChanged: function _debugLogChanged(aCheckBox) {
+        if (aCheckBox.checked) {
+            this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox1"), false);
+            this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox2"), false);
+        }
+        else {
+            this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox1"), true);
+            this.disableChildren(document.getElementById("exchangeWebService_debug_groupbox2"), true);
+        }
+    },
 
     readLogLocation: function _readLogLocation() {
         var logUrl = document.getElementById("exchangeWebService_preference_debug_file_filefield");
diff --git a/chrome/content/delegateCalendar.js b/chrome/content/delegateCalendar.js
index cf9c9910..aa6254ab 100644
--- a/chrome/content/delegateCalendar.js
+++ b/chrome/content/delegateCalendar.js
@@ -4,10 +4,10 @@
  * The Initial Developer of the Microsoft Exchange Calendar Provider Code is property of Ericsson. 
  * All Rights Reserved.
  * ***** BEGIN LICENSE BLOCK *****/
-  
+
 var Cc = Components.classes;
 var Ci = Components.interfaces;
-var Cu = Components.utils; 
+var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -16,177 +16,170 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/erFindFolder.js");
 
-Cu.import("resource://exchangecalendar/erGetDelegateRequest.js");  
-Cu.import("resource://exchangecalendar/erAddDelegateRequest.js"); 
-Cu.import("resource://exchangecalendar/erRemoveDelegateRequest.js"); 
+Cu.import("resource://exchangecalendar/erGetDelegateRequest.js");
+Cu.import("resource://exchangecalendar/erAddDelegateRequest.js");
+Cu.import("resource://exchangecalendar/erRemoveDelegateRequest.js");
 Cu.import("resource://exchangecalendar/erUpdateDelegateRequest.js");
- 
+
 Cu.import("resource://calendar/modules/calUtils.jsm");
-Cu.import("resource://interfaces/xml2json/xml2json.js"); 
-  
-function exchDelegateCalendarSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow; 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions); 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer); 
-    this.delegatesList=[]; 
-} 
-
-exchDelegateCalendarSettings.prototype = {   
-	 onLoad:function _onLoad() { 
-	 		var calender_id=this._window.arguments[0].calendar.id;
-	        var prefs = Cc["@mozilla.org/preferences-service;1"]
-			                    .getService(Ci.nsIPrefService)
-					    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calender_id+".");
-	        if( this.globalFunctions.safeGetCharPref(prefs, "ecFolderbase") !== 'calendar' ){
-	        	return; 
-	        }
-	         
-			this.refresh();			
-			this.getDelegator();
-   			this._window.sizeToContent() ; 
-	 },  
-	 
-	 addSharedUser: function _addSharedUser() {
-		 var email=this.validateEmail(this._document.getElementById("customshareduser"));
-		 if ( !email )
-		 {
-			 this._window.alert('Not Valid Email address! ' );
-		     this.onActionLoadEnd();
-			 this._window.sizeToContent() ; 
-		 } 
-		 else
-		 {
-			 var calendarEmailDomain=this.emailDomain(email);
-			 var displayName =  email.replace('@'+calendarEmailDomain,"");
-			 var cboxitem = this._document.createElement("treeitem"); 
-	         var cboxrow = this._document.createElement("treerow");
-	         var tree = this._document.getElementById("shared"); 
-	         //add checkbox
-	         var cboxcell = this._document.createElement("treecell");
-	         
-		     cboxcell.setAttribute("value","false");
-	         cboxcell.setAttribute("editable",true);  
-	         cboxcell.setAttribute("name", "checkbox"  );  
-	         	 cboxrow.appendChild(cboxcell); 
-	         	  
-	         	 //add user
-	         cboxcell = this._document.createElement("treecell");
-	         cboxcell.setAttribute("label", displayName  ); 
-	         cboxcell.setAttribute("name", "name"  ); 
-	         cboxcell.setAttribute("value",  email  ); 
-	         cboxcell.setAttribute("editable",false);
-	         	 cboxrow.appendChild(cboxcell); 
-         	 cboxitem.appendChild(cboxrow); 
-	         tree.appendChild(cboxitem);
-	         
-		 }
-	 },
-	 
-	 getDelegator : function _getDelegator() {  
-		 	 //Load Team calendar 
-		 	   ldapInit(this); 
-		       var tree = this._document.getElementById("shared"); 
-           //    this.emptyList(listBox);     
-           		/**Add already added calendar in delegator list**/ 
-        	      var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
-	        	                     .getService(Ci.nsIPrefService)
-	        	 		    .getBranch("calendar.registry."); 
-        	      
-        	      var thisCalId = this._window.arguments[0].calendar.id;
-	              var userArr=[];
-          		  var calendarEmail=this.calendarEmail();
-      			  var calendarEmailDomain = this.emailDomain(calendarEmail);
-        	      var children = tmpPrefs.getChildList("");
-					if (children.length > 0) {
-						// read prefs get uuid and description.
-							for (var index in children) { 
-							  
-								var pos = children[index].indexOf(".");
-								var tmpUUID = children[index].substr(0, pos);
-								var tmpField = children[index].substr(pos+1);
-					         	 
-								 if (tmpField == "uri")  { 
-									if ( thisCalId != tmpUUID ) { 
-									  var prefs = Cc["@mozilla.org/preferences-service;1"]
-									                    .getService(Ci.nsIPrefService)
-											    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+tmpUUID+".");
-										if ( this.globalFunctions.safeGetCharPref(prefs, "delegateOwner") == thisCalId )
-										{		 
-										     if( userArr.indexOf(primaryAddress) == -1 ){
-										         userArr.push(primaryAddress);  
-									         
-										         var cboxitem = this._document.createElement("treeitem"); 
-										         var cboxrow = this._document.createElement("treerow");
-										         
-										         //add checkbox
-										         var cboxcell = this._document.createElement("treecell");
-										         
-											     cboxcell.setAttribute("value","true");
-										         cboxcell.setAttribute("editable",true);  
-										         cboxcell.setAttribute("name", "checkbox"  );  
-										         	 cboxrow.appendChild(cboxcell); 
-										         	  
-										         	 //add user
-										         cboxcell = this._document.createElement("treecell");
-										         cboxcell.setAttribute("label", this.globalFunctions.safeGetCharPref(prefs, "name")  ); 
-										         cboxcell.setAttribute("name", "name"  ); 
-										         cboxcell.setAttribute("value",  this.globalFunctions.safeGetCharPref(prefs, "ecMailbox")   ); 
-										         cboxcell.setAttribute("editable",false);
-										         	 cboxrow.appendChild(cboxcell); 
-									         	 cboxitem.appendChild(cboxrow); 
-										         tree.appendChild(cboxitem);
-										         
-										     }
-										}
-								 	} 
-								}
-							}
-					} 
-				
-					var searchQuery = "(or(PrimaryEmail,bw,@V)(and(IsMailList,=,FALSE)))";
-					 searchQuery = searchQuery.replace(/@V/g, encodeURIComponent(calendarEmailDomain));
-					        
-				      let abManager = Components.classes["@mozilla.org/abmanager;1"]
-				                                        .getService(Components.interfaces.nsIAbManager);
-				              let allAddressBooks = abManager.directories;
-				              
-  				              while (allAddressBooks.hasMoreElements()) {
-				
-				                let ab = allAddressBooks.getNext();
-				                if (ab instanceof Components.interfaces.nsIAbDirectory &&
-				                    !ab.isRemote) {
- 				                	 if ( ab.dirName == "Collected Addresses" ){
-				                      let searchResult = abManager.getDirectory(ab.URI + "?" + searchQuery).childCards; 
-				                    	 // alert(searchResult);
-				                    	  while (searchResult.hasMoreElements()) {   
-				                    		  var abCard=searchResult.getNext()
-				                                 .QueryInterface(Components.interfaces.nsIAbCard);
-				                    		 
-				                    		  var displayName; 
-				                    		  var primaryAddress;
-				                    		  primaryAddress = abCard.primaryEmail;
-				                    		  if( abCard.displayName == "" )
-				                    		  {
-			                    				  displayName =  abCard.primaryEmail.replace('@'+calendarEmailDomain,"");
-  				                    		  }  
-				                    		  else
-				                   			  {
-			                    				  displayName = abCard.displayName; 
- 				                   			  }
- 				                    		  if(displayName)
-				                    		  { 
-				                    		            //this will fire off async ldap requests and populate
-				                    		            //  the right nodes on the card
-				                    		     if ( this.emailDomain(primaryAddress)  === calendarEmailDomain ){  
- 					                    		 	  if(  primaryAddress && ( primaryAddress != calendarEmail ) ){ 
-													         
- 													         if( userArr.indexOf(primaryAddress) == -1 ){
-														         userArr.push(primaryAddress);  
-														      /*   var cboxrow =   this._document.createElement("listitem"); 
+Cu.import("resource://interfaces/xml2json/xml2json.js");
+
+function exchDelegateCalendarSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
+    this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer);
+    this.delegatesList = [];
+}
+
+exchDelegateCalendarSettings.prototype = {
+    onLoad: function _onLoad() {
+        var calender_id = this._window.arguments[0].calendar.id;
+        var prefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calender_id + ".");
+        if (this.globalFunctions.safeGetCharPref(prefs, "ecFolderbase") !== 'calendar') {
+            return;
+        }
+
+        this.refresh();
+        this.getDelegator();
+        this._window.sizeToContent();
+    },
+
+    addSharedUser: function _addSharedUser() {
+        var email = this.validateEmail(this._document.getElementById("customshareduser"));
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            var calendarEmailDomain = this.emailDomain(email);
+            var displayName = email.replace('@' + calendarEmailDomain, "");
+            var cboxitem = this._document.createElement("treeitem");
+            var cboxrow = this._document.createElement("treerow");
+            var tree = this._document.getElementById("shared");
+            //add checkbox
+            var cboxcell = this._document.createElement("treecell");
+
+            cboxcell.setAttribute("value", "false");
+            cboxcell.setAttribute("editable", true);
+            cboxcell.setAttribute("name", "checkbox");
+            cboxrow.appendChild(cboxcell);
+
+            //add user
+            cboxcell = this._document.createElement("treecell");
+            cboxcell.setAttribute("label", displayName);
+            cboxcell.setAttribute("name", "name");
+            cboxcell.setAttribute("value", email);
+            cboxcell.setAttribute("editable", false);
+            cboxrow.appendChild(cboxcell);
+            cboxitem.appendChild(cboxrow);
+            tree.appendChild(cboxitem);
+
+        }
+    },
+
+    getDelegator: function _getDelegator() {
+        //Load Team calendar 
+        ldapInit(this);
+        var tree = this._document.getElementById("shared");
+        //    this.emptyList(listBox);     
+        /**Add already added calendar in delegator list**/
+        var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry.");
+
+        var thisCalId = this._window.arguments[0].calendar.id;
+        var userArr = [];
+        var calendarEmail = this.calendarEmail();
+        var calendarEmailDomain = this.emailDomain(calendarEmail);
+        var children = tmpPrefs.getChildList("");
+        if (children.length > 0) {
+            // read prefs get uuid and description.
+            for (var index in children) {
+
+                var pos = children[index].indexOf(".");
+                var tmpUUID = children[index].substr(0, pos);
+                var tmpField = children[index].substr(pos + 1);
+
+                if (tmpField == "uri") {
+                    if (thisCalId != tmpUUID) {
+                        var prefs = Cc["@mozilla.org/preferences-service;1"]
+                            .getService(Ci.nsIPrefService)
+                            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + tmpUUID + ".");
+                        if (this.globalFunctions.safeGetCharPref(prefs, "delegateOwner") == thisCalId) {
+                            if (userArr.indexOf(primaryAddress) == -1) {
+                                userArr.push(primaryAddress);
+
+                                var cboxitem = this._document.createElement("treeitem");
+                                var cboxrow = this._document.createElement("treerow");
+
+                                //add checkbox
+                                var cboxcell = this._document.createElement("treecell");
+
+                                cboxcell.setAttribute("value", "true");
+                                cboxcell.setAttribute("editable", true);
+                                cboxcell.setAttribute("name", "checkbox");
+                                cboxrow.appendChild(cboxcell);
+
+                                //add user
+                                cboxcell = this._document.createElement("treecell");
+                                cboxcell.setAttribute("label", this.globalFunctions.safeGetCharPref(prefs, "name"));
+                                cboxcell.setAttribute("name", "name");
+                                cboxcell.setAttribute("value", this.globalFunctions.safeGetCharPref(prefs, "ecMailbox"));
+                                cboxcell.setAttribute("editable", false);
+                                cboxrow.appendChild(cboxcell);
+                                cboxitem.appendChild(cboxrow);
+                                tree.appendChild(cboxitem);
+
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        var searchQuery = "(or(PrimaryEmail,bw,@V)(and(IsMailList,=,FALSE)))";
+        searchQuery = searchQuery.replace(/@V/g, encodeURIComponent(calendarEmailDomain));
+
+        let abManager = Components.classes["@mozilla.org/abmanager;1"]
+            .getService(Components.interfaces.nsIAbManager);
+        let allAddressBooks = abManager.directories;
+
+        while (allAddressBooks.hasMoreElements()) {
+
+            let ab = allAddressBooks.getNext();
+            if (ab instanceof Components.interfaces.nsIAbDirectory
+                && !ab.isRemote) {
+                if (ab.dirName == "Collected Addresses") {
+                    let searchResult = abManager.getDirectory(ab.URI + "?" + searchQuery).childCards;
+                    // alert(searchResult);
+                    while (searchResult.hasMoreElements()) {
+                        var abCard = searchResult.getNext()
+                            .QueryInterface(Components.interfaces.nsIAbCard);
+
+                        var displayName;
+                        var primaryAddress;
+                        primaryAddress = abCard.primaryEmail;
+                        if (abCard.displayName == "") {
+                            displayName = abCard.primaryEmail.replace('@' + calendarEmailDomain, "");
+                        }
+                        else {
+                            displayName = abCard.displayName;
+                        }
+                        if (displayName) {
+                            //this will fire off async ldap requests and populate
+                            //  the right nodes on the card
+                            if (this.emailDomain(primaryAddress) === calendarEmailDomain) {
+                                if (primaryAddress && (primaryAddress != calendarEmail)) {
+
+                                    if (userArr.indexOf(primaryAddress) == -1) {
+                                        userArr.push(primaryAddress);
+                                        /*   var cboxrow =   this._document.createElement("listitem"); 
 													         	 cboxrow.setAttribute("type","checkbox"); 
 													         	 cboxrow.setAttribute("checked",false);
 													         	 cboxrow.setAttribute("id",primaryAddress);
@@ -194,723 +187,710 @@ exchDelegateCalendarSettings.prototype = {
 													         	 cboxrow.setAttribute("value", primaryAddress  ); 
 													         	 cboxrow.setAttribute("hidden","false");
 														         listBox.appendChild(cboxrow); */
-														         var cboxitem = this._document.createElement("treeitem"); 
-														         var cboxrow = this._document.createElement("treerow");
-														         
-														         //add checkbox
-														         var cboxcell = this._document.createElement("treecell");
-														         
-															     cboxcell.setAttribute("value","false");
-														         cboxcell.setAttribute("editable",true);  
-														         cboxcell.setAttribute("name", "checkbox"  );  
-	 												         	 cboxrow.appendChild(cboxcell); 
-	 												         	  
-	 												         	 //add user
-														         cboxcell = this._document.createElement("treecell");
-														         cboxcell.setAttribute("label", displayName ); 
-														         cboxcell.setAttribute("name", "name"  ); 
-														         cboxcell.setAttribute("value", primaryAddress  ); 
-														         cboxcell.setAttribute("editable",false);
-	 												         	 cboxrow.appendChild(cboxcell); 
-													         	 cboxitem.appendChild(cboxrow); 
-														         tree.appendChild(cboxitem);
-														          
-													         } 
-					                    			   }
-				                    		      }
-				                    		  } 
-				                    	  } 
-				                	 } 
-			                	}
-			              	} 
-	 },
-	 
-	 calendarEmail: function _calendarEmail()
-	 {
-	     var calId = this._window.arguments[0].calendar.id;
-		 var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-						            .getService(Ci.nsIPrefService)
-							    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calId+"."); 
-		 return this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox");
-	 },
-	 
-	 emailDomain: function _emailDomain(email)
-	 { 
-	      if(email)
-	      { 
-	    	  return email.replace(/.*@/, "");;
-	      }
-	      return;
-	      
-	 },
-	 
-	 addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	 { 
-			this.loadBalancer.addToQueue({ calendar: this,
-					 ecRequest:aRequest,
-					 arguments: aArgument,
-					 cbOk: aCbOk,
-					 cbError: aCbError,
-					 listener: aListener});
-	 },
-	
-	 getEmail: function _getEmail()
-	 { 
-			 var email=this._document.getElementById("email").value; 
-			 if( email)
-			 { 
-				 var d1 = this.emailDomain(this.calendarEmail());
-				 var d2;
-				 var sValidEmail = /<(\S+@\S+\.\S+)>/;
-				 var reValidEmail = new RegExp(sValidEmail);
-				 var isEmail=null;
-				 try{
-					 isEmail = email.match(reValidEmail)[1] ;
-					 d2 = this.emailDomain(isEmail); 
-				 }
-				 catch(e){
-						 sValidEmail = /\S+@\S+\.\S+/;
-						 reValidEmail = new RegExp(sValidEmail);
-						 isEmail = email.match(reValidEmail)[0];
-						 d2 = this.emailDomain(isEmail);
-	 			 }
-				 finally{   
-					  if( d1  == d2 )
-					  {
-						  dump("\nccc "+ isEmail);
-						  return isEmail;
-					  }
-					  return;
-
-	 			 } 
-			 }
-			 return;
-	 },
-	 
-	 validateEmail: function _validateEmail(textbox)
-	 { 
-			 var email=textbox.value;
-			 if( email)
-			 { 
-				 var d1 = this.emailDomain(this.calendarEmail());
-				 var d2;
-				 var sValidEmail = /<(\S+@\S+\.\S+)>/;
-				 var reValidEmail = new RegExp(sValidEmail);
-				 var isEmail=null;
-				 try{
-					 isEmail = email.match(reValidEmail)[1] ;
-					 d2 = this.emailDomain(isEmail); 
-				 }
-				 catch(e){
-						 sValidEmail = /\S+@\S+\.\S+/;
-						 reValidEmail = new RegExp(sValidEmail);
-						 isEmail = email.match(reValidEmail)[0];
-						 d2 = this.emailDomain(isEmail);
-	 			 }
-				 finally{   
-					  if( d1  == d2 )
-					  {
-						  dump("\nccc "+ isEmail);
-						  return isEmail;
-					  }
-					  return;
-
-	 			 } 
-			 }
-			 return;
-	 },
-	 
-	 changeDelegatorCalendar :function _changeDelegatorCalendar(event) {
-		 
- 		 	 var tree = this._document.getElementById("sharedcalendars"); 
-			 var tbo = tree.boxObject;
-			 tbo.QueryInterface(Components.interfaces.nsITreeBoxObject);
-	 		  // get the row, col and child element at the point
-			 var row = { }, col = { }, child = { };
-			 tbo.getCellAt(event.clientX, event.clientY, row, col, child); 
-			 
-			 var _isContainer = ( tree.view.isContainer(row.value) === 'true' ); 
-			 
-			 if( _isContainer ){
- 				 return;
-			 }
-				 var isSelected = ( tree.view.getCellValue(row.value, tree.columns.getColumnAt(0)) === 'true' );
-				 var emailAddress = tree.view.getCellValue(row.value, tree.columns.getColumnAt(1));
-				 var displayName = tree.view.getCellText(row.value, tree.columns.getColumnAt(1)); 
-				 
-				 var checkBox = {emailAddress:emailAddress,checked:isSelected,displayName:displayName}; 			    
- 			    
- 				    if ( checkBox.checked  ) { 
-	 				    var calName =checkBox.displayName ;
-	 				    var email = checkBox.emailAddress;  
-	 				    if( calName && email ) 	    { 
-	 				    	  this.createCalendar(checkBox) ;  
-	 				    }
-				    }
-				    else
-				    {
-				    	this.deleteCalendar(checkBox);
-				    } 
-			 	 
-		this._window.sizeToContent() ;
-	 }, 
-	 
-	deleteCalendar: function _deleteCalendar(checkBox)	 {   
-		  var email =  checkBox.emailAddress;  
-	
-	      var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
-    	                     .getService(Ci.nsIPrefService)
-    	 		    .getBranch("calendar.registry."); 
-	      
-	      var thisCalId = this._window.arguments[0].calendar.id;
-	      
-	      var children = tmpPrefs.getChildList("");
-			if (children.length > 0) {  
-					// read prefs get uuid and description. 
-					for (var index in children) { 
-					  
-						var pos = children[index].indexOf(".");
-						var tmpUUID = children[index].substr(0, pos);
-						var tmpField = children[index].substr(pos+1);
-			         	 
-						 if (tmpField == "uri")  { 
-							var prefs = Cc["@mozilla.org/preferences-service;1"]
-						                    .getService(Ci.nsIPrefService)
-								    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+tmpUUID+".");
-							if(email==this.globalFunctions.safeGetCharPref(prefs, "ecMailbox")  && thisCalId == this.globalFunctions.safeGetCharPref(prefs, "delegateOwner") )
-							{ 
-		  				    	 var calManager = Cc["@mozilla.org/calendar/manager;1"]
-		 				    	       			.getService(Ci.calICalendarManager);
-		 				    	 
-		 				    	 let calendars = calManager.getCalendars({});	
-		 				    	 for each (let calendar in calendars) {
-		 				    		  if(tmpUUID == calendar.id) { 
-		 				    			 calManager.unregisterCalendar(calendar);
-		 				    			 calManager.deleteCalendar(calendar);
-					    			  } 
-		 				         } 
-							}
-						 }
-					}
-			}//children.length   
-	 },
-	 
-	createCalendar: function _createCalendar(checkBox)	{
-		this.globalFunctions.LOG("Going to create the calendar in prefs.js - " + checkBox.displayName  + " " + checkBox.emailAddress);
-		
-		var useOfflineCache=false;
-		var calendarName = checkBox.displayName;
-		var reminderOption=true;
-		var emailAddress = checkBox.emailAddress;  
-		
-		// Calculate the new calendar.id
-		var newCalId = this.globalFunctions.getUUID();
- 		// Save settings in dialog to new cal id.
-		//tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
-
-		//Old Calendar Preferences 
-		var calId = this._window.arguments[0].calendar.id;
-	    var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-					            .getService(Ci.nsIPrefService)
-						    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calId+"."); 
-		 
-	    var exchWebServicesgServer = this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"); 
-	    var exchWebServicesgUser = this.globalFunctions.safeGetCharPref(calPrefs, "ecUser");
-		var exchWebServicesgDomain = this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain");  
-		var exchWebServicesgFolderPath = this.globalFunctions.safeGetCharPref(calPrefs, "ecFolderpath"); 
-		var exchWebServicesgFolderBase = this.globalFunctions.safeGetCharPref(calPrefs, "ecFolderbase"); 
-		var exchWebServicesgMailbox = emailAddress ; 
- 		var exchWebServicesgFolderIdOfShare ="";
- 		var exchWebServicesgFolderId="";
- 		var exchWebServicesgChangeKey  = "";
-  
- 		//Applying parent calendarsettings to new calendar similar to autodiscovery : tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
-		//New Calendar Preferences
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		             		            .getService(Ci.nsIPrefService)
-		             			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+newCalId+".");
-
-		             		if (exchWebServicesCalPrefs) {
-		             			exchWebServicesCalPrefs.setCharPref("ecServer",  exchWebServicesgServer);
-		             			exchWebServicesCalPrefs.setCharPref("ecUser",     exchWebServicesgUser);
-		             			exchWebServicesCalPrefs.setCharPref("ecDomain",  exchWebServicesgDomain);
-		             			exchWebServicesCalPrefs.setCharPref("ecFolderpath",  exchWebServicesgFolderPath);
-		             			exchWebServicesCalPrefs.setCharPref("ecFolderbase",  exchWebServicesgFolderBase);
-		             			exchWebServicesCalPrefs.setCharPref("ecMailbox",  exchWebServicesgMailbox);
-		             			
-		             			exchWebServicesCalPrefs.setCharPref("name",  calendarName); 
-		             			exchWebServicesCalPrefs.setCharPref("delegateOwner", calId ); 
-
-		             		}
-
-		             		if (( exchWebServicesgFolderPath == "/") && ( exchWebServicesgFolderIdOfShare == "")) {
-		             			 exchWebServicesgFolderID = "";
-		             			 exchWebServicesgChangeKey = "";
-		             		}
-		             		exchWebServicesCalPrefs.setCharPref("ecFolderID",  exchWebServicesgFolderID);
-		             		exchWebServicesCalPrefs.setCharPref("ecChangeKey", exchWebServicesgChangeKey); 
-		 
-		// Need to save the useOfflineCache preference separetly because it is not part of the main.
-		this.prefs = Cc["@mozilla.org/preferences-service;1"]
-	                    .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+newCalId+".");
-		this.prefs.setBoolPref("useOfflineCache", useOfflineCache );
-		this.prefs.setIntPref("exchangePrefVersion", 1);
-
-		// We create a new URI for this calendar which will contain the calendar.id
-		var ioService = Cc["@mozilla.org/network/io-service;1"]  
-				.getService(Ci.nsIIOService);  
-		var tmpURI = ioService.newURI("https://auto/"+newCalId, null, null);  
-
-		var calManager = Cc["@mozilla.org/calendar/manager;1"]
-			.getService(Ci.calICalendarManager);
-		var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
-
-		newCal.id = newCalId;
-		newCal.name =  calendarName ;
-
-		var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+newCalId+".");
-
-		calPrefs.setCharPref("name", calendarName );
-
-		newCal.setProperty("color", "Yellow" );
-		if (!reminderOption) {
-			newCal.setProperty("suppressAlarms", true);
-		}
-
-		var identity="id1";
-		newCal.setProperty("imip.identity.key", identity);  
-		newCal.setProperty("cache.enabled", false);
-
-		Cc["@mozilla.org/preferences-service;1"]
-	                    .getService(Ci.nsIPrefService).savePrefFile(null);
-
-		 calManager.registerCalendar(newCal); 
-	},
- 
-	 getDelegate  :function _getDelegate() { 
-			
-			this.onActionLoad();  
-            var listBox = this._document.getElementById("delegatee"); 
-            this.emptyList(listBox);   
-		    var self=this;
-		    var calendar = this._window.arguments[0].calendar; 
-			var calId = this._window.arguments[0].calendar.id;
-		    var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-						            .getService(Ci.nsIPrefService)
-							    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calId+"."); 
- 
-	       var tmpObject = new erGetDelegateRequest({ 
-	    			delegatingItem: "calendar" ,
-	    	   		mailbox : this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox") ,
-	    	   		user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),	 		 
-	    	   		serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"), },  
-	 		 	 	function(erGetDelegateRequest, aResp){self.erGetDelegateRequestOK(erGetDelegateRequest, aResp)},
-	 		 	 	function(erGetDelegateRequest, aCode, aMsg){self.erGetDelegateRequestError(erGetDelegateRequest, aCode, aMsg)},
-	 		 	 	null );	
-	        
-          this.onActionLoadEnd();
-	   	  this._window.sizeToContent() ;  
-		 },
-		 
-		 refresh: function _refresh() {
-		      this.getDelegate(); 
-	          this.updateDelegateView(); 
- 		 },
-		  		 
- 		delayRefresh: function _delayRefresh() {
-	         setTimeout( this.getDelegate(),5000); 
-	         setTimeout( this.updateDelegateView(),7000); 
-  		 },
- 		 
-		 listSelectEvent :function _listSelectEvent() { 
-			 
-			 	if(this.delegatesList.length>0)
-			 	{  
-			 	var node = this._document.getElementById("delegatee").getSelectedItem(0);  
-		 			if(node)
-	 				{
-						var childNodes = node.childNodes;  
-						var listName = childNodes[0].getAttribute("label");
-						var regex = /[^()]+/g;
-				        var email = listName.match(regex);
-				        var listEmail=childNodes[0].getAttribute("value");  
-				        
-				        for( var index=0;index<this.delegatesList.length;index++)
-					 	{   			
-				        	if( this.delegatesList[index].PrimarySmtpAddress == listEmail )
-				        	{
-	 					       // this._document.getElementById('email').value = listEmail;  
-						        if ( this.delegatesList[index].ReceiveCopiesOfMeetingMessages == 'true') {
-						        	this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "true");
-						        } else {
-						        	this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
-						        }  
-						        if ( this.delegatesList[index].ViewPrivateItems== 'true') { 
-						        	this._document.getElementById('ViewPrivateItems').setAttribute("checked", "true");
-						        } else {
-						        	this._document.getElementById('ViewPrivateItems').setAttribute("checked", "false");
-						        } 
-						       // this._document.getElementById('deliverMeetingRequestslist').value = '';
-						        this._document.getElementById('delegateCalendarpermission').value = this.delegatesList[index].DelegatePermissions;
-				        	}
-					 	}
-				 	}
-		 			
-			 	} 
-			this._window.sizeToContent() ;
-		 },
-		 
-		 erGetDelegateRequestOK : function _erGetDelegateRequestOK(aGetDelegateRequest, aResp)
-		 {  
-               if ( aResp.length > 0 )
-               {  
-            	   for( index=0;index<aResp.length;index++)
-	               { 
-            		   this.delegatesList[index]=aResp[index];
-	               } 
- 		           this.updateDelegateView();  
-               }
- 		 },
- 		 
-		 erGetDelegateRequestError : function _erGetDelegateRequestError(aGetDelegateRequest, aCode, aMsg)
-		 { 
-			   this.globalFunctions.LOG("erGetDelegateRequestError: "+ aCode+":"+aMsg);  
-		 }, 
-		 
-		updateDelegateView: function _updateDelegateView(){
-			 
-			 var listBox = this._document.getElementById("delegatee"); 
-             this.emptyList(listBox);   
-			 for (var index=0;index<this.delegatesList.length;index++)
-			 {   
-				 	var row =   this._document.createElement("listitem"); 
-				 	var cell =   this._document.createElement("listcell");
-					 cell.setAttribute("label", this.delegatesList[index].DisplayName+" ("+this.delegatesList[index].PrimarySmtpAddress+")");
-        	         cell.setAttribute("value", this.delegatesList[index].PrimarySmtpAddress);
-        	         row.appendChild(cell);  
-        	         listBox.appendChild(row);   
-			 }	 
-  		 },
-		 
-		removeDelegateCache :function _removeDelegateCache(email)
-		{  
- 			 if(email){ 
- 				 for (var index=0;index < this.delegatesList.length ;index++ )
-				 { 
-					if ( email == this.delegatesList[index].PrimarySmtpAddress )
-					{
-						this.delegatesList.splice(index,1);
-					}
-				 }	 
-			 }
-			 this.updateDelegateView();
-  		},
- 		
- 		addDelegateCache :function _addDelegateCache(delegate)
-		{
-			 if(delegate){ 
-				 var count=this.delegatesList.length;
-				 if(!count){
-					 count=0; 
-				 }
- 
-				 this.delegatesList[count]=delegate;
-			 } 
-			 this.updateDelegateView();
-			 this.delayRefresh(); 
-  		},
-		
-		removeDelegate   :function _removeDelegate() {
-			 this.onActionLoad(); 
-				 var email = this.getEmail();  
-				 if ( !email )
-				 {
-					 this._window.alert('Not Valid Email address! ' );
-				     this.onActionLoadEnd();
-					 this._window.sizeToContent() ; 
-				 } 
-				 else
-				 {      
-				    var self=this;
-				    var calendar = this._window.arguments[0].calendar; 
-					var calId = this._window.arguments[0].calendar.id;
-				    var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-								            .getService(Ci.nsIPrefService)
-									    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calId+".");  
-				   
-		            var tmpObject = new erRemoveDelegateRequest({ 
-	            	delegatingItem: "calendar", 
-	    			DelegateEmail : email ,
-	    	   		mailbox : this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox") ,
-	    	   		user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),	 		 
-	    	   		serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"), },   
-	 		 	 	function(erRemoveDelegateRequest, aResp){self.erRemoveDelegateRequestOK(erRemoveDelegateRequest,aResp)},
-	 		 	 	function(erRemoveDelegateRequest, aCode, aMsg){self.erRemoveDelegateRequestError(erRemoveDelegateRequest, aCode, aMsg)},
-	 		 	 	null );				        
-		}	 
- 		  this.onActionLoadEnd();
-		  this._window.sizeToContent() ;  
-	 },
-	 
-	 erRemoveDelegateRequestOK : function _erRemoveDelegateRequestOK(aRemoveDelegateRequest,aResp)
-	 {	 
-		 for(var index=0;index<aResp.length;index++)
-		 {
- 			 this.removeDelegateCache(aResp[index].PrimarySmtpAddress);
-		 } 		 
-		 this.delayRefresh(); 
-	 },
-	 erRemoveDelegateRequestError : function _erRemoveDelegateRequestError(aRemoveDelegateRequest, aCode, aMsg)
-	 {
-		  switch( aCode ){
-		    case -8:
-		    aCode="inCorrect email address requested!";
-		    break;
-		    
-		    default:
-		     this._window.alert( "erRemoveDelegateRequestError: "+ aCode+":"+aMsg);   
-		    return;
-		    }
-		    
-		    this._window.alert(aCode); 
-		
-	 }, 
-	 
-	 onActionLoad:function _onActionLoad() {
-	  this._window.sizeToContent() ; 
-	  this._document.getElementById("delegateCalendaractionadd").setAttribute("disabled", "true");
-	  this._document.getElementById("delegateCalendaractionupdate").setAttribute("disabled", "true");
-	  this._document.getElementById("delegateCalendaractiondelete" ).setAttribute("disabled", "true");
-//	  this._document.getElementById("delegateCalendaractionrefresh").setAttribute("disabled", "true");
-	 },
-	 
-	 onActionLoadEnd:function _onActionLoadEnd() {
-	  this._window.sizeToContent() ; 
-	//  this._document.getElementById("email").Value=""; 
-	  this._document.getElementById("delegateCalendaractionadd").removeAttribute("disabled");
-	  this._document.getElementById("delegateCalendaractionupdate").removeAttribute("disabled");
-	  this._document.getElementById("delegateCalendaractiondelete" ).removeAttribute("disabled");
-	//  this._document.getElementById("delegateCalendaractionrefresh").removeAttribute("disabled");
-	 }, 
-		
-	 emptyList :function emptyList(listId)
-	 {
-	      var myListBox = listId;
-	        var countrow = myListBox.itemCount;
-	        while (countrow-- > 0) {
-	            myListBox.removeItemAt(0);
-	        } 
-	 },
-	  
-	 addDelegate:function _addDelegate() {
- 	 this.onActionLoad(); 
-	 var email = this.getEmail();  
-	 if ( !email )
-	 {
-		 this._window.alert('Not Valid Email address! ' );
-	     this.onActionLoadEnd();
-		 this._window.sizeToContent() ; 
-	 }  
-     else
-     {  
-    	 if( this.delegatesList ) {
-		    for(var index=0;index<this.delegatesList.length;index++ )
-		    {
-		    	var listEmail = this.delegatesList[index].PrimarySmtpAddress;
-		    	if ( email == listEmail )
-		    	{
-		    		this._window.alert('Already added! do Update');
-		    	    this.onActionLoadEnd(); 
-		    		this._window.sizeToContent();
-		    		return;
- 		    	} 
-		    }
-    	 }
-    	    var self=this;
-		    var calendar = this._window.arguments[0].calendar; 
-			var calId = this._window.arguments[0].calendar.id;
-		    var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-						            .getService(Ci.nsIPrefService)
-							    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calId+".");  
-		   var delegateProperties={
-				   DelegatePermissions: this._document.getElementById('delegateCalendarpermission').selectedItem.value  ,
-				   ReceiveCopiesOfMeetingMessages:  this._document.getElementById('ReceiveCopiesOfMeetingMessages').checked ,
-				   ViewPrivateItems: this._document.getElementById('ViewPrivateItems').checked ,
-				   DeliverMeetingRequests: this._document.getElementById('deliverMeetingRequestslist').value,
-		   }; 
-	       var tmpObject = new erAddDelegateRequest({
-	    			delegatingItem: "calendar", 
-	    	   		delegateproperties : delegateProperties ,
-	    			delegateemail : email ,
-	    	   		mailbox : this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox") ,
-	    	   		user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),	 		 
-	    	   		serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"), },   
-	 		 	 	function(erAddDelegateRequest, aResp){self.erAddDelegateRequestOK(erAddDelegateRequest, aResp)},
-	 		 	 	function(erAddDelegateRequest, aCode, aMsg){self.erAddDelegateRequestError(erAddDelegateRequest, aCode, aMsg)},
-	 		 	 	null );		 
-      }
-  	  this.onActionLoadEnd();
-	  this._window.sizeToContent() ; 
-	 }, 
-	 
-	 erAddDelegateRequestOK : function _erAddDelegateRequestOK(aAddDelegateRequest, aResp)
-	 {
-		 if ( aResp.length > 0 )
-         { 
-             for( var index=0;index<aResp.length;index++)
-             { 
-               	 //dump("\n  "+ index + " Resp 1: " + aResp[index].SID );	
-               	 //dump("\n  "+ index + " Resp 2: " + aResp[index].PrimarySmtpAddress );	
-               	 //dump("\n  "+ index + " Resp 3: " + aResp[index].DisplayName );	
-               	 //dump("\n  "+ index + " Resp 4: " + aResp[index].DelegatePermissions );	
-               	 //dump("\n  "+ index + " Resp 5: " + aResp[index].ReceiveCopiesOfMeetingMessages );	
-               	 //dump("\n  "+ index + " Resp 6: " + aResp[index].ViewPrivateItems ); 
-            	  this.addDelegateCache(aResp[index]);
-  		   }	 
-         }
-	 },
-	 
-	 erAddDelegateRequestError : function _erAddDelegateRequestError(aAddDelegateRequest, aCode, aMsg)
-	 {
-		    switch( aCode ){
-		    case -8:
-		    aCode="inCorrect email address requested!";
-		    break;
-		    
-		    default:
-		    this._window.alert( "erAddDelegateRequestError : "+  aCode +" : "+aMsg);
-		    return;
-		    }
-		    
-		    this._window.alert(aCode); 
-	 }, 
-	
-	updateDelegate :function _updateDelegate() {
-		
-		 	 this.onActionLoad();  
-			 var email = this.getEmail();  
-			 if ( !email )
-			 {
-				 this._window.alert('Not Valid Email address! ' );
-			     this.onActionLoadEnd();
-				 this._window.sizeToContent() ; 
-			 }  
-			 else
-			 {
-	        	var self=this;
-			    var calendar = this._window.arguments[0].calendar; 
-				var calId = this._window.arguments[0].calendar.id;
-			    var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-							            .getService(Ci.nsIPrefService)
-								    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ calId+"."); 
-			    
-			   var delegateProperties={
-					   DelegatePermissions: this._document.getElementById('delegateCalendarpermission').selectedItem.value  ,
-					   ReceiveCopiesOfMeetingMessages:  this._document.getElementById('ReceiveCopiesOfMeetingMessages').checked ,
-					   ViewPrivateItems: this._document.getElementById('ViewPrivateItems').checked ,
-					   DeliverMeetingRequests:this._document.getElementById('deliverMeetingRequestslist').value,
-			   };
-			   
-		       var tmpObject = new erUpdateDelegateRequest({ 
-		    			delegatingItem: "calendar", 
-		    	   		delegateproperties : delegateProperties ,
-		    			delegateemail : email ,
-		    	   		mailbox : this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox") ,
-		    	   		user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),	 		 
-		    	   		serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"), },   
-		 		 	 	function(erUpdateDelegateRequest, aResp){self.erUpdateDelegateRequestOK(erUpdateDelegateRequest, aResp)},
-		 		 	 	function(erUpdateDelegateRequest, aCode, aMsg){self.erUpdateDelegateRequestError(erUpdateDelegateRequest, aCode, aMsg)},
-		 		 	 	null );	 
-	        }
-	 
-		  this.onActionLoadEnd();
-		  this._window.sizeToContent() ;
-	 },
-	 
-	 erUpdateDelegateRequestOK : function _erUpdateDelegateRequestOK(aUpdateDelegateRequest, aResp)
-	 {
-		 if ( aResp.length > 0 )
-         { 
-             var listBox = this._document.getElementById("delegatee"); 
-              for( index=0;index<aResp.length;index++)
-             { 
-               	 //dump("\n  "+ index + " Resp 1: " + aResp[index].SID );	
-               	 //dump("\n  "+ index + " Resp 2: " + aResp[index].PrimarySmtpAddress );	
-               	 //dump("\n  "+ index + " Resp 3: " + aResp[index].DisplayName );	
-               	 //dump("\n  "+ index + " Resp 4: " + aResp[index].DelegatePermissions );	
-               	 //dump("\n  "+ index + " Resp 5: " + aResp[index].ReceiveCopiesOfMeetingMessages );	
-               	 //dump("\n  "+ index + " Resp 6: " + aResp[index].ViewPrivateItems ); 
-            	  this.removeDelegateCache(aResp[index].PrimarySmtpAddress);
-            	  this.addDelegateCache(aResp[index]);
-  		   }	 
-         }
-		 this.delayRefresh();
-	 },
-	 
-	 erUpdateDelegateRequestError : function _erUpdateDelegateRequestError(aUpdateDelegateRequest, aCode, aMsg)
-	 {
-		 
-		 switch( aCode ){
-		    case -8:
-		    aCode="inCorrect email address requested!";
-		    break;
-		    
-		    default:
-		     this._window.alert( "erUpdateDelegateRequestError "+  aCode+":"+aMsg);  
-		    return;
-		    }
-		    
-		    this._window.alert(aCode);
-		
-	 }, 
-   
-	deliverMeetingRequestsSelectEvent : function _deliverMeetingRequestsSelectEvent() {
-	    if (this._document.getElementById('deliverMeetingRequestslist').selectedItem.value == 'DelegatesOnly') {
-	    	this._document.getElementById('deliverMeetingRequestsDesc').value = 'Meeting requests are forwarded to the delegate and moved to the Deleted Items folder.';
-	    } else if (this._document.getElementById('deliverMeetingRequestslist').selectedItem.value == 'DelegatesAndMe') {
-	    	this._document.getElementById('deliverMeetingRequestsDesc').value = 'Meeting requests are forwarded to the delegate.';
-	    } else if (this._document.getElementById('deliverMeetingRequestslist').selectedItem.value == 'DelegatesAndSendInformationToMe') {
-	    	this._document.getElementById('deliverMeetingRequestsDesc').value = "Meeting requests are forwarded but the Accept, Tentative, and Decline buttons do not appear.";
-	    } 
-	},
-	
-	permissionsSelectEvent :function _permissionsSelectEvent() {
-	 
- 		if (  this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'Author') {
-			 // this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "false");
-			  this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
-			  this._document.getElementById('delegateCalendarpermissiondiv').value = 'Read and create items in the Calendar folder.';
-        }
-        if (  this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'Editor') {
-        	  this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("disabled", "false");
-        	  this._document.getElementById('delegateCalendarpermissiondiv').value = 'Read, create, and modify items in the Calendar folder.';
-        	//  this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "false");
-        }
-        if (  this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'Reviewer') {
-			  this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("disabled", "true");
-			  this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
-			  this._document.getElementById('delegateCalendarpermissiondiv').value = 'Read items in the Calendar folder.';
-			//  this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "true");
+                                        var cboxitem = this._document.createElement("treeitem");
+                                        var cboxrow = this._document.createElement("treerow");
+
+                                        //add checkbox
+                                        var cboxcell = this._document.createElement("treecell");
+
+                                        cboxcell.setAttribute("value", "false");
+                                        cboxcell.setAttribute("editable", true);
+                                        cboxcell.setAttribute("name", "checkbox");
+                                        cboxrow.appendChild(cboxcell);
+
+                                        //add user
+                                        cboxcell = this._document.createElement("treecell");
+                                        cboxcell.setAttribute("label", displayName);
+                                        cboxcell.setAttribute("name", "name");
+                                        cboxcell.setAttribute("value", primaryAddress);
+                                        cboxcell.setAttribute("editable", false);
+                                        cboxrow.appendChild(cboxcell);
+                                        cboxitem.appendChild(cboxrow);
+                                        tree.appendChild(cboxitem);
+
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    calendarEmail: function _calendarEmail() {
+        var calId = this._window.arguments[0].calendar.id;
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+        return this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox");
+    },
+
+    emailDomain: function _emailDomain(email) {
+        if (email) {
+            return email.replace(/.*@/, "");;
+        }
+        return;
+
+    },
+
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        this.loadBalancer.addToQueue({
+            calendar: this,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+
+    getEmail: function _getEmail() {
+        var email = this._document.getElementById("email").value;
+        if (email) {
+            var d1 = this.emailDomain(this.calendarEmail());
+            var d2;
+            var sValidEmail = /<(\S+@\S+\.\S+)>/;
+            var reValidEmail = new RegExp(sValidEmail);
+            var isEmail = null;
+            try {
+                isEmail = email.match(reValidEmail)[1];
+                d2 = this.emailDomain(isEmail);
+            }
+            catch (e) {
+                sValidEmail = /\S+@\S+\.\S+/;
+                reValidEmail = new RegExp(sValidEmail);
+                isEmail = email.match(reValidEmail)[0];
+                d2 = this.emailDomain(isEmail);
+            }
+            finally {
+                if (d1 == d2) {
+                    dump("\nccc " + isEmail);
+                    return isEmail;
+                }
+                return;
+
+            }
+        }
+        return;
+    },
+
+    validateEmail: function _validateEmail(textbox) {
+        var email = textbox.value;
+        if (email) {
+            var d1 = this.emailDomain(this.calendarEmail());
+            var d2;
+            var sValidEmail = /<(\S+@\S+\.\S+)>/;
+            var reValidEmail = new RegExp(sValidEmail);
+            var isEmail = null;
+            try {
+                isEmail = email.match(reValidEmail)[1];
+                d2 = this.emailDomain(isEmail);
+            }
+            catch (e) {
+                sValidEmail = /\S+@\S+\.\S+/;
+                reValidEmail = new RegExp(sValidEmail);
+                isEmail = email.match(reValidEmail)[0];
+                d2 = this.emailDomain(isEmail);
+            }
+            finally {
+                if (d1 == d2) {
+                    dump("\nccc " + isEmail);
+                    return isEmail;
+                }
+                return;
+
+            }
+        }
+        return;
+    },
+
+    changeDelegatorCalendar: function _changeDelegatorCalendar(event) {
+
+        var tree = this._document.getElementById("sharedcalendars");
+        var tbo = tree.boxObject;
+        tbo.QueryInterface(Components.interfaces.nsITreeBoxObject);
+        // get the row, col and child element at the point
+        var row = {},
+            col = {},
+            child = {};
+        tbo.getCellAt(event.clientX, event.clientY, row, col, child);
+
+        var _isContainer = (tree.view.isContainer(row.value) === 'true');
+
+        if (_isContainer) {
+            return;
+        }
+        var isSelected = (tree.view.getCellValue(row.value, tree.columns.getColumnAt(0)) === 'true');
+        var emailAddress = tree.view.getCellValue(row.value, tree.columns.getColumnAt(1));
+        var displayName = tree.view.getCellText(row.value, tree.columns.getColumnAt(1));
+
+        var checkBox = {
+            emailAddress: emailAddress,
+            checked: isSelected,
+            displayName: displayName
+        };
+
+        if (checkBox.checked) {
+            var calName = checkBox.displayName;
+            var email = checkBox.emailAddress;
+            if (calName && email) {
+                this.createCalendar(checkBox);
+            }
+        }
+        else {
+            this.deleteCalendar(checkBox);
+        }
+
+        this._window.sizeToContent();
+    },
+
+    deleteCalendar: function _deleteCalendar(checkBox) {
+        var email = checkBox.emailAddress;
+
+        var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry.");
+
+        var thisCalId = this._window.arguments[0].calendar.id;
+
+        var children = tmpPrefs.getChildList("");
+        if (children.length > 0) {
+            // read prefs get uuid and description. 
+            for (var index in children) {
+
+                var pos = children[index].indexOf(".");
+                var tmpUUID = children[index].substr(0, pos);
+                var tmpField = children[index].substr(pos + 1);
+
+                if (tmpField == "uri") {
+                    var prefs = Cc["@mozilla.org/preferences-service;1"]
+                        .getService(Ci.nsIPrefService)
+                        .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + tmpUUID + ".");
+                    if (email == this.globalFunctions.safeGetCharPref(prefs, "ecMailbox") && thisCalId == this.globalFunctions.safeGetCharPref(prefs, "delegateOwner")) {
+                        var calManager = Cc["@mozilla.org/calendar/manager;1"]
+                            .getService(Ci.calICalendarManager);
+
+                        let calendars = calManager.getCalendars({});
+                        for each(let calendar in calendars) {
+                            if (tmpUUID == calendar.id) {
+                                calManager.unregisterCalendar(calendar);
+                                calManager.deleteCalendar(calendar);
+                            }
+                        }
+                    }
+                }
+            }
+        } //children.length   
+    },
+
+    createCalendar: function _createCalendar(checkBox) {
+        this.globalFunctions.LOG("Going to create the calendar in prefs.js - " + checkBox.displayName + " " + checkBox.emailAddress);
+
+        var useOfflineCache = false;
+        var calendarName = checkBox.displayName;
+        var reminderOption = true;
+        var emailAddress = checkBox.emailAddress;
+
+        // Calculate the new calendar.id
+        var newCalId = this.globalFunctions.getUUID();
+        // Save settings in dialog to new cal id.
+        //tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
+
+        //Old Calendar Preferences 
+        var calId = this._window.arguments[0].calendar.id;
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+        var exchWebServicesgServer = this.globalFunctions.safeGetCharPref(calPrefs, "ecServer");
+        var exchWebServicesgUser = this.globalFunctions.safeGetCharPref(calPrefs, "ecUser");
+        var exchWebServicesgDomain = this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain");
+        var exchWebServicesgFolderPath = this.globalFunctions.safeGetCharPref(calPrefs, "ecFolderpath");
+        var exchWebServicesgFolderBase = this.globalFunctions.safeGetCharPref(calPrefs, "ecFolderbase");
+        var exchWebServicesgMailbox = emailAddress;
+        var exchWebServicesgFolderIdOfShare = "";
+        var exchWebServicesgFolderId = "";
+        var exchWebServicesgChangeKey = "";
+
+        //Applying parent calendarsettings to new calendar similar to autodiscovery : tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
+        //New Calendar Preferences
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + newCalId + ".");
+
+        if (exchWebServicesCalPrefs) {
+            exchWebServicesCalPrefs.setCharPref("ecServer", exchWebServicesgServer);
+            exchWebServicesCalPrefs.setCharPref("ecUser", exchWebServicesgUser);
+            exchWebServicesCalPrefs.setCharPref("ecDomain", exchWebServicesgDomain);
+            exchWebServicesCalPrefs.setCharPref("ecFolderpath", exchWebServicesgFolderPath);
+            exchWebServicesCalPrefs.setCharPref("ecFolderbase", exchWebServicesgFolderBase);
+            exchWebServicesCalPrefs.setCharPref("ecMailbox", exchWebServicesgMailbox);
+
+            exchWebServicesCalPrefs.setCharPref("name", calendarName);
+            exchWebServicesCalPrefs.setCharPref("delegateOwner", calId);
+
+        }
+
+        if ((exchWebServicesgFolderPath == "/") && (exchWebServicesgFolderIdOfShare == "")) {
+            exchWebServicesgFolderID = "";
+            exchWebServicesgChangeKey = "";
+        }
+        exchWebServicesCalPrefs.setCharPref("ecFolderID", exchWebServicesgFolderID);
+        exchWebServicesCalPrefs.setCharPref("ecChangeKey", exchWebServicesgChangeKey);
+
+        // Need to save the useOfflineCache preference separetly because it is not part of the main.
+        this.prefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + newCalId + ".");
+        this.prefs.setBoolPref("useOfflineCache", useOfflineCache);
+        this.prefs.setIntPref("exchangePrefVersion", 1);
+
+        // We create a new URI for this calendar which will contain the calendar.id
+        var ioService = Cc["@mozilla.org/network/io-service;1"]
+            .getService(Ci.nsIIOService);
+        var tmpURI = ioService.newURI("https://auto/" + newCalId, null, null);
+
+        var calManager = Cc["@mozilla.org/calendar/manager;1"]
+            .getService(Ci.calICalendarManager);
+        var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
+
+        newCal.id = newCalId;
+        newCal.name = calendarName;
+
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry." + newCalId + ".");
+
+        calPrefs.setCharPref("name", calendarName);
+
+        newCal.setProperty("color", "Yellow");
+        if (!reminderOption) {
+            newCal.setProperty("suppressAlarms", true);
+        }
+
+        var identity = "id1";
+        newCal.setProperty("imip.identity.key", identity);
+        newCal.setProperty("cache.enabled", false);
+
+        Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService).savePrefFile(null);
+
+        calManager.registerCalendar(newCal);
+    },
+
+    getDelegate: function _getDelegate() {
+
+        this.onActionLoad();
+        var listBox = this._document.getElementById("delegatee");
+        this.emptyList(listBox);
+        var self = this;
+        var calendar = this._window.arguments[0].calendar;
+        var calId = this._window.arguments[0].calendar.id;
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+        var tmpObject = new erGetDelegateRequest({
+                delegatingItem: "calendar",
+                mailbox: this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
+                user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),
+                serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"),
+            },
+            function (erGetDelegateRequest, aResp) {
+                self.erGetDelegateRequestOK(erGetDelegateRequest, aResp)
+            },
+            function (erGetDelegateRequest, aCode, aMsg) {
+                self.erGetDelegateRequestError(erGetDelegateRequest, aCode, aMsg)
+            },
+            null);
+
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    refresh: function _refresh() {
+        this.getDelegate();
+        this.updateDelegateView();
+    },
+
+    delayRefresh: function _delayRefresh() {
+        setTimeout(this.getDelegate(), 5000);
+        setTimeout(this.updateDelegateView(), 7000);
+    },
+
+    listSelectEvent: function _listSelectEvent() {
+
+        if (this.delegatesList.length > 0) {
+            var node = this._document.getElementById("delegatee").getSelectedItem(0);
+            if (node) {
+                var childNodes = node.childNodes;
+                var listName = childNodes[0].getAttribute("label");
+                var regex = /[^()]+/g;
+                var email = listName.match(regex);
+                var listEmail = childNodes[0].getAttribute("value");
+
+                for (var index = 0; index < this.delegatesList.length; index++) {
+                    if (this.delegatesList[index].PrimarySmtpAddress == listEmail) {
+                        // this._document.getElementById('email').value = listEmail;  
+                        if (this.delegatesList[index].ReceiveCopiesOfMeetingMessages == 'true') {
+                            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "true");
+                        }
+                        else {
+                            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
+                        }
+                        if (this.delegatesList[index].ViewPrivateItems == 'true') {
+                            this._document.getElementById('ViewPrivateItems').setAttribute("checked", "true");
+                        }
+                        else {
+                            this._document.getElementById('ViewPrivateItems').setAttribute("checked", "false");
+                        }
+                        // this._document.getElementById('deliverMeetingRequestslist').value = '';
+                        this._document.getElementById('delegateCalendarpermission').value = this.delegatesList[index].DelegatePermissions;
+                    }
+                }
+            }
+
+        }
+        this._window.sizeToContent();
+    },
+
+    erGetDelegateRequestOK: function _erGetDelegateRequestOK(aGetDelegateRequest, aResp) {
+        if (aResp.length > 0) {
+            for (index = 0; index < aResp.length; index++) {
+                this.delegatesList[index] = aResp[index];
+            }
+            this.updateDelegateView();
+        }
+    },
+
+    erGetDelegateRequestError: function _erGetDelegateRequestError(aGetDelegateRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("erGetDelegateRequestError: " + aCode + ":" + aMsg);
+    },
+
+    updateDelegateView: function _updateDelegateView() {
+
+        var listBox = this._document.getElementById("delegatee");
+        this.emptyList(listBox);
+        for (var index = 0; index < this.delegatesList.length; index++) {
+            var row = this._document.createElement("listitem");
+            var cell = this._document.createElement("listcell");
+            cell.setAttribute("label", this.delegatesList[index].DisplayName + " (" + this.delegatesList[index].PrimarySmtpAddress + ")");
+            cell.setAttribute("value", this.delegatesList[index].PrimarySmtpAddress);
+            row.appendChild(cell);
+            listBox.appendChild(row);
+        }
+    },
+
+    removeDelegateCache: function _removeDelegateCache(email) {
+        if (email) {
+            for (var index = 0; index < this.delegatesList.length; index++) {
+                if (email == this.delegatesList[index].PrimarySmtpAddress) {
+                    this.delegatesList.splice(index, 1);
+                }
+            }
+        }
+        this.updateDelegateView();
+    },
+
+    addDelegateCache: function _addDelegateCache(delegate) {
+        if (delegate) {
+            var count = this.delegatesList.length;
+            if (!count) {
+                count = 0;
+            }
+
+            this.delegatesList[count] = delegate;
+        }
+        this.updateDelegateView();
+        this.delayRefresh();
+    },
+
+    removeDelegate: function _removeDelegate() {
+        this.onActionLoad();
+        var email = this.getEmail();
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            var self = this;
+            var calendar = this._window.arguments[0].calendar;
+            var calId = this._window.arguments[0].calendar.id;
+            var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+            var tmpObject = new erRemoveDelegateRequest({
+                    delegatingItem: "calendar",
+                    DelegateEmail: email,
+                    mailbox: this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
+                    user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),
+                    serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"),
+                },
+                function (erRemoveDelegateRequest, aResp) {
+                    self.erRemoveDelegateRequestOK(erRemoveDelegateRequest, aResp)
+                },
+                function (erRemoveDelegateRequest, aCode, aMsg) {
+                    self.erRemoveDelegateRequestError(erRemoveDelegateRequest, aCode, aMsg)
+                },
+                null);
+        }
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    erRemoveDelegateRequestOK: function _erRemoveDelegateRequestOK(aRemoveDelegateRequest, aResp) {
+        for (var index = 0; index < aResp.length; index++) {
+            this.removeDelegateCache(aResp[index].PrimarySmtpAddress);
+        }
+        this.delayRefresh();
+    },
+    erRemoveDelegateRequestError: function _erRemoveDelegateRequestError(aRemoveDelegateRequest, aCode, aMsg) {
+        switch (aCode) {
+        case -8:
+            aCode = "inCorrect email address requested!";
+            break;
+
+        default:
+            this._window.alert("erRemoveDelegateRequestError: " + aCode + ":" + aMsg);
+            return;
+        }
+
+        this._window.alert(aCode);
+
+    },
+
+    onActionLoad: function _onActionLoad() {
+        this._window.sizeToContent();
+        this._document.getElementById("delegateCalendaractionadd").setAttribute("disabled", "true");
+        this._document.getElementById("delegateCalendaractionupdate").setAttribute("disabled", "true");
+        this._document.getElementById("delegateCalendaractiondelete").setAttribute("disabled", "true");
+        //	  this._document.getElementById("delegateCalendaractionrefresh").setAttribute("disabled", "true");
+    },
+
+    onActionLoadEnd: function _onActionLoadEnd() {
+        this._window.sizeToContent();
+        //  this._document.getElementById("email").Value=""; 
+        this._document.getElementById("delegateCalendaractionadd").removeAttribute("disabled");
+        this._document.getElementById("delegateCalendaractionupdate").removeAttribute("disabled");
+        this._document.getElementById("delegateCalendaractiondelete").removeAttribute("disabled");
+        //  this._document.getElementById("delegateCalendaractionrefresh").removeAttribute("disabled");
+    },
+
+    emptyList: function emptyList(listId) {
+        var myListBox = listId;
+        var countrow = myListBox.itemCount;
+        while (countrow-- > 0) {
+            myListBox.removeItemAt(0);
+        }
+    },
+
+    addDelegate: function _addDelegate() {
+        this.onActionLoad();
+        var email = this.getEmail();
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            if (this.delegatesList) {
+                for (var index = 0; index < this.delegatesList.length; index++) {
+                    var listEmail = this.delegatesList[index].PrimarySmtpAddress;
+                    if (email == listEmail) {
+                        this._window.alert('Already added! do Update');
+                        this.onActionLoadEnd();
+                        this._window.sizeToContent();
+                        return;
+                    }
+                }
+            }
+            var self = this;
+            var calendar = this._window.arguments[0].calendar;
+            var calId = this._window.arguments[0].calendar.id;
+            var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+            var delegateProperties = {
+                DelegatePermissions: this._document.getElementById('delegateCalendarpermission').selectedItem.value,
+                ReceiveCopiesOfMeetingMessages: this._document.getElementById('ReceiveCopiesOfMeetingMessages').checked,
+                ViewPrivateItems: this._document.getElementById('ViewPrivateItems').checked,
+                DeliverMeetingRequests: this._document.getElementById('deliverMeetingRequestslist').value,
+            };
+            var tmpObject = new erAddDelegateRequest({
+                    delegatingItem: "calendar",
+                    delegateproperties: delegateProperties,
+                    delegateemail: email,
+                    mailbox: this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
+                    user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),
+                    serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"),
+                },
+                function (erAddDelegateRequest, aResp) {
+                    self.erAddDelegateRequestOK(erAddDelegateRequest, aResp)
+                },
+                function (erAddDelegateRequest, aCode, aMsg) {
+                    self.erAddDelegateRequestError(erAddDelegateRequest, aCode, aMsg)
+                },
+                null);
+        }
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    erAddDelegateRequestOK: function _erAddDelegateRequestOK(aAddDelegateRequest, aResp) {
+        if (aResp.length > 0) {
+            for (var index = 0; index < aResp.length; index++) {
+                //dump("\n  "+ index + " Resp 1: " + aResp[index].SID );	
+                //dump("\n  "+ index + " Resp 2: " + aResp[index].PrimarySmtpAddress );	
+                //dump("\n  "+ index + " Resp 3: " + aResp[index].DisplayName );	
+                //dump("\n  "+ index + " Resp 4: " + aResp[index].DelegatePermissions );	
+                //dump("\n  "+ index + " Resp 5: " + aResp[index].ReceiveCopiesOfMeetingMessages );	
+                //dump("\n  "+ index + " Resp 6: " + aResp[index].ViewPrivateItems ); 
+                this.addDelegateCache(aResp[index]);
+            }
+        }
+    },
+
+    erAddDelegateRequestError: function _erAddDelegateRequestError(aAddDelegateRequest, aCode, aMsg) {
+        switch (aCode) {
+        case -8:
+            aCode = "inCorrect email address requested!";
+            break;
+
+        default:
+            this._window.alert("erAddDelegateRequestError : " + aCode + " : " + aMsg);
+            return;
+        }
+
+        this._window.alert(aCode);
+    },
+
+    updateDelegate: function _updateDelegate() {
+
+        this.onActionLoad();
+        var email = this.getEmail();
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            var self = this;
+            var calendar = this._window.arguments[0].calendar;
+            var calId = this._window.arguments[0].calendar.id;
+            var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+            var delegateProperties = {
+                DelegatePermissions: this._document.getElementById('delegateCalendarpermission').selectedItem.value,
+                ReceiveCopiesOfMeetingMessages: this._document.getElementById('ReceiveCopiesOfMeetingMessages').checked,
+                ViewPrivateItems: this._document.getElementById('ViewPrivateItems').checked,
+                DeliverMeetingRequests: this._document.getElementById('deliverMeetingRequestslist').value,
+            };
+
+            var tmpObject = new erUpdateDelegateRequest({
+                    delegatingItem: "calendar",
+                    delegateproperties: delegateProperties,
+                    delegateemail: email,
+                    mailbox: this.globalFunctions.safeGetCharPref(calPrefs, "ecMailbox"),
+                    user: this.globalFunctions.safeGetCharPref(calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(calPrefs, "ecUser"),
+                    serverUrl: this.globalFunctions.safeGetCharPref(calPrefs, "ecServer"),
+                },
+                function (erUpdateDelegateRequest, aResp) {
+                    self.erUpdateDelegateRequestOK(erUpdateDelegateRequest, aResp)
+                },
+                function (erUpdateDelegateRequest, aCode, aMsg) {
+                    self.erUpdateDelegateRequestError(erUpdateDelegateRequest, aCode, aMsg)
+                },
+                null);
+        }
+
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    erUpdateDelegateRequestOK: function _erUpdateDelegateRequestOK(aUpdateDelegateRequest, aResp) {
+        if (aResp.length > 0) {
+            var listBox = this._document.getElementById("delegatee");
+            for (index = 0; index < aResp.length; index++) {
+                //dump("\n  "+ index + " Resp 1: " + aResp[index].SID );	
+                //dump("\n  "+ index + " Resp 2: " + aResp[index].PrimarySmtpAddress );	
+                //dump("\n  "+ index + " Resp 3: " + aResp[index].DisplayName );	
+                //dump("\n  "+ index + " Resp 4: " + aResp[index].DelegatePermissions );	
+                //dump("\n  "+ index + " Resp 5: " + aResp[index].ReceiveCopiesOfMeetingMessages );	
+                //dump("\n  "+ index + " Resp 6: " + aResp[index].ViewPrivateItems ); 
+                this.removeDelegateCache(aResp[index].PrimarySmtpAddress);
+                this.addDelegateCache(aResp[index]);
+            }
+        }
+        this.delayRefresh();
+    },
+
+    erUpdateDelegateRequestError: function _erUpdateDelegateRequestError(aUpdateDelegateRequest, aCode, aMsg) {
+
+        switch (aCode) {
+        case -8:
+            aCode = "inCorrect email address requested!";
+            break;
+
+        default:
+            this._window.alert("erUpdateDelegateRequestError " + aCode + ":" + aMsg);
+            return;
+        }
+
+        this._window.alert(aCode);
+
+    },
+
+    deliverMeetingRequestsSelectEvent: function _deliverMeetingRequestsSelectEvent() {
+        if (this._document.getElementById('deliverMeetingRequestslist').selectedItem.value == 'DelegatesOnly') {
+            this._document.getElementById('deliverMeetingRequestsDesc').value = 'Meeting requests are forwarded to the delegate and moved to the Deleted Items folder.';
+        }
+        else if (this._document.getElementById('deliverMeetingRequestslist').selectedItem.value == 'DelegatesAndMe') {
+            this._document.getElementById('deliverMeetingRequestsDesc').value = 'Meeting requests are forwarded to the delegate.';
+        }
+        else if (this._document.getElementById('deliverMeetingRequestslist').selectedItem.value == 'DelegatesAndSendInformationToMe') {
+            this._document.getElementById('deliverMeetingRequestsDesc').value = "Meeting requests are forwarded but the Accept, Tentative, and Decline buttons do not appear.";
+        }
+    },
+
+    permissionsSelectEvent: function _permissionsSelectEvent() {
+
+        if (this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'Author') {
+            // this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "false");
+            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
+            this._document.getElementById('delegateCalendarpermissiondiv').value = 'Read and create items in the Calendar folder.';
+        }
+        if (this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'Editor') {
+            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("disabled", "false");
+            this._document.getElementById('delegateCalendarpermissiondiv').value = 'Read, create, and modify items in the Calendar folder.';
+            //  this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "false");
+        }
+        if (this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'Reviewer') {
+            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("disabled", "true");
+            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
+            this._document.getElementById('delegateCalendarpermissiondiv').value = 'Read items in the Calendar folder.';
+            //  this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "true");
         }
         if (this._document.getElementById('delegateCalendarpermission').selectedItem.value == 'None') {
-			this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("disabled", "true");
-			this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
-			 this._document.getElementById('delegateCalendarpermissiondiv').value = 'No access permissions to the Calendar folder.';
-		//	this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "false");
-        } 
-        this._window.sizeToContent() ;
-	}, 
-               
-	 	
-	doCancel:function _doCancel() {
-		this._window.sizeToContent() ;
-	  	this._window.close(); 
-	},
-	     
-	    
+            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("disabled", "true");
+            this._document.getElementById('ReceiveCopiesOfMeetingMessages').setAttribute("checked", "false");
+            this._document.getElementById('delegateCalendarpermissiondiv').value = 'No access permissions to the Calendar folder.';
+            //	this._document.getElementById('deliverMeetingRequestslist').setAttribute("disabled", "false");
+        }
+        this._window.sizeToContent();
+    },
+
+
+    doCancel: function _doCancel() {
+        this._window.sizeToContent();
+        this._window.close();
+    },
+
+
 };
 
 var tmpDelegateCalendarSettings = new exchDelegateCalendarSettings(document, window);
diff --git a/chrome/content/delegateFolder.js b/chrome/content/delegateFolder.js
index 8ff900a9..60318493 100644
--- a/chrome/content/delegateFolder.js
+++ b/chrome/content/delegateFolder.js
@@ -4,734 +4,763 @@
  * The Initial Developer of the Microsoft Exchange Calendar Provider Code is property of Ericsson. 
  * All Rights Reserved.
  * ***** BEGIN LICENSE BLOCK *****/
-  
+
 var Cc = Components.classes;
 var Ci = Components.interfaces;
-var Cu = Components.utils; 
+var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js"); 
- 
+Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+
 Cu.import("resource://exchangecalendar/erUpdateFolderPermission.js");
 Cu.import("resource://exchangecalendar/erFindInboxFolder.js");
 Cu.import("resource://exchangecalendar/erGetFolderPermission.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
-Cu.import("resource://interfaces/xml2json/xml2json.js"); 
-  
-function exchDelegateCalendarSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow; 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions); 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer); 
-	this.calId = null;
-	this.calPrefs = null;
-    this.delegatesList = []; 
+Cu.import("resource://interfaces/xml2json/xml2json.js");
+
+function exchDelegateCalendarSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
+    this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer);
+    this.calId = null;
+    this.calPrefs = null;
+    this.delegatesList = [];
     this.folderName = "";
-    
+
     this.folderId = null;
-	this.changeKey = null;
-} 
- 
-exchDelegateCalendarSettings.prototype = {  
-
-	findAccountFromFolder:function _findAccountFromFolder(theFolder) {
-		    if (!theFolder)  
-		        return null;  
-		    var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-		                                     .getService(Components.interfaces.nsIXULAppInfo);
-             var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                                        .getService(Components.interfaces.nsIVersionComparator);
-             var passwd = "";
-             var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
-                                 .getService(Components.interfaces.nsIMsgAccountManager);
-             var accounts = acctMgr.accounts;
-             if (versionChecker.compare(appInfo.version, "20.0") >= 0){
-		             	for (var i = 0; i < accounts.length; i++) {
-		             	    var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount); 
- 
-		    		        var rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
-		        if (rootFolder.hasSubFolders) {  
-		            var subFolders = rootFolder.subFolders; // nsIMsgFolder  
-		            while(subFolders.hasMoreElements()) {  
-		                if (theFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))  
-		                    return account.QueryInterface(Components.interfaces.nsIMsgAccount);  
-		            }  
-		        }  
-                    
-                 }
-             }
-             else{
-         	for (let i = 0; i < accounts.Count(); i++) {
-         	    let account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount); 
-
-		        let rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
-		        if (rootFolder.hasSubFolders) {  
-		            let subFolders = rootFolder.subFolders; // nsIMsgFolder  
-		            while(subFolders.hasMoreElements()) {  
-		                if (theFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))  
-		                    return account.QueryInterface(Components.interfaces.nsIMsgAccount);  
-		            }  
-		        	}  
-                     
-                 }
-             }  
-		    return null;  
-	},
-		
-	getCalendar: function _getCalendar(){
-		let folder = window.arguments[0].folder; 
-		
-		///Get Selected Folder Account manager 
-		var account = this.findAccountFromFolder(folder);
- 		var accountEmail = "";
-		if( account == null ) return;
-		try{
-			var  identities = account.identities;
-			for (var index=0; index < identities.length; index++) {
-				var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
-				accountEmail = identity.email;
-				/*if (!this.name) {
-					dump("aclEntry: index:"+index+", identitie:"+identity+"\n");
-				}*/
-			}
-		}
-		catch(e){}
- 		
-		///Get Calendar manager
-		var calManager = Cc["@mozilla.org/calendar/manager;1"]
-		        			.getService(Ci.calICalendarManager);
-		var cals = calManager.getCalendars({});
-		
-		for( var i = 0; i < cals.length; i++ ){
-			var cal=cals[i];
-			if( cal.mailbox == accountEmail ){
-				this.calId = cal.id;
-				break;
-			}
-		} 
-	 },
-	 
-	 onLoad:function _onLoad() { 
-		 	this.getCalendar();  
- 		    if( this.calId != null ){
- 		      try{
- 		    	  this.calPrefs = Cc["@mozilla.org/preferences-service;1"]
-	    	    	            .getService(Ci.nsIPrefService)
-	    	    	            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+ this.calId +".");
- 		      }catch(e){}
- 		    	  this.refresh();
-		    }  
- 		    if( this.calId == null ){
- 				this._document.getElementById("delegationPanel").hidden=true;
- 				this._document.getElementById("fmessage").hidden=false;
- 			}
- 			else{
- 				this._document.getElementById("delegationPanel").hidden=false; 
- 				this._document.getElementById("fmessage").hidden=true; 
- 			} 
-	 },   
- 
-	 getFolderPermissionOK: function _getFolderPermissionOK( erGetFolderPermissionRequest,folderID,changeKey,folderName,delegatee,perms){
- 
-		 this.folderId = folderID;
-		 this.changeKey = changeKey;
- 		  if ( delegatee.length > 0 ){  
- 			  this.delegatesList=delegatee;  
-          }  
-           this.updateDelegateView();  
-	 },
-
- 	removeDelegateCache :function _removeDelegateCache(email)
-	{  
-		 if(email){ 
-			 for (var index=0;index < this.delegatesList.length ;index++ )
-			 { 
-				if ( email == this.delegatesList[index].emailId )
-				{
-					this.delegatesList.splice(index,1);
-				}
-			 }	 
-		 }
- 	},
-	
-	addDelegateCache :function _addDelegateCache(delegate)
-	{
-		 if(delegate){ 
-			 var count=this.delegatesList.length;
-			 if(!count){
-				 count=0; 
-			 }
-
-			 this.delegatesList[count]=delegate;
-		 } 
- 	},
-		
-	 getFolderPermissionError: function _getFolderPermissionError(erGetFolderPermissionRequest, aCode, aMsg){
-		this.globalFunctions.LOG("delegateFolder~getFolderPermissionError: aCode -  " + aCode +   ", aMsg - " + aMsg );
-	 },
-	 
-	 erUpdateFolderPermissionRequestOK: function _erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey) {
-		 this.folderId = folderId;
-		 this.changeKey = changeKey;
-		 this.globalFunctions.LOG("delegateFolder~erUpdateFolderPermissionRequestOK: Updated Sucessfully!");
-		 this.infoPopup(this._document.title, "Permission given for user." );
-		 this.refresh(); 
-	 },
-	 
-	 erUpdateFolderPermissionRequestError: function _erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg) {
-		this.globalFunctions.LOG("delegateFolder~erUpdateFolderPermissionRequestError: aCode -  " + aCode +   ", aMsg - " + aMsg );
-		this.infoPopup(this._document.title, "Error:- " + aMsg + " (" + aCode +")" ); 
-	 },   
-	 
-	 addSharedUser: function _addSharedUser() { }, 
-	 
-	 calendarEmail: function _calendarEmail()
-	 {   
-		 return this.globalFunctions.safeGetCharPref( this.calPrefs, "ecMailbox");
-	 },
-	 
-	 emailDomain: function _emailDomain(email)
-	 { 
-	      if(email)
-	      { 
-	    	  return email.replace(/.*@/, "");;
-	      }
-	      return;
-	      
-	 },
-	 
-	 addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	 { 
-			this.loadBalancer.addToQueue({ calendar: this,
-					 ecRequest:aRequest,
-					 arguments: aArgument,
-					 cbOk: aCbOk,
-					 cbError: aCbError,
-					 listener: aListener});
-	 },
-	
-	 getEmail: function _getEmail()
-	 { 
-			 var email=this._document.getElementById("email").value; 
-			 if( email)
-			 { 
-				 var d1 = this.emailDomain(this.calendarEmail());
-				 var d2;
-				 var sValidEmail = /<(\S+@\S+\.\S+)>/;
-				 var reValidEmail = new RegExp(sValidEmail);
-				 var isEmail=null;
-				 try{
-					 isEmail = email.match(reValidEmail)[1] ;
-					 d2 = this.emailDomain(isEmail); 
-				 }
-				 catch(e){
-						 sValidEmail = /\S+@\S+\.\S+/;
-						 reValidEmail = new RegExp(sValidEmail);
-						 isEmail = email.match(reValidEmail)[0];
-						 d2 = this.emailDomain(isEmail);
-	 			 }
-				 finally{   
-					  if( d1  == d2 )
-					  {
- 						  return isEmail;
-					  }
-					  return;
-
-	 			 } 
-			 }
-			 return;
-	 },
-	 
-	 validateEmail: function _validateEmail(textbox)
-	 { 
-			 var email=textbox.value;
-			 if( email)
-			 { 
-				 var d1 = this.emailDomain(this.calendarEmail());
-				 var d2;
-				 var sValidEmail = /<(\S+@\S+\.\S+)>/;
-				 var reValidEmail = new RegExp(sValidEmail);
-				 var isEmail=null;
-				 try{
-					 isEmail = email.match(reValidEmail)[1] ;
-					 d2 = this.emailDomain(isEmail); 
-				 }
-				 catch(e){
-						 sValidEmail = /\S+@\S+\.\S+/;
-						 reValidEmail = new RegExp(sValidEmail);
-						 isEmail = email.match(reValidEmail)[0];
-						 d2 = this.emailDomain(isEmail);
-	 			 }
-				 finally{   
-					  if( d1  == d2 )
-					  {
- 						  return isEmail;
-					  }
-					  return;
-
-	 			 } 
-			 }
-			 return;
-	 }, 
-	 
-	 getDelegate: function _getDelegate() { 
-		    var self=this;  
-			this.onActionLoad();  
-   		    //Get Folders in Inbox includes hidden
- 		    var tmpObject = new  erFindInboxFolderRequest( 
-					{user: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref( this.calPrefs, "ecUser") , 
-					 mailbox:this.globalFunctions.safeGetCharPref( this.calPrefs, "ecMailbox") ,
-					 serverUrl:this.globalFunctions.safeGetCharPref( this.calPrefs, "ecServer"),
-					 folderBase: "msgfolderroot",
-					 folderPath: "",
-					 actionStart: Date.now()}, 
-					function(erFindInboxFolderRequest, folders) { self.checkFolderPathOk(erFindInboxFolderRequest, folders);}, 
-					function(erFindInboxFolderRequest, aCode, aMsg) { self.checkFolderPathError(erFindInboxFolderRequest, aCode, aMsg);},
-					null); 
-          this.onActionLoadEnd();
-	   	  this._window.sizeToContent() ;  
-		 },
-		 
-		 checkFolderPathOk: function _checkFolderPathOk(erFindInboxFolderRequest, folders)
-		 { 	
-			  var self = this; 
-		 			for(var i=0;i<folders.length;i++){ 
-		 				if( folders[i].name == window.arguments[0].name ){
-							this.folderId = folders[i].id ;
-							this.folderName= folders[i].name ;
-							this.changeKey = folders[i].changeKey; 
-							
-							//Get Total users and permissions
-		 					var tmpObject = new erGetFolderPermissionRequest({
-		 	   	   				user: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref( this.calPrefs, "ecUser"),	  
-		 	   					mailbox : this.globalFunctions.safeGetCharPref( this.calPrefs, "ecMailbox") ,
-		 	   					serverUrl: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecServer"),  
-		 	   					folderID: this.folderId ,
-		 	   					changeKey: this.changeKey ,
-		 	   					actionStart: Date.now()}, 
-		 						function(erGetFolderPermissionRequest,folderID,changeKey,folderName,delegatee,permissions) { self.getFolderPermissionOK(erGetFolderPermissionRequest,folderID,changeKey,folderName,delegatee,permissions);}, 
-		 						function(erGetFolderPermissionRequest, aCode, aMsg) { self.getFolderPermissionError(erGetFolderPermissionRequest, aCode, aMsg);},
-		 						null);  
-		 					break;
-						} 
-					}  
-	 	 },
-	 	 
-		 checkFolderPathError: function _checkFolderPathError(erFindInboxFolderRequest, aCode, aMsg) {
-				this.globalFunctions.LOG("delegateFolder~checkFolderPathError: aCode -  " + aCode +   ", aMsg - " + aMsg ); 
-		 },
-		 
-		 refresh: function _refresh() {
-		      this.getDelegate(); 
- 		 },
-		 
- 		selectedUserEmail: function _selectedUserEmail(){
- 			 try{
- 				var node = this._document.getElementById("delegatee").getSelectedItem(0);  
- 				var childNodes = node.childNodes;  
- 				var listName = childNodes[0].getAttribute("label");
- 				var regex = /[^()]+/g;
- 				var email = listName.match(regex);
- 				var listEmail=childNodes[0].getAttribute("value");  
- 				}  catch(e){}      
-
-               return listEmail;
- 		},
- 		 
- 		showUserPermission: function _resetUserPermission(aEmail) { 
- 			if(!aEmail){
- 				aEmail = this.selectedUserEmail();
- 			} 
-				        if( !aEmail ){ 
-				        	aEmail = this.getEmail();
-				        }
-				        
-				        if( !aEmail ){
-				        	return;
-						}	
-				        
-				        for( var index=0;index<this.delegatesList.length;index++)
-					 	{   			
-				        	if( this.delegatesList[index].emailId == aEmail )
-				        	{ 
-				        	  this._document.getElementById('menuPermissionLevel').value = this.delegatesList[index].permissionLevel;
-  						      this.updatePermissionDetails(this.delegatesList[index].permissions); 
-					          break;
-				        	}
-					 	} 
-			this._window.sizeToContent() ;
-		 },  
-		 
-		updateDelegateView: function _updateDelegateView(){ 
-			 var listBox = this._document.getElementById("delegatee"); 
-             this.emptyList(listBox);   
-			 for (var index=0;index<this.delegatesList.length;index++)
-			 {   
-				 	var row =   this._document.createElement("listitem"); 
-				 	var celluser =   this._document.createElement("listcell");
-					 celluser.setAttribute("label", this.delegatesList[index].name+" ("+this.delegatesList[index].emailId+")");
-        	         celluser.setAttribute("value", this.delegatesList[index].emailId);
-        	         row.appendChild(celluser);  
-        	         var cellperm =   this._document.createElement("listcell");
-					 cellperm.setAttribute("label", this.delegatesList[index].permissionLevel);
-        	         cellperm.setAttribute("value", this.delegatesList[index].permissionLevel);
-        	         row.appendChild(cellperm); 
-        	         listBox.appendChild(row);   
-			 }	 
-			 this.updatePermissionDetails(this.delegatesList[index].permissions)
-  		 },
-  		   
-  		 getCustomPermissions:function _getCustomPermissions(){
-		 try{
-		 	var cancreateitems = this._document.getElementById("cancreateitems").value;
-		 	var cancreatesubfolders = this._document.getElementById("cancreatesubfolders").value;
-		 	var isfolderowner = this._document.getElementById("isfolderowner").value;
-		 	var isfoldervisible = this._document.getElementById("isfoldervisible").value;
-		 	var isfoldercontact = this._document.getElementById("isfoldercontact").value;
-		 	var edititems = this._document.getElementById("edititems").value;
-		 	var deleteitems = this._document.getElementById("deleteitems").value;
-		 	var readitems = this._document.getElementById("readitems").value;
-  			 }catch(e){}
-          return { "canCreateItems":cancreateitems,
-		 	"canCreateSubFolders":cancreatesubfolders,
-		 	"isFolderOwner":isfolderowner,
-		 	"isFolderVisible":isfoldervisible,
-		 	"isFolderContact":isfoldercontact,
-		 	"editItems":edititems,
-		 	"deleteItems":deleteitems,
-		 	"readItems":readitems } ; 
-  		 },
-  		 
-		removeDelegate   :function _removeDelegate() {
-   			 var self=this; 
-			 this.onActionLoad(); 
-			 var email = this.selectedUserEmail(); 
-		        if( !email ){ 
-		        	email = this.getEmail();
-        		}
-				 if ( !email )
-				 {
-					 this._window.alert('Not Valid Email address! ' );
-				     this.onActionLoadEnd();
-					 this._window.sizeToContent() ; 
-				 } 
-				 else
-				 {	  
- 					   var existing=false; 
-					   
-					   var newDelegatesList = this.cloneList(); 
-		 			   for(var i = 0; i < this.delegatesList.length; i++ ){
-						   if(this.delegatesList[i].emailId){
-							   if( email ==  this.delegatesList[i].emailId ){
-								   existing=true;  
-								   newDelegatesList.splice(i, 1);
-								   continue;
-							   }   
-						   }
-					   } 
-					   
-				       var tmpObject = new erUpdateFolderPermissionRequest({ 
-		   	   		 		permissionSet : newDelegatesList,
-				            folderId : this.folderId ,
-				            changeKey : this.changeKey ,
-			    	   		mailbox : this.globalFunctions.safeGetCharPref( this.calPrefs, "ecMailbox") ,
-			    	   		user: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref( this.calPrefs, "ecUser"),	 		 
-			    	   		serverUrl: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecServer"), },   
-			 		 	 	function(erUpdateFolderPermissionRequest, folderId,changeKey){self.erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey)},
-			 		 	 	function(erUpdateFolderPermissionRequest, aCode, aMsg){self.erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg)},
-			 		 	 	null );	 
-				        
-			        }	 
- 		  this.onActionLoadEnd();
-		  this._window.sizeToContent() ;  
-	 }, 
-	   
-	 onActionLoad:function _onActionLoad() {
-	  this._window.sizeToContent() ; 
-	  this._document.getElementById("delegateCalendaractionadd").setAttribute("disabled", "true");
-	  this._document.getElementById("delegateCalendaractionupdate").setAttribute("disabled", "true");
-	  this._document.getElementById("delegateCalendaractiondelete" ).setAttribute("disabled", "true");
- 	 },
-	 
-	 onActionLoadEnd:function _onActionLoadEnd() {
-	  this._window.sizeToContent() ; 
- 	  this._document.getElementById("delegateCalendaractionadd").removeAttribute("disabled");
-	  this._document.getElementById("delegateCalendaractionupdate").removeAttribute("disabled");
-	  this._document.getElementById("delegateCalendaractiondelete" ).removeAttribute("disabled");
- 	 }, 
-		
-	 emptyList :function emptyList(listId)
-	 {
-	      var myListBox = listId;
-	        var countrow = myListBox.itemCount;
-	        while (countrow-- > 0) {
-	            myListBox.removeItemAt(0);
-	        } 
-	 },
-	  
-	 addDelegate:function _addDelegate() {
-		 var self=this;
-
-	 	 this.onActionLoad(); 
-		 var email = this.getEmail();  
-		 if ( !email )
-		 {
-			 this._window.alert('Not Valid Email address! ' );
-		     this.onActionLoadEnd();
-			 this._window.sizeToContent() ; 
-		 }  
-	     else
-	     {     
- 				   var existing=false; 
- 				   var newDelegatesList = this.cloneList();
-				   
- 				   for(var i = 0; i < this.delegatesList.length; i++ ){
-					   if(this.delegatesList[i].emailId){
-						   if( email == this.delegatesList[i].emailId ){
-							   existing=true;   
-							   continue;
-						   }   
-					   }
-				   } 
-				   
-				   if(  existing != true ){
-					   var len = newDelegatesList.length;
-					   newDelegatesList[len] = {"emailId":email,
-		   				 	"permissionLevel":this._document.getElementById('menuPermissionLevel').selectedItem.value,
-		   				 	"sid":"","permissions":{}} ;
-					  
-					   newDelegatesList[len].permissionLevel = this._document.getElementById('menuPermissionLevel').selectedItem.value; 
-					   
-					   if(newDelegatesList[len].permissionLevel == "Custom"){
-						   newDelegatesList[len].permissions = this.getCustomPermissions();							   
-					   }
- 					   existing = null; 
-				   }
-				   else{
-					    this._window.alert('Already added! do Update');
-			    	    this.onActionLoadEnd(); 
-			    		this._window.sizeToContent();
-			    		return; 
-				   }
-				   
-			       var tmpObject = new erUpdateFolderPermissionRequest({ 
-	   	   		 		permissionSet : newDelegatesList,
-			            folderId : this.folderId ,
-			            changeKey : this.changeKey ,
-		    	   		mailbox : this.globalFunctions.safeGetCharPref( this.calPrefs, "ecMailbox") ,
-		    	   		user: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref( this.calPrefs, "ecUser"),	 		 
-		    	   		serverUrl: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecServer"), },   
-		 		 	 	function(erUpdateFolderPermissionRequest, folderId,changeKey){self.erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey)},
-		 		 	 	function(erUpdateFolderPermissionRequest, aCode, aMsg){self.erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg)},
-		 		 	 	null );	 
-			        
-	      }
-	  	  this.onActionLoadEnd();
-		  this._window.sizeToContent() ; 
-	 }, 
-	  
-	 cloneList: function _cloneList(){
-		  return this.delegatesList.slice(0); 
-	 },
-	 
-	 setPermissionCustom:function _setPermissionCustom(){
-		 this._document.getElementById('menuPermissionLevel').value="Custom";
-	 },
-	 
-	 updateDelegate :function _updateDelegate() {
-     		 var self=this; 
-		 	 this.onActionLoad();  
-		 	var email = this.selectedUserEmail(); 
-	        if( !email ){ 
-	        	email = this.getEmail();
-    		}
-			 if ( !email )
-			 {
-				 this._window.alert('Not Valid Email address! ' );
-			     this.onActionLoadEnd();
-				 this._window.sizeToContent() ; 
-			 }  
-			 else
-			 { 
-			   var permissionSet = [];
-			   var existing=false;
-			   var newDelegatesList = this.cloneList(); 
- 			   for(var i = 0; i < this.delegatesList.length; i++ ){
-				   if(this.delegatesList[i].emailId){
-					   if( email == this.delegatesList[i].emailId ){
-						   existing=true;  
-						   newDelegatesList[i].permissionLevel = this._document.getElementById('menuPermissionLevel').selectedItem.value;
-						   
-						   if(newDelegatesList[i].permissionLevel == "Custom"){
-							   newDelegatesList[i].permissions = this.getCustomPermissions();							   
-						   }
-						   
-						   continue;
-					   }   
-				   }
-			   } 
-  			   	
-			   if(  existing != true ){
-				  /* permissionSet.push({"primarysmtpaddress":this.getEmail(),
+    this.changeKey = null;
+}
+
+exchDelegateCalendarSettings.prototype = {
+
+    findAccountFromFolder: function _findAccountFromFolder(theFolder) {
+        if (!theFolder)
+            return null;
+        var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+            .getService(Components.interfaces.nsIXULAppInfo);
+        var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+            .getService(Components.interfaces.nsIVersionComparator);
+        var passwd = "";
+        var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
+            .getService(Components.interfaces.nsIMsgAccountManager);
+        var accounts = acctMgr.accounts;
+        if (versionChecker.compare(appInfo.version, "20.0") >= 0) {
+            for (var i = 0; i < accounts.length; i++) {
+                var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);
+
+                var rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
+                if (rootFolder.hasSubFolders) {
+                    var subFolders = rootFolder.subFolders; // nsIMsgFolder  
+                    while (subFolders.hasMoreElements()) {
+                        if (theFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))
+                            return account.QueryInterface(Components.interfaces.nsIMsgAccount);
+                    }
+                }
+
+            }
+        }
+        else {
+            for (let i = 0; i < accounts.Count(); i++) {
+                let account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
+
+                let rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
+                if (rootFolder.hasSubFolders) {
+                    let subFolders = rootFolder.subFolders; // nsIMsgFolder  
+                    while (subFolders.hasMoreElements()) {
+                        if (theFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))
+                            return account.QueryInterface(Components.interfaces.nsIMsgAccount);
+                    }
+                }
+
+            }
+        }
+        return null;
+    },
+
+    getCalendar: function _getCalendar() {
+        let folder = window.arguments[0].folder;
+
+        ///Get Selected Folder Account manager 
+        var account = this.findAccountFromFolder(folder);
+        var accountEmail = "";
+        if (account == null) return;
+        try {
+            var identities = account.identities;
+            for (var index = 0; index < identities.length; index++) {
+                var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
+                accountEmail = identity.email;
+                /*if (!this.name) {
+                	dump("aclEntry: index:"+index+", identitie:"+identity+"\n");
+                }*/
+            }
+        }
+        catch (e) {}
+
+        ///Get Calendar manager
+        var calManager = Cc["@mozilla.org/calendar/manager;1"]
+            .getService(Ci.calICalendarManager);
+        var cals = calManager.getCalendars({});
+
+        for (var i = 0; i < cals.length; i++) {
+            var cal = cals[i];
+            if (cal.mailbox == accountEmail) {
+                this.calId = cal.id;
+                break;
+            }
+        }
+    },
+
+    onLoad: function _onLoad() {
+        this.getCalendar();
+        if (this.calId != null) {
+            try {
+                this.calPrefs = Cc["@mozilla.org/preferences-service;1"]
+                    .getService(Ci.nsIPrefService)
+                    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + this.calId + ".");
+            }
+            catch (e) {}
+            this.refresh();
+        }
+        if (this.calId == null) {
+            this._document.getElementById("delegationPanel").hidden = true;
+            this._document.getElementById("fmessage").hidden = false;
+        }
+        else {
+            this._document.getElementById("delegationPanel").hidden = false;
+            this._document.getElementById("fmessage").hidden = true;
+        }
+    },
+
+    getFolderPermissionOK: function _getFolderPermissionOK(erGetFolderPermissionRequest, folderID, changeKey, folderName, delegatee, perms) {
+
+        this.folderId = folderID;
+        this.changeKey = changeKey;
+        if (delegatee.length > 0) {
+            this.delegatesList = delegatee;
+        }
+        this.updateDelegateView();
+    },
+
+    removeDelegateCache: function _removeDelegateCache(email) {
+        if (email) {
+            for (var index = 0; index < this.delegatesList.length; index++) {
+                if (email == this.delegatesList[index].emailId) {
+                    this.delegatesList.splice(index, 1);
+                }
+            }
+        }
+    },
+
+    addDelegateCache: function _addDelegateCache(delegate) {
+        if (delegate) {
+            var count = this.delegatesList.length;
+            if (!count) {
+                count = 0;
+            }
+
+            this.delegatesList[count] = delegate;
+        }
+    },
+
+    getFolderPermissionError: function _getFolderPermissionError(erGetFolderPermissionRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("delegateFolder~getFolderPermissionError: aCode -  " + aCode + ", aMsg - " + aMsg);
+    },
+
+    erUpdateFolderPermissionRequestOK: function _erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey) {
+        this.folderId = folderId;
+        this.changeKey = changeKey;
+        this.globalFunctions.LOG("delegateFolder~erUpdateFolderPermissionRequestOK: Updated Sucessfully!");
+        this.infoPopup(this._document.title, "Permission given for user.");
+        this.refresh();
+    },
+
+    erUpdateFolderPermissionRequestError: function _erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("delegateFolder~erUpdateFolderPermissionRequestError: aCode -  " + aCode + ", aMsg - " + aMsg);
+        this.infoPopup(this._document.title, "Error:- " + aMsg + " (" + aCode + ")");
+    },
+
+    addSharedUser: function _addSharedUser() {},
+
+    calendarEmail: function _calendarEmail() {
+        return this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox");
+    },
+
+    emailDomain: function _emailDomain(email) {
+        if (email) {
+            return email.replace(/.*@/, "");;
+        }
+        return;
+
+    },
+
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        this.loadBalancer.addToQueue({
+            calendar: this,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+
+    getEmail: function _getEmail() {
+        var email = this._document.getElementById("email").value;
+        if (email) {
+            var d1 = this.emailDomain(this.calendarEmail());
+            var d2;
+            var sValidEmail = /<(\S+@\S+\.\S+)>/;
+            var reValidEmail = new RegExp(sValidEmail);
+            var isEmail = null;
+            try {
+                isEmail = email.match(reValidEmail)[1];
+                d2 = this.emailDomain(isEmail);
+            }
+            catch (e) {
+                sValidEmail = /\S+@\S+\.\S+/;
+                reValidEmail = new RegExp(sValidEmail);
+                isEmail = email.match(reValidEmail)[0];
+                d2 = this.emailDomain(isEmail);
+            }
+            finally {
+                if (d1 == d2) {
+                    return isEmail;
+                }
+                return;
+
+            }
+        }
+        return;
+    },
+
+    validateEmail: function _validateEmail(textbox) {
+        var email = textbox.value;
+        if (email) {
+            var d1 = this.emailDomain(this.calendarEmail());
+            var d2;
+            var sValidEmail = /<(\S+@\S+\.\S+)>/;
+            var reValidEmail = new RegExp(sValidEmail);
+            var isEmail = null;
+            try {
+                isEmail = email.match(reValidEmail)[1];
+                d2 = this.emailDomain(isEmail);
+            }
+            catch (e) {
+                sValidEmail = /\S+@\S+\.\S+/;
+                reValidEmail = new RegExp(sValidEmail);
+                isEmail = email.match(reValidEmail)[0];
+                d2 = this.emailDomain(isEmail);
+            }
+            finally {
+                if (d1 == d2) {
+                    return isEmail;
+                }
+                return;
+
+            }
+        }
+        return;
+    },
+
+    getDelegate: function _getDelegate() {
+        var self = this;
+        this.onActionLoad();
+        //Get Folders in Inbox includes hidden
+        var tmpObject = new erFindInboxFolderRequest({
+                user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser"),
+                mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox"),
+                serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer"),
+                folderBase: "msgfolderroot",
+                folderPath: "",
+                actionStart: Date.now()
+            },
+            function (erFindInboxFolderRequest, folders) {
+                self.checkFolderPathOk(erFindInboxFolderRequest, folders);
+            },
+            function (erFindInboxFolderRequest, aCode, aMsg) {
+                self.checkFolderPathError(erFindInboxFolderRequest, aCode, aMsg);
+            },
+            null);
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    checkFolderPathOk: function _checkFolderPathOk(erFindInboxFolderRequest, folders) {
+        var self = this;
+        for (var i = 0; i < folders.length; i++) {
+            if (folders[i].name == window.arguments[0].name) {
+                this.folderId = folders[i].id;
+                this.folderName = folders[i].name;
+                this.changeKey = folders[i].changeKey;
+
+                //Get Total users and permissions
+                var tmpObject = new erGetFolderPermissionRequest({
+                        user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser"),
+                        mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox"),
+                        serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer"),
+                        folderID: this.folderId,
+                        changeKey: this.changeKey,
+                        actionStart: Date.now()
+                    },
+                    function (erGetFolderPermissionRequest, folderID, changeKey, folderName, delegatee, permissions) {
+                        self.getFolderPermissionOK(erGetFolderPermissionRequest, folderID, changeKey, folderName, delegatee, permissions);
+                    },
+                    function (erGetFolderPermissionRequest, aCode, aMsg) {
+                        self.getFolderPermissionError(erGetFolderPermissionRequest, aCode, aMsg);
+                    },
+                    null);
+                break;
+            }
+        }
+    },
+
+    checkFolderPathError: function _checkFolderPathError(erFindInboxFolderRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("delegateFolder~checkFolderPathError: aCode -  " + aCode + ", aMsg - " + aMsg);
+    },
+
+    refresh: function _refresh() {
+        this.getDelegate();
+    },
+
+    selectedUserEmail: function _selectedUserEmail() {
+        try {
+            var node = this._document.getElementById("delegatee").getSelectedItem(0);
+            var childNodes = node.childNodes;
+            var listName = childNodes[0].getAttribute("label");
+            var regex = /[^()]+/g;
+            var email = listName.match(regex);
+            var listEmail = childNodes[0].getAttribute("value");
+        }
+        catch (e) {}
+
+        return listEmail;
+    },
+
+    showUserPermission: function _resetUserPermission(aEmail) {
+        if (!aEmail) {
+            aEmail = this.selectedUserEmail();
+        }
+        if (!aEmail) {
+            aEmail = this.getEmail();
+        }
+
+        if (!aEmail) {
+            return;
+        }
+
+        for (var index = 0; index < this.delegatesList.length; index++) {
+            if (this.delegatesList[index].emailId == aEmail) {
+                this._document.getElementById('menuPermissionLevel').value = this.delegatesList[index].permissionLevel;
+                this.updatePermissionDetails(this.delegatesList[index].permissions);
+                break;
+            }
+        }
+        this._window.sizeToContent();
+    },
+
+    updateDelegateView: function _updateDelegateView() {
+        var listBox = this._document.getElementById("delegatee");
+        this.emptyList(listBox);
+        for (var index = 0; index < this.delegatesList.length; index++) {
+            var row = this._document.createElement("listitem");
+            var celluser = this._document.createElement("listcell");
+            celluser.setAttribute("label", this.delegatesList[index].name + " (" + this.delegatesList[index].emailId + ")");
+            celluser.setAttribute("value", this.delegatesList[index].emailId);
+            row.appendChild(celluser);
+            var cellperm = this._document.createElement("listcell");
+            cellperm.setAttribute("label", this.delegatesList[index].permissionLevel);
+            cellperm.setAttribute("value", this.delegatesList[index].permissionLevel);
+            row.appendChild(cellperm);
+            listBox.appendChild(row);
+        }
+        this.updatePermissionDetails(this.delegatesList[index].permissions)
+    },
+
+    getCustomPermissions: function _getCustomPermissions() {
+        try {
+            var cancreateitems = this._document.getElementById("cancreateitems").value;
+            var cancreatesubfolders = this._document.getElementById("cancreatesubfolders").value;
+            var isfolderowner = this._document.getElementById("isfolderowner").value;
+            var isfoldervisible = this._document.getElementById("isfoldervisible").value;
+            var isfoldercontact = this._document.getElementById("isfoldercontact").value;
+            var edititems = this._document.getElementById("edititems").value;
+            var deleteitems = this._document.getElementById("deleteitems").value;
+            var readitems = this._document.getElementById("readitems").value;
+        }
+        catch (e) {}
+        return {
+            "canCreateItems": cancreateitems,
+            "canCreateSubFolders": cancreatesubfolders,
+            "isFolderOwner": isfolderowner,
+            "isFolderVisible": isfoldervisible,
+            "isFolderContact": isfoldercontact,
+            "editItems": edititems,
+            "deleteItems": deleteitems,
+            "readItems": readitems
+        };
+    },
+
+    removeDelegate: function _removeDelegate() {
+        var self = this;
+        this.onActionLoad();
+        var email = this.selectedUserEmail();
+        if (!email) {
+            email = this.getEmail();
+        }
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            var existing = false;
+
+            var newDelegatesList = this.cloneList();
+            for (var i = 0; i < this.delegatesList.length; i++) {
+                if (this.delegatesList[i].emailId) {
+                    if (email == this.delegatesList[i].emailId) {
+                        existing = true;
+                        newDelegatesList.splice(i, 1);
+                        continue;
+                    }
+                }
+            }
+
+            var tmpObject = new erUpdateFolderPermissionRequest({
+                    permissionSet: newDelegatesList,
+                    folderId: this.folderId,
+                    changeKey: this.changeKey,
+                    mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox"),
+                    user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser"),
+                    serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer"),
+                },
+                function (erUpdateFolderPermissionRequest, folderId, changeKey) {
+                    self.erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey)
+                },
+                function (erUpdateFolderPermissionRequest, aCode, aMsg) {
+                    self.erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg)
+                },
+                null);
+
+        }
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    onActionLoad: function _onActionLoad() {
+        this._window.sizeToContent();
+        this._document.getElementById("delegateCalendaractionadd").setAttribute("disabled", "true");
+        this._document.getElementById("delegateCalendaractionupdate").setAttribute("disabled", "true");
+        this._document.getElementById("delegateCalendaractiondelete").setAttribute("disabled", "true");
+    },
+
+    onActionLoadEnd: function _onActionLoadEnd() {
+        this._window.sizeToContent();
+        this._document.getElementById("delegateCalendaractionadd").removeAttribute("disabled");
+        this._document.getElementById("delegateCalendaractionupdate").removeAttribute("disabled");
+        this._document.getElementById("delegateCalendaractiondelete").removeAttribute("disabled");
+    },
+
+    emptyList: function emptyList(listId) {
+        var myListBox = listId;
+        var countrow = myListBox.itemCount;
+        while (countrow-- > 0) {
+            myListBox.removeItemAt(0);
+        }
+    },
+
+    addDelegate: function _addDelegate() {
+        var self = this;
+
+        this.onActionLoad();
+        var email = this.getEmail();
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            var existing = false;
+            var newDelegatesList = this.cloneList();
+
+            for (var i = 0; i < this.delegatesList.length; i++) {
+                if (this.delegatesList[i].emailId) {
+                    if (email == this.delegatesList[i].emailId) {
+                        existing = true;
+                        continue;
+                    }
+                }
+            }
+
+            if (existing != true) {
+                var len = newDelegatesList.length;
+                newDelegatesList[len] = {
+                    "emailId": email,
+                    "permissionLevel": this._document.getElementById('menuPermissionLevel').selectedItem.value,
+                    "sid": "",
+                    "permissions": {}
+                };
+
+                newDelegatesList[len].permissionLevel = this._document.getElementById('menuPermissionLevel').selectedItem.value;
+
+                if (newDelegatesList[len].permissionLevel == "Custom") {
+                    newDelegatesList[len].permissions = this.getCustomPermissions();
+                }
+                existing = null;
+            }
+            else {
+                this._window.alert('Already added! do Update');
+                this.onActionLoadEnd();
+                this._window.sizeToContent();
+                return;
+            }
+
+            var tmpObject = new erUpdateFolderPermissionRequest({
+                    permissionSet: newDelegatesList,
+                    folderId: this.folderId,
+                    changeKey: this.changeKey,
+                    mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox"),
+                    user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser"),
+                    serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer"),
+                },
+                function (erUpdateFolderPermissionRequest, folderId, changeKey) {
+                    self.erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey)
+                },
+                function (erUpdateFolderPermissionRequest, aCode, aMsg) {
+                    self.erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg)
+                },
+                null);
+
+        }
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    cloneList: function _cloneList() {
+        return this.delegatesList.slice(0);
+    },
+
+    setPermissionCustom: function _setPermissionCustom() {
+        this._document.getElementById('menuPermissionLevel').value = "Custom";
+    },
+
+    updateDelegate: function _updateDelegate() {
+        var self = this;
+        this.onActionLoad();
+        var email = this.selectedUserEmail();
+        if (!email) {
+            email = this.getEmail();
+        }
+        if (!email) {
+            this._window.alert('Not Valid Email address! ');
+            this.onActionLoadEnd();
+            this._window.sizeToContent();
+        }
+        else {
+            var permissionSet = [];
+            var existing = false;
+            var newDelegatesList = this.cloneList();
+            for (var i = 0; i < this.delegatesList.length; i++) {
+                if (this.delegatesList[i].emailId) {
+                    if (email == this.delegatesList[i].emailId) {
+                        existing = true;
+                        newDelegatesList[i].permissionLevel = this._document.getElementById('menuPermissionLevel').selectedItem.value;
+
+                        if (newDelegatesList[i].permissionLevel == "Custom") {
+                            newDelegatesList[i].permissions = this.getCustomPermissions();
+                        }
+
+                        continue;
+                    }
+                }
+            }
+
+            if (existing != true) {
+                /* permissionSet.push({"primarysmtpaddress":this.getEmail(),
 	   				 	"permissionlevel":this._document.getElementById('menuPermissionLevel').selectedItem.value});
     				*/
-				   	existing = null;  
-				   	this._window.alert('Already not added! do add');
-		    	    this.onActionLoadEnd(); 
-		    		this._window.sizeToContent();
-		    		return; 
-			   }
-			   
-		       var tmpObject = new erUpdateFolderPermissionRequest({ 
-   	   		 		permissionSet : newDelegatesList,
-		            folderId : this.folderId ,
-		            changeKey : this.changeKey ,
-	    	   		mailbox : this.globalFunctions.safeGetCharPref( this.calPrefs, "ecMailbox") ,
-	    	   		user: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecDomain")+"\\"+this.globalFunctions.safeGetCharPref( this.calPrefs, "ecUser"),	 		 
-	    	   		serverUrl: this.globalFunctions.safeGetCharPref( this.calPrefs, "ecServer"), },   
-	 		 	 	function(erUpdateFolderPermissionRequest, folderId,changeKey){self.erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey)},
-	 		 	 	function(erUpdateFolderPermissionRequest, aCode, aMsg){self.erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg)},
-	 		 	 	null );	 
-		        
-	        }
-	 
-		  this.onActionLoadEnd();
-		  this._window.sizeToContent() ;
-	 },
-	  
-	permissionsSelectEvent : function _permissionsSelectEvent(selectedValue) {
-		if(!selectedValue) return;
- 		switch(selectedValue){
-			case "Author": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":false,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"Owned",
-					"deleteItems":"Owned",
-					"readItems":"FullDetails"});
-				break;
-			case "Editor": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":false,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"All",
-					"deleteItems":"All",
-					"readItems":"FullDetails"});
-					break; 
-			case "Reviewer": 
-				this.updatePermissionDetails({"canCreateItems":false,
-					"canCreateSubFolders":false,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"None",
-					"deleteItems":"None",
-					"readItems":"FullDetails"});
-						break;
-			case "None": 
-				this.updatePermissionDetails({"canCreateItems":false,
-					"canCreateSubFolders":false,
-					"isFolderOwner":false,
-					"isFolderVisible":false,
-					"isFolderContact":false,
-					"editItems":"None",
-					"deleteItems":"None",
-					"readItems":"None"});
-					break;
-			case "Owner": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":true,
-					"isFolderOwner":true,
-					"isFolderVisible":true,
-					"isFolderContact":true,
-					"editItems":"All",
-					"deleteItems":"All",
-					"readItems":"FullDetails"});
-					break;
-			case "PublishingEditor": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":true,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"All",
-					"deleteItems":"All",
-					"readItems":"FullDetails"});
-					break;
-			case "PublishingAuthor": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":true,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"Owned",
-					"deleteItems":"Owned",
-					"readItems":"FullDetails"});
-					break;
-			case "NoneditingAuthor": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":false,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"None",
-					"deleteItems":"Owned",
-					"readItems":"FullDetails"});
-					break;
-			case "Contributor": 
-				this.updatePermissionDetails({"canCreateItems":true,
-					"canCreateSubFolders":false,
-					"isFolderOwner":false,
-					"isFolderVisible":true,
-					"isFolderContact":false,
-					"editItems":"None",
-					"deleteItems":"None",
-					"readItems":"None"});
-					break;
-			default: 
-		}        
- 	}, 
- 	
- 	updatePermissionDetails: function _updatePermissionDetails(aPermission){
- 		if(!aPermission){
- 		return;	
- 		}
-	       this._document.getElementById("cancreateitems").value = aPermission.canCreateItems;
-	       this._document.getElementById("cancreatesubfolders").value = aPermission.canCreateSubFolders;
-	       this._document.getElementById("isfolderowner").value = aPermission.isFolderOwner;
-	       this._document.getElementById("isfoldervisible").value = aPermission.isFolderVisible;
-	       this._document.getElementById("isfoldercontact").value = aPermission.isFolderContact;
-	       this._document.getElementById("edititems").value = aPermission.editItems;
-	       this._document.getElementById("deleteitems").value = aPermission.deleteItems;
-	       this._document.getElementById("readitems").value = aPermission.readItems; 
- 	},               
-	 	
-	doCancel:function _doCancel() {
-		this._window.sizeToContent() ;
-	  	this._window.close(); 
-	},
-	
-	infoPopup:function _infoPopup(title, msg) {
-		 var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
-		  var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
-		                      getService(Components.interfaces.nsIWindowWatcher).
-		                      openWindow(null, 'chrome://global/content/alerts/alert.xul',
-		                                  '_blank', 'chrome,titlebar=no,popup=yes', null);
-		  win.arguments = [image,  title, msg, true, ''];
-	}, 
+                existing = null;
+                this._window.alert('Already not added! do add');
+                this.onActionLoadEnd();
+                this._window.sizeToContent();
+                return;
+            }
+
+            var tmpObject = new erUpdateFolderPermissionRequest({
+                    permissionSet: newDelegatesList,
+                    folderId: this.folderId,
+                    changeKey: this.changeKey,
+                    mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox"),
+                    user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser"),
+                    serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer"),
+                },
+                function (erUpdateFolderPermissionRequest, folderId, changeKey) {
+                    self.erUpdateFolderPermissionRequestOK(erUpdateFolderPermissionRequest, folderId, changeKey)
+                },
+                function (erUpdateFolderPermissionRequest, aCode, aMsg) {
+                    self.erUpdateFolderPermissionRequestError(erUpdateFolderPermissionRequest, aCode, aMsg)
+                },
+                null);
+
+        }
+
+        this.onActionLoadEnd();
+        this._window.sizeToContent();
+    },
+
+    permissionsSelectEvent: function _permissionsSelectEvent(selectedValue) {
+        if (!selectedValue) return;
+        switch (selectedValue) {
+        case "Author":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": false,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "Owned",
+                "deleteItems": "Owned",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "Editor":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": false,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "All",
+                "deleteItems": "All",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "Reviewer":
+            this.updatePermissionDetails({
+                "canCreateItems": false,
+                "canCreateSubFolders": false,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "None",
+                "deleteItems": "None",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "None":
+            this.updatePermissionDetails({
+                "canCreateItems": false,
+                "canCreateSubFolders": false,
+                "isFolderOwner": false,
+                "isFolderVisible": false,
+                "isFolderContact": false,
+                "editItems": "None",
+                "deleteItems": "None",
+                "readItems": "None"
+            });
+            break;
+        case "Owner":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": true,
+                "isFolderOwner": true,
+                "isFolderVisible": true,
+                "isFolderContact": true,
+                "editItems": "All",
+                "deleteItems": "All",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "PublishingEditor":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": true,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "All",
+                "deleteItems": "All",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "PublishingAuthor":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": true,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "Owned",
+                "deleteItems": "Owned",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "NoneditingAuthor":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": false,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "None",
+                "deleteItems": "Owned",
+                "readItems": "FullDetails"
+            });
+            break;
+        case "Contributor":
+            this.updatePermissionDetails({
+                "canCreateItems": true,
+                "canCreateSubFolders": false,
+                "isFolderOwner": false,
+                "isFolderVisible": true,
+                "isFolderContact": false,
+                "editItems": "None",
+                "deleteItems": "None",
+                "readItems": "None"
+            });
+            break;
+        default:
+        }
+    },
+
+    updatePermissionDetails: function _updatePermissionDetails(aPermission) {
+        if (!aPermission) {
+            return;
+        }
+        this._document.getElementById("cancreateitems").value = aPermission.canCreateItems;
+        this._document.getElementById("cancreatesubfolders").value = aPermission.canCreateSubFolders;
+        this._document.getElementById("isfolderowner").value = aPermission.isFolderOwner;
+        this._document.getElementById("isfoldervisible").value = aPermission.isFolderVisible;
+        this._document.getElementById("isfoldercontact").value = aPermission.isFolderContact;
+        this._document.getElementById("edititems").value = aPermission.editItems;
+        this._document.getElementById("deleteitems").value = aPermission.deleteItems;
+        this._document.getElementById("readitems").value = aPermission.readItems;
+    },
+
+    doCancel: function _doCancel() {
+        this._window.sizeToContent();
+        this._window.close();
+    },
+
+    infoPopup: function _infoPopup(title, msg) {
+        var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+        var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
+        getService(Components.interfaces.nsIWindowWatcher).
+        openWindow(null, 'chrome://global/content/alerts/alert.xul',
+            '_blank', 'chrome,titlebar=no,popup=yes', null);
+        win.arguments = [image, title, msg, true, ''];
+    },
 };
 
 
 var tmpDelegateFolderSettings = new exchDelegateCalendarSettings(document, window);
-window.addEventListener("load",function(){document.getElementById("folderPropertiesDialog").addEventListener("load",tmpDelegateFolderSettings.onLoad(),false);},false);
+window.addEventListener("load", function () {
+    document.getElementById("folderPropertiesDialog").addEventListener("load", tmpDelegateFolderSettings.onLoad(), false);
+}, false);
diff --git a/chrome/content/ecCalendarCreation.js b/chrome/content/ecCalendarCreation.js
index 5c02fa79..cb0c5cfb 100644
--- a/chrome/content/ecCalendarCreation.js
+++ b/chrome/content/ecCalendarCreation.js
@@ -38,189 +38,184 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-function exchCalendarCreation(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchCalendarCreation(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchCalendarCreation.prototype = {
 
-	oldLocationTextBox: "",
-	oldNextPage: "",
-	oldCache: false,
-	oldOnPageAdvanced: "",
-
-	firstTime: true,
-
-	createPrefs : Cc["@mozilla.org/preferences-service;1"]
-                    			.getService(Ci.nsIPrefService)
-		    			.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.createcalendar."),
-
-	doRadioExchangeCalendar: function _doRadioExchangeCalendar(type)
-	{
-		if (this.firstTime) {
-			// Get the next page to change how it should advance.
-			let aCustomizePage = this._document.getElementById('calendar-wizard').getPageById("customizePage");
-			this.oldNextPage = aCustomizePage.getAttribute("next");
-			this.oldOnPageAdvanced = aCustomizePage.getAttribute("onpageadvanced");
-
-			this.firstTime = false;		
-		}
-
-		if (type == "exchangecalendar") {
-			
-			// Get the next page to set back new values.
-			let aCustomizePage = this._document.getElementById('calendar-wizard').getPageById("customizePage");
-			aCustomizePage.removeAttribute("next");
-			aCustomizePage.removeAttribute("onpageadvanced"); 
-			aCustomizePage.setAttribute( "next", "exchWebService_exchange1");
-			aCustomizePage.setAttribute( "onpageadvanced", "return true;");
-
-			this.oldLocationTextBox = this._document.getElementById("calendar-uri").value;
-			this.oldCache = this._document.getElementById("cache").checked;
-
-			this._document.getElementById("calendar-uri").value = "https://auto/"+this.globalFunctions.getUUID();
-			this._document.getElementById("calendar-uri").setAttribute("disabled",true);
-			
-			this._document.getElementById("cache").parentNode.hidden = true;
-			this._document.getElementById("cache").checked = false;
-			var temp = this._document.getElementById("cache").parentNode.parentNode;
-
-			if(this._document.getElementById("exchange-cache-row")){
-				this._document.getElementById("exchange-cache-row").hidden = false;
-			}  
-			tmpSettingsOverlay.exchWebServicesCheckRequired();
-
-		}
-		else {
-			this._document.getElementById("calendar-uri").value = "";
-			this._document.getElementById("calendar-uri").removeAttribute("disabled",false);
-
-			// Get the next page to set back  how it should advance.
-			var aCustomizePage = this._document.getElementById('calendar-wizard').getPageById("customizePage");
-			aCustomizePage.setAttribute( "next", this.oldNextPage);
-			aCustomizePage.setAttribute( "onpageadvanced", this.oldOnPageAdvanced);
-
-			this._document.getElementById("cache").parentNode.hidden = false;
-			this._document.getElementById("cache").checked = this.oldCache;
-			
-			if(this._document.getElementById("exchange-cache-row")){
-				this._document.getElementById("exchange-cache-row").hidden = true; 
-			}
-			 		onSelectProvider(type); 
-		}
-		
-	},
-
-	initExchange1: function _initExchange1()
-	{
-		this.createPrefs.deleteBranch("");
-
-		var selItem = this._document.getElementById("email-identity-menulist").selectedItem;
-		if (selItem) {
-			var identity = selItem.getAttribute("value");
-			if (identity != "none") {
-				var identityPrefs = Cc["@mozilla.org/preferences-service;1"]
-			            .getService(Ci.nsIPrefService)
-				    .getBranch("mail.identity."+identity+".");
-
-				this._document.getElementById("exchWebService_mailbox").value = identityPrefs.getCharPref("useremail");
-				tmpSettingsOverlay.exchWebServicesInitMailbox(this._document.getElementById("exchWebService_mailbox").value);
-				this.createPrefs.setCharPref("mailbox", this._document.getElementById("exchWebService_mailbox").value);
-			}
-			else {
-				this._document.getElementById("exchWebService_mailbox").value = "";
-			}
-		}
-		else {
-			this.globalFunctions.LOG("no item selected");
-		}
-
-
-		this._document.getElementById("exchWebService_folderpath").value = "/";
-
-		tmpSettingsOverlay.exchWebServicesCheckRequired();
-	
-	},
-
-	/*
-	 * saveSettings: save calendar settings after calendar wizard completed
-	 *
-	 * Lightning original code to save calendar can be found in:
-	 * comm-central/calendar/resources/content/calendarCreation.js
-	 */
-	saveSettings: function _saveSettings()
-	{
-		this.globalFunctions.LOG("saveSettings Going to create the calendar in prefs.js");
-
-		// Calculate the new calendar.id and properties
-		let newCalId = this.globalFunctions.getUUID();
-		let newCalName = this._document.getElementById("calendar-name").value;
-		let newCalColor = this._document.getElementById("calendar-color").value;
-
-		// Save settings in dialog to new cal id.
-		tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
-
-		// Need to save the useOfflineCache preference separetly because it is not part of the main.
-		this.prefs = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefService)
-			.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+newCalId+".");
-		this.prefs.setBoolPref("useOfflineCache", this._document.getElementById("exchange-cache").checked);
-		this.prefs.setIntPref("exchangePrefVersion", 1);
-
-		// We create a new URI for this calendar which will contain the calendar.id
-		var ioService = Cc["@mozilla.org/network/io-service;1"]
-				.getService(Ci.nsIIOService);
-		var tmpURI = ioService.newURI("https://auto/"+newCalId, null, null);
-
-		// Register calendar to global settings
-		var calPrefs = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefService)
-			.getBranch("calendar.registry."+newCalId+".");
-		calPrefs.setCharPref("name", newCalName);
-
-		// Create the new calendar object
-		// Should be synced with Lightning doCreateCalendar() code
-		var calManager = Cc["@mozilla.org/calendar/manager;1"]
-			.getService(Ci.calICalendarManager);
-
-		var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
-
-		newCal.id = newCalId;
-		newCal.name = newCalName;
-
-		newCal.setProperty("color", newCalColor);
-
-		newCal.setProperty("cache.enabled", false);
-
-		if (!this._document.getElementById("fire-alarms").checked) {
-			newCal.setProperty("suppressAlarms", true);
-		}
-		// End of sync
-
-		var emailCalendarIdentity = this._document.getElementById("email-identity-menulist").selectedItem;
-
-		if (emailCalendarIdentity) {
-			var identity = emailCalendarIdentity.getAttribute("value");
-		}
-		else {
-			var identity = "";
-		}
-
-		newCal.setProperty("imip.identity.key", identity); 
-
-
-		Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefService).savePrefFile(null);
-
-		// Finally register completly the new calendar
-		calManager.registerCalendar(newCal);
-	},
+    oldLocationTextBox: "",
+    oldNextPage: "",
+    oldCache: false,
+    oldOnPageAdvanced: "",
+
+    firstTime: true,
+
+    createPrefs: Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService)
+        .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.createcalendar."),
+
+    doRadioExchangeCalendar: function _doRadioExchangeCalendar(type) {
+        if (this.firstTime) {
+            // Get the next page to change how it should advance.
+            let aCustomizePage = this._document.getElementById('calendar-wizard').getPageById("customizePage");
+            this.oldNextPage = aCustomizePage.getAttribute("next");
+            this.oldOnPageAdvanced = aCustomizePage.getAttribute("onpageadvanced");
+
+            this.firstTime = false;
+        }
+
+        if (type == "exchangecalendar") {
+
+            // Get the next page to set back new values.
+            let aCustomizePage = this._document.getElementById('calendar-wizard').getPageById("customizePage");
+            aCustomizePage.removeAttribute("next");
+            aCustomizePage.removeAttribute("onpageadvanced");
+            aCustomizePage.setAttribute("next", "exchWebService_exchange1");
+            aCustomizePage.setAttribute("onpageadvanced", "return true;");
+
+            this.oldLocationTextBox = this._document.getElementById("calendar-uri").value;
+            this.oldCache = this._document.getElementById("cache").checked;
+
+            this._document.getElementById("calendar-uri").value = "https://auto/" + this.globalFunctions.getUUID();
+            this._document.getElementById("calendar-uri").setAttribute("disabled", true);
+
+            this._document.getElementById("cache").parentNode.hidden = true;
+            this._document.getElementById("cache").checked = false;
+            var temp = this._document.getElementById("cache").parentNode.parentNode;
+
+            if (this._document.getElementById("exchange-cache-row")) {
+                this._document.getElementById("exchange-cache-row").hidden = false;
+            }
+            tmpSettingsOverlay.exchWebServicesCheckRequired();
+
+        }
+        else {
+            this._document.getElementById("calendar-uri").value = "";
+            this._document.getElementById("calendar-uri").removeAttribute("disabled", false);
+
+            // Get the next page to set back  how it should advance.
+            var aCustomizePage = this._document.getElementById('calendar-wizard').getPageById("customizePage");
+            aCustomizePage.setAttribute("next", this.oldNextPage);
+            aCustomizePage.setAttribute("onpageadvanced", this.oldOnPageAdvanced);
+
+            this._document.getElementById("cache").parentNode.hidden = false;
+            this._document.getElementById("cache").checked = this.oldCache;
+
+            if (this._document.getElementById("exchange-cache-row")) {
+                this._document.getElementById("exchange-cache-row").hidden = true;
+            }
+            onSelectProvider(type);
+        }
+
+    },
+
+    initExchange1: function _initExchange1() {
+        this.createPrefs.deleteBranch("");
+
+        var selItem = this._document.getElementById("email-identity-menulist").selectedItem;
+        if (selItem) {
+            var identity = selItem.getAttribute("value");
+            if (identity != "none") {
+                var identityPrefs = Cc["@mozilla.org/preferences-service;1"]
+                    .getService(Ci.nsIPrefService)
+                    .getBranch("mail.identity." + identity + ".");
+
+                this._document.getElementById("exchWebService_mailbox").value = identityPrefs.getCharPref("useremail");
+                tmpSettingsOverlay.exchWebServicesInitMailbox(this._document.getElementById("exchWebService_mailbox").value);
+                this.createPrefs.setCharPref("mailbox", this._document.getElementById("exchWebService_mailbox").value);
+            }
+            else {
+                this._document.getElementById("exchWebService_mailbox").value = "";
+            }
+        }
+        else {
+            this.globalFunctions.LOG("no item selected");
+        }
+
+
+        this._document.getElementById("exchWebService_folderpath").value = "/";
+
+        tmpSettingsOverlay.exchWebServicesCheckRequired();
+
+    },
+
+    /*
+     * saveSettings: save calendar settings after calendar wizard completed
+     *
+     * Lightning original code to save calendar can be found in:
+     * comm-central/calendar/resources/content/calendarCreation.js
+     */
+    saveSettings: function _saveSettings() {
+        this.globalFunctions.LOG("saveSettings Going to create the calendar in prefs.js");
+
+        // Calculate the new calendar.id and properties
+        let newCalId = this.globalFunctions.getUUID();
+        let newCalName = this._document.getElementById("calendar-name").value;
+        let newCalColor = this._document.getElementById("calendar-color").value;
+
+        // Save settings in dialog to new cal id.
+        tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
+
+        // Need to save the useOfflineCache preference separetly because it is not part of the main.
+        this.prefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + newCalId + ".");
+        this.prefs.setBoolPref("useOfflineCache", this._document.getElementById("exchange-cache").checked);
+        this.prefs.setIntPref("exchangePrefVersion", 1);
+
+        // We create a new URI for this calendar which will contain the calendar.id
+        var ioService = Cc["@mozilla.org/network/io-service;1"]
+            .getService(Ci.nsIIOService);
+        var tmpURI = ioService.newURI("https://auto/" + newCalId, null, null);
+
+        // Register calendar to global settings
+        var calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry." + newCalId + ".");
+        calPrefs.setCharPref("name", newCalName);
+
+        // Create the new calendar object
+        // Should be synced with Lightning doCreateCalendar() code
+        var calManager = Cc["@mozilla.org/calendar/manager;1"]
+            .getService(Ci.calICalendarManager);
+
+        var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
+
+        newCal.id = newCalId;
+        newCal.name = newCalName;
+
+        newCal.setProperty("color", newCalColor);
+
+        newCal.setProperty("cache.enabled", false);
+
+        if (!this._document.getElementById("fire-alarms").checked) {
+            newCal.setProperty("suppressAlarms", true);
+        }
+        // End of sync
+
+        var emailCalendarIdentity = this._document.getElementById("email-identity-menulist").selectedItem;
+
+        if (emailCalendarIdentity) {
+            var identity = emailCalendarIdentity.getAttribute("value");
+        }
+        else {
+            var identity = "";
+        }
+
+        newCal.setProperty("imip.identity.key", identity);
+
+
+        Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService).savePrefFile(null);
+
+        // Finally register completly the new calendar
+        calManager.registerCalendar(newCal);
+    },
 }
 
 var tmpCalendarCreation = new exchCalendarCreation(document, window);
-
diff --git a/chrome/content/exchangeCloneSettings.js b/chrome/content/exchangeCloneSettings.js
index 5df6be82..c2a022b1 100644
--- a/chrome/content/exchangeCloneSettings.js
+++ b/chrome/content/exchangeCloneSettings.js
@@ -24,73 +24,68 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-function exchExchangeCloneSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchExchangeCloneSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchExchangeCloneSettings.prototype = {
 
-	checkRequired: function _checkRequired()
-	{
-	    let canAdvance = true;
-	    let vbox = this._document.getElementById('exchWebService-exchange-settings');
-	    if (vbox) {
-		let eList = vbox.getElementsByAttribute('required', 'true');
-		for (let i = 0; i < eList.length && canAdvance; ++i) {
-		    canAdvance = (eList[i].value != "");
-		}
-
-		if (canAdvance) {
-			this._document.getElementById("exchWebService_CloneSettings_dialog").buttons = "accept,cancel";
-		}
-		else {
-			this._document.getElementById("exchWebService_CloneSettings_dialog").buttons = "cancel";
-		}
-	    }
-
-	},
-
-	onLoad: function _onLoad()
-	{
-		var calId = this._window.arguments[0].calendar.id;
-		this._document.getElementById("exchWebService_clone_description").value = this._window.arguments[0].calendar.name+" (copy)";
-		tmpSettingsOverlay.exchWebServicesLoadExchangeSettingsByCalId(calId);
-	},
-
-	onSave: function _onSave()
-	{
-		var oldCalId = this._window.arguments[0].calendar.id;
-
-		// Clone the Calendar settings to a new cal id.
-		var newCalId = this.globalFunctions.copyCalendarSettings(oldCalId);
-
-		// Save settings in dialog to new cal id.
-		tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
-
-		// Save the description/name for the calendar and create a new unique uri.
-		var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+newCalId+".");
-
-		toCalPrefs.setCharPref("name", this._document.getElementById("exchWebService_clone_description").value);
-		toCalPrefs.setCharPref("uri", "https://auto/"+newCalId);
-
-		// Store the new cal id for the calling process of this dialog.
-		this._window.arguments[0].newCalId = newCalId;
-
-		this._window.arguments[0].answer = "saved";
-
-		Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService).savePrefFile(null);
-		return true;
-	},
+    checkRequired: function _checkRequired() {
+        let canAdvance = true;
+        let vbox = this._document.getElementById('exchWebService-exchange-settings');
+        if (vbox) {
+            let eList = vbox.getElementsByAttribute('required', 'true');
+            for (let i = 0; i < eList.length && canAdvance; ++i) {
+                canAdvance = (eList[i].value != "");
+            }
+
+            if (canAdvance) {
+                this._document.getElementById("exchWebService_CloneSettings_dialog").buttons = "accept,cancel";
+            }
+            else {
+                this._document.getElementById("exchWebService_CloneSettings_dialog").buttons = "cancel";
+            }
+        }
+
+    },
+
+    onLoad: function _onLoad() {
+        var calId = this._window.arguments[0].calendar.id;
+        this._document.getElementById("exchWebService_clone_description").value = this._window.arguments[0].calendar.name + " (copy)";
+        tmpSettingsOverlay.exchWebServicesLoadExchangeSettingsByCalId(calId);
+    },
+
+    onSave: function _onSave() {
+        var oldCalId = this._window.arguments[0].calendar.id;
+
+        // Clone the Calendar settings to a new cal id.
+        var newCalId = this.globalFunctions.copyCalendarSettings(oldCalId);
+
+        // Save settings in dialog to new cal id.
+        tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
+
+        // Save the description/name for the calendar and create a new unique uri.
+        var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry." + newCalId + ".");
+
+        toCalPrefs.setCharPref("name", this._document.getElementById("exchWebService_clone_description").value);
+        toCalPrefs.setCharPref("uri", "https://auto/" + newCalId);
+
+        // Store the new cal id for the calling process of this dialog.
+        this._window.arguments[0].newCalId = newCalId;
+
+        this._window.arguments[0].answer = "saved";
+
+        Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService).savePrefFile(null);
+        return true;
+    },
 
 }
 
 var tmpExchangeCloneSettings = new exchExchangeCloneSettings(document, window);
-
diff --git a/chrome/content/exchangeSettings.js b/chrome/content/exchangeSettings.js
index 5b114f82..7c7a6b27 100644
--- a/chrome/content/exchangeSettings.js
+++ b/chrome/content/exchangeSettings.js
@@ -42,382 +42,378 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 
 function exchWebService_permissionsPropertiesView(aProperties) {
 
-	this.properties = aProperties;
-				
+    this.properties = aProperties;
+
 };
 
 exchWebService_permissionsPropertiesView.prototype = {
 
-  treeBox: null,  
-  
-  get rowCount()                     { return this.properties.length; },  
-  setTree: function(treeBox)         { this.treeBox = treeBox; },  
-
-	getCellText: function(idx, column) 
-	{
-		switch (column.id) {
-			case "exchWebService_permissonTree_userId":
-				if (this.properties[idx].UserId) {
-					if (this.properties[idx].UserId.DistinguishedUser) {
-						return this.properties[idx].UserId.DistinguishedUser;
-					}
-					if (this.properties[idx].UserId.DisplayName) {
-						return this.properties[idx].UserId.DisplayName;
-					}
-				}
-
-				return "Unknown";
-
-				break;
-			case "exchWebService_permissonTree_email":
-				if (this.properties[idx].UserId) {
-					if (this.properties[idx].UserId.PrimarySmtpAddress) {
-						return this.properties[idx].UserId.PrimarySmtpAddress;
-					}
-				}
-
-				return "";
-
-				break;
-		}
-		return "";
-	},  
-
-  isContainer: function(idx)         { return false; },  
-  isContainerOpen: function(idx)     { return false; },  
-  isContainerEmpty: function(idx)    { return false; },  
-  isSeparator: function(idx)         { return false; },  
-  isSorted: function()               { return false; },  
-  isEditable: function(idx, column)  { return false; },  
-  
-	getParentIndex: function _getParentIndex(idx)
-	{
-		return -1;
-	},  
-
-	getLevel: function _getLevel(idx) 
-	{
-		return 0;
-	},  
-
-	hasNextSibling: function _hasNextSibling(idx, after)
-	{
-		if (idx < this.properties.length - 1) return true;
-
-		return false;  
-	}, 
- 
-	openFolder: function(idx) 
-	{
-	},
-
-	toggleOpenState: function _toggleOpenState(idx) 
-	{
-	},  
-  
-	getImageSrc: function(idx, column) 
-	{
-	},
-  
-  getProgressMode : function(idx,column) {},  
-  getCellValue: function(idx, column) {},  
-  cycleHeader: function(col, elem) {},  
-  selectionChanged: function() {},  
-  cycleCell: function(idx, column) {},  
-  performAction: function(action) {},  
-  performActionOnCell: function(action, index, column) {},  
-  getRowProperties: function(idx, prop) {},  
-  getCellProperties: function(idx, column, prop) {},  
-  getColumnProperties: function(column, element, prop) {}, 
-
-	getPermissions: function _getPermissions(aIndex)
-	{
-		return this.properties[aIndex];
-	}, 
+    treeBox: null,
+
+    get rowCount() {
+        return this.properties.length;
+    },
+    setTree: function (treeBox) {
+        this.treeBox = treeBox;
+    },
+
+    getCellText: function (idx, column) {
+        switch (column.id) {
+        case "exchWebService_permissonTree_userId":
+            if (this.properties[idx].UserId) {
+                if (this.properties[idx].UserId.DistinguishedUser) {
+                    return this.properties[idx].UserId.DistinguishedUser;
+                }
+                if (this.properties[idx].UserId.DisplayName) {
+                    return this.properties[idx].UserId.DisplayName;
+                }
+            }
+
+            return "Unknown";
+
+            break;
+        case "exchWebService_permissonTree_email":
+            if (this.properties[idx].UserId) {
+                if (this.properties[idx].UserId.PrimarySmtpAddress) {
+                    return this.properties[idx].UserId.PrimarySmtpAddress;
+                }
+            }
+
+            return "";
+
+            break;
+        }
+        return "";
+    },
+
+    isContainer: function (idx) {
+        return false;
+    },
+    isContainerOpen: function (idx) {
+        return false;
+    },
+    isContainerEmpty: function (idx) {
+        return false;
+    },
+    isSeparator: function (idx) {
+        return false;
+    },
+    isSorted: function () {
+        return false;
+    },
+    isEditable: function (idx, column) {
+        return false;
+    },
+
+    getParentIndex: function _getParentIndex(idx) {
+        return -1;
+    },
+
+    getLevel: function _getLevel(idx) {
+        return 0;
+    },
+
+    hasNextSibling: function _hasNextSibling(idx, after) {
+        if (idx < this.properties.length - 1) return true;
+
+        return false;
+    },
+
+    openFolder: function (idx) {},
+
+    toggleOpenState: function _toggleOpenState(idx) {},
+
+    getImageSrc: function (idx, column) {},
+
+    getProgressMode: function (idx, column) {},
+    getCellValue: function (idx, column) {},
+    cycleHeader: function (col, elem) {},
+    selectionChanged: function () {},
+    cycleCell: function (idx, column) {},
+    performAction: function (action) {},
+    performActionOnCell: function (action, index, column) {},
+    getRowProperties: function (idx, prop) {},
+    getCellProperties: function (idx, column, prop) {},
+    getColumnProperties: function (column, element, prop) {},
+
+    getPermissions: function _getPermissions(aIndex) {
+        return this.properties[aIndex];
+    },
 
 };
 
-function exchExchangeSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchExchangeSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchExchangeSettings.prototype = {
 
-	permissionsPropertiesTreeView: null,
-
-	doOnSelectUserId: function _doOnSelectUserId(aTree)
-	{
-		var treeIndex = aTree.currentIndex;
-
-		var permissions = this.permissionsPropertiesTreeView.getPermissions(treeIndex);
-
-		if (permissions) {
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-CanCreateItems").value = permissions.CanCreateItems;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-CanCreateSubFolders").value = permissions.CanCreateSubFolders;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-IsFolderOwner").value = permissions.IsFolderOwner;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-IsFolderVisible").value = permissions.IsFolderVisible;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-IsFolderContact").value = permissions.IsFolderContact;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-EditItems").value = permissions.EditItems;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-DeleteItems").value = permissions.DeleteItems;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-ReadItems").value = permissions.ReadItems;
-			this._document.getElementById("exchWebServices-UserId-EffectiveRights-CalendarPermissionLevel").value = permissions.CalendarPermissionLevel;
-		}
-	},
-
-	checkRequired: function _checkRequired()
-	{
-	    let canAdvance = true;
-	    let vbox = this._document.getElementById('exchWebService-exchange-settings');
-	    if (vbox) {
-		let eList = vbox.getElementsByAttribute('required', 'true');
-		for (let i = 0; i < eList.length && canAdvance; ++i) {
-		    canAdvance = (eList[i].value != "");
-		}
-
-		if (canAdvance) {
-			this._document.getElementById("exchWebService_ExchangeSettings_dialog").buttons = "accept,cancel";
-		}
-		else {
-			this._document.getElementById("exchWebService_ExchangeSettings_dialog").buttons = "cancel";
-		}
-	    }
-
-		this._window.sizeToContent() ;
-
-	},
-
-	permissionObject: function _permissionObject(aPermission)
-	{
-		for each (var item in aPermission.XPath('/*')) {
-			if (item.tagName == "UserId") {
-				for each( var userProp in item.XPath('/*')) {
-					if (!this[item.tagName]) {
-						this[item.tagName] = {};
-					}
-					this[item.tagName][userProp.tagName] = userProp.value;
-				}
-			}
-			else {
-				this[item.tagName] = item.value;
-			}
-		}
-	},
-
-	showFolderProprties: function _showFolderProprties(aProperties)
-	{
-		this.globalFunctions.LOG("showFolderProprties:"+aProperties.toString());
-		var serverVersionInfo = aProperties.XPath('/s:Header/ServerVersionInfo')[0];
-		this._document.getElementById("exchWebServices-ServerVersionInfo").value = serverVersionInfo.getAttribute('Version') + " ("+serverVersionInfo.getAttribute('MajorVersion')+"."+serverVersionInfo.getAttribute('MinorVersion')+"."+serverVersionInfo.getAttribute('MajorBuildNumber')+"."+serverVersionInfo.getAttribute('MinorBuildNumber')+")";
-
-		var propType = "calendar";
-		var calendarFolder = aProperties.XPath('/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:CalendarFolder');
-		if (calendarFolder.length > 0) {
-			var calendarFolder = calendarFolder[0];
-			var calendarPermissions = calendarFolder.XPath('/t:PermissionSet/t:CalendarPermissions/t:CalendarPermission');
-		}
-		else {
-			var calendarFolder = aProperties.XPath('/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:TasksFolder')[0];
-			var calendarPermissions = calendarFolder.XPath('/t:PermissionSet/*/t:Permission');
-			propType = "task";
-		}
-
-		this._document.getElementById("exchWebServices-CalendarFolder-DisplayName").value = calendarFolder.getTagValue('t:DisplayName');
-		this._document.getElementById("exchWebServices-CalendarFolder-TotalCount").value = calendarFolder.getTagValue('t:TotalCount');
-		this._document.getElementById("exchWebServices-CalendarFolder-ChildFolderCount").value = calendarFolder.getTagValue('t:ChildFolderCount');
-
-		var effectiveRights = calendarFolder.XPath('t:EffectiveRights')[0];
-		this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-CreateAssociated").value = effectiveRights.getTagValue('t:CreateAssociated');
-		this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-CreateContents").value = effectiveRights.getTagValue('t:CreateContents');
-		this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-CreateHierarchy").value = effectiveRights.getTagValue('t:CreateHierarchy');
-		this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-Delete").value = effectiveRights.getTagValue('t:Delete');
-		this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-Modify").value = effectiveRights.getTagValue('t:Modify');
-		this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-Read").value = effectiveRights.getTagValue('t:Read');
-
-		// PermissionSet
-		var permissions = new Array;
-		for each(var permission in calendarPermissions) {
-			permissions.push(new this.permissionObject(permission));
-		}
-
-		try {
-			this.permissionsPropertiesTreeView = new exchWebService_permissionsPropertiesView(permissions);
-		} catch(err) { this.globalFunctions.LOG("ERROR:"+err);}
-
-		this._document.getElementById('exchWebServicesPermissionsTree').treeBoxObject.view = this.permissionsPropertiesTreeView;
-	},
-
-	onLoad: function _onLoad()
-	{
-		var calId = this._window.arguments[0].calendar.id;
-		this._document.getElementById("exchWebService_ExchangeSettings-title").value = this._window.arguments[0].calendar.name;
-		tmpSettingsOverlay.exchWebServicesLoadExchangeSettingsByCalId(calId);
-
-		// Load meeting request settings.
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");		
-		this._document.getElementById("exchWebService-poll-calendar-interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecCalendarPollInterval", 60);
-		this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingdeletecancelleditems", true);
-		this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingmarkeventtentative", false);
-		
-		this._document.getElementById("exchWebService-syncMailItems-Interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "syncMailItems.Interval", 15);
-		this._document.getElementById("exchWebService-syncMailItems-active").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "mailsync.active",false);
-		this._document.getElementById("exchWebService-followup-deactivtate").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "followup.task.deactivate",false);
-
-		
-		if ( this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecFolderbase", "") == "calendar" ){ 
-			this._document.getElementById("exchWebService-mail-properties-calendar").hidden = false;
-			this._document.getElementById("exchWebService-mail-properties-task").hidden = true; 
-		} 
-		else{
-			this._document.getElementById("exchWebService-mail-properties-calendar").hidden = true;
-			this._document.getElementById("exchWebService-mail-properties-task").hidden = false; 
-		}
-		
-/*
-		this._document.getElementById("exchWebService-poll-inbox").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecPollInbox", true);
-		this._document.getElementById("exchWebService-poll-inbox-interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecPollInboxInterval", 180);
-		this._document.getElementById("exchWebService-autorespond-meetingrequest").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRespondMeetingRequest", false); 
-		this._document.getElementById("exchWebService-autorespond-answer").value = this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecAutoRespondAnswer", "TENTATIVE"); 
-
-		this._document.getElementById("exchWebService-autoremove-invitation_cancellation1").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRemoveInvitationCancellation1", false); 
-		this._document.getElementById("exchWebService-autoremove-invitation_cancellation2").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRemoveInvitationCancellation2", false); 
-
-		this._document.getElementById("exchWebService-autoremove-invitation_response1").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRemoveInvitationResponse1", true); 
-
-		this._document.getElementById("exchWebService-doautorespond-meetingrequest-message").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecSendAutoRespondMeetingRequestMessage", false); 
-		this._document.getElementById("exchWebService-autorespond-meetingrequest-message").value = this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecAutoRespondMeetingRequestMessage", ""); 
-*/
-		this.checkFolderSettings();
-
-		this._document.getElementById("exchWebService_folderbaserow").hidden = (tmpSettingsOverlay.exchWebServicesgFolderIdOfShare != "");
-		this._document.getElementById("exchWebService_folderpathrow").hidden = (tmpSettingsOverlay.exchWebServicesgFolderIdOfShare != "");
-		this._document.getElementById("exchWebServices-SharedFolderID").hidden = true;
-
-		if (this._window.arguments[0].calendar.getProperty("exchWebService.getFolderProperties")) {
-			var folderProperties = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
-						       .createInstance(Ci.mivIxml2jxon);
-			folderProperties.processXMLString(this._window.arguments[0].calendar.getProperty("exchWebService.getFolderProperties"), 0, null);
-			this.showFolderProprties(folderProperties);
-		}
-		else {
-			this._document.getElementById("exchWebService-folderproperties-xml").value = "not found";
-			this._document.getElementById("exchWebService_folderbaserow").hidden = true;
-			this._document.getElementById("exchWebService_folderpathrow").hidden = true;
-			this._document.getElementById("exchWebServices-UserAvailability").hidden = false;
-		}
-
-		if (this._window) {
-			this._window.sizeToContent();
-		}
-	},
-
-	onSave: function _onSave()
-	{
-		var calId = this._window.arguments[0].calendar.id;
-		var aCalendar = this._window.arguments[0].calendar;
-		tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(calId);
-
-		// Save meeting request settings.
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");
-
-		this.checkFolderSettings();
-		
-		if ( this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked != this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingdeletecancelleditems",null) ){  
-			exchWebServicesCalPrefs.setBoolPref("ecautoprocessingdeletecancelleditems", this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked);
-		}
-		if ( this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked != this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingmarkeventtentative",null) ) {  
-			exchWebServicesCalPrefs.setBoolPref("ecautoprocessingmarkeventtentative", this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked);
-		} 
-		 
-		this.doAutoProcessing();
-		
-		if ( this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecFolderbase", "") == "calendar" ){ 
-			exchWebServicesCalPrefs.setIntPref("syncMailItems.Interval", this._document.getElementById("exchWebService-syncMailItems-Interval").value);
-			exchWebServicesCalPrefs.setBoolPref("mailsync.active", this._document.getElementById("exchWebService-syncMailItems-active").checked); 
-		}
-		else{
-			//Add items  releted to Task here these will be taken only when task calendar changes
-			exchWebServicesCalPrefs.setBoolPref("followup.task.deactivate", this._document.getElementById("exchWebService-followup-deactivtate").checked); 
- 		}
-		
-		//exchWebServicesCalPrefs.setBoolPref("ecPollInbox", this._document.getElementById("exchWebService-poll-inbox").checked); 
-
-		exchWebServicesCalPrefs.setIntPref("ecCalendarPollInterval", this._document.getElementById("exchWebService-poll-calendar-interval").value);
-		//exchWebServicesCalPrefs.setIntPref("ecPollInboxInterval", this._document.getElementById("exchWebService-poll-inbox-interval").value); 
-		//exchWebServicesCalPrefs.setBoolPref("ecAutoRespondMeetingRequest", this._document.getElementById("exchWebService-autorespond-meetingrequest").checked); 
-		//exchWebServicesCalPrefs.setCharPref("ecAutoRespondAnswer", this._document.getElementById("exchWebService-autorespond-answer").value); 
-
-		//exchWebServicesCalPrefs.setBoolPref("ecAutoRemoveInvitationCancellation1", this._document.getElementById("exchWebService-autoremove-invitation_cancellation1").checked); 
-		//exchWebServicesCalPrefs.setBoolPref("ecAutoRemoveInvitationCancellation2", this._document.getElementById("exchWebService-autoremove-invitation_cancellation2").checked); 
-
-		//exchWebServicesCalPrefs.setBoolPref("ecAutoRemoveInvitationResponse1", this._document.getElementById("exchWebService-autoremove-invitation_response1").checked); 
-
-		//exchWebServicesCalPrefs.setBoolPref("ecSendAutoRespondMeetingRequestMessage", this._document.getElementById("exchWebService-doautorespond-meetingrequest-message").checked); 
-		//exchWebServicesCalPrefs.setCharPref("ecAutoRespondMeetingRequestMessage", this._document.getElementById("exchWebService-autorespond-meetingrequest-message").value); 
-
-		this._window.arguments[0].answer = "saved";
-
-		var observerService = Cc["@mozilla.org/observer-service;1"]  
-			                  .getService(Ci.nsIObserverService);
-
-		observerService.notifyObservers(this, "onCalReset", calId);  
-
-		Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService).savePrefFile(null);
-		return true;
-	},
-
-	checkFolderSettings: function _checkFolderSettings()
-	{
-/*		if ((this._document.getElementById("exchWebService_folderbase").value != "calendar") ||
-		    (this._document.getElementById("exchWebService_folderpath").value != "/") ||
-		    (!this._window.arguments[0].calendar.getProperty("exchWebService.getFolderProperties"))) {
-			// Disable inbox polling.
-			this._document.getElementById("exchWebService-poll-inbox").checked = false;
-			this._document.getElementById("vbox-exchWebService-meetingrequestsettings").hidden = true;
-			this._document.getElementById("vbox-exchWebService-nomeetingrequestsettings").hidden = false;
-		}
-		else {
-			this._document.getElementById("vbox-exchWebService-meetingrequestsettings").hidden = false;
-			this._document.getElementById("vbox-exchWebService-nomeetingrequestsettings").hidden = true;
-		}
-
-		this._document.getElementById("exchWebService-poll-inbox-interval").disabled = (!this._document.getElementById("exchWebService-poll-inbox").checked);
-
-		this._document.getElementById("exchWebService-autorespond-answer").disabled = (!this._document.getElementById("exchWebService-autorespond-meetingrequest").checked);
-		this._document.getElementById("exchWebService-doautorespond-meetingrequest-message").disabled = (!this._document.getElementById("exchWebService-autorespond-meetingrequest").checked);
-		this._document.getElementById("exchWebService-autorespond-meetingrequest-message").disabled = (!this._document.getElementById("exchWebService-autorespond-meetingrequest").checked);
-*/
-		this._window.sizeToContent() ;
-	},
-
-	doAutoProcessing: function _doAutoProcessing()
-	{   
-		this._window.sizeToContent() ;
-	},
-
-	doTabChanged: function _doTabChanged(aTabs)
-	{
-		this.checkFolderSettings();
-	},
-
-	doPollInboxChanged: function _doPollInboxChanged(aCheckbox)
-	{
-		this.checkFolderSettings();
-	},
-
-	doAutoRespondChanged: function doAutoRespondChanged(aCheckbox)
-	{
-		this.checkFolderSettings();
-	},
+    permissionsPropertiesTreeView: null,
+
+    doOnSelectUserId: function _doOnSelectUserId(aTree) {
+        var treeIndex = aTree.currentIndex;
+
+        var permissions = this.permissionsPropertiesTreeView.getPermissions(treeIndex);
+
+        if (permissions) {
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-CanCreateItems").value = permissions.CanCreateItems;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-CanCreateSubFolders").value = permissions.CanCreateSubFolders;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-IsFolderOwner").value = permissions.IsFolderOwner;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-IsFolderVisible").value = permissions.IsFolderVisible;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-IsFolderContact").value = permissions.IsFolderContact;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-EditItems").value = permissions.EditItems;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-DeleteItems").value = permissions.DeleteItems;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-ReadItems").value = permissions.ReadItems;
+            this._document.getElementById("exchWebServices-UserId-EffectiveRights-CalendarPermissionLevel").value = permissions.CalendarPermissionLevel;
+        }
+    },
+
+    checkRequired: function _checkRequired() {
+        let canAdvance = true;
+        let vbox = this._document.getElementById('exchWebService-exchange-settings');
+        if (vbox) {
+            let eList = vbox.getElementsByAttribute('required', 'true');
+            for (let i = 0; i < eList.length && canAdvance; ++i) {
+                canAdvance = (eList[i].value != "");
+            }
+
+            if (canAdvance) {
+                this._document.getElementById("exchWebService_ExchangeSettings_dialog").buttons = "accept,cancel";
+            }
+            else {
+                this._document.getElementById("exchWebService_ExchangeSettings_dialog").buttons = "cancel";
+            }
+        }
+
+        this._window.sizeToContent();
+
+    },
+
+    permissionObject: function _permissionObject(aPermission) {
+        for each(var item in aPermission.XPath('/*')) {
+            if (item.tagName == "UserId") {
+                for each(var userProp in item.XPath('/*')) {
+                    if (!this[item.tagName]) {
+                        this[item.tagName] = {};
+                    }
+                    this[item.tagName][userProp.tagName] = userProp.value;
+                }
+            }
+            else {
+                this[item.tagName] = item.value;
+            }
+        }
+    },
+
+    showFolderProprties: function _showFolderProprties(aProperties) {
+        this.globalFunctions.LOG("showFolderProprties:" + aProperties.toString());
+        var serverVersionInfo = aProperties.XPath('/s:Header/ServerVersionInfo')[0];
+        this._document.getElementById("exchWebServices-ServerVersionInfo").value = serverVersionInfo.getAttribute('Version') + " (" + serverVersionInfo.getAttribute('MajorVersion') + "." + serverVersionInfo.getAttribute('MinorVersion') + "." + serverVersionInfo.getAttribute('MajorBuildNumber') + "." + serverVersionInfo.getAttribute('MinorBuildNumber') + ")";
+
+        var propType = "calendar";
+        var calendarFolder = aProperties.XPath('/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:CalendarFolder');
+        if (calendarFolder.length > 0) {
+            var calendarFolder = calendarFolder[0];
+            var calendarPermissions = calendarFolder.XPath('/t:PermissionSet/t:CalendarPermissions/t:CalendarPermission');
+        }
+        else {
+            var calendarFolder = aProperties.XPath('/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:TasksFolder')[0];
+            var calendarPermissions = calendarFolder.XPath('/t:PermissionSet/*/t:Permission');
+            propType = "task";
+        }
+
+        this._document.getElementById("exchWebServices-CalendarFolder-DisplayName").value = calendarFolder.getTagValue('t:DisplayName');
+        this._document.getElementById("exchWebServices-CalendarFolder-TotalCount").value = calendarFolder.getTagValue('t:TotalCount');
+        this._document.getElementById("exchWebServices-CalendarFolder-ChildFolderCount").value = calendarFolder.getTagValue('t:ChildFolderCount');
+
+        var effectiveRights = calendarFolder.XPath('t:EffectiveRights')[0];
+        this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-CreateAssociated").value = effectiveRights.getTagValue('t:CreateAssociated');
+        this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-CreateContents").value = effectiveRights.getTagValue('t:CreateContents');
+        this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-CreateHierarchy").value = effectiveRights.getTagValue('t:CreateHierarchy');
+        this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-Delete").value = effectiveRights.getTagValue('t:Delete');
+        this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-Modify").value = effectiveRights.getTagValue('t:Modify');
+        this._document.getElementById("exchWebServices-CalendarFolder-EffectiveRights-Read").value = effectiveRights.getTagValue('t:Read');
+
+        // PermissionSet
+        var permissions = new Array;
+        for each(var permission in calendarPermissions) {
+            permissions.push(new this.permissionObject(permission));
+        }
+
+        try {
+            this.permissionsPropertiesTreeView = new exchWebService_permissionsPropertiesView(permissions);
+        }
+        catch (err) {
+            this.globalFunctions.LOG("ERROR:" + err);
+        }
+
+        this._document.getElementById('exchWebServicesPermissionsTree').treeBoxObject.view = this.permissionsPropertiesTreeView;
+    },
+
+    onLoad: function _onLoad() {
+        var calId = this._window.arguments[0].calendar.id;
+        this._document.getElementById("exchWebService_ExchangeSettings-title").value = this._window.arguments[0].calendar.name;
+        tmpSettingsOverlay.exchWebServicesLoadExchangeSettingsByCalId(calId);
+
+        // Load meeting request settings.
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+        this._document.getElementById("exchWebService-poll-calendar-interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecCalendarPollInterval", 60);
+        this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingdeletecancelleditems", true);
+        this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingmarkeventtentative", false);
+
+        this._document.getElementById("exchWebService-syncMailItems-Interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "syncMailItems.Interval", 15);
+        this._document.getElementById("exchWebService-syncMailItems-active").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "mailsync.active", false);
+        this._document.getElementById("exchWebService-followup-deactivtate").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "followup.task.deactivate", false);
+
+
+        if (this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecFolderbase", "") == "calendar") {
+            this._document.getElementById("exchWebService-mail-properties-calendar").hidden = false;
+            this._document.getElementById("exchWebService-mail-properties-task").hidden = true;
+        }
+        else {
+            this._document.getElementById("exchWebService-mail-properties-calendar").hidden = true;
+            this._document.getElementById("exchWebService-mail-properties-task").hidden = false;
+        }
+
+        /*
+        		this._document.getElementById("exchWebService-poll-inbox").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecPollInbox", true);
+        		this._document.getElementById("exchWebService-poll-inbox-interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecPollInboxInterval", 180);
+        		this._document.getElementById("exchWebService-autorespond-meetingrequest").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRespondMeetingRequest", false); 
+        		this._document.getElementById("exchWebService-autorespond-answer").value = this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecAutoRespondAnswer", "TENTATIVE"); 
+
+        		this._document.getElementById("exchWebService-autoremove-invitation_cancellation1").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRemoveInvitationCancellation1", false); 
+        		this._document.getElementById("exchWebService-autoremove-invitation_cancellation2").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRemoveInvitationCancellation2", false); 
+
+        		this._document.getElementById("exchWebService-autoremove-invitation_response1").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecAutoRemoveInvitationResponse1", true); 
+
+        		this._document.getElementById("exchWebService-doautorespond-meetingrequest-message").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecSendAutoRespondMeetingRequestMessage", false); 
+        		this._document.getElementById("exchWebService-autorespond-meetingrequest-message").value = this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecAutoRespondMeetingRequestMessage", ""); 
+        */
+        this.checkFolderSettings();
+
+        this._document.getElementById("exchWebService_folderbaserow").hidden = (tmpSettingsOverlay.exchWebServicesgFolderIdOfShare != "");
+        this._document.getElementById("exchWebService_folderpathrow").hidden = (tmpSettingsOverlay.exchWebServicesgFolderIdOfShare != "");
+        this._document.getElementById("exchWebServices-SharedFolderID").hidden = true;
+
+        if (this._window.arguments[0].calendar.getProperty("exchWebService.getFolderProperties")) {
+            var folderProperties = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
+                .createInstance(Ci.mivIxml2jxon);
+            folderProperties.processXMLString(this._window.arguments[0].calendar.getProperty("exchWebService.getFolderProperties"), 0, null);
+            this.showFolderProprties(folderProperties);
+        }
+        else {
+            this._document.getElementById("exchWebService-folderproperties-xml").value = "not found";
+            this._document.getElementById("exchWebService_folderbaserow").hidden = true;
+            this._document.getElementById("exchWebService_folderpathrow").hidden = true;
+            this._document.getElementById("exchWebServices-UserAvailability").hidden = false;
+        }
+
+        if (this._window) {
+            this._window.sizeToContent();
+        }
+    },
+
+    onSave: function _onSave() {
+        var calId = this._window.arguments[0].calendar.id;
+        var aCalendar = this._window.arguments[0].calendar;
+        tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(calId);
+
+        // Save meeting request settings.
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+        this.checkFolderSettings();
+
+        if (this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked != this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingdeletecancelleditems", null)) {
+            exchWebServicesCalPrefs.setBoolPref("ecautoprocessingdeletecancelleditems", this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked);
+        }
+        if (this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked != this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingmarkeventtentative", null)) {
+            exchWebServicesCalPrefs.setBoolPref("ecautoprocessingmarkeventtentative", this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked);
+        }
+
+        this.doAutoProcessing();
+
+        if (this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecFolderbase", "") == "calendar") {
+            exchWebServicesCalPrefs.setIntPref("syncMailItems.Interval", this._document.getElementById("exchWebService-syncMailItems-Interval").value);
+            exchWebServicesCalPrefs.setBoolPref("mailsync.active", this._document.getElementById("exchWebService-syncMailItems-active").checked);
+        }
+        else {
+            //Add items  releted to Task here these will be taken only when task calendar changes
+            exchWebServicesCalPrefs.setBoolPref("followup.task.deactivate", this._document.getElementById("exchWebService-followup-deactivtate").checked);
+        }
+
+        //exchWebServicesCalPrefs.setBoolPref("ecPollInbox", this._document.getElementById("exchWebService-poll-inbox").checked); 
+
+        exchWebServicesCalPrefs.setIntPref("ecCalendarPollInterval", this._document.getElementById("exchWebService-poll-calendar-interval").value);
+        //exchWebServicesCalPrefs.setIntPref("ecPollInboxInterval", this._document.getElementById("exchWebService-poll-inbox-interval").value); 
+        //exchWebServicesCalPrefs.setBoolPref("ecAutoRespondMeetingRequest", this._document.getElementById("exchWebService-autorespond-meetingrequest").checked); 
+        //exchWebServicesCalPrefs.setCharPref("ecAutoRespondAnswer", this._document.getElementById("exchWebService-autorespond-answer").value); 
+
+        //exchWebServicesCalPrefs.setBoolPref("ecAutoRemoveInvitationCancellation1", this._document.getElementById("exchWebService-autoremove-invitation_cancellation1").checked); 
+        //exchWebServicesCalPrefs.setBoolPref("ecAutoRemoveInvitationCancellation2", this._document.getElementById("exchWebService-autoremove-invitation_cancellation2").checked); 
+
+        //exchWebServicesCalPrefs.setBoolPref("ecAutoRemoveInvitationResponse1", this._document.getElementById("exchWebService-autoremove-invitation_response1").checked); 
+
+        //exchWebServicesCalPrefs.setBoolPref("ecSendAutoRespondMeetingRequestMessage", this._document.getElementById("exchWebService-doautorespond-meetingrequest-message").checked); 
+        //exchWebServicesCalPrefs.setCharPref("ecAutoRespondMeetingRequestMessage", this._document.getElementById("exchWebService-autorespond-meetingrequest-message").value); 
+
+        this._window.arguments[0].answer = "saved";
+
+        var observerService = Cc["@mozilla.org/observer-service;1"]
+            .getService(Ci.nsIObserverService);
+
+        observerService.notifyObservers(this, "onCalReset", calId);
+
+        Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService).savePrefFile(null);
+        return true;
+    },
+
+    checkFolderSettings: function _checkFolderSettings() {
+        /*		if ((this._document.getElementById("exchWebService_folderbase").value != "calendar") ||
+        		    (this._document.getElementById("exchWebService_folderpath").value != "/") ||
+        		    (!this._window.arguments[0].calendar.getProperty("exchWebService.getFolderProperties"))) {
+        			// Disable inbox polling.
+        			this._document.getElementById("exchWebService-poll-inbox").checked = false;
+        			this._document.getElementById("vbox-exchWebService-meetingrequestsettings").hidden = true;
+        			this._document.getElementById("vbox-exchWebService-nomeetingrequestsettings").hidden = false;
+        		}
+        		else {
+        			this._document.getElementById("vbox-exchWebService-meetingrequestsettings").hidden = false;
+        			this._document.getElementById("vbox-exchWebService-nomeetingrequestsettings").hidden = true;
+        		}
+
+        		this._document.getElementById("exchWebService-poll-inbox-interval").disabled = (!this._document.getElementById("exchWebService-poll-inbox").checked);
+
+        		this._document.getElementById("exchWebService-autorespond-answer").disabled = (!this._document.getElementById("exchWebService-autorespond-meetingrequest").checked);
+        		this._document.getElementById("exchWebService-doautorespond-meetingrequest-message").disabled = (!this._document.getElementById("exchWebService-autorespond-meetingrequest").checked);
+        		this._document.getElementById("exchWebService-autorespond-meetingrequest-message").disabled = (!this._document.getElementById("exchWebService-autorespond-meetingrequest").checked);
+        */
+        this._window.sizeToContent();
+    },
+
+    doAutoProcessing: function _doAutoProcessing() {
+        this._window.sizeToContent();
+    },
+
+    doTabChanged: function _doTabChanged(aTabs) {
+        this.checkFolderSettings();
+    },
+
+    doPollInboxChanged: function _doPollInboxChanged(aCheckbox) {
+        this.checkFolderSettings();
+    },
+
+    doAutoRespondChanged: function doAutoRespondChanged(aCheckbox) {
+        this.checkFolderSettings();
+    },
 
 }
 
diff --git a/chrome/content/exchangeSettingsOverlay.js b/chrome/content/exchangeSettingsOverlay.js
index a0fe49a2..69cf46d1 100644
--- a/chrome/content/exchangeSettingsOverlay.js
+++ b/chrome/content/exchangeSettingsOverlay.js
@@ -50,922 +50,946 @@ Cu.import("resource://exchangecalendar/erGetUserAvailability.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 
-function exchSettingsOverlay(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchSettingsOverlay(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchSettingsOverlay.prototype = {
-	gexchWebServicesDetailsChecked : false,
-	gexchWebServices2ndDetailsChecked : true,
-
-	exchWebServicesgAutoDiscover : false,
-	exchWebServicesgServer : "",
-	exchWebServicesgMailbox : "",
-	exchWebServicesgDisplayName : "",
-	exchWebServicesgUser : "",
-	exchWebServicesgDomain : "",
-	exchWebServicesgFolderIdOfShare : "",
-	exchWebServicesgFolderBase : "calendar",
-	exchWebServicesgFolderPath : "/",
-	exchWebServicesgFolderID : "",
-	exchWebServicesgChangeKey : "",
-
-	exchWebServicesValidUsernameDomain: function _exchWebServicesValidUsernameDomain()
-	{
-		return true;
-
-	/*	if ((this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") > -1) &&
-			(this._document.getElementById("exchWebService_windowsdomain").value == "")) {
-			return true;
-		}
-
-		if ((this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") == -1) &&
-			(this._document.getElementById("exchWebService_windowsdomain").value != "")) {
-			return true;
-		}
-
-		return false; */
-	},
-
-	exchWebServicesCheckRequired: function _exchWebServicesCheckRequired() {
-	
-		if (!this.gexchWebServicesDetailsChecked) {
-			this._document.getElementById("exchWebService_folderbaserow").hidden = true;
-			this._document.getElementById("exchWebService_folderpathrow").hidden = true;
-			this._document.getElementById("exchWebServices-SharedFolderID").hidden = true;
-			this._document.getElementById("exchWebServices-UserAvailability").hidden = true;
-		}
-
-		if ((!this.gexchWebServices2ndDetailsChecked) || (!this.gexchWebServicesDetailsChecked)) {
-			this._document.getElementById("exchWebService_detailschecked").setAttribute("required", true);
-		}
-		else {
-			this._document.getElementById("exchWebService_detailschecked").setAttribute("required", false);
-		}		
-		
-		if (this._document.getElementById("exchWebService_autodiscover").checked) {
-
-			this.exchWebServicesChangeFolderbaseMenuItemAvailability(false);
-
-			this._document.getElementById("exchWebService_mailbox").setAttribute("required", true);
-			this._document.getElementById("exchWebService_servercheckrow").hidden = true;
-
-			if ( (this._document.getElementById("exchWebService_mailbox").value == "") ||
-			     (!this.exchWebServicesValidUsernameDomain()) ) {
-				this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
-				this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
-			}
-			else {
-				this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = false;
-				this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
-			}
-			this._document.getElementById("exchWebService_server").disabled = true;
-		}
-		else {
-			this._document.getElementById("exchWebService_mailbox").setAttribute("required", false);
-			if (this._document.getElementById("exchWebService_mailbox").value == "") {
-
-				if (this._document.getElementById("exchWebService_mailbox").value == "") {
-					this.exchWebServicesChangeFolderbaseMenuItemAvailability(true);
-					this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
-				}
-
-				// No mailbox specified. We only do server check.
-				if ( (this._document.getElementById("exchWebService_server").value == "") ||
-				     (!this.exchWebServicesValidUsernameDomain()) ) {
-					this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
-					this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
-					this._document.getElementById("exchWebService_servercheckrow").hidden = true;
-				}
-				else {
-					this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
-					this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
-					this._document.getElementById("exchWebService_servercheckrow").hidden = false;
-				}
-			}
-			else {
-				this.exchWebServicesChangeFolderbaseMenuItemAvailability(false);
-
-				// No mailbox specified. We do server and mailbox check
-				// No mailbox specified. We only do server check.
-				if ( (this._document.getElementById("exchWebService_server").value == "") ||
-				     (!this.exchWebServicesValidUsernameDomain()) ) {
-					this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
-					this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
-					this._document.getElementById("exchWebService_servercheckrow").hidden = true;
-				}
-				else {
-					this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
-					this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = false;
-					this._document.getElementById("exchWebService_servercheckrow").hidden = true;
-				}
-			}
-
-			this._document.getElementById("exchWebService_server").disabled = false;
-		}
-	
-		if (this.gexchWebServicesDetailsChecked) {
-			this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
-			this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
-			this._document.getElementById("exchWebService_servercheckrow").hidden = true;
-
-			this._document.getElementById("exchWebService_folderbaserow").hidden = (this.exchWebServicesgFolderIdOfShare != "");
-			this._document.getElementById("exchWebService_folderpathrow").hidden = (this.exchWebServicesgFolderIdOfShare != "");
-
-			this._document.getElementById("exchWebServices-SharedFolderID").hidden = (this.exchWebServicesgFolderIdOfShare == "");
-		
-		}
-
-		// We determine which to use on the dialog id which is active for the current this._document.
-		if (this._document.getElementById("exchWebService_ContactSettings_dialog")) {   // Contact settings dialog.
-			tmpExchangeContactSettings.checkRequired();
-		}
-		else {
-			if (this._document.getElementById("exchWebService_ExchangeSettings_dialog")) { // EWS Settings dialog.
-				tmpExchangeSettings.checkRequired();
-			}
-			else {
-				if (this._document.getElementById("exchWebService_CloneSettings_dialog")) { // Clone Settings dialog.
-					tmpExchangeCloneSettings.checkRequired();
-				}
-				else {
-					try {
-						checkRequired();  // On creating a new calendar. Default Lightning create calendar wizard.
-					}
-					catch(ex) {
-						this.globalFunctions.LOG("NO checkRequired found.");
-					}
-				}
-			}
-		}
-
-		if (this._window) {
-			this._window.sizeToContent();
-		}
-	},
-
-	exchWebServicesAutodiscoverCheckbox: function _exchWebServicesAutodiscoverCheckbox(aCheckBox)
-	{
-		this.exchWebServicesgAutoDiscover = aCheckBox.checked;
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesServerType: function _exchWebServicesServerType(radioGroup)
-	{
-		if ( radioGroup.selectedIndex == 1 ){
-			this._document.getElementById("exchWebService_server").value = "https://outlook.office365.com/EWS/Exchange.asmx";
-			this._document.getElementById("exchWebService_autodiscover").checked = false;
-			this._document.getElementById("exchWebService_autodiscover").disabled = true;
-			
-			this.exchWebServicesgServer = this._document.getElementById("exchWebService_server").value; 
-			this.exchWebServicesgUser   = this._document.getElementById("exchWebService_mailbox").value;
-			this._document.getElementById("exchWebService_windowsuser").value = this.exchWebServicesgUser;
-		}
-		else {
-			this._document.getElementById("exchWebService_server").value = "";
-			this.exchWebServicesgServer = "";
-			this._document.getElementById("exchWebService_windowsuser").value = "";
-			this.exchWebServicesgUser   = ""; 
-			this._document.getElementById("exchWebService_autodiscover").checked = false; 
-			this._document.getElementById("exchWebService_autodiscover").disabled = false;  
-		} 
-	 
-		this.exchWebServicesCheckRequired();
-	},
-	
-	exchWebServicesInitMailbox: function _exchWebServicesInitMailbox(aNewValue)
-	{
-		this.exchWebServicesgMailbox = aNewValue;
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesDoMailboxChanged: function _exchWebServicesDoMailboxChanged(aTextBox)
-	{
-		this.exchWebServicesgMailbox = aTextBox.value;
-		this._document.getElementById("exchWebService_displayname").value = "";
-		this.exchWebServicesgDisplayName = "";
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesDoUserChanged: function _exchWebServicesDoUserChanged(aTextBox)
-	{
-		this.exchWebServicesgUser = aTextBox.value;
-		if ((this.exchWebServicesgUser.indexOf("@") > -1) || (this.exchWebServicesgUser.indexOf("\\") > -1) ){
-			this._document.getElementById("exchWebService_windowsdomain").disabled = true;
-			this._document.getElementById("exchWebService_windowsdomain").value = "";
-			//this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false);
-			this.exchWebServicesgDomain = ""; 
-			
-			if(this.exchWebServicesgUser.indexOf("\\") > -1){ 
-				var username = this.exchWebServicesgUser;
-				this.exchWebServicesgUser =username.substr(0,username.indexOf("\\"));
-				this.exchWebServicesgDomain = username.substr(username.indexOf("\\") +1); 
-			}
-		}
-		else {
-			this._document.getElementById("exchWebService_windowsdomain").disabled = false;
-			//this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", true);
-		}
-
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesDoDomainChanged: function _exchWebServicesDoDomainChanged(aTextBox)
-	{
-		this.exchWebServicesgDomain = aTextBox.value;
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesDoFolderIdOfShareChanged: function _exchWebServicesDoFolderIdOfShareChanged(aTextBox)
-	{
-		this.exchWebServicesgFolderIdOfShare = aTextBox.value;
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesDoServerChanged: function _exchWebServicesDoServerChanged(aTextBox)
-	{
-		this.exchWebServicesgServer = aTextBox.value;
-		this.gexchWebServicesDetailsChecked = false;
-		this.exchWebServicesCheckRequired();
-	},
-
-	// newStatus = true will disable folderbase menuitems
-	// newStatus = false will enable all folderbase menuitems
-
-	exchWebServicesChangeFolderbaseMenuItemAvailability: function _exchWebServicesChangeFolderbaseMenuItemAvailability(newStatus)
-	{
-		var menuItem = this._document.getElementById("menupopup.ecfolderbase").firstChild;
-		while (menuItem) {
-			if (! menuItem.hasAttribute("donotchange")) {
-				menuItem.disabled = newStatus;
-			}
-			menuItem = menuItem.nextSibling;
-		}
-	
-	},
-
-	exchWebServicesDoFolderBaseChanged: function _exchWebServicesDoFolderBaseChanged(aMenuList)
-	{
-		this.exchWebServicesgFolderBase = aMenuList.value;
-
-		// Reset folder path
-		this._document.getElementById("exchWebService_folderpath").value = "/";
-		this.exchWebServicesgFolderPath = "/";
-
-		this.exchWebServicesgFolderID = "";
-		this.exchWebServicesgChangeKey = "";
-
-		if (this._document.getElementById("exchWebService_folderpath").value != "/") {
-			this.gexchWebServices2ndDetailsChecked = false;
-		}
-		else {
-			this.gexchWebServices2ndDetailsChecked = true;
-		}
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesGetUsername: function _exchWebServicesGetUsername()
-	{
- 		if (this.exchWebServicesgUser.indexOf("@") > -1) {
-			return this.exchWebServicesgUser;
-		}
-		else {
-			if (this.exchWebServicesgDomain == "") {
-				return this.exchWebServicesgUser;
-			}
-			else {
-				return this.exchWebServicesgDomain+"\\"+this.exchWebServicesgUser;
-			}
-		}
-	},
-
-	exchWebServicesDoCheckServerAndMailbox: function _exchWebServicesDoCheckServerAndMailbox()
-	{
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = true;
-
-		var folderIdOfShare = this.exchWebServicesgFolderIdOfShare;
-
-		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-		myAuthPrompt2.removeUserCanceled(this.exchWebServicesgServer);
-
-		try {
-			this._window.setCursor("wait");
-			var self = this;
-			if ((folderIdOfShare) && (folderIdOfShare != "")) {
-				var tmpObject = new erConvertIDRequest(
-					{user: this.exchWebServicesGetUsername(), 
-					 mailbox: this.exchWebServicesgMailbox,
-					 serverUrl: this.exchWebServicesgServer,
-					 folderId: folderIdOfShare}, 
-					function(aFolderID, aMailbox) { self.exchWebServicesConvertIDOK(aFolderID, aMailbox);}, 
-					function(aExchangeRequest, aCode, aMsg) { self.exchWebServicesConvertIDError(aExchangeRequest, aCode, aMsg);});
-			}
-			else {
-		this.globalFunctions.LOG("exchWebServicesConvertIDOK: user:"+this.exchWebServicesGetUsername()+", mailbox:"+this.exchWebServicesgMailbox);
-				var tmpObject = new erPrimarySMTPCheckRequest(
-					{user: this.exchWebServicesGetUsername(), 
-					 mailbox: this.exchWebServicesgMailbox,
-					 serverUrl: this.exchWebServicesgServer,
-					 folderBase: "calendar"}, 
-					function(newPrimarySMTP) { self.exchWebServicesCheckServerAndMailboxOK(newPrimarySMTP);}, 
-					function(aExchangeRequest, aCode, aMsg) { self.exchWebServicesCheckServerAndMailboxError(aExchangeRequest, aCode, aMsg);});
-			}
-		}
-		catch(err) {
-			this._window.setCursor("auto");
-			this.globalFunctions.ERROR("Warning: Error during creation of erPrimarySMTPCheckRequest. Err="+err+"\n");
-		}
-	},
-
-	exchWebServicesConvertIDOK: function _exchWebServicesConvertIDOK(aFolderID, aMailbox)
-	{
-		this.globalFunctions.LOG("exchWebServicesConvertIDOK: aFolderID:"+aFolderID+", aMailbox:"+aMailbox);
-
-		try {
-			this._window.setCursor("wait");
-			var self = this;
-			var tmpObject = new erGetFolderRequest(
-				{user: this.exchWebServicesGetUsername(), 
-				 mailbox: aMailbox,
-				 serverUrl: this.exchWebServicesgServer,
-				 folderID: aFolderID}, 
-				function(aExchangeRequest, aFolderID, aChangeKey, aFolderClass){ self.exchWebServicesGetFolderOK(aExchangeRequest, aFolderID, aChangeKey, aFolderClass);}, 
-				function(aExchangeRequest, aCode, aMsg){ self.exchWebServicesGetFolderError(aExchangeRequest, aCode, aMsg);});
-		}
-		catch(err) {
-			this._window.setCursor("auto");
-			this.globalFunctions.ERROR("Warning: Error during creation of erPrimarySMTPCheckRequest (2). Err="+err+"\n");
-		}
-	},
-
-	exchWebServicesConvertIDError: function _exchWebServicesConvertIDError(aExchangeRequest, aCode, aMsg)
-	{
-		this.gexchWebServicesDetailsChecked = false;
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
-			break;
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
-		}
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesGetFolderOK: function _exchWebServicesGetFolderOK(aExchangeRequest, aFolderID, aChangeKey, aFolderClass)
-	{
-		this.globalFunctions.LOG("exchWebServicesGetFolderOK: aFolderID:"+aFolderID+", aChangeKey:"+aChangeKey+", aFolderClass:"+aFolderClass);
-
-		if (aFolderClass == "IPF.Appointment" || aFolderClass == "IPF.Task") {
-			this.exchWebServicesgFolderID = aFolderID;
-			this.exchWebServicesgChangeKey = aChangeKey;
-			this.gexchWebServicesDetailsChecked = true;
-			this.gexchWebServices2ndDetailsChecked = true;
-			this._document.getElementById("exchWebServices-SharedFolderID-label").value = aExchangeRequest.displayName;
-		}
-		else {
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
-		}
-	
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
-
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesGetFolderError: function _exchWebServicesGetFolderError(aExchangeRequest, aCode, aMsg)
-	{
-		this.gexchWebServicesDetailsChecked = false;
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
-			break;
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
-		}
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesCheckServerAndMailboxOK: function _exchWebServicesCheckServerAndMailboxOK(newPrimarySMTP)
-	{
-
-		if (newPrimarySMTP) {
-			this.exchWebServicesgMailbox = newPrimarySMTP
-			this._document.getElementById("exchWebService_mailbox").value = newPrimarySMTP;
-		}
-
-		this.gexchWebServicesDetailsChecked = true;
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
-
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesCheckServerAndMailboxError: function _exchWebServicesCheckServerAndMailboxError(aExchangeRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("exchWebServicesCheckServerAndMailboxError: aCode:"+ aCode+", aMsg:"+aMsg);
-		this.gexchWebServicesDetailsChecked = false;
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
-			break;
-		case -7: 
-		case -208:  // folderNotFound. 
-			this.checkUserAvailability();
-			return;
-		case -212:
-			aMsg = aMsg + "("+this.exchWebServicesgMailbox+")";
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
-		}
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	// Check if we can get useravailability
-	checkUserAvailability: function _checkUserAvailability()
-	{
-		this.globalFunctions.LOG("checkUserAvailability");
-		var self = this;
-
-		var start = cal.now();
-		var offset = cal.createDuration();
-		offset.hours = 10;
-		var end = start.clone();
-		end.addDuration(offset);
-
-		var tmpObject = new erGetUserAvailabilityRequest(
-			{user: this.exchWebServicesGetUsername(), 
-			 mailbox: this.exchWebServicesgMailbox,
-			 serverUrl: this.exchWebServicesgServer,
-			 folderBase: "calendar", 
-			 email: this.exchWebServicesgMailbox,
-			 attendeeType: 'Required',
-			 start: cal.toRFC3339(start),
-			 end: cal.toRFC3339(end) },
-			function(erGetUserAvailabilityRequest, aEvents) { self.checkUserAvailabilityOk(erGetUserAvailabilityRequest, aEvents);}, 
-			function(erGetUserAvailabilityRequest, aCode, aMsg) { self.checkUserAvailabilityError(erGetUserAvailabilityRequest, aCode, aMsg);});
-
-	},
-
-	checkUserAvailabilityOk: function _checkUserAvailabilityOk(erGetUserAvailabilityRequest, aEvents)
-	{
-		this.globalFunctions.LOG("checkUserAvailabilityOk");
-		this.exchWebServicesCheckServerAndMailboxOK();
-		this._document.getElementById("exchWebService_folderbaserow").hidden = true;
-		this._document.getElementById("exchWebService_folderpathrow").hidden = true;
-		this._document.getElementById("exchWebServices-UserAvailability").hidden = false;
-	},
-
-	checkUserAvailabilityError: function _checkUserAvailabilityError(erGetUserAvailabilityRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("checkUserAvailabilityError");
-		this.gexchWebServicesDetailsChecked = false;
-
-		alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
-
-		this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesDoCheckServer: function _exchWebServicesDoCheckServer()
-	{
-		this._document.getElementById("exchWebService_servercheckbutton").disabled = true;
-
-	
-		try {
-			this._window.setCursor("wait");
-			var self = this;
-			var tmpObject = new erGetFolderRequest(
-				{user: this.exchWebServicesGetUsername(), 
-				 mailbox: "",
-				 folderBase: "publicfoldersroot",
-				 folderPath: "/",
-				 serverUrl: this.exchWebServicesgServer}, 
-				function(folderID, changeKey, folderClass){ self.exchWebServicesCheckServerOK(folderID, changeKey, folderClass);}, 
-				function(aExchangeRequest, aCode, aMsg){ self.exchWebServicesCheckServerError(aExchangeRequest, aCode, aMsg);})
-		}
-		catch(err) {
-			this._window.setCursor("auto");
-			this.globalFunctions.ERROR("Warning: Error during creation of erGetFolderRequest. Err="+err+"\n");
-		}
-	},
-
-	exchWebServicesCheckServerOK: function _exchWebServicesCheckServerOK(folderID, changeKey, folderClass)
-	{
-
-		this.gexchWebServicesDetailsChecked = true;
-		this._document.getElementById("exchWebService_servercheckbutton").disabled = false;
-	//	exchWebServicesChangeFolderbaseMenuItemAvailability(true);
-	//	this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
-
-		if (this.exchWebServicesgFolderBase != "publicfoldersroot") {
-			this.exchWebServicesgFolderBase = "publicfoldersroot";
-			this._document.getElementById("exchWebService_folderbase").value = "publicfoldersroot";
-			this._document.getElementById("exchWebService_folderpath").value = "/";
-		}
-
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesCheckServerError: function _exchWebServicesCheckServerError(aExchangeRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("exchWebServicesCheckServerError");
-		this.gexchWebServicesDetailsChecked = false;
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
-			break;
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecalendar"));
-		}
-		this._document.getElementById("exchWebService_servercheckbutton").disabled = false;
-
-	//	exchWebServicesChangeFolderbaseMenuItemAvailability(false);
-
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchAutoDiscovery2010 : true,
-
-	exchWebServicesDoAutodiscoverCheck: function _exchWebServicesDoAutodiscoverCheck()
-	{
-		this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = true;
-
-		try {
-			this._window.setCursor("wait");
-			this.exchAutoDiscovery2010 = true;  // We first try Autodiscovery for Exchange2010 and higher.
-			var self = this; 
-			var tmpObject = new erAutoDiscoverySOAPRequest( 
-				{user: this.exchWebServicesGetUsername(), 
-				 mailbox: this.exchWebServicesgMailbox}, 
-				 function(ewsUrls, DisplayName, SMTPAddress, redirectAddr){ self.exchWebServicesAutodiscoveryOK(ewsUrls, DisplayName, SMTPAddress, redirectAddr);}, 
-				 function(aExchangeRequest, aCode, aMsg){ self.exchWebServicesAutodiscoveryError(aExchangeRequest, aCode, aMsg);}, null);
-		}
-		catch(err) {
-			this._window.setCursor("auto");
-			this.globalFunctions.ERROR("Warning: Could not create erAutoDiscoverRequest. Err="+err+"\n");
-		}
-	},
-
-	exchWebServicesAutodiscoveryOK: function _exchWebServicesAutodiscoveryOK(ewsUrls, DisplayName, SMTPAddress, redirectAddr)
-	{
-		this.globalFunctions.LOG("ecAutodiscoveryOK");
-
-		if (redirectAddr) {
-			// We have an redirectAddr. Go use the new email address as primary.
-			this.globalFunctions.LOG("ecAutodiscoveryOK: We received an redirectAddr:"+redirectAddr);
-			this.exchWebServicesgMailbox = redirectAddr;
-			this._document.getElementById("exchWebService_mailbox").value = redirectAddr;
-			this.exchWebServicesDoAutodiscoverCheck();
-			return;
-		}
-
-		var selectedEWSUrl = {value:undefined};
-		var userCancel = false;
-
-		if (ewsUrls) {
-			if (ewsUrls.length > 1) {
-				// We have got multiple ews urls returned. Let the user choose.
-
-				this._window.openDialog("chrome://exchangecalendar/content/selectEWSUrl.xul",
-					"selectfrommultipleews",
-					"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
-					ewsUrls, selectedEWSUrl); 
-
-				if ((!selectedEWSUrl.value) || (selectedEWSUrl.value == "")) {
-					this.globalFunctions.LOG("  ++++ Selection canceled by user");
-					userCancel = true;
-				}
-			}
-			else {
-				// We only have one url. Use it.
-	//			selectedEWSUrl.value = ewsUrls.text();
-				selectedEWSUrl.value = ewsUrls[0].value;
-			}
-
-		}
-
-		if (!userCancel) {
-			this.exchWebServicesgDisplayName = DisplayName;
-			this._document.getElementById("exchWebService_displayname").value = DisplayName;
-
-			if ((SMTPAddress) && (SMTPAddress != '')) {
-				this.exchWebServicesgMailbox = SMTPAddress;
-				this._document.getElementById("exchWebService_mailbox").value = SMTPAddress;
-			}
-	
-			this.exchWebServicesgServer = selectedEWSUrl.value;
-			this._document.getElementById("exchWebService_server").value = selectedEWSUrl.value; 
-
-			//this.gexchWebServicesDetailsChecked = true;
-			this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
-			this._document.getElementById("exchWebService_autodiscover").checked = false;
-
-			this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = true;
-			this.exchWebServicesDoCheckServerAndMailbox();
-			return;
-
-		}
-		else {
-			this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
-		}
-
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesAutodiscoveryError: function _exchWebServicesAutodiscoveryError(aExchangeRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("ecAutodiscoveryError. aCode:"+aCode+", aMsg:"+aMsg);
-
-		if ((this.exchAutoDiscovery2010 == true) && (aCode != -20)) {
-			this.globalFunctions.LOG("exchWebServicesAutodiscoveryError: Going to try old POX autodiscovery as SOAP autodiscovery did not succeed.");
-			this.exchAutoDiscovery2010 = false; // AutoDiscovery for Exchange2010 and higher failed. Next try old POX Autodiscovery.
-
-			try {
-				var self = this;
-				var tmpObject = new erAutoDiscoverRequest( 
-					{user: this.exchWebServicesGetUsername(), 
-					 mailbox: this.exchWebServicesgMailbox}, 
-					 function(ewsUrls, DisplayName, SMTPAddress, redirectAddr){ self.exchWebServicesAutodiscoveryOK(ewsUrls, DisplayName, SMTPAddress, redirectAddr);}, 
-					 function(aExchangeRequest, aCode, aMsg){ self.exchWebServicesAutodiscoveryError(aExchangeRequest, aCode, aMsg);}, null);
-				return;
-			}
-			catch(err) {
-				this._window.setCursor("auto");
-				this.globalFunctions.ERROR("Warning: Could not create erAutoDiscoverRequest. Err="+err+"\n");
-				return;
-			}
-		}
-
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-		case -9:
-		case -10:
-		case -14:
-		case -15:
-		case -16:
-		case -17:
-		case -18:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [this.exchWebServicesgMailbox], "exchangecalendar"));
-			break;
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecalendar"));
-		}
-
-		this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
-		this.exchWebServicesCheckRequired();
-		this._window.setCursor("auto");
-	},
-
-	exchWebServicesLoadExchangeSettingsByCalId: function _exchWebServicesLoadExchangeSettingsByCalId(aCalId)
-	{
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+aCalId+".");
-
-		if (exchWebServicesCalPrefs) {
-			this._document.getElementById("exchWebService_server").value = exchWebServicesCalPrefs.getCharPref("ecServer");
-			this._document.getElementById("exchWebService_windowsuser").value = exchWebServicesCalPrefs.getCharPref("ecUser");
-			if (this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") > -1) {
-				//this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false);
-				this._document.getElementById("exchWebService_windowsdomain").disabled = true;
-			}
-			this._document.getElementById("exchWebService_windowsdomain").value = exchWebServicesCalPrefs.getCharPref("ecDomain");
-			this._document.getElementById("exchWebService_folderpath").value = exchWebServicesCalPrefs.getCharPref("ecFolderpath");
-
-			for (var i=0; i < this._document.getElementById("exchWebService_folderbase").itemCount; i++) {
-				if (this._document.getElementById("exchWebService_folderbase").getItemAtIndex(i).value == exchWebServicesCalPrefs.getCharPref("ecFolderbase")) {
-					this._document.getElementById("exchWebService_folderbase").selectedIndex = i;
-				}
-			}
-			this._document.getElementById("exchWebService_mailbox").value = exchWebServicesCalPrefs.getCharPref("ecMailbox");
-			if (this._document.getElementById("exchWebService_mailbox").value == "") {
-				this.exchWebServicesChangeFolderbaseMenuItemAvailability(true);
-				this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
-			}
-
-
-
-			this.exchWebServicesgServer = exchWebServicesCalPrefs.getCharPref("ecServer");
-			this.exchWebServicesgUser = exchWebServicesCalPrefs.getCharPref("ecUser");
-			this.exchWebServicesgDomain = exchWebServicesCalPrefs.getCharPref("ecDomain");
-
-			this.exchWebServicesgFolderBase = exchWebServicesCalPrefs.getCharPref("ecFolderbase");
-			this.exchWebServicesgFolderPath = exchWebServicesCalPrefs.getCharPref("ecFolderpath");
-			this.exchWebServicesgMailbox = exchWebServicesCalPrefs.getCharPref("ecMailbox");
-			try {
-				this.exchWebServicesgFolderID = exchWebServicesCalPrefs.getCharPref("ecFolderID");
-			} catch(err) { this.exchWebServicesgFolderID = ""; }
-			try {
-				this.exchWebServicesgChangeKey = exchWebServicesCalPrefs.getCharPref("ecChangeKey");
-			} catch(err) { this.exchWebServicesgChangeKey = ""; }
-			try {
-				this.exchWebServicesgFolderIdOfShare = exchWebServicesCalPrefs.getCharPref("ecFolderIDOfShare");
-				this._document.getElementById("exchWebService_folderidofshare").value = this.exchWebServicesgFolderIdOfShare;
-			} catch(err) { this.exchWebServicesgFolderIdOfShare = ""; }
-		}
-
-		this.gexchWebServicesDetailsChecked = true;
-		this.gexchWebServices2ndDetailsChecked = true;
-
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesSaveExchangeSettingsByCalId: function _exchWebServicesSaveExchangeSettingsByCalId(aCalId)
-	{
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+aCalId+".");
-
-		if (exchWebServicesCalPrefs) {
-			exchWebServicesCalPrefs.setCharPref("ecServer", this.exchWebServicesgServer);
-			exchWebServicesCalPrefs.setCharPref("ecUser", this.exchWebServicesgUser);
-			exchWebServicesCalPrefs.setCharPref("ecDomain", this.exchWebServicesgDomain);
-			exchWebServicesCalPrefs.setCharPref("ecFolderpath", this.exchWebServicesgFolderPath);
-			exchWebServicesCalPrefs.setCharPref("ecFolderbase", this.exchWebServicesgFolderBase);
-			exchWebServicesCalPrefs.setCharPref("ecMailbox", this.exchWebServicesgMailbox);
-		}
-
-		if ((this.exchWebServicesgFolderPath == "/") && (this.exchWebServicesgFolderIdOfShare == "")) {
-			this.exchWebServicesgFolderID = "";
-			this.exchWebServicesgChangeKey = "";
-		}
-		exchWebServicesCalPrefs.setCharPref("ecFolderID", this.exchWebServicesgFolderID);
-		exchWebServicesCalPrefs.setCharPref("ecChangeKey", this.exchWebServicesgChangeKey);
-
-		exchWebServicesCalPrefs.setCharPref("ecFolderIDOfShare", this.exchWebServicesgFolderIdOfShare);
-
-	},
-
-	exchWebServicesDoFolderBrowse: function _exchWebServicesDoFolderBrowse()
-	{
-		var input = { answer: "",
-				parentFolder: {user: this.exchWebServicesGetUsername(), 
-						mailbox: this.exchWebServicesgMailbox,
-						folderBase: this.exchWebServicesgFolderBase,
-						serverUrl: this.exchWebServicesgServer,
-						folderID: null,
-						changeKey: null} 
-				};
-
-		this._window.openDialog("chrome://exchangecalendar/content/browseFolder.xul",
-				"browseFolder",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
-				input); 
-
-		if (input.answer == "select") {
-			this._document.getElementById("exchWebService_folderpath").value = input.fullPath;
-			this.exchWebServicesgFolderPath = input.fullPath;
-
-			this.gexchWebServices2ndDetailsChecked = true;
-
-			if (input.fullPath == "/") {
-				this.exchWebServicesgFolderID = "";
-				this.exchWebServicesgChangeKey = "";
-			}
-			else {
-				this.exchWebServicesgFolderID = input.selectedFolder.folderID;
-				this.exchWebServicesgChangeKey = input.selectedFolder.changeKey;
-			}
-			this.exchWebServicesCheckRequired();
-		}
-	},
-
-	exchWebServicesLoadExchangeSettingsByContactUUID: function _exchWebServicesLoadExchangeSettingsByContactUUID(aUUID)
-	{
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+aUUID+".");
-
-		if (exchWebServicesCalPrefs) {
-
-			this._document.getElementById("exchWebService_contact_description").value = exchWebServicesCalPrefs.getCharPref("description");
-			this._document.getElementById("exchWebService_mailbox").value = exchWebServicesCalPrefs.getCharPref("mailbox");
-		        if (this._document.getElementById("exchWebService_mailbox").value == "") {
-		                this.exchWebServicesChangeFolderbaseMenuItemAvailability(true);
-		                this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
-		        }
-
-			this._document.getElementById("exchWebService_server").value = exchWebServicesCalPrefs.getCharPref("server");
-			this._document.getElementById("exchWebService_windowsuser").value = exchWebServicesCalPrefs.getCharPref("user");
-		        if (this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") > -1) {
-		                //this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false);
-		                this._document.getElementById("exchWebService_windowsdomain").disabled = true;
-		        }
-			this._document.getElementById("exchWebService_windowsdomain").value = exchWebServicesCalPrefs.getCharPref("domain");
-
-			this._document.getElementById("exchWebService_folderpath").value = exchWebServicesCalPrefs.getCharPref("folderpath");
-
-			for (var i=0; i < this._document.getElementById("exchWebService_folderbase").itemCount; i++) {
-				if (this._document.getElementById("exchWebService_folderbase").getItemAtIndex(i).value == exchWebServicesCalPrefs.getCharPref("folderbase")) {
-					this._document.getElementById("exchWebService_folderbase").selectedIndex = i;
-					break;
-				}
-			}
-
-			this.exchWebServicesgServer = exchWebServicesCalPrefs.getCharPref("server");
-			this.exchWebServicesgUser = exchWebServicesCalPrefs.getCharPref("user");
-			this.exchWebServicesgDomain = exchWebServicesCalPrefs.getCharPref("domain");
-
-			this.exchWebServicesgFolderBase = exchWebServicesCalPrefs.getCharPref("folderbase");
-			this.exchWebServicesgFolderPath = exchWebServicesCalPrefs.getCharPref("folderpath");
-			this.exchWebServicesgMailbox = exchWebServicesCalPrefs.getCharPref("mailbox");
-			try {
-				this.exchWebServicesgFolderID = exchWebServicesCalPrefs.getCharPref("folderid");
-			} catch(err) { this.exchWebServicesgFolderID = ""; }
-			try {
-				this.exchWebServicesgChangeKey = exchWebServicesCalPrefs.getCharPref("changekey");
-			} catch(err) { this.exchWebServicesgChangeKey = ""; }
-		        try {
-		                this.exchWebServicesgFolderIdOfShare = exchWebServicesCalPrefs.getCharPref("folderIDOfShare");
-		                this._document.getElementById("exchWebService_folderidofshare").value = this.exchWebServicesgFolderIdOfShare;
-		        } catch(err) { this.exchWebServicesgFolderIdOfShare = ""; }
-		}
-
-		this.gexchWebServicesDetailsChecked = true;
-		this.gexchWebServices2ndDetailsChecked = true;
-
-		this.exchWebServicesCheckRequired();
-	},
-
-	exchWebServicesSaveExchangeSettingsByContactUUID: function _exchWebServicesSaveExchangeSettingsByContactUUID(isNewDirectory, aUUID)
-	{
-
-		if (!isNewDirectory) {
-			var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-			            .getService(Ci.nsIPrefService)
-				    .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+aUUID+".");
-		}
-
-		if ((exchWebServicesCalPrefs) && (!isNewDirectory)) {
-			exchWebServicesCalPrefs.setCharPref("description", this._document.getElementById("exchWebService_contact_description").value);
-			exchWebServicesCalPrefs.setCharPref("server", this.exchWebServicesgServer);
-			exchWebServicesCalPrefs.setCharPref("user", this.exchWebServicesgUser);
-			exchWebServicesCalPrefs.setCharPref("domain", this.exchWebServicesgDomain);
-			exchWebServicesCalPrefs.setCharPref("folderpath", this.exchWebServicesgFolderPath);
-		this.globalFunctions.LOG("exchWebServicesSaveExchangeSettingsByContactUUID: folderbase:"+this.exchWebServicesgFolderBase);
-			exchWebServicesCalPrefs.setCharPref("folderbase", this.exchWebServicesgFolderBase);
-			exchWebServicesCalPrefs.setCharPref("mailbox", this.exchWebServicesgMailbox);
-		}
-
-		if (this.exchWebServicesgFolderPath == "/") {
-			this.exchWebServicesgFolderID = "";
-			this.exchWebServicesgChangeKey = "";
-		}
-
-		if (!isNewDirectory) {
-			exchWebServicesCalPrefs.setCharPref("folderid", this.exchWebServicesgFolderID);
-			exchWebServicesCalPrefs.setCharPref("changekey", this.exchWebServicesgChangeKey);
-			exchWebServicesCalPrefs.setCharPref("folderIDOfShare", this.exchWebServicesgFolderIdOfShare);
-		}
-
-		return {
-				description: this._document.getElementById("exchWebService_contact_description").value,
-				mailbox: this.exchWebServicesgMailbox,
-				user: this.exchWebServicesgUser,
-				domain: this.exchWebServicesgDomain,
-				serverUrl: this.exchWebServicesgServer,
-				folderBase: this.exchWebServicesgFolderBase,
-				folderPath: this.exchWebServicesgFolderPath,
-				folderID: this.exchWebServicesgFolderID,
-				changeKey: this.exchWebServicesgChangeKey,
-				folderIDOfShare: this.exchWebServicesgFolderIdOfShare 
-			};
-	},
+    gexchWebServicesDetailsChecked: false,
+    gexchWebServices2ndDetailsChecked: true,
+
+    exchWebServicesgAutoDiscover: false,
+    exchWebServicesgServer: "",
+    exchWebServicesgMailbox: "",
+    exchWebServicesgDisplayName: "",
+    exchWebServicesgUser: "",
+    exchWebServicesgDomain: "",
+    exchWebServicesgFolderIdOfShare: "",
+    exchWebServicesgFolderBase: "calendar",
+    exchWebServicesgFolderPath: "/",
+    exchWebServicesgFolderID: "",
+    exchWebServicesgChangeKey: "",
+
+    exchWebServicesValidUsernameDomain: function _exchWebServicesValidUsernameDomain() {
+        return true;
+
+        /*	if ((this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") > -1) &&
+        		(this._document.getElementById("exchWebService_windowsdomain").value == "")) {
+        		return true;
+        	}
+
+        	if ((this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") == -1) &&
+        		(this._document.getElementById("exchWebService_windowsdomain").value != "")) {
+        		return true;
+        	}
+
+        	return false; */
+    },
+
+    exchWebServicesCheckRequired: function _exchWebServicesCheckRequired() {
+
+        if (!this.gexchWebServicesDetailsChecked) {
+            this._document.getElementById("exchWebService_folderbaserow").hidden = true;
+            this._document.getElementById("exchWebService_folderpathrow").hidden = true;
+            this._document.getElementById("exchWebServices-SharedFolderID").hidden = true;
+            this._document.getElementById("exchWebServices-UserAvailability").hidden = true;
+        }
+
+        if ((!this.gexchWebServices2ndDetailsChecked) || (!this.gexchWebServicesDetailsChecked)) {
+            this._document.getElementById("exchWebService_detailschecked").setAttribute("required", true);
+        }
+        else {
+            this._document.getElementById("exchWebService_detailschecked").setAttribute("required", false);
+        }
+
+        if (this._document.getElementById("exchWebService_autodiscover").checked) {
+
+            this.exchWebServicesChangeFolderbaseMenuItemAvailability(false);
+
+            this._document.getElementById("exchWebService_mailbox").setAttribute("required", true);
+            this._document.getElementById("exchWebService_servercheckrow").hidden = true;
+
+            if ((this._document.getElementById("exchWebService_mailbox").value == "")
+                || (!this.exchWebServicesValidUsernameDomain())) {
+                this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
+                this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
+            }
+            else {
+                this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = false;
+                this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
+            }
+            this._document.getElementById("exchWebService_server").disabled = true;
+        }
+        else {
+            this._document.getElementById("exchWebService_mailbox").setAttribute("required", false);
+            if (this._document.getElementById("exchWebService_mailbox").value == "") {
+
+                if (this._document.getElementById("exchWebService_mailbox").value == "") {
+                    this.exchWebServicesChangeFolderbaseMenuItemAvailability(true);
+                    this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
+                }
+
+                // No mailbox specified. We only do server check.
+                if ((this._document.getElementById("exchWebService_server").value == "")
+                    || (!this.exchWebServicesValidUsernameDomain())) {
+                    this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_servercheckrow").hidden = true;
+                }
+                else {
+                    this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_servercheckrow").hidden = false;
+                }
+            }
+            else {
+                this.exchWebServicesChangeFolderbaseMenuItemAvailability(false);
+
+                // No mailbox specified. We do server and mailbox check
+                // No mailbox specified. We only do server check.
+                if ((this._document.getElementById("exchWebService_server").value == "")
+                    || (!this.exchWebServicesValidUsernameDomain())) {
+                    this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_servercheckrow").hidden = true;
+                }
+                else {
+                    this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
+                    this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = false;
+                    this._document.getElementById("exchWebService_servercheckrow").hidden = true;
+                }
+            }
+
+            this._document.getElementById("exchWebService_server").disabled = false;
+        }
+
+        if (this.gexchWebServicesDetailsChecked) {
+            this._document.getElementById("exchWebService_autodiscovercheckrow").hidden = true;
+            this._document.getElementById("exchWebService_serverandmailboxcheckrow").hidden = true;
+            this._document.getElementById("exchWebService_servercheckrow").hidden = true;
+
+            this._document.getElementById("exchWebService_folderbaserow").hidden = (this.exchWebServicesgFolderIdOfShare != "");
+            this._document.getElementById("exchWebService_folderpathrow").hidden = (this.exchWebServicesgFolderIdOfShare != "");
+
+            this._document.getElementById("exchWebServices-SharedFolderID").hidden = (this.exchWebServicesgFolderIdOfShare == "");
+
+        }
+
+        // We determine which to use on the dialog id which is active for the current this._document.
+        if (this._document.getElementById("exchWebService_ContactSettings_dialog")) { // Contact settings dialog.
+            tmpExchangeContactSettings.checkRequired();
+        }
+        else {
+            if (this._document.getElementById("exchWebService_ExchangeSettings_dialog")) { // EWS Settings dialog.
+                tmpExchangeSettings.checkRequired();
+            }
+            else {
+                if (this._document.getElementById("exchWebService_CloneSettings_dialog")) { // Clone Settings dialog.
+                    tmpExchangeCloneSettings.checkRequired();
+                }
+                else {
+                    try {
+                        checkRequired(); // On creating a new calendar. Default Lightning create calendar wizard.
+                    }
+                    catch (ex) {
+                        this.globalFunctions.LOG("NO checkRequired found.");
+                    }
+                }
+            }
+        }
+
+        if (this._window) {
+            this._window.sizeToContent();
+        }
+    },
+
+    exchWebServicesAutodiscoverCheckbox: function _exchWebServicesAutodiscoverCheckbox(aCheckBox) {
+        this.exchWebServicesgAutoDiscover = aCheckBox.checked;
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesServerType: function _exchWebServicesServerType(radioGroup) {
+        if (radioGroup.selectedIndex == 1) {
+            this._document.getElementById("exchWebService_server").value = "https://outlook.office365.com/EWS/Exchange.asmx";
+            this._document.getElementById("exchWebService_autodiscover").checked = false;
+            this._document.getElementById("exchWebService_autodiscover").disabled = true;
+
+            this.exchWebServicesgServer = this._document.getElementById("exchWebService_server").value;
+            this.exchWebServicesgUser = this._document.getElementById("exchWebService_mailbox").value;
+            this._document.getElementById("exchWebService_windowsuser").value = this.exchWebServicesgUser;
+        }
+        else {
+            this._document.getElementById("exchWebService_server").value = "";
+            this.exchWebServicesgServer = "";
+            this._document.getElementById("exchWebService_windowsuser").value = "";
+            this.exchWebServicesgUser = "";
+            this._document.getElementById("exchWebService_autodiscover").checked = false;
+            this._document.getElementById("exchWebService_autodiscover").disabled = false;
+        }
+
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesInitMailbox: function _exchWebServicesInitMailbox(aNewValue) {
+        this.exchWebServicesgMailbox = aNewValue;
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesDoMailboxChanged: function _exchWebServicesDoMailboxChanged(aTextBox) {
+        this.exchWebServicesgMailbox = aTextBox.value;
+        this._document.getElementById("exchWebService_displayname").value = "";
+        this.exchWebServicesgDisplayName = "";
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesDoUserChanged: function _exchWebServicesDoUserChanged(aTextBox) {
+        this.exchWebServicesgUser = aTextBox.value;
+        if ((this.exchWebServicesgUser.indexOf("@") > -1) || (this.exchWebServicesgUser.indexOf("\\") > -1)) {
+            this._document.getElementById("exchWebService_windowsdomain").disabled = true;
+            this._document.getElementById("exchWebService_windowsdomain").value = "";
+            //this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false);
+            this.exchWebServicesgDomain = "";
+
+            if (this.exchWebServicesgUser.indexOf("\\") > -1) {
+                var username = this.exchWebServicesgUser;
+                this.exchWebServicesgUser = username.substr(0, username.indexOf("\\"));
+                this.exchWebServicesgDomain = username.substr(username.indexOf("\\") + 1);
+            }
+        }
+        else {
+            this._document.getElementById("exchWebService_windowsdomain").disabled = false;
+            //this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", true);
+        }
+
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesDoDomainChanged: function _exchWebServicesDoDomainChanged(aTextBox) {
+        this.exchWebServicesgDomain = aTextBox.value;
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesDoFolderIdOfShareChanged: function _exchWebServicesDoFolderIdOfShareChanged(aTextBox) {
+        this.exchWebServicesgFolderIdOfShare = aTextBox.value;
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesDoServerChanged: function _exchWebServicesDoServerChanged(aTextBox) {
+        this.exchWebServicesgServer = aTextBox.value;
+        this.gexchWebServicesDetailsChecked = false;
+        this.exchWebServicesCheckRequired();
+    },
+
+    // newStatus = true will disable folderbase menuitems
+    // newStatus = false will enable all folderbase menuitems
+
+    exchWebServicesChangeFolderbaseMenuItemAvailability: function _exchWebServicesChangeFolderbaseMenuItemAvailability(newStatus) {
+        var menuItem = this._document.getElementById("menupopup.ecfolderbase").firstChild;
+        while (menuItem) {
+            if (!menuItem.hasAttribute("donotchange")) {
+                menuItem.disabled = newStatus;
+            }
+            menuItem = menuItem.nextSibling;
+        }
+
+    },
+
+    exchWebServicesDoFolderBaseChanged: function _exchWebServicesDoFolderBaseChanged(aMenuList) {
+        this.exchWebServicesgFolderBase = aMenuList.value;
+
+        // Reset folder path
+        this._document.getElementById("exchWebService_folderpath").value = "/";
+        this.exchWebServicesgFolderPath = "/";
+
+        this.exchWebServicesgFolderID = "";
+        this.exchWebServicesgChangeKey = "";
+
+        if (this._document.getElementById("exchWebService_folderpath").value != "/") {
+            this.gexchWebServices2ndDetailsChecked = false;
+        }
+        else {
+            this.gexchWebServices2ndDetailsChecked = true;
+        }
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesGetUsername: function _exchWebServicesGetUsername() {
+        if (this.exchWebServicesgUser.indexOf("@") > -1) {
+            return this.exchWebServicesgUser;
+        }
+        else {
+            if (this.exchWebServicesgDomain == "") {
+                return this.exchWebServicesgUser;
+            }
+            else {
+                return this.exchWebServicesgDomain + "\\" + this.exchWebServicesgUser;
+            }
+        }
+    },
+
+    exchWebServicesDoCheckServerAndMailbox: function _exchWebServicesDoCheckServerAndMailbox() {
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = true;
+
+        var folderIdOfShare = this.exchWebServicesgFolderIdOfShare;
+
+        var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+        myAuthPrompt2.removeUserCanceled(this.exchWebServicesgServer);
+
+        try {
+            this._window.setCursor("wait");
+            var self = this;
+            if ((folderIdOfShare) && (folderIdOfShare != "")) {
+                var tmpObject = new erConvertIDRequest({
+                        user: this.exchWebServicesGetUsername(),
+                        mailbox: this.exchWebServicesgMailbox,
+                        serverUrl: this.exchWebServicesgServer,
+                        folderId: folderIdOfShare
+                    },
+                    function (aFolderID, aMailbox) {
+                        self.exchWebServicesConvertIDOK(aFolderID, aMailbox);
+                    },
+                    function (aExchangeRequest, aCode, aMsg) {
+                        self.exchWebServicesConvertIDError(aExchangeRequest, aCode, aMsg);
+                    });
+            }
+            else {
+                this.globalFunctions.LOG("exchWebServicesConvertIDOK: user:" + this.exchWebServicesGetUsername() + ", mailbox:" + this.exchWebServicesgMailbox);
+                var tmpObject = new erPrimarySMTPCheckRequest({
+                        user: this.exchWebServicesGetUsername(),
+                        mailbox: this.exchWebServicesgMailbox,
+                        serverUrl: this.exchWebServicesgServer,
+                        folderBase: "calendar"
+                    },
+                    function (newPrimarySMTP) {
+                        self.exchWebServicesCheckServerAndMailboxOK(newPrimarySMTP);
+                    },
+                    function (aExchangeRequest, aCode, aMsg) {
+                        self.exchWebServicesCheckServerAndMailboxError(aExchangeRequest, aCode, aMsg);
+                    });
+            }
+        }
+        catch (err) {
+            this._window.setCursor("auto");
+            this.globalFunctions.ERROR("Warning: Error during creation of erPrimarySMTPCheckRequest. Err=" + err + "\n");
+        }
+    },
+
+    exchWebServicesConvertIDOK: function _exchWebServicesConvertIDOK(aFolderID, aMailbox) {
+        this.globalFunctions.LOG("exchWebServicesConvertIDOK: aFolderID:" + aFolderID + ", aMailbox:" + aMailbox);
+
+        try {
+            this._window.setCursor("wait");
+            var self = this;
+            var tmpObject = new erGetFolderRequest({
+                    user: this.exchWebServicesGetUsername(),
+                    mailbox: aMailbox,
+                    serverUrl: this.exchWebServicesgServer,
+                    folderID: aFolderID
+                },
+                function (aExchangeRequest, aFolderID, aChangeKey, aFolderClass) {
+                    self.exchWebServicesGetFolderOK(aExchangeRequest, aFolderID, aChangeKey, aFolderClass);
+                },
+                function (aExchangeRequest, aCode, aMsg) {
+                    self.exchWebServicesGetFolderError(aExchangeRequest, aCode, aMsg);
+                });
+        }
+        catch (err) {
+            this._window.setCursor("auto");
+            this.globalFunctions.ERROR("Warning: Error during creation of erPrimarySMTPCheckRequest (2). Err=" + err + "\n");
+        }
+    },
+
+    exchWebServicesConvertIDError: function _exchWebServicesConvertIDError(aExchangeRequest, aCode, aMsg) {
+        this.gexchWebServicesDetailsChecked = false;
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            break;
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+        }
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesGetFolderOK: function _exchWebServicesGetFolderOK(aExchangeRequest, aFolderID, aChangeKey, aFolderClass) {
+        this.globalFunctions.LOG("exchWebServicesGetFolderOK: aFolderID:" + aFolderID + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
+
+        if (aFolderClass == "IPF.Appointment" || aFolderClass == "IPF.Task") {
+            this.exchWebServicesgFolderID = aFolderID;
+            this.exchWebServicesgChangeKey = aChangeKey;
+            this.gexchWebServicesDetailsChecked = true;
+            this.gexchWebServices2ndDetailsChecked = true;
+            this._document.getElementById("exchWebServices-SharedFolderID-label").value = aExchangeRequest.displayName;
+        }
+        else {
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+        }
+
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
+
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesGetFolderError: function _exchWebServicesGetFolderError(aExchangeRequest, aCode, aMsg) {
+        this.gexchWebServicesDetailsChecked = false;
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            break;
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+        }
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesCheckServerAndMailboxOK: function _exchWebServicesCheckServerAndMailboxOK(newPrimarySMTP) {
+
+        if (newPrimarySMTP) {
+            this.exchWebServicesgMailbox = newPrimarySMTP
+            this._document.getElementById("exchWebService_mailbox").value = newPrimarySMTP;
+        }
+
+        this.gexchWebServicesDetailsChecked = true;
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
+
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesCheckServerAndMailboxError: function _exchWebServicesCheckServerAndMailboxError(aExchangeRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("exchWebServicesCheckServerAndMailboxError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.gexchWebServicesDetailsChecked = false;
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            break;
+        case -7:
+        case -208: // folderNotFound. 
+            this.checkUserAvailability();
+            return;
+        case -212:
+            aMsg = aMsg + "(" + this.exchWebServicesgMailbox + ")";
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+        }
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    // Check if we can get useravailability
+    checkUserAvailability: function _checkUserAvailability() {
+        this.globalFunctions.LOG("checkUserAvailability");
+        var self = this;
+
+        var start = cal.now();
+        var offset = cal.createDuration();
+        offset.hours = 10;
+        var end = start.clone();
+        end.addDuration(offset);
+
+        var tmpObject = new erGetUserAvailabilityRequest({
+                user: this.exchWebServicesGetUsername(),
+                mailbox: this.exchWebServicesgMailbox,
+                serverUrl: this.exchWebServicesgServer,
+                folderBase: "calendar",
+                email: this.exchWebServicesgMailbox,
+                attendeeType: 'Required',
+                start: cal.toRFC3339(start),
+                end: cal.toRFC3339(end)
+            },
+            function (erGetUserAvailabilityRequest, aEvents) {
+                self.checkUserAvailabilityOk(erGetUserAvailabilityRequest, aEvents);
+            },
+            function (erGetUserAvailabilityRequest, aCode, aMsg) {
+                self.checkUserAvailabilityError(erGetUserAvailabilityRequest, aCode, aMsg);
+            });
+
+    },
+
+    checkUserAvailabilityOk: function _checkUserAvailabilityOk(erGetUserAvailabilityRequest, aEvents) {
+        this.globalFunctions.LOG("checkUserAvailabilityOk");
+        this.exchWebServicesCheckServerAndMailboxOK();
+        this._document.getElementById("exchWebService_folderbaserow").hidden = true;
+        this._document.getElementById("exchWebService_folderpathrow").hidden = true;
+        this._document.getElementById("exchWebServices-UserAvailability").hidden = false;
+    },
+
+    checkUserAvailabilityError: function _checkUserAvailabilityError(erGetUserAvailabilityRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("checkUserAvailabilityError");
+        this.gexchWebServicesDetailsChecked = false;
+
+        alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+
+        this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesDoCheckServer: function _exchWebServicesDoCheckServer() {
+        this._document.getElementById("exchWebService_servercheckbutton").disabled = true;
+
+
+        try {
+            this._window.setCursor("wait");
+            var self = this;
+            var tmpObject = new erGetFolderRequest({
+                    user: this.exchWebServicesGetUsername(),
+                    mailbox: "",
+                    folderBase: "publicfoldersroot",
+                    folderPath: "/",
+                    serverUrl: this.exchWebServicesgServer
+                },
+                function (folderID, changeKey, folderClass) {
+                    self.exchWebServicesCheckServerOK(folderID, changeKey, folderClass);
+                },
+                function (aExchangeRequest, aCode, aMsg) {
+                    self.exchWebServicesCheckServerError(aExchangeRequest, aCode, aMsg);
+                })
+        }
+        catch (err) {
+            this._window.setCursor("auto");
+            this.globalFunctions.ERROR("Warning: Error during creation of erGetFolderRequest. Err=" + err + "\n");
+        }
+    },
+
+    exchWebServicesCheckServerOK: function _exchWebServicesCheckServerOK(folderID, changeKey, folderClass) {
+
+        this.gexchWebServicesDetailsChecked = true;
+        this._document.getElementById("exchWebService_servercheckbutton").disabled = false;
+        //	exchWebServicesChangeFolderbaseMenuItemAvailability(true);
+        //	this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
+
+        if (this.exchWebServicesgFolderBase != "publicfoldersroot") {
+            this.exchWebServicesgFolderBase = "publicfoldersroot";
+            this._document.getElementById("exchWebService_folderbase").value = "publicfoldersroot";
+            this._document.getElementById("exchWebService_folderpath").value = "/";
+        }
+
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesCheckServerError: function _exchWebServicesCheckServerError(aExchangeRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("exchWebServicesCheckServerError");
+        this.gexchWebServicesDetailsChecked = false;
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            break;
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecalendar"));
+        }
+        this._document.getElementById("exchWebService_servercheckbutton").disabled = false;
+
+        //	exchWebServicesChangeFolderbaseMenuItemAvailability(false);
+
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchAutoDiscovery2010: true,
+
+    exchWebServicesDoAutodiscoverCheck: function _exchWebServicesDoAutodiscoverCheck() {
+        this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = true;
+
+        try {
+            this._window.setCursor("wait");
+            this.exchAutoDiscovery2010 = true; // We first try Autodiscovery for Exchange2010 and higher.
+            var self = this;
+            var tmpObject = new erAutoDiscoverySOAPRequest({
+                    user: this.exchWebServicesGetUsername(),
+                    mailbox: this.exchWebServicesgMailbox
+                },
+                function (ewsUrls, DisplayName, SMTPAddress, redirectAddr) {
+                    self.exchWebServicesAutodiscoveryOK(ewsUrls, DisplayName, SMTPAddress, redirectAddr);
+                },
+                function (aExchangeRequest, aCode, aMsg) {
+                    self.exchWebServicesAutodiscoveryError(aExchangeRequest, aCode, aMsg);
+                }, null);
+        }
+        catch (err) {
+            this._window.setCursor("auto");
+            this.globalFunctions.ERROR("Warning: Could not create erAutoDiscoverRequest. Err=" + err + "\n");
+        }
+    },
+
+    exchWebServicesAutodiscoveryOK: function _exchWebServicesAutodiscoveryOK(ewsUrls, DisplayName, SMTPAddress, redirectAddr) {
+        this.globalFunctions.LOG("ecAutodiscoveryOK");
+
+        if (redirectAddr) {
+            // We have an redirectAddr. Go use the new email address as primary.
+            this.globalFunctions.LOG("ecAutodiscoveryOK: We received an redirectAddr:" + redirectAddr);
+            this.exchWebServicesgMailbox = redirectAddr;
+            this._document.getElementById("exchWebService_mailbox").value = redirectAddr;
+            this.exchWebServicesDoAutodiscoverCheck();
+            return;
+        }
+
+        var selectedEWSUrl = {
+            value: undefined
+        };
+        var userCancel = false;
+
+        if (ewsUrls) {
+            if (ewsUrls.length > 1) {
+                // We have got multiple ews urls returned. Let the user choose.
+
+                this._window.openDialog("chrome://exchangecalendar/content/selectEWSUrl.xul",
+                    "selectfrommultipleews",
+                    "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
+                    ewsUrls, selectedEWSUrl);
+
+                if ((!selectedEWSUrl.value) || (selectedEWSUrl.value == "")) {
+                    this.globalFunctions.LOG("  ++++ Selection canceled by user");
+                    userCancel = true;
+                }
+            }
+            else {
+                // We only have one url. Use it.
+                //			selectedEWSUrl.value = ewsUrls.text();
+                selectedEWSUrl.value = ewsUrls[0].value;
+            }
+
+        }
+
+        if (!userCancel) {
+            this.exchWebServicesgDisplayName = DisplayName;
+            this._document.getElementById("exchWebService_displayname").value = DisplayName;
+
+            if ((SMTPAddress) && (SMTPAddress != '')) {
+                this.exchWebServicesgMailbox = SMTPAddress;
+                this._document.getElementById("exchWebService_mailbox").value = SMTPAddress;
+            }
+
+            this.exchWebServicesgServer = selectedEWSUrl.value;
+            this._document.getElementById("exchWebService_server").value = selectedEWSUrl.value;
+
+            //this.gexchWebServicesDetailsChecked = true;
+            this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
+            this._document.getElementById("exchWebService_autodiscover").checked = false;
+
+            this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = true;
+            this.exchWebServicesDoCheckServerAndMailbox();
+            return;
+
+        }
+        else {
+            this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
+        }
+
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesAutodiscoveryError: function _exchWebServicesAutodiscoveryError(aExchangeRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("ecAutodiscoveryError. aCode:" + aCode + ", aMsg:" + aMsg);
+
+        if ((this.exchAutoDiscovery2010 == true) && (aCode != -20)) {
+            this.globalFunctions.LOG("exchWebServicesAutodiscoveryError: Going to try old POX autodiscovery as SOAP autodiscovery did not succeed.");
+            this.exchAutoDiscovery2010 = false; // AutoDiscovery for Exchange2010 and higher failed. Next try old POX Autodiscovery.
+
+            try {
+                var self = this;
+                var tmpObject = new erAutoDiscoverRequest({
+                        user: this.exchWebServicesGetUsername(),
+                        mailbox: this.exchWebServicesgMailbox
+                    },
+                    function (ewsUrls, DisplayName, SMTPAddress, redirectAddr) {
+                        self.exchWebServicesAutodiscoveryOK(ewsUrls, DisplayName, SMTPAddress, redirectAddr);
+                    },
+                    function (aExchangeRequest, aCode, aMsg) {
+                        self.exchWebServicesAutodiscoveryError(aExchangeRequest, aCode, aMsg);
+                    }, null);
+                return;
+            }
+            catch (err) {
+                this._window.setCursor("auto");
+                this.globalFunctions.ERROR("Warning: Could not create erAutoDiscoverRequest. Err=" + err + "\n");
+                return;
+            }
+        }
+
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+        case -9:
+        case -10:
+        case -14:
+        case -15:
+        case -16:
+        case -17:
+        case -18:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [this.exchWebServicesgMailbox], "exchangecalendar"));
+            break;
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecalendar"));
+        }
+
+        this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
+        this.exchWebServicesCheckRequired();
+        this._window.setCursor("auto");
+    },
+
+    exchWebServicesLoadExchangeSettingsByCalId: function _exchWebServicesLoadExchangeSettingsByCalId(aCalId) {
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + aCalId + ".");
+
+        if (exchWebServicesCalPrefs) {
+            this._document.getElementById("exchWebService_server").value = exchWebServicesCalPrefs.getCharPref("ecServer");
+            this._document.getElementById("exchWebService_windowsuser").value = exchWebServicesCalPrefs.getCharPref("ecUser");
+            if (this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") > -1) {
+                //this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false);
+                this._document.getElementById("exchWebService_windowsdomain").disabled = true;
+            }
+            this._document.getElementById("exchWebService_windowsdomain").value = exchWebServicesCalPrefs.getCharPref("ecDomain");
+            this._document.getElementById("exchWebService_folderpath").value = exchWebServicesCalPrefs.getCharPref("ecFolderpath");
+
+            for (var i = 0; i < this._document.getElementById("exchWebService_folderbase").itemCount; i++) {
+                if (this._document.getElementById("exchWebService_folderbase").getItemAtIndex(i).value == exchWebServicesCalPrefs.getCharPref("ecFolderbase")) {
+                    this._document.getElementById("exchWebService_folderbase").selectedIndex = i;
+                }
+            }
+            this._document.getElementById("exchWebService_mailbox").value = exchWebServicesCalPrefs.getCharPref("ecMailbox");
+            if (this._document.getElementById("exchWebService_mailbox").value == "") {
+                this.exchWebServicesChangeFolderbaseMenuItemAvailability(true);
+                this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
+            }
+
+
+
+            this.exchWebServicesgServer = exchWebServicesCalPrefs.getCharPref("ecServer");
+            this.exchWebServicesgUser = exchWebServicesCalPrefs.getCharPref("ecUser");
+            this.exchWebServicesgDomain = exchWebServicesCalPrefs.getCharPref("ecDomain");
+
+            this.exchWebServicesgFolderBase = exchWebServicesCalPrefs.getCharPref("ecFolderbase");
+            this.exchWebServicesgFolderPath = exchWebServicesCalPrefs.getCharPref("ecFolderpath");
+            this.exchWebServicesgMailbox = exchWebServicesCalPrefs.getCharPref("ecMailbox");
+            try {
+                this.exchWebServicesgFolderID = exchWebServicesCalPrefs.getCharPref("ecFolderID");
+            }
+            catch (err) {
+                this.exchWebServicesgFolderID = "";
+            }
+            try {
+                this.exchWebServicesgChangeKey = exchWebServicesCalPrefs.getCharPref("ecChangeKey");
+            }
+            catch (err) {
+                this.exchWebServicesgChangeKey = "";
+            }
+            try {
+                this.exchWebServicesgFolderIdOfShare = exchWebServicesCalPrefs.getCharPref("ecFolderIDOfShare");
+                this._document.getElementById("exchWebService_folderidofshare").value = this.exchWebServicesgFolderIdOfShare;
+            }
+            catch (err) {
+                this.exchWebServicesgFolderIdOfShare = "";
+            }
+        }
+
+        this.gexchWebServicesDetailsChecked = true;
+        this.gexchWebServices2ndDetailsChecked = true;
+
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesSaveExchangeSettingsByCalId: function _exchWebServicesSaveExchangeSettingsByCalId(aCalId) {
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + aCalId + ".");
+
+        if (exchWebServicesCalPrefs) {
+            exchWebServicesCalPrefs.setCharPref("ecServer", this.exchWebServicesgServer);
+            exchWebServicesCalPrefs.setCharPref("ecUser", this.exchWebServicesgUser);
+            exchWebServicesCalPrefs.setCharPref("ecDomain", this.exchWebServicesgDomain);
+            exchWebServicesCalPrefs.setCharPref("ecFolderpath", this.exchWebServicesgFolderPath);
+            exchWebServicesCalPrefs.setCharPref("ecFolderbase", this.exchWebServicesgFolderBase);
+            exchWebServicesCalPrefs.setCharPref("ecMailbox", this.exchWebServicesgMailbox);
+        }
+
+        if ((this.exchWebServicesgFolderPath == "/") && (this.exchWebServicesgFolderIdOfShare == "")) {
+            this.exchWebServicesgFolderID = "";
+            this.exchWebServicesgChangeKey = "";
+        }
+        exchWebServicesCalPrefs.setCharPref("ecFolderID", this.exchWebServicesgFolderID);
+        exchWebServicesCalPrefs.setCharPref("ecChangeKey", this.exchWebServicesgChangeKey);
+
+        exchWebServicesCalPrefs.setCharPref("ecFolderIDOfShare", this.exchWebServicesgFolderIdOfShare);
+
+    },
+
+    exchWebServicesDoFolderBrowse: function _exchWebServicesDoFolderBrowse() {
+        var input = {
+            answer: "",
+            parentFolder: {
+                user: this.exchWebServicesGetUsername(),
+                mailbox: this.exchWebServicesgMailbox,
+                folderBase: this.exchWebServicesgFolderBase,
+                serverUrl: this.exchWebServicesgServer,
+                folderID: null,
+                changeKey: null
+            }
+        };
+
+        this._window.openDialog("chrome://exchangecalendar/content/browseFolder.xul",
+            "browseFolder",
+            "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
+            input);
+
+        if (input.answer == "select") {
+            this._document.getElementById("exchWebService_folderpath").value = input.fullPath;
+            this.exchWebServicesgFolderPath = input.fullPath;
+
+            this.gexchWebServices2ndDetailsChecked = true;
+
+            if (input.fullPath == "/") {
+                this.exchWebServicesgFolderID = "";
+                this.exchWebServicesgChangeKey = "";
+            }
+            else {
+                this.exchWebServicesgFolderID = input.selectedFolder.folderID;
+                this.exchWebServicesgChangeKey = input.selectedFolder.changeKey;
+            }
+            this.exchWebServicesCheckRequired();
+        }
+    },
+
+    exchWebServicesLoadExchangeSettingsByContactUUID: function _exchWebServicesLoadExchangeSettingsByContactUUID(aUUID) {
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + aUUID + ".");
+
+        if (exchWebServicesCalPrefs) {
+
+            this._document.getElementById("exchWebService_contact_description").value = exchWebServicesCalPrefs.getCharPref("description");
+            this._document.getElementById("exchWebService_mailbox").value = exchWebServicesCalPrefs.getCharPref("mailbox");
+            if (this._document.getElementById("exchWebService_mailbox").value == "") {
+                this.exchWebServicesChangeFolderbaseMenuItemAvailability(true);
+                this._document.getElementById("menuitem.label.ecfolderbase.publicfoldersroot").disabled = false;
+            }
+
+            this._document.getElementById("exchWebService_server").value = exchWebServicesCalPrefs.getCharPref("server");
+            this._document.getElementById("exchWebService_windowsuser").value = exchWebServicesCalPrefs.getCharPref("user");
+            if (this._document.getElementById("exchWebService_windowsuser").value.indexOf("@") > -1) {
+                //this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false);
+                this._document.getElementById("exchWebService_windowsdomain").disabled = true;
+            }
+            this._document.getElementById("exchWebService_windowsdomain").value = exchWebServicesCalPrefs.getCharPref("domain");
+
+            this._document.getElementById("exchWebService_folderpath").value = exchWebServicesCalPrefs.getCharPref("folderpath");
+
+            for (var i = 0; i < this._document.getElementById("exchWebService_folderbase").itemCount; i++) {
+                if (this._document.getElementById("exchWebService_folderbase").getItemAtIndex(i).value == exchWebServicesCalPrefs.getCharPref("folderbase")) {
+                    this._document.getElementById("exchWebService_folderbase").selectedIndex = i;
+                    break;
+                }
+            }
+
+            this.exchWebServicesgServer = exchWebServicesCalPrefs.getCharPref("server");
+            this.exchWebServicesgUser = exchWebServicesCalPrefs.getCharPref("user");
+            this.exchWebServicesgDomain = exchWebServicesCalPrefs.getCharPref("domain");
+
+            this.exchWebServicesgFolderBase = exchWebServicesCalPrefs.getCharPref("folderbase");
+            this.exchWebServicesgFolderPath = exchWebServicesCalPrefs.getCharPref("folderpath");
+            this.exchWebServicesgMailbox = exchWebServicesCalPrefs.getCharPref("mailbox");
+            try {
+                this.exchWebServicesgFolderID = exchWebServicesCalPrefs.getCharPref("folderid");
+            }
+            catch (err) {
+                this.exchWebServicesgFolderID = "";
+            }
+            try {
+                this.exchWebServicesgChangeKey = exchWebServicesCalPrefs.getCharPref("changekey");
+            }
+            catch (err) {
+                this.exchWebServicesgChangeKey = "";
+            }
+            try {
+                this.exchWebServicesgFolderIdOfShare = exchWebServicesCalPrefs.getCharPref("folderIDOfShare");
+                this._document.getElementById("exchWebService_folderidofshare").value = this.exchWebServicesgFolderIdOfShare;
+            }
+            catch (err) {
+                this.exchWebServicesgFolderIdOfShare = "";
+            }
+        }
+
+        this.gexchWebServicesDetailsChecked = true;
+        this.gexchWebServices2ndDetailsChecked = true;
+
+        this.exchWebServicesCheckRequired();
+    },
+
+    exchWebServicesSaveExchangeSettingsByContactUUID: function _exchWebServicesSaveExchangeSettingsByContactUUID(isNewDirectory, aUUID) {
+
+        if (!isNewDirectory) {
+            var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + aUUID + ".");
+        }
+
+        if ((exchWebServicesCalPrefs) && (!isNewDirectory)) {
+            exchWebServicesCalPrefs.setCharPref("description", this._document.getElementById("exchWebService_contact_description").value);
+            exchWebServicesCalPrefs.setCharPref("server", this.exchWebServicesgServer);
+            exchWebServicesCalPrefs.setCharPref("user", this.exchWebServicesgUser);
+            exchWebServicesCalPrefs.setCharPref("domain", this.exchWebServicesgDomain);
+            exchWebServicesCalPrefs.setCharPref("folderpath", this.exchWebServicesgFolderPath);
+            this.globalFunctions.LOG("exchWebServicesSaveExchangeSettingsByContactUUID: folderbase:" + this.exchWebServicesgFolderBase);
+            exchWebServicesCalPrefs.setCharPref("folderbase", this.exchWebServicesgFolderBase);
+            exchWebServicesCalPrefs.setCharPref("mailbox", this.exchWebServicesgMailbox);
+        }
+
+        if (this.exchWebServicesgFolderPath == "/") {
+            this.exchWebServicesgFolderID = "";
+            this.exchWebServicesgChangeKey = "";
+        }
+
+        if (!isNewDirectory) {
+            exchWebServicesCalPrefs.setCharPref("folderid", this.exchWebServicesgFolderID);
+            exchWebServicesCalPrefs.setCharPref("changekey", this.exchWebServicesgChangeKey);
+            exchWebServicesCalPrefs.setCharPref("folderIDOfShare", this.exchWebServicesgFolderIdOfShare);
+        }
+
+        return {
+            description: this._document.getElementById("exchWebService_contact_description").value,
+            mailbox: this.exchWebServicesgMailbox,
+            user: this.exchWebServicesgUser,
+            domain: this.exchWebServicesgDomain,
+            serverUrl: this.exchWebServicesgServer,
+            folderBase: this.exchWebServicesgFolderBase,
+            folderPath: this.exchWebServicesgFolderPath,
+            folderID: this.exchWebServicesgFolderID,
+            changeKey: this.exchWebServicesgChangeKey,
+            folderIDOfShare: this.exchWebServicesgFolderIdOfShare
+        };
+    },
 }
 var tmpSettingsOverlay = new exchSettingsOverlay(document, window);
diff --git a/chrome/content/invitationResponse.js b/chrome/content/invitationResponse.js
index d1c7f2df..079b9760 100644
--- a/chrome/content/invitationResponse.js
+++ b/chrome/content/invitationResponse.js
@@ -40,103 +40,99 @@ var Cu = Components.utils;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 var exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-		.getService(Ci.mivExchangeStatistics); 
-		
+    .getService(Ci.mivExchangeStatistics);
+
 exchWebService.invitationResponse = {
 
-	onAccept: function _onAccept()
-	{
-		window.arguments[0].answer = "send";
-		window.arguments[0].bodyText = document.getElementById("exchWebService_messageReponseBody").value;
-		window.arguments[0].response = document.getElementById("exchWebService_itemResponse").value;
-
-		var pStart = this.formatDate(document.getElementById("exchWebService_propose_start").value);
-		var pEnd = this.formatDate(document.getElementById("exchWebService_propose_end").value);
-		
-		
-		window.arguments[0].proposeStart = pStart;	
-		window.arguments[0].proposeEnd = pEnd;
-
-		return true;
-	},
-	
-	formatDate: function _formatDate(date) {
-		var year = date.getFullYear(),
-			month = date.getMonth() + 1, // months are zero indexed
-			day = date.getDate(),
-			hour = date.getHours(),
-			minute = date.getMinutes(),
-			second = date.getSeconds(),
-			dayFormatted = day < 10 ? "0" + day : day,
-			monthFormatted = month < 10 ? "0" + month : month,  
-			hourFormatted = hour < 10 ? "0" + hour : hour,  
-			minuteFormatted = minute < 10 ? "0" + minute : minute,
-			secondFormatted = second < 10 ? "0" + second : second,
-			morning = hour < 12 ? "am" : "pm";
-
-		return year + "-" + monthFormatted + "-" + dayFormatted + "T" + hourFormatted + ":" +
-				minuteFormatted + ":"+ secondFormatted+ "Z"  ;
-	},
-	
-	onLoad: function _onLoad()
-	{
-		var item = window.arguments[0].item;
-
-		document.getElementById("exchWebService_calendarName").value = item.calendar.name;
-		document.getElementById("exchWebService_itemTitle").value = item.title;
-
-		let dtFormat = Cc["@mozilla.org/calendar/datetime-formatter;1"]
-		             .getService(Ci.calIDateTimeFormatter);
-
-		let tzService = Cc["@mozilla.org/calendar/timezone-service;1"]
-		             .getService(Ci.calITimezoneService);
-
-		let displayDate = item.startDate.getInTimezone(tzService.defaultTimezone);
-		document.getElementById("exchWebService_itemStart").value = dtFormat.formatDate(displayDate)+" "+dtFormat.formatTime(displayDate);
-
-		document.getElementById("exchWebService_itemResponse").value = window.arguments[0].response;
-
-		if (item.organizer) {
-			document.getElementById("exchWebService_meetingOrganiser").value = item.organizer.commonName+" ("+item.organizer.id.replace(/^mailto:/i, '')+")";
-		}
-		else {
-			// Should never happen.
-			document.getElementById("exchWebService_meetingOrganiser").value = "(unknown)";
-		}
-
-		document.getElementById("exchWebService_messageReponseBody").placeholder = window.arguments[0].response; 
-		
-		var serverUrl = window.arguments[0].serverUrl;  
-		if ( exchangeStatistics.getServerVersion(serverUrl).indexOf("Exchange2013") > -1) {
-			document.getElementById("exchWebService_propose_time_checkbox").setAttribute("disabled","false");
-		}
-		else{
-			document.getElementById("exchWebService_propose_time_checkbox").setAttribute("disabled","true");
-		}
-	},
-
-	doResponseChanged: function _doResponseChanged(aMenuList)
-	{
-		document.getElementById("exchWebService_messageReponseBody").placeholder = aMenuList.value;
-	},
-	
-	onCheckChanged: function _onCheckChanged(aCheckbox)
-	{   
-		if( aCheckbox.checked == true ){
-			document.getElementById("exchWebService_propose_end_label").setAttribute("disabled","false");
-			document.getElementById("exchWebService_propose_start_label").setAttribute("disabled","false");
-			document.getElementById("exchWebService_propose_start").setAttribute("disabled","false");
-			document.getElementById("exchWebService_propose_end").setAttribute("disabled","false"); 
-		} 
-		else{
-			document.getElementById("exchWebService_propose_end_label").setAttribute("disabled","true");
-			document.getElementById("exchWebService_propose_start_label").setAttribute("disabled","true");
-			document.getElementById("exchWebService_propose_start").setAttribute("disabled","true");
-			document.getElementById("exchWebService_propose_end").setAttribute("disabled","true");
-		}
-	},
-	 
+    onAccept: function _onAccept() {
+        window.arguments[0].answer = "send";
+        window.arguments[0].bodyText = document.getElementById("exchWebService_messageReponseBody").value;
+        window.arguments[0].response = document.getElementById("exchWebService_itemResponse").value;
+
+        var pStart = this.formatDate(document.getElementById("exchWebService_propose_start").value);
+        var pEnd = this.formatDate(document.getElementById("exchWebService_propose_end").value);
+
+
+        window.arguments[0].proposeStart = pStart;
+        window.arguments[0].proposeEnd = pEnd;
+
+        return true;
+    },
+
+    formatDate: function _formatDate(date) {
+        var year = date.getFullYear(),
+            month = date.getMonth() + 1, // months are zero indexed
+            day = date.getDate(),
+            hour = date.getHours(),
+            minute = date.getMinutes(),
+            second = date.getSeconds(),
+            dayFormatted = day < 10 ? "0" + day : day,
+            monthFormatted = month < 10 ? "0" + month : month,
+            hourFormatted = hour < 10 ? "0" + hour : hour,
+            minuteFormatted = minute < 10 ? "0" + minute : minute,
+            secondFormatted = second < 10 ? "0" + second : second,
+            morning = hour < 12 ? "am" : "pm";
+
+        return year + "-" + monthFormatted + "-" + dayFormatted + "T" + hourFormatted + ":"
+            + minuteFormatted + ":" + secondFormatted + "Z";
+    },
+
+    onLoad: function _onLoad() {
+        var item = window.arguments[0].item;
+
+        document.getElementById("exchWebService_calendarName").value = item.calendar.name;
+        document.getElementById("exchWebService_itemTitle").value = item.title;
+
+        let dtFormat = Cc["@mozilla.org/calendar/datetime-formatter;1"]
+            .getService(Ci.calIDateTimeFormatter);
+
+        let tzService = Cc["@mozilla.org/calendar/timezone-service;1"]
+            .getService(Ci.calITimezoneService);
+
+        let displayDate = item.startDate.getInTimezone(tzService.defaultTimezone);
+        document.getElementById("exchWebService_itemStart").value = dtFormat.formatDate(displayDate) + " " + dtFormat.formatTime(displayDate);
+
+        document.getElementById("exchWebService_itemResponse").value = window.arguments[0].response;
+
+        if (item.organizer) {
+            document.getElementById("exchWebService_meetingOrganiser").value = item.organizer.commonName + " (" + item.organizer.id.replace(/^mailto:/i, '') + ")";
+        }
+        else {
+            // Should never happen.
+            document.getElementById("exchWebService_meetingOrganiser").value = "(unknown)";
+        }
+
+        document.getElementById("exchWebService_messageReponseBody").placeholder = window.arguments[0].response;
+
+        var serverUrl = window.arguments[0].serverUrl;
+        if (exchangeStatistics.getServerVersion(serverUrl).indexOf("Exchange2013") > -1) {
+            document.getElementById("exchWebService_propose_time_checkbox").setAttribute("disabled", "false");
+        }
+        else {
+            document.getElementById("exchWebService_propose_time_checkbox").setAttribute("disabled", "true");
+        }
+    },
+
+    doResponseChanged: function _doResponseChanged(aMenuList) {
+        document.getElementById("exchWebService_messageReponseBody").placeholder = aMenuList.value;
+    },
+
+    onCheckChanged: function _onCheckChanged(aCheckbox) {
+        if (aCheckbox.checked == true) {
+            document.getElementById("exchWebService_propose_end_label").setAttribute("disabled", "false");
+            document.getElementById("exchWebService_propose_start_label").setAttribute("disabled", "false");
+            document.getElementById("exchWebService_propose_start").setAttribute("disabled", "false");
+            document.getElementById("exchWebService_propose_end").setAttribute("disabled", "false");
+        }
+        else {
+            document.getElementById("exchWebService_propose_end_label").setAttribute("disabled", "true");
+            document.getElementById("exchWebService_propose_start_label").setAttribute("disabled", "true");
+            document.getElementById("exchWebService_propose_start").setAttribute("disabled", "true");
+            document.getElementById("exchWebService_propose_end").setAttribute("disabled", "true");
+        }
+    },
+
 }
diff --git a/chrome/content/invite-style.js b/chrome/content/invite-style.js
index 8b789578..f9a99ec2 100644
--- a/chrome/content/invite-style.js
+++ b/chrome/content/invite-style.js
@@ -1,71 +1,76 @@
 Components.utils.import("resource:///modules/gloda/mimemsg.js");
-    
-function showIconsAsInviteColumn(){} 
-showIconsAsInviteColumn.prototype.execute = function(){   
+
+function showIconsAsInviteColumn() {}
+showIconsAsInviteColumn.prototype.execute = function () {
     var extrasObserver = {
-			observe: function(aMsgFolder, aTopic, aData) {  
-	  
-    			if (gDBView) {
-		    			var columnHandler = { 
-		    			    getCellText: function(row, col) {}, 
-		    			    getSortStringForRow: function(hdr) { 
-			    				var Subject  = hdr.mime2DecodedSubject; 
-		    				   	var isInviteMail= hdr.getStringProperty("isInviteMail");   
-		    				   	
-		    				   	if( isInviteMail == "true"   ){ 
-		    				     var res = Subject.match(/Accepted:/);  
-								 if(!res){
-									 res = Subject.match(/Declined:/);  
-								 }
-								 else{   
-									 return "accepted"; 
-								 }
-								  
-								 if(!res){
-									 res = Subject.match(/Tentative:/);  
-								 }
-								 else{ 	
-									 return "declined"; 
-								 } 
-								 if(!res){
-									 res = Subject.match(/Canceled:/);  
-								 }
-								 else{   
-									 return "tentative"; 
-								 }  
-								 
-								 if(!res){
-									 res = Subject.match(/Updated:/);  
-								 }
-								 else{   
-									 return "updated"; 
-								 }  
-								 
-								 if(!res){
-									 res = Subject.match(/Event Invitation:/);  
-								 }
-								 else{  
-									 return "updated"; 
-								 }   
-							 	 return "invited";   
-		    				  } 
-		    			    }, 
-		    			    isString: function() { return true; }, 
-		    			    getImageSrc: function(row, col) { 
-		    			    	var hdr = gDBView.getMsgHdrAt(row); 
-			    				var Subject  = hdr.mime2DecodedSubject; 
-		    				   	var msgFolder=hdr.folder;
-		  	    				  var isInviteMail= hdr.getStringProperty("isInviteMail"); 
-		 
-		  	    				 if( ( isInviteMail  == "false" ) || ( isInviteMail  == "true" ) ) { 
-		 	    				  }
-		 	    				  else  {	 
-		 	    					  var self=this;
-		 	    					  setTimeout( function(){ tmpMailTools.fetchMail(hdr); } ,0); 
-		 	    					  setTimeout( function(row,col){ self.getImageSrc(row,col); } ,5000);
-		  	    				  }
-		  	    				  
-		 	    		/*		  if(   isInviteMail == ""  ){  
+        observe: function (aMsgFolder, aTopic, aData) {
+
+            if (gDBView) {
+                var columnHandler = {
+                    getCellText: function (row, col) {},
+                    getSortStringForRow: function (hdr) {
+                        var Subject = hdr.mime2DecodedSubject;
+                        var isInviteMail = hdr.getStringProperty("isInviteMail");
+
+                        if (isInviteMail == "true") {
+                            var res = Subject.match(/Accepted:/);
+                            if (!res) {
+                                res = Subject.match(/Declined:/);
+                            }
+                            else {
+                                return "accepted";
+                            }
+
+                            if (!res) {
+                                res = Subject.match(/Tentative:/);
+                            }
+                            else {
+                                return "declined";
+                            }
+                            if (!res) {
+                                res = Subject.match(/Canceled:/);
+                            }
+                            else {
+                                return "tentative";
+                            }
+
+                            if (!res) {
+                                res = Subject.match(/Updated:/);
+                            }
+                            else {
+                                return "updated";
+                            }
+
+                            if (!res) {
+                                res = Subject.match(/Event Invitation:/);
+                            }
+                            else {
+                                return "updated";
+                            }
+                            return "invited";
+                        }
+                    },
+                    isString: function () {
+                        return true;
+                    },
+                    getImageSrc: function (row, col) {
+                        var hdr = gDBView.getMsgHdrAt(row);
+                        var Subject = hdr.mime2DecodedSubject;
+                        var msgFolder = hdr.folder;
+                        var isInviteMail = hdr.getStringProperty("isInviteMail");
+
+                        if ((isInviteMail == "false") || (isInviteMail == "true")) {}
+                        else {
+                            var self = this;
+                            setTimeout(function () {
+                                tmpMailTools.fetchMail(hdr);
+                            }, 0);
+                            setTimeout(function (row, col) {
+                                self.getImageSrc(row, col);
+                            }, 5000);
+                        }
+
+                        /*		  if(   isInviteMail == ""  ){  
 			 	    				   	MsgHdrToMimeMessage(hdr, null, function (hdr, aMimeMessage) {  
 				    			              try {
 				  	    			             let attachments = aMimeMessage.allUserAttachments || aMimeMessage.allAttachments;
@@ -80,183 +85,186 @@ showIconsAsInviteColumn.prototype.execute = function(){
 				    			              } catch (err) {} 
 			  	    				      }, true ,{examineEncryptedParts:true,}); // true means force the message into being downloaded... this might take some time! 	    				 
 		 	    				  	} */ //Thunderbird crashes during new account.
-						         if( isInviteMail == "true" ){ 
-		    				     var res = Subject.match(/Accepted:/);  
-								 if(!res){
-									 res = Subject.match(/Declined:/);  
-								 }
-								 else{   
-									 return "chrome://exchangecalendar-common/skin/images/accepted.png"; 
-								 }
-								  
-								 if(!res){
-									 res = Subject.match(/Tentative:/);  
-								 }
-								 else{ 	
-									 return "chrome://exchangecalendar-common/skin/images/declined.png"; 
-								 } 
-								 if(!res){
-									 res = Subject.match(/Canceled:/);  
-								 }
-								 else{   
-									 return "chrome://exchangecalendar-common/skin/images/tentative.png"; 
-								 }  
-								 
-								 if(!res){
-									 res = Subject.match(/Updated:/);  
-								 }
-								 else{   
-									 return "chrome://exchangecalendar-common/skin/images/updated.png"; 
-								 }  
-								 
-								 if(!res){
-									 res = Subject.match(/Event Invitation:/);  
-								 }
-								 else{  
-									 return "chrome://exchangecalendar-common/skin/images/updated.png"; 
-								 }   
-							 	 return "chrome://exchangecalendar-common/skin/images/invited.png";   
-		    				  }
-		    			    }, 
-		    			    getSortLongForRow: function(hdr) {},
-							isEditable: function(row, col) {
-								return false;
-							},
-							getCellProperties:   function(row, col, properties) {
-								return properties;
-							},
-							cycleCell: function(row, col) {
-							},
-							getRowProperties:    function(row, properties) {
-								return properties;
-							}
-		    			}; 
-				    			
-						try {
-						    columnHandler.old = gDBView.getColumnHandler("inviteCol");
-						}
-						catch (ex) {}
-						
-						gDBView.addColumnHandler("inviteCol", columnHandler);  
- 		    	}//ifend
-	 		  
-			}
-	    };
-    
-    	var ObserverService = Cc["@mozilla.org/observer-service;1"]
-                     		.getService(Ci.nsIObserverService);
-		ObserverService.addObserver( extrasObserver, "MsgCreateDBView", false);  
+                        if (isInviteMail == "true") {
+                            var res = Subject.match(/Accepted:/);
+                            if (!res) {
+                                res = Subject.match(/Declined:/);
+                            }
+                            else {
+                                return "chrome://exchangecalendar-common/skin/images/accepted.png";
+                            }
+
+                            if (!res) {
+                                res = Subject.match(/Tentative:/);
+                            }
+                            else {
+                                return "chrome://exchangecalendar-common/skin/images/declined.png";
+                            }
+                            if (!res) {
+                                res = Subject.match(/Canceled:/);
+                            }
+                            else {
+                                return "chrome://exchangecalendar-common/skin/images/tentative.png";
+                            }
+
+                            if (!res) {
+                                res = Subject.match(/Updated:/);
+                            }
+                            else {
+                                return "chrome://exchangecalendar-common/skin/images/updated.png";
+                            }
+
+                            if (!res) {
+                                res = Subject.match(/Event Invitation:/);
+                            }
+                            else {
+                                return "chrome://exchangecalendar-common/skin/images/updated.png";
+                            }
+                            return "chrome://exchangecalendar-common/skin/images/invited.png";
+                        }
+                    },
+                    getSortLongForRow: function (hdr) {},
+                    isEditable: function (row, col) {
+                        return false;
+                    },
+                    getCellProperties: function (row, col, properties) {
+                        return properties;
+                    },
+                    cycleCell: function (row, col) {},
+                    getRowProperties: function (row, properties) {
+                        return properties;
+                    }
+                };
+
+                try {
+                    columnHandler.old = gDBView.getColumnHandler("inviteCol");
+                }
+                catch (ex) {}
+
+                gDBView.addColumnHandler("inviteCol", columnHandler);
+            } //ifend
+
+        }
+    };
+
+    var ObserverService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
+    ObserverService.addObserver(extrasObserver, "MsgCreateDBView", false);
 };
 
 
-function mailTools(aWindow,aDocument) {
-	this._window = aWindow;
-	this._document = aDocument; 
-	try{
-		this.msgHdrs = [] ; 
-		this.working = null;
-	}catch(e){}
-} 
-
-mailTools.prototype.getMailBody = function(aMsgHdr,aCallback) {
-  	  if( this.working ){
-	  let callback=aCallback;
-	  let uri=aMsgHdr.folder.getUriForMsg(aMsgHdr); 
-	  var  messageStream = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance()
-	  .QueryInterface(Components.interfaces.nsIInputStream); 
-	  var  inputStream   = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance()
-	  .QueryInterface(Components.interfaces.nsIScriptableInputStream);
-
-	  let messageService = messenger.messageServiceFromURI(uri); 
-	  inputStream.init(messageStream); 
-	  
-	  try {
-		  messageService.streamMessage(uri, messageStream, null, null, false, "");  
- 	  }  catch (e) {
- 		    this.working=false;  
-	  }
-	  let body = "";
-	  inputStream.available(); 
-		  while (inputStream.available()) {
-		     body = body + inputStream.read(512); 
-		  }  
-      inputStream.close();  
-      messageStream.close();
-	  callback(aMsgHdr,body);
-	  this.working=false;
-  	  }
-	  return;
-} 
-
-mailTools.prototype.markMailAsInvite = function(aMsgHdr,bodyPlain){ 
-	var self=this;
-	var searchString = 'Content-Type: text/calendar;'; 
-  	let result = bodyPlain.match(/Content-Type: text\/calendar;/g); 
-    if( result == searchString ){ 
-    	//setting header string to identify invitation mail
-	   aMsgHdr.setStringProperty("isInviteMail","true");
-    }  
-    else
-    {
- 	   aMsgHdr.setStringProperty("isInviteMail","false"); 
+function mailTools(aWindow, aDocument) {
+    this._window = aWindow;
+    this._document = aDocument;
+    try {
+        this.msgHdrs = [];
+        this.working = null;
+    }
+    catch (e) {}
+}
+
+mailTools.prototype.getMailBody = function (aMsgHdr, aCallback) {
+    if (this.working) {
+        let callback = aCallback;
+        let uri = aMsgHdr.folder.getUriForMsg(aMsgHdr);
+        var messageStream = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance()
+            .QueryInterface(Components.interfaces.nsIInputStream);
+        var inputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance()
+            .QueryInterface(Components.interfaces.nsIScriptableInputStream);
+
+        let messageService = messenger.messageServiceFromURI(uri);
+        inputStream.init(messageStream);
+
+        try {
+            messageService.streamMessage(uri, messageStream, null, null, false, "");
+        }
+        catch (e) {
+            this.working = false;
+        }
+        let body = "";
+        inputStream.available();
+        while (inputStream.available()) {
+            body = body + inputStream.read(512);
+        }
+        inputStream.close();
+        messageStream.close();
+        callback(aMsgHdr, body);
+        this.working = false;
     }
-    self.working=true;
     return;
 }
 
-mailTools.prototype.fetchMail = function(oneMsgHdr){
-	//dump("\nxxxx fetchMail To be Processed :  " + this.msgHdrs.length ); 
-	 
-	 if( this.msgHdrs.length > 10 ) {
-		 this.msgHdrs.shift();
-	 	 this.msgHdrs.push(oneMsgHdr); 
-		 return; 
-	 }else
-	 {
-	 	 this.msgHdrs.push(oneMsgHdr); 
-	 }
-	 
-	 if( this.msgHdrs.length < 1 ) return; 
-
-	 	if ( this.working != true ) { 
-		 while ( this.msgHdrs.length > 0 ){
-
-			 if( this.working == true ) continue;
-			 this.working=true;
-
-			 var self=this; 
-			 var aMsgHdr=this.msgHdrs.pop(); 
-			 let isInviteMail=aMsgHdr.getStringProperty("isInviteMail");
-				 if( ( isInviteMail ==  "false" ) || ( isInviteMail  == "true" ) ) {
-					 this.working=false;
-					 continue;
-					 }
-				 else{
-					 //call to analyze change body
-					 this.getMailBody(aMsgHdr,function(aMsgHdr,bodyPlain){ self.markMailAsInvite(aMsgHdr,bodyPlain);}) ;
-				 }
-			 }
-		 }  
-	 	return;
+mailTools.prototype.markMailAsInvite = function (aMsgHdr, bodyPlain) {
+    var self = this;
+    var searchString = 'Content-Type: text/calendar;';
+    let result = bodyPlain.match(/Content-Type: text\/calendar;/g);
+    if (result == searchString) {
+        //setting header string to identify invitation mail
+        aMsgHdr.setStringProperty("isInviteMail", "true");
+    }
+    else {
+        aMsgHdr.setStringProperty("isInviteMail", "false");
+    }
+    self.working = true;
+    return;
 }
 
-mailTools.prototype.onLoad = function(){ 
-	var self=this;
-	this.newMailListener = {
-				msgAdded: function(aMsgHdr) {
-				     setTimeout( function(){ self.fetchMail(aMsgHdr); } ,3000);
-			    }
-	};  
-
-	var notificationService = Components.classes["@mozilla.org/messenger/msgnotificationservice;1"]
-	                     	  .getService(Components.interfaces.nsIMsgFolderNotificationService);
-	notificationService.addListener(this.newMailListener, notificationService.msgAdded);
-	
+mailTools.prototype.fetchMail = function (oneMsgHdr) {
+    //dump("\nxxxx fetchMail To be Processed :  " + this.msgHdrs.length ); 
+
+    if (this.msgHdrs.length > 10) {
+        this.msgHdrs.shift();
+        this.msgHdrs.push(oneMsgHdr);
+        return;
+    }
+    else {
+        this.msgHdrs.push(oneMsgHdr);
+    }
+
+    if (this.msgHdrs.length < 1) return;
+
+    if (this.working != true) {
+        while (this.msgHdrs.length > 0) {
+
+            if (this.working == true) continue;
+            this.working = true;
+
+            var self = this;
+            var aMsgHdr = this.msgHdrs.pop();
+            let isInviteMail = aMsgHdr.getStringProperty("isInviteMail");
+            if ((isInviteMail == "false") || (isInviteMail == "true")) {
+                this.working = false;
+                continue;
+            }
+            else {
+                //call to analyze change body
+                this.getMailBody(aMsgHdr, function (aMsgHdr, bodyPlain) {
+                    self.markMailAsInvite(aMsgHdr, bodyPlain);
+                });
+            }
+        }
+    }
+    return;
 }
-  
-var tmpShowIconsAsInviteColumn = new showIconsAsInviteColumn();
-var tmpMailTools = new mailTools(window,document);  
 
-window.addEventListener("load",tmpMailTools.onLoad(),false);
-window.addEventListener("load",tmpShowIconsAsInviteColumn.execute(),false);
+mailTools.prototype.onLoad = function () {
+    var self = this;
+    this.newMailListener = {
+        msgAdded: function (aMsgHdr) {
+            setTimeout(function () {
+                self.fetchMail(aMsgHdr);
+            }, 3000);
+        }
+    };
+
+    var notificationService = Components.classes["@mozilla.org/messenger/msgnotificationservice;1"]
+        .getService(Components.interfaces.nsIMsgFolderNotificationService);
+    notificationService.addListener(this.newMailListener, notificationService.msgAdded);
+
+}
+
+var tmpShowIconsAsInviteColumn = new showIconsAsInviteColumn();
+var tmpMailTools = new mailTools(window, document);
 
+window.addEventListener("load", tmpMailTools.onLoad(), false);
+window.addEventListener("load", tmpShowIconsAsInviteColumn.execute(), false);
diff --git a/chrome/content/lightning-item-iframe.js b/chrome/content/lightning-item-iframe.js
index ea00139c..f26b9827 100644
--- a/chrome/content/lightning-item-iframe.js
+++ b/chrome/content/lightning-item-iframe.js
@@ -34,291 +34,291 @@ var Cc = Components.classes;
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-function exchangeEventDialog(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchangeEventDialog(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchangeEventDialog.prototype = {
-	_initialized: false,
-	_oldCallback: null,
-
-	/*
-	 * onAcceptCallback: read caller content to save extra information if caller was exchangecalendar
-	 */
-	onAcceptCallback: function _onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing)
-	{
-		if (aCalendar.type === "exchangecalendar") {
-			if (cal.isEvent(aItem)) {
-				if (!aItem.className) {
-					var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-						.createInstance(Ci.mivExchangeEvent);
-					newItem.cloneToCalEvent(aItem);
-					aItem = newItem;
-				}
-			}
-			else {
-				// Save extra exchange fields to item.
-				if (!aItem.className) {
-					var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
-						.createInstance(Ci.mivExchangeTodo);
-					newItem.cloneToCalEvent(aItem);
-					aItem = newItem;
-				}
-
-				aItem.totalWork = this._document.getElementById("exchWebService-totalWork-count").value;
-				aItem.actualWork = this._document.getElementById("exchWebService-actualWork-count").value;
-				aItem.mileage = this._document.getElementById("exchWebService-mileage-count").value;
-				aItem.billingInformation = this._document.getElementById("exchWebService-billingInformation-count").value;
-				aItem.companies = this._document.getElementById("exchWebService-companies-count").value;
-			}
-
-			// Copy content from HTML editor
-			try{
-				if (this.newItem) {
-					aItem.bodyType = "HTML";
-					aItem.body = this._document.getElementById("exchWebService-body-editor").content;
-					this.newItem = false;
-				}
-				else if (aItem.bodyType === "HTML") {
-					aItem.body = this._document.getElementById("exchWebService-body-editor").content;
-				}
-			} catch(err) {
-				dump("Error saving content\n");
-			}
-		}
-
-		if (this._oldCallback) {
-			this._oldCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
-		}
-	},
-
-	/*
-	 * Update repeat informations on Exchange tasks
-	 */
-	updateRepeat: function _updateRepeat()
-	{
-		var repeatDetails = this._document.getElementById("repeat-details").childNodes;
-		if (repeatDetails.length === 3) {
-			this._document.getElementById("repeat-details").removeChild(repeatDetails[2]);
-			var toolTip = repeatDetails[0].getAttribute("tooltiptext");
-			var tmpArray = toolTip.split("\n");
-			tmpArray.splice(2,1);
-			repeatDetails[0].setAttribute("tooltiptext", tmpArray.join("\n"));
-			repeatDetails[1].setAttribute("tooltiptext", tmpArray.join("\n"));
-		}
-	},
-
-	/*
-	 * Adds HTML editor for exchangecalendar items
-	 * Adds extra informations for Exchange tasks
-	 *
-	 * As the same dialog is used for non-Exchange tasks and for events, this function
-	 * removes too these details when necessary.
-	 */
-	updateScreen: function _updateScreen(aItem, aCalendar)
-	{
-		var item = aItem;
-
-		if (aCalendar.type === "exchangecalendar") {
-
-			// For all item type, enable HTML editor
-
-			// Set HTML content editor
-			let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
-
-			// Try to read directly item body, otherwise fallback to item description property
-			if (item.body) {
-				itemBodyEditor.content = item.body;
-
-				// As this dialog set the bodyType, we check it to know if it's a new Item or not
-				this.newItem = item.bodyType.toLowerCase() !== "html";
-			}
-			else {
-				this.newItem = true;
-				itemBodyEditor.content = item.getProperty("DESCRIPTION");
-			}
-
-			// Display HTML content editor
-			if (item.bodyType === undefined // item is not already defined
-					|| item.bodyType.toLowerCase() === "html" // current item contains HTML
-				) {
-				// Hidde original item description editor
-				this._document.getElementById("item-description").hidden = true;
-
-				// Display our own HTML content editor
-				itemBodyEditor.setAttribute("collapsed", "false");;
-
-				itemBodyEditor.setAttribute("scrollbars","yes");
-			}
-
-			// If not an event, add Exchange task extra informations
-			if (!cal.isEvent(item)) {
-
-				// Set and display task owner
-
-				var ownerLabel = this._document.getElementById("exchWebService-owner-label");
-				if (ownerLabel) {
-					ownerLabel.setAttribute("collapsed", "false");
-					ownerLabel.value = item.owner;
-				}
-
-				// Set and display Exchange task details
-
-				this._document.getElementById("exchWebService-details-separator").hidden = false;
-				this._document.getElementById("exchWebService-details-row1").collapsed = false;
-				this._document.getElementById("exchWebService-details-row2").collapsed = false;
-				this._document.getElementById("exchWebService-details-row3").collapsed = false;
-
-				if (item.className) {
-					this._document.getElementById("exchWebService-totalWork-count").value = item.totalWork;
-					this._document.getElementById("exchWebService-actualWork-count").value = item.actualWork;
-					this._document.getElementById("exchWebService-mileage-count").value = item.mileage;
-					this._document.getElementById("exchWebService-billingInformation-count").value = item.billingInformation;
-					this._document.getElementById("exchWebService-companies-count").value = item.companies;
-				}
-
-				// Remove some standard inputs
-
-				this._document.getElementById("event-grid-location-row").hidden = true;
-
-				this._document.getElementById("reminder-none-separator").hidden = true;
-				this._document.getElementById("reminder-0minutes-menuitem").hidden = true;
-				this._document.getElementById("reminder-5minutes-menuitem").hidden = true;
-				this._document.getElementById("reminder-15minutes-menuitem").hidden = true;
-				this._document.getElementById("reminder-30minutes-menuitem").hidden = true;
-				this._document.getElementById("reminder-minutes-separator").hidden = true;
-				this._document.getElementById("reminder-1hour-menuitem").hidden = true;
-				this._document.getElementById("reminder-2hours-menuitem").hidden = true;
-				this._document.getElementById("reminder-12hours-menuitem").hidden = true;
-				this._document.getElementById("reminder-hours-separator").hidden = true;
-				this._document.getElementById("reminder-1day-menuitem").hidden = true;
-				this._document.getElementById("reminder-2days-menuitem").hidden = true;
-				this._document.getElementById("reminder-1week-menuitem").hidden = true;
-
-				this._document.getElementById("timezone-starttime").hidden = true;
-				this._document.getElementById("timezone-endtime").hidden = true;
-
-				// Manage repeat for Exchange tasks
-
-				if (this._document.getElementById("item-repeat")) {
-					this._document.getElementById("item-repeat").addEventListener("command", function() { self.updateRepeat(); }, false);
-				}
-
-				this.updateRepeat();
-			}
-		}
-
-		// For events and other calendar type, hidde back all Exchange task details, display back standard items
-		if (cal.isEvent(item)
-			|| cal.type !== "exchangecalendar") {
-
-			// Hide Exchange task details
-
-			// Task owner
-			this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "true");
-
-			// Task details
-			this._document.getElementById("exchWebService-details-separator").hidden = true;
-			this._document.getElementById("exchWebService-details-row1").collapsed = true;
-			this._document.getElementById("exchWebService-details-row2").collapsed = true;
-			this._document.getElementById("exchWebService-details-row3").collapsed = true;
-
-			// Reset standard form
-			this._document.getElementById("event-grid-location-row").hidden = false;
-			this._document.getElementById("event-grid-recurrence-row").hidden=false;
-
-			// Reset reminder select list for todo
-			this._document.getElementById("reminder-none-separator").hidden = false;
-			this._document.getElementById("reminder-0minutes-menuitem").hidden = false;
-			this._document.getElementById("reminder-5minutes-menuitem").hidden = false;
-			this._document.getElementById("reminder-15minutes-menuitem").hidden = false;
-			this._document.getElementById("reminder-30minutes-menuitem").hidden = false;
-			this._document.getElementById("reminder-minutes-separator").hidden = false;
-			this._document.getElementById("reminder-1hour-menuitem").hidden = false;
-			this._document.getElementById("reminder-2hours-menuitem").hidden = false;
-			this._document.getElementById("reminder-12hours-menuitem").hidden = false;
-			this._document.getElementById("reminder-hours-separator").hidden = false;
-			this._document.getElementById("reminder-1day-menuitem").hidden = false;
-			this._document.getElementById("reminder-2days-menuitem").hidden = false;
-			this._document.getElementById("reminder-1week-menuitem").hidden = false;
-
-			// Reset timezone start/end time
-			this._document.getElementById("timezone-starttime").hidden = false;
-			this._document.getElementById("timezone-endtime").hidden = false;
-		}
-
-		// Reset content editor when not exchangecalendar items
-		if (aCalendar.type !== "exchangecalendar") {
-			// Hidde HTML content editor
-			this._document.getElementById("item-description").hidden = false;
-			this._document.getElementById("exchWebService-body-editor").setAttribute("collapsed", "true");
-		}
-	},
-
-
-	/**
-	 * Receives asynchronous messages from the parent context that contains the iframe.
-	 *
-	 * @param {MessageEvent} aEvent  Contains the message being received
-	 */
-	receiveMessage: function _receiveMessage(aEvent) {
-		let validOrigin = gTabmail ? "chrome://messenger" : "chrome://calendar";
-		if (aEvent.origin !== validOrigin) {
-			return;
-		}
-		switch (aEvent.data.command) {
-			//case "exchWebService_addAttachmentDialog": this.addAttachmentDialog(); break;
-		}
-	},
-
-	/*
-	 * onLoad: setup event dialog window
-	 * - Update screen according to type of item (task / event)
-	 * - Add callback (once)
-	 **/
-	onLoad: function _onLoad()
-	{
-		// Update screen according to task / event
-		let item = this._window.calendarItem;
-		this.updateScreen(item, item.calendar);
-
-		if (this._initialized) {
-			return;
-		}
-
-		var self = this;
-
-		// Override dialog callback to add extra exchangecalendar information processing
-		this._oldCallback = this._window.onAcceptCallback;
-		this._window.onAcceptCallback = function(aItem, aCalendar, aOriginalItem, aIsClosing) {
-			self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
-		};
-
-		// Add message listener to be able to receive message from parent window or tab
-		window.addEventListener("message", function(aEvent) { self.receiveMessage(aEvent); }, false);
-
-		this._initialized = true;
-	},
-
-	/*
-	 * selectedCalendarChanged: modify event-dialog to add extra exchangecalendar info when an exchange calendar is selected
-	 */
-	selectedCalendarChanged: function _selectedCalendarChanged(aMenuList)
-	{
-		updateCalendar();
-
-		this.updateScreen(this._window.calendarItem, getCurrentCalendar());
-	}
+    _initialized: false,
+    _oldCallback: null,
+
+    /*
+     * onAcceptCallback: read caller content to save extra information if caller was exchangecalendar
+     */
+    onAcceptCallback: function _onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing) {
+        if (aCalendar.type === "exchangecalendar") {
+            if (cal.isEvent(aItem)) {
+                if (!aItem.className) {
+                    var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+                        .createInstance(Ci.mivExchangeEvent);
+                    newItem.cloneToCalEvent(aItem);
+                    aItem = newItem;
+                }
+            }
+            else {
+                // Save extra exchange fields to item.
+                if (!aItem.className) {
+                    var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
+                        .createInstance(Ci.mivExchangeTodo);
+                    newItem.cloneToCalEvent(aItem);
+                    aItem = newItem;
+                }
+
+                aItem.totalWork = this._document.getElementById("exchWebService-totalWork-count").value;
+                aItem.actualWork = this._document.getElementById("exchWebService-actualWork-count").value;
+                aItem.mileage = this._document.getElementById("exchWebService-mileage-count").value;
+                aItem.billingInformation = this._document.getElementById("exchWebService-billingInformation-count").value;
+                aItem.companies = this._document.getElementById("exchWebService-companies-count").value;
+            }
+
+            // Copy content from HTML editor
+            try {
+                if (this.newItem) {
+                    aItem.bodyType = "HTML";
+                    aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+                    this.newItem = false;
+                }
+                else if (aItem.bodyType === "HTML") {
+                    aItem.body = this._document.getElementById("exchWebService-body-editor").content;
+                }
+            }
+            catch (err) {
+                dump("Error saving content\n");
+            }
+        }
+
+        if (this._oldCallback) {
+            this._oldCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
+        }
+    },
+
+    /*
+     * Update repeat informations on Exchange tasks
+     */
+    updateRepeat: function _updateRepeat() {
+        var repeatDetails = this._document.getElementById("repeat-details").childNodes;
+        if (repeatDetails.length === 3) {
+            this._document.getElementById("repeat-details").removeChild(repeatDetails[2]);
+            var toolTip = repeatDetails[0].getAttribute("tooltiptext");
+            var tmpArray = toolTip.split("\n");
+            tmpArray.splice(2, 1);
+            repeatDetails[0].setAttribute("tooltiptext", tmpArray.join("\n"));
+            repeatDetails[1].setAttribute("tooltiptext", tmpArray.join("\n"));
+        }
+    },
+
+    /*
+     * Adds HTML editor for exchangecalendar items
+     * Adds extra informations for Exchange tasks
+     *
+     * As the same dialog is used for non-Exchange tasks and for events, this function
+     * removes too these details when necessary.
+     */
+    updateScreen: function _updateScreen(aItem, aCalendar) {
+        var item = aItem;
+
+        if (aCalendar.type === "exchangecalendar") {
+
+            // For all item type, enable HTML editor
+
+            // Set HTML content editor
+            let itemBodyEditor = this._document.getElementById("exchWebService-body-editor");
+
+            // Try to read directly item body, otherwise fallback to item description property
+            if (item.body) {
+                itemBodyEditor.content = item.body;
+
+                // As this dialog set the bodyType, we check it to know if it's a new Item or not
+                this.newItem = item.bodyType.toLowerCase() !== "html";
+            }
+            else {
+                this.newItem = true;
+                itemBodyEditor.content = item.getProperty("DESCRIPTION");
+            }
+
+            // Display HTML content editor
+            if (item.bodyType === undefined // item is not already defined
+                || item.bodyType.toLowerCase() === "html" // current item contains HTML
+            ) {
+                // Hidde original item description editor
+                this._document.getElementById("item-description").hidden = true;
+
+                // Display our own HTML content editor
+                itemBodyEditor.setAttribute("collapsed", "false");;
+
+                itemBodyEditor.setAttribute("scrollbars", "yes");
+            }
+
+            // If not an event, add Exchange task extra informations
+            if (!cal.isEvent(item)) {
+
+                // Set and display task owner
+
+                var ownerLabel = this._document.getElementById("exchWebService-owner-label");
+                if (ownerLabel) {
+                    ownerLabel.setAttribute("collapsed", "false");
+                    ownerLabel.value = item.owner;
+                }
+
+                // Set and display Exchange task details
+
+                this._document.getElementById("exchWebService-details-separator").hidden = false;
+                this._document.getElementById("exchWebService-details-row1").collapsed = false;
+                this._document.getElementById("exchWebService-details-row2").collapsed = false;
+                this._document.getElementById("exchWebService-details-row3").collapsed = false;
+
+                if (item.className) {
+                    this._document.getElementById("exchWebService-totalWork-count").value = item.totalWork;
+                    this._document.getElementById("exchWebService-actualWork-count").value = item.actualWork;
+                    this._document.getElementById("exchWebService-mileage-count").value = item.mileage;
+                    this._document.getElementById("exchWebService-billingInformation-count").value = item.billingInformation;
+                    this._document.getElementById("exchWebService-companies-count").value = item.companies;
+                }
+
+                // Remove some standard inputs
+
+                this._document.getElementById("event-grid-location-row").hidden = true;
+
+                this._document.getElementById("reminder-none-separator").hidden = true;
+                this._document.getElementById("reminder-0minutes-menuitem").hidden = true;
+                this._document.getElementById("reminder-5minutes-menuitem").hidden = true;
+                this._document.getElementById("reminder-15minutes-menuitem").hidden = true;
+                this._document.getElementById("reminder-30minutes-menuitem").hidden = true;
+                this._document.getElementById("reminder-minutes-separator").hidden = true;
+                this._document.getElementById("reminder-1hour-menuitem").hidden = true;
+                this._document.getElementById("reminder-2hours-menuitem").hidden = true;
+                this._document.getElementById("reminder-12hours-menuitem").hidden = true;
+                this._document.getElementById("reminder-hours-separator").hidden = true;
+                this._document.getElementById("reminder-1day-menuitem").hidden = true;
+                this._document.getElementById("reminder-2days-menuitem").hidden = true;
+                this._document.getElementById("reminder-1week-menuitem").hidden = true;
+
+                this._document.getElementById("timezone-starttime").hidden = true;
+                this._document.getElementById("timezone-endtime").hidden = true;
+
+                // Manage repeat for Exchange tasks
+
+                if (this._document.getElementById("item-repeat")) {
+                    this._document.getElementById("item-repeat").addEventListener("command", function () {
+                        self.updateRepeat();
+                    }, false);
+                }
+
+                this.updateRepeat();
+            }
+        }
+
+        // For events and other calendar type, hidde back all Exchange task details, display back standard items
+        if (cal.isEvent(item)
+            || cal.type !== "exchangecalendar") {
+
+            // Hide Exchange task details
+
+            // Task owner
+            this._document.getElementById("exchWebService-owner-row").setAttribute("collapsed", "true");
+
+            // Task details
+            this._document.getElementById("exchWebService-details-separator").hidden = true;
+            this._document.getElementById("exchWebService-details-row1").collapsed = true;
+            this._document.getElementById("exchWebService-details-row2").collapsed = true;
+            this._document.getElementById("exchWebService-details-row3").collapsed = true;
+
+            // Reset standard form
+            this._document.getElementById("event-grid-location-row").hidden = false;
+            this._document.getElementById("event-grid-recurrence-row").hidden = false;
+
+            // Reset reminder select list for todo
+            this._document.getElementById("reminder-none-separator").hidden = false;
+            this._document.getElementById("reminder-0minutes-menuitem").hidden = false;
+            this._document.getElementById("reminder-5minutes-menuitem").hidden = false;
+            this._document.getElementById("reminder-15minutes-menuitem").hidden = false;
+            this._document.getElementById("reminder-30minutes-menuitem").hidden = false;
+            this._document.getElementById("reminder-minutes-separator").hidden = false;
+            this._document.getElementById("reminder-1hour-menuitem").hidden = false;
+            this._document.getElementById("reminder-2hours-menuitem").hidden = false;
+            this._document.getElementById("reminder-12hours-menuitem").hidden = false;
+            this._document.getElementById("reminder-hours-separator").hidden = false;
+            this._document.getElementById("reminder-1day-menuitem").hidden = false;
+            this._document.getElementById("reminder-2days-menuitem").hidden = false;
+            this._document.getElementById("reminder-1week-menuitem").hidden = false;
+
+            // Reset timezone start/end time
+            this._document.getElementById("timezone-starttime").hidden = false;
+            this._document.getElementById("timezone-endtime").hidden = false;
+        }
+
+        // Reset content editor when not exchangecalendar items
+        if (aCalendar.type !== "exchangecalendar") {
+            // Hidde HTML content editor
+            this._document.getElementById("item-description").hidden = false;
+            this._document.getElementById("exchWebService-body-editor").setAttribute("collapsed", "true");
+        }
+    },
+
+
+    /**
+     * Receives asynchronous messages from the parent context that contains the iframe.
+     *
+     * @param {MessageEvent} aEvent  Contains the message being received
+     */
+    receiveMessage: function _receiveMessage(aEvent) {
+        let validOrigin = gTabmail ? "chrome://messenger" : "chrome://calendar";
+        if (aEvent.origin !== validOrigin) {
+            return;
+        }
+        switch (aEvent.data.command) {
+            //case "exchWebService_addAttachmentDialog": this.addAttachmentDialog(); break;
+        }
+    },
+
+    /*
+     * onLoad: setup event dialog window
+     * - Update screen according to type of item (task / event)
+     * - Add callback (once)
+     **/
+    onLoad: function _onLoad() {
+        // Update screen according to task / event
+        let item = this._window.calendarItem;
+        this.updateScreen(item, item.calendar);
+
+        if (this._initialized) {
+            return;
+        }
+
+        var self = this;
+
+        // Override dialog callback to add extra exchangecalendar information processing
+        this._oldCallback = this._window.onAcceptCallback;
+        this._window.onAcceptCallback = function (aItem, aCalendar, aOriginalItem, aIsClosing) {
+            self.onAcceptCallback(aItem, aCalendar, aOriginalItem, aIsClosing);
+        };
+
+        // Add message listener to be able to receive message from parent window or tab
+        window.addEventListener("message", function (aEvent) {
+            self.receiveMessage(aEvent);
+        }, false);
+
+        this._initialized = true;
+    },
+
+    /*
+     * selectedCalendarChanged: modify event-dialog to add extra exchangecalendar info when an exchange calendar is selected
+     */
+    selectedCalendarChanged: function _selectedCalendarChanged(aMenuList) {
+        updateCalendar();
+
+        this.updateScreen(this._window.calendarItem, getCurrentCalendar());
+    }
 }
 
 
 var exchToolsEventDialog = new exchangeEventDialog(document, window);
 
 // Add our loader to update dialog window with Exchange extra widgets if needed
-window.addEventListener("load", function () { exchToolsEventDialog.onLoad(); }, false);
-
+window.addEventListener("load", function () {
+    exchToolsEventDialog.onLoad();
+}, false);
diff --git a/chrome/content/lightningtimezoneOverlay.js b/chrome/content/lightningtimezoneOverlay.js
index 46917521..b788eb20 100644
--- a/chrome/content/lightningtimezoneOverlay.js
+++ b/chrome/content/lightningtimezoneOverlay.js
@@ -1,77 +1,78 @@
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
- 
 
-function lightningTimzone(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
-	
-	this.prefs = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefService); 
+function lightningTimzone(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
+
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
+
+    this.prefs = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService);
 }
 
 lightningTimzone.prototype = {
-		onload: function _onload(){   
-		    this.resetTimezone = this.globalFunctions.safeGetBoolPref(this.prefs, "calendar.timezone.local.auto");
- 			var timezone = this.globalFunctions.safeGetCharPref(this.prefs, "calendar.timezone.local") ;
-			if( timezone ){
-				try{
-					if( this.resetTimezone ==   true  ){ 
-						var self=this;
-	 					setTimeout(function(){self.prefs.setCharPref("calendar.timezone.local","");
-	 					self.infoPopup("Timezone Information","System timezone changed and set to lightning automatically!");
-	 					self.globalFunctions.LOG("lightningTimzone : Timzone Changed");},
-	 					120000);
-					} 
-				}catch(e){
-					this.prefs.setCharPref("calendar.timezone.local",timezone);
-				}
-			} 
-			
- 			this.onTimezoneChange(); 
-		},
-		
-		onTimezoneChange:function _onTimezoneChange(){
-			
- 			var oldOffset; 
- 			var currentOffset;
- 			var self = this;
- 			
- 			function change2()
- 			{
- 				var resetTimezone = self.globalFunctions.safeGetBoolPref(self.prefs, "calendar.timezone.local.auto");
- 				if( resetTimezone == true ){ 
-						var nowdate = new Date(); 
-						currentOffset = nowdate.getTimezoneOffset();
- 						
-						if( oldOffset != currentOffset && oldOffset != undefined && currentOffset  != undefined ){
-							self.prefs.setCharPref("calendar.timezone.local","");
-							self.globalFunctions.LOG("lightningTimzone : Timzone Changed");
- 						} 
-						oldOffset = currentOffset;
-					} 	
- 			}
- 			
- 			function change(){ 
-				change2();
- 			}
- 			setInterval(change,3600000); //interval = 1000*60*60*1 Hour(s)			
- 		},
-		
-		infoPopup:function _infoPopup(title, msg) {
-			 var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
-			  var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
-			                      getService(Components.interfaces.nsIWindowWatcher).
-			                      openWindow(null, 'chrome://global/content/alerts/alert.xul',
-			                                  '_blank', 'chrome,titlebar=no,popup=yes', null);
-			  win.arguments = [image,  title, msg, true, ''];
-		},
-		
+    onload: function _onload() {
+        this.resetTimezone = this.globalFunctions.safeGetBoolPref(this.prefs, "calendar.timezone.local.auto");
+        var timezone = this.globalFunctions.safeGetCharPref(this.prefs, "calendar.timezone.local");
+        if (timezone) {
+            try {
+                if (this.resetTimezone == true) {
+                    var self = this;
+                    setTimeout(function () {
+                            self.prefs.setCharPref("calendar.timezone.local", "");
+                            self.infoPopup("Timezone Information", "System timezone changed and set to lightning automatically!");
+                            self.globalFunctions.LOG("lightningTimzone : Timzone Changed");
+                        },
+                        120000);
+                }
+            }
+            catch (e) {
+                this.prefs.setCharPref("calendar.timezone.local", timezone);
+            }
+        }
+
+        this.onTimezoneChange();
+    },
+
+    onTimezoneChange: function _onTimezoneChange() {
+
+        var oldOffset;
+        var currentOffset;
+        var self = this;
+
+        function change2() {
+            var resetTimezone = self.globalFunctions.safeGetBoolPref(self.prefs, "calendar.timezone.local.auto");
+            if (resetTimezone == true) {
+                var nowdate = new Date();
+                currentOffset = nowdate.getTimezoneOffset();
+
+                if (oldOffset != currentOffset && oldOffset != undefined && currentOffset != undefined) {
+                    self.prefs.setCharPref("calendar.timezone.local", "");
+                    self.globalFunctions.LOG("lightningTimzone : Timzone Changed");
+                }
+                oldOffset = currentOffset;
+            }
+        }
+
+        function change() {
+            change2();
+        }
+        setInterval(change, 3600000); //interval = 1000*60*60*1 Hour(s)			
+    },
+
+    infoPopup: function _infoPopup(title, msg) {
+        var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+        var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
+        getService(Components.interfaces.nsIWindowWatcher).
+        openWindow(null, 'chrome://global/content/alerts/alert.xul',
+            '_blank', 'chrome,titlebar=no,popup=yes', null);
+        win.arguments = [image, title, msg, true, ''];
+    },
+
 }
 
 var tmpLightningTimezone = new lightningTimzone(document, window);
diff --git a/chrome/content/manageEWSAccounts.js b/chrome/content/manageEWSAccounts.js
index dd00c95b..855858ac 100644
--- a/chrome/content/manageEWSAccounts.js
+++ b/chrome/content/manageEWSAccounts.js
@@ -29,404 +29,397 @@ Cu.import("resource://exchangecalendar/erAutoDiscover.js");
 Cu.import("resource://exchangecalendar/erPrimarySMTPCheck.js");
 Cu.import("resource://exchangecalendar/erGetFolder.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.manageEWSAccounts = {
 
-	_detailsChecked: false,
-	_detailsChanged: false,
-	selectedAccount: {},
-
-	accountManager : Cc["@1st-setup.nl/exchange/accountmanager;1"]
-				.getService(Ci.mivExchangeAccountManager),
-
-	globalFunctions : Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions),
-
-	set detailsChecked(aValue)
-	{
-		this._detailsChecked = aValue;
-
-		this.checkRequired();
-	},
-
-	set detailsChanged(aValue)
-	{
-		this._detailsChanged = aValue;
-		if (aValue) {
-			document.getElementById("exchWebService_manageEWSAccounts_save_button").hidden = false;
-		}
-		else {
-			document.getElementById("exchWebService_manageEWSAccounts_save_button").hidden = true;
-		}
-	},
-
-	detailsOk: false,
-
-	checkRequired: function _checkRequired()
-	{
-		let canAdvance = true;
-		let vbox = document.getElementById('exchWebService-account-settings');
-		if (vbox) {
-			let eList = vbox.getElementsByAttribute('required', 'true');
-			for (let i = 0; i < eList.length && canAdvance; ++i) {
-
-				if (!eList[i].hidden) {
-					canAdvance = (eList[i].value != "");
-				}
-			}
-
-			if (canAdvance) {
-				if (document.getElementById("exchWebService_autodiscover").checked) {
-					document.getElementById("exchWebService_autodiscovercheckbutton").hidden = false;
-					document.getElementById("exchWebService_servercheckbutton").hidden = true;
-				}
-				else {
-					document.getElementById("exchWebService_autodiscovercheckbutton").hidden = true;
-					document.getElementById("exchWebService_servercheckbutton").hidden = false;
-				}
-			}
-			else {
-				document.getElementById("exchWebService_autodiscovercheckbutton").hidden = true;
-				document.getElementById("exchWebService_servercheckbutton").hidden = true;
-			}
-		}
-
-		if (window) {
-			window.sizeToContent();
-		}
-	},
-
-	logInfo: function _logInfo(aMsg)
-	{
-		this.globalFunctions.LOG(aMsg);
-	},
-
-	onLoad: function _onLoad()
-	{
-		// Load the exchWebService_manageEWSAccounts_accounts_listbox
-		var listbox = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox");
-		if (listbox) {
-			while (listbox.itemCount > 0) {
-				listbox.removeItemAt(0);
-			}
-		}
-
-		var accounts = this.accountManager.getAccounts();
-
-		for (var index in accounts) {
-			if (listbox) {
-				var newItem = listbox.appendItem( accounts[index].name.value, accounts[index].id);
-			}
-		}
-	},
-
-	showDetails: function _showDetails(aAccount)
-	{
-		document.getElementById("exchWebService_autodiscover").disabled = false;
-
-		document.getElementById("exchWebService_manageEWSAccounts_account_name").value = aAccount.name.value;
-		document.getElementById("exchWebService_manageEWSAccounts_account_name").disabled = false;
-
-		document.getElementById("exchWebService_server").value = aAccount.server.value;
-		document.getElementById("exchWebService_server").disabled = false;
-
-		document.getElementById("exchWebService_mailbox").value = aAccount.mailbox.value;
-		document.getElementById("exchWebService_mailbox").disabled = false;
-
-		document.getElementById("exchWebService_windowsuser").value = aAccount.user.value;
-		document.getElementById("exchWebService_windowsuser").disabled = false;
-	},
-
-	disableDetails: function _showDetails(aAccount)
-	{
-		document.getElementById("exchWebService_autodiscover").disabled = true;
-
-		document.getElementById("exchWebService_manageEWSAccounts_account_name").value = "";
-		document.getElementById("exchWebService_manageEWSAccounts_account_name").disabled = true;
-
-		document.getElementById("exchWebService_server").value = "";
-		document.getElementById("exchWebService_server").disabled = true;
-
-		document.getElementById("exchWebService_mailbox").value = "";
-		document.getElementById("exchWebService_mailbox").disabled = true;
-
-		document.getElementById("exchWebService_windowsuser").value = "";
-		document.getElementById("exchWebService_windowsuser").disabled = true;
-
-		this.detailsChanged = false;
-		this.detailsChecked = true;
-	},
-
-	onSelect: function _onSelect()
-	{
-		var item = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox").selectedItem;
-
-		this.selectedAccount = {};
-		if (item == null) {
-			this.disableDetails();
-			document.getElementById("exchWebService_manageEWSAccounts_removeAccount_button").disabled = true;
-			return;
-		}
-
-		var tmpResult = this.accountManager.getAccountById(item.value);
-
-		if (!tmpResult.result) return;
-		this.selectedAccount = tmpResult.account;
-
-		this.showDetails(this.selectedAccount);			
-
-		document.getElementById("exchWebService_server_status").status = 0;
-		document.getElementById("exchWebService_mailbox_status").status = 0;
-
-		document.getElementById("exchWebService_manageEWSAccounts_removeAccount_button").disabled = false;
-	},
-
-	onClose: function _onClose()
-	{
-		return true;
-	},
-
-	addNewAccount: function _addNewAccount()
-	{
-		this.selectedAccount = {
-				id : this.globalFunctions.getUUID(),
-				name: { type: "string", value:"new Account"},
-				server: { type: "string", value:""},
-				user: { type: "string", value:""},
-				mailbox: { type: "string", value:""} };
-		this.accountManager.saveAccount(this.selectedAccount);
-		var listbox = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox");
-		if (listbox) {
-			var newItem = listbox.appendItem( this.selectedAccount.name.value, this.selectedAccount.id);
-			listbox.selectedItem = newItem;
-		}
-	},
-
-	removeAccount: function _removeAccount()
-	{
-		this.accountManager.removeAccount(this.selectedAccount);
-		
-		var listbox = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox");
-		if (listbox) {
-			var oldIndex = listbox.selectedIndex;
-			listbox.selectedIndex = -1;
-			listbox.removeItemAt(oldIndex);
-
-			if (listbox.itemCount == 0) {
-				this.disableDetails();
-				document.getElementById("exchWebService_manageEWSAccounts_removeAccount_button").disabled = true;
-			}
-			else {
-				if (oldIndex == listbox.itemCount) {
-					oldIndex--;
-				}
-				listbox.selectedIndex = oldIndex;
-			}
-		}
-
-	},
-
-	saveAccount: function _saveAccount()
-	{
-		this.detailsChanged = false;
-		this.accountManager.saveAccount(this.selectedAccount);
-		document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox").selectedItem.label = this.selectedAccount.name.value;
-	},
-
-	doAutodiscoverChanged: function _doAutodiscoverChanged(aCheckBox)
-	{
-		if (aCheckBox.checked) {
-			document.getElementById("exchWebService_mailboxrow").hidden = false;
-			document.getElementById("exchWebService_mailboxrow").setAttribute("required", "true");
-			document.getElementById("exchWebService_serverrow").hidden = true;
-		}
-		else {
-			document.getElementById("exchWebService_mailboxrow").hidden = true;
-			document.getElementById("exchWebService_mailboxrow").setAttribute("required", "false");
-			document.getElementById("exchWebService_serverrow").hidden = false;
-		}
-		this.detailsChecked = false;
-	},
-
-	doNameChanged: function _doNameChanged(aTextBox)
-	{
-		this.detailsChanged = true;
-		this.selectedAccount.name.value = aTextBox.value;
-	},
-
-	doServerChanged: function _doServerChanged(aTextBox)
-	{
-		document.getElementById("exchWebService_server_status").status = 0;
-		this.detailsChecked = false;
-		this.selectedAccount.server.value = aTextBox.value;
-		if (aTextBox.value != "") {
-			var serverExists = this.accountManager.getAccountByServer(this.selectedAccount.server.value);
-			if ((serverExists != null) && (serverExists.id != this.selectedAccount.id)) {
-				// We allready have an account with the same server. warn and remove save button.
-				this.detailsChanged = false;
-				return;
-			}
-		}
-		this.detailsChanged = true;
-	},
-
-	doMailboxChanged: function _doMailboxChanged(aTextBox)
-	{
-		document.getElementById("exchWebService_mailbox_status").status = 0;
-		this.detailsChecked = false;
-		this.detailsChanged = true;
-		this.selectedAccount.mailbox.value = aTextBox.value;
-	},
-
-	doUserChanged: function _doUserChanged(aTextBox)
-	{
-		this.detailsChecked = false;
-		this.detailsChanged = true;
-		this.selectedAccount.user.value = aTextBox.value;
-	},
-
-	doAutodiscoverCheck: function _doAutodiscoverCheck()
-	{
-		document.getElementById("exchWebService_autodiscovercheckbutton").disabled = true;
-
-		try {
-			window.setCursor("wait");
-			var user = document.getElementById("exchWebService_windowsuser").value;
-			var mailbox = document.getElementById("exchWebService_mailbox").value;
-			var tmpObject = new erAutoDiscoverRequest( 
-				{user: user, 
-				 mailbox: mailbox}, 
-				 this.autodiscoveryOK, 
-				 this.autodiscoveryError, null);
-		}
-		catch(err) {
-			window.setCursor("auto");
-			this.globalFunctions.ERROR("Warning: Could not create erAutoDiscoverRequest. Err="+err+"\n");
-		}
-	},
-
-	autodiscoveryOK: function _autodiscoveryOK(ewsUrls, DisplayName, SMTPAddress)
-	{
-		this.globalFunctions.LOG("ecAutodiscoveryOK");
-		var selectedEWSUrl = {value:undefined};
-		var userCancel = false;
-
-		if (ewsUrls) {
-			if (ewsUrls.length() > 1) {
-				// We have got multiple ews urls returned. Let the use choose.
-
-				window.openDialog("chrome://exchangecalendar/content/selectEWSUrl.xul",
-					"selectfrommultipleews",
-					"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
-					ewsUrls, selectedEWSUrl); 
-
-				if ((!selectedEWSUrl.value) || (selectedEWSUrl.value == "")) {
-					this.globalFunctions.LOG("  ++++ Selection canceled by user");
-					userCancel = true;
-				}
-			}
-			else {
-				// We only have one url. Use it.
-				selectedEWSUrl.value = ewsUrls.text();
-			}
-
-		}
-
-		if (!userCancel) {
-			document.getElementById("exchWebService_server").value = selectedEWSUrl.value; 
-			document.getElementById("exchWebService_serverrow").hidden = false; 
-			document.getElementById("exchWebService_mailboxrow").hidden = false; 
-
-			gexchWebServicesDetailsChecked = true;
-			document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
-			document.getElementById("exchWebService_autodiscover").checked = false;
-		}
-		else {
-			document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
-		}
-
-		window.setCursor("auto");
-		this.detailsChecked = true;
-		document.getElementById("exchWebService_server_status").status = 2;
-		document.getElementById("exchWebService_mailbox_status").status = 2;
-	},
-
-	autodiscoveryError: function _autodiscoveryError(aExchangeRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("ecAutodiscoveryError. aCode:"+aCode+", aMsg:"+aMsg);
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-		case -9:
-		case -10:
-		case -14:
-		case -15:
-		case -16:
-		case -17:
-		case -18:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [document.getElementById("exchWebService_mailbox").value], "exchangecalendar"));
-			break;
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecalendar"));
-		}
-
-		document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
-		window.setCursor("auto");
-		this.detailsChecked = false;
-		document.getElementById("exchWebService_mailbox_status").status = 1;
-	},
-
-	doCheckServer: function _doCheckServer()
-	{
-		document.getElementById("exchWebService_servercheckbutton").disabled = true;
-
-
-		try {
-			window.setCursor("wait");
-			var user = document.getElementById("exchWebService_windowsuser").value;
-			var tmpObject = new erGetFolderRequest(
-				{user: user, 
-				 mailbox: "",
-				 folderBase: "publicfoldersroot",
-				 folderPath: "/",
-				 serverUrl: document.getElementById("exchWebService_server").value}, this.checkServerOK, this.checkServerError)
-		}
-		catch(err) {
-			window.setCursor("auto");
-			this.globalFunctions.ERROR("Warning: Error during creation of erGetFolderRequest. Err="+err+"\n");
-		}
-	},
-
-	checkServerOK: function _checkServerOK( folderID, changeKey, folderClass)
-	{
-
-		document.getElementById("exchWebService_servercheckbutton").disabled = false;
-		window.setCursor("auto");
-		this.detailsChecked = true;
-		document.getElementById("exchWebService_server_status").status = 2;
-	},
-
-	checkServerError: function _checkServerError(aExchangeRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("exchWebServicesCheckServerError");
-		switch (aCode) {
-		case -20:
-		case -30:
-			break;
-		case -6:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [document.getElementById("exchWebService_server").value], "exchangecalendar"));
-			break;
-		default:
-			alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecalendar"));
-		}
-		document.getElementById("exchWebService_servercheckbutton").disabled = false;
-
-		window.setCursor("auto");
-		this.detailsChecked = false;
-		document.getElementById("exchWebService_server_status").status = 1;
-	},
+    _detailsChecked: false,
+    _detailsChanged: false,
+    selectedAccount: {},
+
+    accountManager: Cc["@1st-setup.nl/exchange/accountmanager;1"]
+        .getService(Ci.mivExchangeAccountManager),
+
+    globalFunctions: Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions),
+
+    set detailsChecked(aValue) {
+        this._detailsChecked = aValue;
+
+        this.checkRequired();
+    },
+
+    set detailsChanged(aValue) {
+        this._detailsChanged = aValue;
+        if (aValue) {
+            document.getElementById("exchWebService_manageEWSAccounts_save_button").hidden = false;
+        }
+        else {
+            document.getElementById("exchWebService_manageEWSAccounts_save_button").hidden = true;
+        }
+    },
+
+    detailsOk: false,
+
+    checkRequired: function _checkRequired() {
+        let canAdvance = true;
+        let vbox = document.getElementById('exchWebService-account-settings');
+        if (vbox) {
+            let eList = vbox.getElementsByAttribute('required', 'true');
+            for (let i = 0; i < eList.length && canAdvance; ++i) {
+
+                if (!eList[i].hidden) {
+                    canAdvance = (eList[i].value != "");
+                }
+            }
+
+            if (canAdvance) {
+                if (document.getElementById("exchWebService_autodiscover").checked) {
+                    document.getElementById("exchWebService_autodiscovercheckbutton").hidden = false;
+                    document.getElementById("exchWebService_servercheckbutton").hidden = true;
+                }
+                else {
+                    document.getElementById("exchWebService_autodiscovercheckbutton").hidden = true;
+                    document.getElementById("exchWebService_servercheckbutton").hidden = false;
+                }
+            }
+            else {
+                document.getElementById("exchWebService_autodiscovercheckbutton").hidden = true;
+                document.getElementById("exchWebService_servercheckbutton").hidden = true;
+            }
+        }
+
+        if (window) {
+            window.sizeToContent();
+        }
+    },
+
+    logInfo: function _logInfo(aMsg) {
+        this.globalFunctions.LOG(aMsg);
+    },
+
+    onLoad: function _onLoad() {
+        // Load the exchWebService_manageEWSAccounts_accounts_listbox
+        var listbox = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox");
+        if (listbox) {
+            while (listbox.itemCount > 0) {
+                listbox.removeItemAt(0);
+            }
+        }
+
+        var accounts = this.accountManager.getAccounts();
+
+        for (var index in accounts) {
+            if (listbox) {
+                var newItem = listbox.appendItem(accounts[index].name.value, accounts[index].id);
+            }
+        }
+    },
+
+    showDetails: function _showDetails(aAccount) {
+        document.getElementById("exchWebService_autodiscover").disabled = false;
+
+        document.getElementById("exchWebService_manageEWSAccounts_account_name").value = aAccount.name.value;
+        document.getElementById("exchWebService_manageEWSAccounts_account_name").disabled = false;
+
+        document.getElementById("exchWebService_server").value = aAccount.server.value;
+        document.getElementById("exchWebService_server").disabled = false;
+
+        document.getElementById("exchWebService_mailbox").value = aAccount.mailbox.value;
+        document.getElementById("exchWebService_mailbox").disabled = false;
+
+        document.getElementById("exchWebService_windowsuser").value = aAccount.user.value;
+        document.getElementById("exchWebService_windowsuser").disabled = false;
+    },
+
+    disableDetails: function _showDetails(aAccount) {
+        document.getElementById("exchWebService_autodiscover").disabled = true;
+
+        document.getElementById("exchWebService_manageEWSAccounts_account_name").value = "";
+        document.getElementById("exchWebService_manageEWSAccounts_account_name").disabled = true;
+
+        document.getElementById("exchWebService_server").value = "";
+        document.getElementById("exchWebService_server").disabled = true;
+
+        document.getElementById("exchWebService_mailbox").value = "";
+        document.getElementById("exchWebService_mailbox").disabled = true;
+
+        document.getElementById("exchWebService_windowsuser").value = "";
+        document.getElementById("exchWebService_windowsuser").disabled = true;
+
+        this.detailsChanged = false;
+        this.detailsChecked = true;
+    },
+
+    onSelect: function _onSelect() {
+        var item = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox").selectedItem;
+
+        this.selectedAccount = {};
+        if (item == null) {
+            this.disableDetails();
+            document.getElementById("exchWebService_manageEWSAccounts_removeAccount_button").disabled = true;
+            return;
+        }
+
+        var tmpResult = this.accountManager.getAccountById(item.value);
+
+        if (!tmpResult.result) return;
+        this.selectedAccount = tmpResult.account;
+
+        this.showDetails(this.selectedAccount);
+
+        document.getElementById("exchWebService_server_status").status = 0;
+        document.getElementById("exchWebService_mailbox_status").status = 0;
+
+        document.getElementById("exchWebService_manageEWSAccounts_removeAccount_button").disabled = false;
+    },
+
+    onClose: function _onClose() {
+        return true;
+    },
+
+    addNewAccount: function _addNewAccount() {
+        this.selectedAccount = {
+            id: this.globalFunctions.getUUID(),
+            name: {
+                type: "string",
+                value: "new Account"
+            },
+            server: {
+                type: "string",
+                value: ""
+            },
+            user: {
+                type: "string",
+                value: ""
+            },
+            mailbox: {
+                type: "string",
+                value: ""
+            }
+        };
+        this.accountManager.saveAccount(this.selectedAccount);
+        var listbox = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox");
+        if (listbox) {
+            var newItem = listbox.appendItem(this.selectedAccount.name.value, this.selectedAccount.id);
+            listbox.selectedItem = newItem;
+        }
+    },
+
+    removeAccount: function _removeAccount() {
+        this.accountManager.removeAccount(this.selectedAccount);
+
+        var listbox = document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox");
+        if (listbox) {
+            var oldIndex = listbox.selectedIndex;
+            listbox.selectedIndex = -1;
+            listbox.removeItemAt(oldIndex);
+
+            if (listbox.itemCount == 0) {
+                this.disableDetails();
+                document.getElementById("exchWebService_manageEWSAccounts_removeAccount_button").disabled = true;
+            }
+            else {
+                if (oldIndex == listbox.itemCount) {
+                    oldIndex--;
+                }
+                listbox.selectedIndex = oldIndex;
+            }
+        }
+
+    },
+
+    saveAccount: function _saveAccount() {
+        this.detailsChanged = false;
+        this.accountManager.saveAccount(this.selectedAccount);
+        document.getElementById("exchWebService-manageEWSAccounts-accounts-listbox").selectedItem.label = this.selectedAccount.name.value;
+    },
+
+    doAutodiscoverChanged: function _doAutodiscoverChanged(aCheckBox) {
+        if (aCheckBox.checked) {
+            document.getElementById("exchWebService_mailboxrow").hidden = false;
+            document.getElementById("exchWebService_mailboxrow").setAttribute("required", "true");
+            document.getElementById("exchWebService_serverrow").hidden = true;
+        }
+        else {
+            document.getElementById("exchWebService_mailboxrow").hidden = true;
+            document.getElementById("exchWebService_mailboxrow").setAttribute("required", "false");
+            document.getElementById("exchWebService_serverrow").hidden = false;
+        }
+        this.detailsChecked = false;
+    },
+
+    doNameChanged: function _doNameChanged(aTextBox) {
+        this.detailsChanged = true;
+        this.selectedAccount.name.value = aTextBox.value;
+    },
+
+    doServerChanged: function _doServerChanged(aTextBox) {
+        document.getElementById("exchWebService_server_status").status = 0;
+        this.detailsChecked = false;
+        this.selectedAccount.server.value = aTextBox.value;
+        if (aTextBox.value != "") {
+            var serverExists = this.accountManager.getAccountByServer(this.selectedAccount.server.value);
+            if ((serverExists != null) && (serverExists.id != this.selectedAccount.id)) {
+                // We allready have an account with the same server. warn and remove save button.
+                this.detailsChanged = false;
+                return;
+            }
+        }
+        this.detailsChanged = true;
+    },
+
+    doMailboxChanged: function _doMailboxChanged(aTextBox) {
+        document.getElementById("exchWebService_mailbox_status").status = 0;
+        this.detailsChecked = false;
+        this.detailsChanged = true;
+        this.selectedAccount.mailbox.value = aTextBox.value;
+    },
+
+    doUserChanged: function _doUserChanged(aTextBox) {
+        this.detailsChecked = false;
+        this.detailsChanged = true;
+        this.selectedAccount.user.value = aTextBox.value;
+    },
+
+    doAutodiscoverCheck: function _doAutodiscoverCheck() {
+        document.getElementById("exchWebService_autodiscovercheckbutton").disabled = true;
+
+        try {
+            window.setCursor("wait");
+            var user = document.getElementById("exchWebService_windowsuser").value;
+            var mailbox = document.getElementById("exchWebService_mailbox").value;
+            var tmpObject = new erAutoDiscoverRequest({
+                    user: user,
+                    mailbox: mailbox
+                },
+                this.autodiscoveryOK,
+                this.autodiscoveryError, null);
+        }
+        catch (err) {
+            window.setCursor("auto");
+            this.globalFunctions.ERROR("Warning: Could not create erAutoDiscoverRequest. Err=" + err + "\n");
+        }
+    },
+
+    autodiscoveryOK: function _autodiscoveryOK(ewsUrls, DisplayName, SMTPAddress) {
+        this.globalFunctions.LOG("ecAutodiscoveryOK");
+        var selectedEWSUrl = {
+            value: undefined
+        };
+        var userCancel = false;
+
+        if (ewsUrls) {
+            if (ewsUrls.length() > 1) {
+                // We have got multiple ews urls returned. Let the use choose.
+
+                window.openDialog("chrome://exchangecalendar/content/selectEWSUrl.xul",
+                    "selectfrommultipleews",
+                    "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
+                    ewsUrls, selectedEWSUrl);
+
+                if ((!selectedEWSUrl.value) || (selectedEWSUrl.value == "")) {
+                    this.globalFunctions.LOG("  ++++ Selection canceled by user");
+                    userCancel = true;
+                }
+            }
+            else {
+                // We only have one url. Use it.
+                selectedEWSUrl.value = ewsUrls.text();
+            }
+
+        }
+
+        if (!userCancel) {
+            document.getElementById("exchWebService_server").value = selectedEWSUrl.value;
+            document.getElementById("exchWebService_serverrow").hidden = false;
+            document.getElementById("exchWebService_mailboxrow").hidden = false;
+
+            gexchWebServicesDetailsChecked = true;
+            document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
+            document.getElementById("exchWebService_autodiscover").checked = false;
+        }
+        else {
+            document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
+        }
+
+        window.setCursor("auto");
+        this.detailsChecked = true;
+        document.getElementById("exchWebService_server_status").status = 2;
+        document.getElementById("exchWebService_mailbox_status").status = 2;
+    },
+
+    autodiscoveryError: function _autodiscoveryError(aExchangeRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("ecAutodiscoveryError. aCode:" + aCode + ", aMsg:" + aMsg);
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+        case -9:
+        case -10:
+        case -14:
+        case -15:
+        case -16:
+        case -17:
+        case -18:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [document.getElementById("exchWebService_mailbox").value], "exchangecalendar"));
+            break;
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecalendar"));
+        }
+
+        document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
+        window.setCursor("auto");
+        this.detailsChecked = false;
+        document.getElementById("exchWebService_mailbox_status").status = 1;
+    },
+
+    doCheckServer: function _doCheckServer() {
+        document.getElementById("exchWebService_servercheckbutton").disabled = true;
+
+
+        try {
+            window.setCursor("wait");
+            var user = document.getElementById("exchWebService_windowsuser").value;
+            var tmpObject = new erGetFolderRequest({
+                user: user,
+                mailbox: "",
+                folderBase: "publicfoldersroot",
+                folderPath: "/",
+                serverUrl: document.getElementById("exchWebService_server").value
+            }, this.checkServerOK, this.checkServerError)
+        }
+        catch (err) {
+            window.setCursor("auto");
+            this.globalFunctions.ERROR("Warning: Error during creation of erGetFolderRequest. Err=" + err + "\n");
+        }
+    },
+
+    checkServerOK: function _checkServerOK(folderID, changeKey, folderClass) {
+
+        document.getElementById("exchWebService_servercheckbutton").disabled = false;
+        window.setCursor("auto");
+        this.detailsChecked = true;
+        document.getElementById("exchWebService_server_status").status = 2;
+    },
+
+    checkServerError: function _checkServerError(aExchangeRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("exchWebServicesCheckServerError");
+        switch (aCode) {
+        case -20:
+        case -30:
+            break;
+        case -6:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [document.getElementById("exchWebService_server").value], "exchangecalendar"));
+            break;
+        default:
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecalendar"));
+        }
+        document.getElementById("exchWebService_servercheckbutton").disabled = false;
+
+        window.setCursor("auto");
+        this.detailsChecked = false;
+        document.getElementById("exchWebService_server_status").status = 1;
+    },
 }
-
diff --git a/chrome/content/manageEWSAccountsMenu.js b/chrome/content/manageEWSAccountsMenu.js
index 7cdd1720..3cbd3258 100644
--- a/chrome/content/manageEWSAccountsMenu.js
+++ b/chrome/content/manageEWSAccountsMenu.js
@@ -26,17 +26,15 @@ var Cu = Components.utils;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.manageEWSAccountsMenu = {
 
-	showManager: function _showManager()
-	{
-		window.openDialog("chrome://exchangecalendar/content/manageEWSAccounts.xul",
-			"manageEWSAccounts",
-			"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-			null); 
-	},
+    showManager: function _showManager() {
+        window.openDialog("chrome://exchangecalendar/content/manageEWSAccounts.xul",
+            "manageEWSAccounts",
+            "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+            null);
+    },
 
 }
-
diff --git a/chrome/content/messenger_task_delegation.js b/chrome/content/messenger_task_delegation.js
index a2fbb41f..7390fd8a 100644
--- a/chrome/content/messenger_task_delegation.js
+++ b/chrome/content/messenger_task_delegation.js
@@ -36,131 +36,142 @@ Cu.import("resource://calendar/modules/calUtils.jsm");
 
 //if (! exchWebService) var exchWebService = {};
 
-function exchTaskDelegation(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchTaskDelegation(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchTaskDelegation.prototype = {
 
-//exchWebService.taskDelegation = {
-
-	_initialized: false,
-
-	onLoad: function _onLoad()
-	{
-		if (this._initialized) return;
-
-		if (this._document.getElementById("calendar-task-tree")) {
-			this._initialized = true;
-			// nuke the onload, or we get called every time there's
-			// any load that occurs
-			//this._document.removeEventListener("load", exchWebService.taskDelegation.onLoad, false);
-			var self = this;
-			this._document.getElementById("calendar-task-tree").addEventListener("select", function(){ self.onSelect();}, true);
-		}
-	},
-
-	onSelect: function _onSelect()
-	{
-		var task = this._document.getElementById("calendar-task-tree").currentTask;
-		if (task) {
-			if (task.hasProperty("exchWebService-Owner")) {
-				this._document.getElementById("exchWebService-task-delegation-owner-label").value = task.getProperty("exchWebService-Owner")+"|"+task.getProperty("exchWebService-PidLidTaskAccepted")+"|"+task.getProperty("exchWebService-PidLidTaskAcceptanceState")+"|"+task.getProperty("exchWebService-PidLidTaskHistory")+"|";
-				this._document.getElementById("exchWebService-task-delegation-owner").hidden = false;
-
-				// Hide the buttons if we are the Owner.
-				if (task.getProperty("exchWebService-PidLidTaskAcceptanceState") != "NoMatch") {
-					this._document.getElementById("exchWebService-task-delegation-accept-button").hidden = true;
-					this._document.getElementById("exchWebService-task-delegation-decline-button").hidden = true;
-					this._document.getElementById("exchWebService-task-delegation-toolbar").hidden = true;
-				}
-				else {
-					this._document.getElementById("exchWebService-task-delegation-toolbar").hidden = false;
-					if (task.getProperty("exchWebService-PidLidTaskHistory") == 5) {
-						this._document.getElementById("exchWebService-task-delegation-accept-button").hidden = false;
-						this._document.getElementById("exchWebService-task-delegation-decline-button").hidden = false;
-						this._document.getElementById("exchWebService-task-delegation-toolbar").setAttribute("defaultset", "exchWebService-task-delegation-accept-button, exchWebService-task-delegation-decline-button");
-					}
-					else {
-						this._document.getElementById("exchWebService-task-delegation-accept-button").hidden = true;
-						this._document.getElementById("exchWebService-task-delegation-toolbar").setAttribute("defaultset", "exchWebService-task-delegation-decline-button");
-					}
-				}
-				this._document.getElementById("exchWebService-task-delegation-toolbar").hidden = true; // Temporary until we get it fixed.
-				this._document.getElementById("exchWebService-task-delegation-toolbar").setAttribute("defaultset", ""); // Temporary until we get it fixed.
-			}
-			else {
-				this._document.getElementById("exchWebService-task-delegation-owner").hidden = true;
-			}
-
-			if (task.hasProperty("exchWebService-Delegator")) {
-				this._document.getElementById("exchWebService-task-delegation-delegator-label").value = task.getProperty("exchWebService-Delegator");
-				this._document.getElementById("exchWebService-task-delegation-delegator").hidden = false;
-			}
-			else {
-				this._document.getElementById("exchWebService-task-delegation-delegator").hidden = true;
-			}
-
-			if (task.hasProperty("exchWebService-PidLidTaskLastUpdate")) {
-				let dtFormat = Cc["@mozilla.org/calendar/datetime-formatter;1"]
-					             .getService(Ci.calIDateTimeFormatter);
-
-				var tmpDate = cal.fromRFC3339(task.getProperty("exchWebService-PidLidTaskLastUpdate"), this.globalFunctions.ecTZService().UTC).getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-
-				var lastChange = task.getProperty("exchWebService-PidLidTaskHistory");
-				switch (lastChange) {
-				case "4": lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.duedate.changed", [], "exchangecalendar"); break;
-				case "3": lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.some.property.changed", [], "exchangecalendar"); break;
-				case "1": lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.accepted", [task.getProperty("exchWebService-Owner")], "exchangecalendar"); break;
-				case "2": lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.rejected", [task.getProperty("exchWebService-Owner")], "exchangecalendar"); break;
-				case "5": lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.assigned", [task.getProperty("exchWebService-Owner")], "exchangecalendar"); break;
-				case "0": lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.no.changes", [], "exchangecalendar"); break;
-				}
-
-				this._document.getElementById("exchWebService-task-delegation-lastUpdateDate-label").value = dtFormat.formatDateTime(tmpDate)+" "+lastChange;
-				this._document.getElementById("exchWebService-task-delegation-lastUpdateDate").hidden = false;
-			}
-			else {
-				this._document.getElementById("exchWebService-task-delegation-lastUpdateDate").hidden = true;
-			}
-		}
-	},
-
-	onAccept: function _onAccept()
-	{
-		this.globalFunctions.LOG("onAccept");
-		var task = this._document.getElementById("calendar-task-tree").currentTask;
-		if (task) {
-			var newTask = task.clone();
-			newTask.setProperty("exchWebService-PidLidTaskLastUpdate", cal.toRFC3339(cal.now()) );
-			newTask.setProperty("exchWebService-PidLidTaskHistory", "1")
-			newTask.setProperty("exchWebService-PidLidTaskAccepted", "true")
-			task.calendar.modifyItem(newTask, task, null);
-		}
-	},
-
-	onReject: function _onReject()
-	{
-		this.globalFunctions.LOG("onReject");
-		var task = this._document.getElementById("calendar-task-tree").currentTask;
-		if (task) {
-			var newTask = task.clone();
-			newTask.setProperty("exchWebService-PidLidTaskLastUpdate", cal.toRFC3339(cal.now()) );
-			newTask.setProperty("exchWebService-PidLidTaskHistory", "2")
-			newTask.setProperty("exchWebService-PidLidTaskAccepted", "true")
-			task.calendar.modifyItem(newTask, task, null);
-		}
-	},
+    //exchWebService.taskDelegation = {
+
+    _initialized: false,
+
+    onLoad: function _onLoad() {
+        if (this._initialized) return;
+
+        if (this._document.getElementById("calendar-task-tree")) {
+            this._initialized = true;
+            // nuke the onload, or we get called every time there's
+            // any load that occurs
+            //this._document.removeEventListener("load", exchWebService.taskDelegation.onLoad, false);
+            var self = this;
+            this._document.getElementById("calendar-task-tree").addEventListener("select", function () {
+                self.onSelect();
+            }, true);
+        }
+    },
+
+    onSelect: function _onSelect() {
+        var task = this._document.getElementById("calendar-task-tree").currentTask;
+        if (task) {
+            if (task.hasProperty("exchWebService-Owner")) {
+                this._document.getElementById("exchWebService-task-delegation-owner-label").value = task.getProperty("exchWebService-Owner") + "|" + task.getProperty("exchWebService-PidLidTaskAccepted") + "|" + task.getProperty("exchWebService-PidLidTaskAcceptanceState") + "|" + task.getProperty("exchWebService-PidLidTaskHistory") + "|";
+                this._document.getElementById("exchWebService-task-delegation-owner").hidden = false;
+
+                // Hide the buttons if we are the Owner.
+                if (task.getProperty("exchWebService-PidLidTaskAcceptanceState") != "NoMatch") {
+                    this._document.getElementById("exchWebService-task-delegation-accept-button").hidden = true;
+                    this._document.getElementById("exchWebService-task-delegation-decline-button").hidden = true;
+                    this._document.getElementById("exchWebService-task-delegation-toolbar").hidden = true;
+                }
+                else {
+                    this._document.getElementById("exchWebService-task-delegation-toolbar").hidden = false;
+                    if (task.getProperty("exchWebService-PidLidTaskHistory") == 5) {
+                        this._document.getElementById("exchWebService-task-delegation-accept-button").hidden = false;
+                        this._document.getElementById("exchWebService-task-delegation-decline-button").hidden = false;
+                        this._document.getElementById("exchWebService-task-delegation-toolbar").setAttribute("defaultset", "exchWebService-task-delegation-accept-button, exchWebService-task-delegation-decline-button");
+                    }
+                    else {
+                        this._document.getElementById("exchWebService-task-delegation-accept-button").hidden = true;
+                        this._document.getElementById("exchWebService-task-delegation-toolbar").setAttribute("defaultset", "exchWebService-task-delegation-decline-button");
+                    }
+                }
+                this._document.getElementById("exchWebService-task-delegation-toolbar").hidden = true; // Temporary until we get it fixed.
+                this._document.getElementById("exchWebService-task-delegation-toolbar").setAttribute("defaultset", ""); // Temporary until we get it fixed.
+            }
+            else {
+                this._document.getElementById("exchWebService-task-delegation-owner").hidden = true;
+            }
+
+            if (task.hasProperty("exchWebService-Delegator")) {
+                this._document.getElementById("exchWebService-task-delegation-delegator-label").value = task.getProperty("exchWebService-Delegator");
+                this._document.getElementById("exchWebService-task-delegation-delegator").hidden = false;
+            }
+            else {
+                this._document.getElementById("exchWebService-task-delegation-delegator").hidden = true;
+            }
+
+            if (task.hasProperty("exchWebService-PidLidTaskLastUpdate")) {
+                let dtFormat = Cc["@mozilla.org/calendar/datetime-formatter;1"]
+                    .getService(Ci.calIDateTimeFormatter);
+
+                var tmpDate = cal.fromRFC3339(task.getProperty("exchWebService-PidLidTaskLastUpdate"), this.globalFunctions.ecTZService().UTC).getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+
+                var lastChange = task.getProperty("exchWebService-PidLidTaskHistory");
+                switch (lastChange) {
+                case "4":
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.duedate.changed", [], "exchangecalendar");
+                    break;
+                case "3":
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.some.property.changed", [], "exchangecalendar");
+                    break;
+                case "1":
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.accepted", [task.getProperty("exchWebService-Owner")], "exchangecalendar");
+                    break;
+                case "2":
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.rejected", [task.getProperty("exchWebService-Owner")], "exchangecalendar");
+                    break;
+                case "5":
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.assigned", [task.getProperty("exchWebService-Owner")], "exchangecalendar");
+                    break;
+                case "0":
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.no.changes", [], "exchangecalendar");
+                    break;
+                }
+
+                this._document.getElementById("exchWebService-task-delegation-lastUpdateDate-label").value = dtFormat.formatDateTime(tmpDate) + " " + lastChange;
+                this._document.getElementById("exchWebService-task-delegation-lastUpdateDate").hidden = false;
+            }
+            else {
+                this._document.getElementById("exchWebService-task-delegation-lastUpdateDate").hidden = true;
+            }
+        }
+    },
+
+    onAccept: function _onAccept() {
+        this.globalFunctions.LOG("onAccept");
+        var task = this._document.getElementById("calendar-task-tree").currentTask;
+        if (task) {
+            var newTask = task.clone();
+            newTask.setProperty("exchWebService-PidLidTaskLastUpdate", cal.toRFC3339(cal.now()));
+            newTask.setProperty("exchWebService-PidLidTaskHistory", "1")
+            newTask.setProperty("exchWebService-PidLidTaskAccepted", "true")
+            task.calendar.modifyItem(newTask, task, null);
+        }
+    },
+
+    onReject: function _onReject() {
+        this.globalFunctions.LOG("onReject");
+        var task = this._document.getElementById("calendar-task-tree").currentTask;
+        if (task) {
+            var newTask = task.clone();
+            newTask.setProperty("exchWebService-PidLidTaskLastUpdate", cal.toRFC3339(cal.now()));
+            newTask.setProperty("exchWebService-PidLidTaskHistory", "2")
+            newTask.setProperty("exchWebService-PidLidTaskAccepted", "true")
+            task.calendar.modifyItem(newTask, task, null);
+        }
+    },
 
 }
 
 //this._document.addEventListener("load", exchWebService.taskDelegation.onLoad, true);
 
 var tmpTaskDelegation = new exchTaskDelegation(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpTaskDelegation.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpTaskDelegation.onLoad();
+}, true);
diff --git a/chrome/content/msgHdrUtils.js b/chrome/content/msgHdrUtils.js
index f6e0556c..6103a2d5 100644
--- a/chrome/content/msgHdrUtils.js
+++ b/chrome/content/msgHdrUtils.js
@@ -42,27 +42,32 @@
  */
 
 var EXPORTED_SYMBOLS = [
-  // Low-level XPCOM boring stuff
-  'msgHdrToMessageBody', 'msgHdrToNeckoURL', 'msgHdrGetTags', 'msgUriToMsgHdr',
-  'msgHdrGetUri', 'msgHdrFromNeckoUrl', 'msgHdrSetTags',
-  // Quickly identify a message
-  'msgHdrIsDraft', 'msgHdrIsSent', 'msgHdrIsArchive', 'msgHdrIsInbox',
-  'msgHdrIsRss', 'msgHdrIsNntp', 'msgHdrIsJunk',
-  // Actions on a set of message headers
-  'msgHdrsMarkAsRead', 'msgHdrsArchive', 'msgHdrsDelete',
-  // Doesn't really belong here
-  'getMail3Pane',
-  // Higher-level functions
-  'msgHdrGetHeaders',
+    // Low-level XPCOM boring stuff
+    'msgHdrToMessageBody', 'msgHdrToNeckoURL', 'msgHdrGetTags', 'msgUriToMsgHdr',
+    'msgHdrGetUri', 'msgHdrFromNeckoUrl', 'msgHdrSetTags',
+    // Quickly identify a message
+    'msgHdrIsDraft', 'msgHdrIsSent', 'msgHdrIsArchive', 'msgHdrIsInbox',
+    'msgHdrIsRss', 'msgHdrIsNntp', 'msgHdrIsJunk',
+    // Actions on a set of message headers
+    'msgHdrsMarkAsRead', 'msgHdrsArchive', 'msgHdrsDelete',
+    // Doesn't really belong here
+    'getMail3Pane',
+    // Higher-level functions
+    'msgHdrGetHeaders',
 ]
 
-  const {classes: Cc, interfaces: Ci, utils: Cu, results : Cr} = Components;
+const {
+    classes: Cc,
+    interfaces: Ci,
+    utils: Cu,
+    results: Cr
+} = Components;
 
 // from mailnews/base/public/nsMsgFolderFlags.idl
 const nsMsgFolderFlags_SentMail = 0x00000200;
-const nsMsgFolderFlags_Drafts   = 0x00000400;
-const nsMsgFolderFlags_Archive  = 0x00004000;
-const nsMsgFolderFlags_Inbox    = 0x00001000;
+const nsMsgFolderFlags_Drafts = 0x00000400;
+const nsMsgFolderFlags_Archive = 0x00004000;
+const nsMsgFolderFlags_Inbox = 0x00001000;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm"); // for defineLazyServiceGetter
 Cu.import("resource:///modules/gloda/mimemsg.js");
@@ -72,7 +77,7 @@ Cu.import("resource:///modules/mailServices.js");
 
 // Adding a messenger lazy getter to the MailServices even though it's not a service
 XPCOMUtils.defineLazyGetter(MailServices, "messenger", function () {
-  return Cc["@mozilla.org/messenger;1"].createInstance(Ci.nsIMessenger);
+    return Cc["@mozilla.org/messenger;1"].createInstance(Ci.nsIMessenger);
 });
 
 /**
@@ -80,8 +85,8 @@ XPCOMUtils.defineLazyGetter(MailServices, "messenger", function () {
  * @param {nsIMsgDbHdr} aMsg The message
  * @return {String}
  */
-function msgHdrGetUri (aMsg)
-  aMsg.folder.getUriForMsg(aMsg)
+function msgHdrGetUri(aMsg)
+aMsg.folder.getUriForMsg(aMsg)
 
 /**
  * Get a msgHdr from a message URI (msgHdr.URI).
@@ -89,13 +94,14 @@ function msgHdrGetUri (aMsg)
  * @return {nsIMsgDbHdr}
  */
 function msgUriToMsgHdr(aUri) {
-  try {
-    let messageService = MailServices.messenger.messageServiceFromURI(aUri);
-    return messageService.messageURIToMsgHdr(aUri);
-  } catch (e) {
-    dump("Unable to get "+aUri+" — returning null instead");
-    return null;
-  }
+    try {
+        let messageService = MailServices.messenger.messageServiceFromURI(aUri);
+        return messageService.messageURIToMsgHdr(aUri);
+    }
+    catch (e) {
+        dump("Unable to get " + aUri + " — returning null instead");
+        return null;
+    }
 }
 
 /**
@@ -104,7 +110,7 @@ function msgUriToMsgHdr(aUri) {
  * @return {bool}
  */
 function msgHdrIsInbox(msgHdr)
-  msgHdr.folder.getFlag(nsMsgFolderFlags_Inbox)
+msgHdr.folder.getFlag(nsMsgFolderFlags_Inbox)
 
 /**
  * Tells if the message is a draft message
@@ -112,7 +118,7 @@ function msgHdrIsInbox(msgHdr)
  * @return {bool}
  */
 function msgHdrIsDraft(msgHdr)
-  msgHdr.folder.getFlag(nsMsgFolderFlags_Drafts)
+msgHdr.folder.getFlag(nsMsgFolderFlags_Drafts)
 
 /**
  * Tells if the message is a sent message
@@ -120,7 +126,7 @@ function msgHdrIsDraft(msgHdr)
  * @return {bool}
  */
 function msgHdrIsSent(msgHdr)
-  msgHdr.folder.getFlag(nsMsgFolderFlags_SentMail)
+msgHdr.folder.getFlag(nsMsgFolderFlags_SentMail)
 
 /**
  * Tells if the message is an archived message
@@ -128,7 +134,7 @@ function msgHdrIsSent(msgHdr)
  * @return {bool}
  */
 function msgHdrIsArchive(msgHdr)
-  msgHdr.folder.getFlag(nsMsgFolderFlags_Archive)
+msgHdr.folder.getFlag(nsMsgFolderFlags_Archive)
 
 /**
  * Get a nsIMsgDbHdr from a Necko URL.
@@ -136,7 +142,7 @@ function msgHdrIsArchive(msgHdr)
  * @return {nsIMsgDbHdr} The message header.
  */
 function msgHdrFromNeckoUrl(aUrl)
-  aUrl.QueryInterface(Ci.nsIMsgMessageUrl).messageHeader
+aUrl.QueryInterface(Ci.nsIMsgMessageUrl).messageHeader
 
 /**
  * Get a string containing the body of a messsage.
@@ -145,20 +151,20 @@ function msgHdrFromNeckoUrl(aUrl)
  * @return {string}
  */
 function msgHdrToMessageBody(aMessageHeader, aStripHtml, aLength) {
-  let messenger = Cc["@mozilla.org/messenger;1"].createInstance(Ci.nsIMessenger);  
-  let listener = Cc["@mozilla.org/network/sync-stream-listener;1"].createInstance(Ci.nsISyncStreamListener);  
-  let uri = aMessageHeader.folder.getUriForMsg(aMessageHeader);  
-  messenger.messageServiceFromURI(uri).streamMessage(uri, listener, null, null, false, "");  
-  let folder = aMessageHeader.folder;  
-  /*
-   * AUTF8String getMsgTextFromStream(in nsIInputStream aStream, in ACString aCharset,
-                                      in unsigned long aBytesToRead, in unsigned long aMaxOutputLen, 
-                                      in boolean aCompressQuotes, in boolean aStripHTMLTags,
-                                      out ACString aContentType);
-  */
-  return folder.getMsgTextFromStream(
-    listener.inputStream, aMessageHeader.Charset, 2*aLength, aLength, false, aStripHtml, { });  
-}  
+    let messenger = Cc["@mozilla.org/messenger;1"].createInstance(Ci.nsIMessenger);
+    let listener = Cc["@mozilla.org/network/sync-stream-listener;1"].createInstance(Ci.nsISyncStreamListener);
+    let uri = aMessageHeader.folder.getUriForMsg(aMessageHeader);
+    messenger.messageServiceFromURI(uri).streamMessage(uri, listener, null, null, false, "");
+    let folder = aMessageHeader.folder;
+    /*
+     * AUTF8String getMsgTextFromStream(in nsIInputStream aStream, in ACString aCharset,
+                                        in unsigned long aBytesToRead, in unsigned long aMaxOutputLen, 
+                                        in boolean aCompressQuotes, in boolean aStripHTMLTags,
+                                        out ACString aContentType);
+    */
+    return folder.getMsgTextFromStream(
+        listener.inputStream, aMessageHeader.Charset, 2 * aLength, aLength, false, aStripHtml, {});
+}
 
 /**
  * Get a nsIURI from a nsIMsgDBHdr
@@ -166,11 +172,11 @@ function msgHdrToMessageBody(aMessageHeader, aStripHtml, aLength) {
  * @return {nsIURI}
  */
 function msgHdrToNeckoURL(aMsgHdr) {
-  let uri = aMsgHdr.folder.getUriForMsg(aMsgHdr);
-  let neckoURL = {};
-  let msgService = MailServices.messenger.messageServiceFromURI(uri);
-  msgService.GetUrlForUri(uri, neckoURL, null);
-  return neckoURL.value;
+    let uri = aMsgHdr.folder.getUriForMsg(aMsgHdr);
+    let neckoURL = {};
+    let msgService = MailServices.messenger.messageServiceFromURI(uri);
+    msgService.GetUrlForUri(uri, neckoURL, null);
+    return neckoURL.value;
 }
 
 /**
@@ -181,22 +187,22 @@ function msgHdrToNeckoURL(aMsgHdr) {
  * @param {nsIMsgDbHdr} aMsgHdr the msgHdr whose tags we want
  * @return {nsIMsgTag array} a list of tag objects
  */
-function msgHdrGetTags (aMsgHdr) {
-  let keywords = aMsgHdr.getStringProperty("keywords");
-  let keywordList = keywords.split(' ');
-  let keywordMap = {};
-  for (let [, keyword] in Iterator(keywordList)) {
-    keywordMap[keyword] = true;
-  }
-
-  let tagArray = MailServices.tags.getAllTags({});
-  let tags = [];
-  for (let [iTag, tag] in Iterator(tagArray)) {
-    let tag = tagArray[iTag];
-    if (tag.key in keywordMap)
-      tags.push(tag);
-  }
-  return tags;
+function msgHdrGetTags(aMsgHdr) {
+    let keywords = aMsgHdr.getStringProperty("keywords");
+    let keywordList = keywords.split(' ');
+    let keywordMap = {};
+    for (let [, keyword] in Iterator(keywordList)) {
+        keywordMap[keyword] = true;
+    }
+
+    let tagArray = MailServices.tags.getAllTags({});
+    let tags = [];
+    for (let [iTag, tag] in Iterator(tagArray)) {
+        let tag = tagArray[iTag];
+        if (tag.key in keywordMap)
+            tags.push(tag);
+    }
+    return tags;
 }
 
 /**
@@ -205,25 +211,25 @@ function msgHdrGetTags (aMsgHdr) {
  * @param {nsIMsgDBHdr} aMsgHdr
  * @param {nsIMsgTag array} aTags
  */
-function msgHdrSetTags (aMsgHdr, aTags) {
-  let oldTagList = msgHdrGetTags(aMsgHdr);
-  let oldTags = {}; // hashmap
-  for (let tag of oldTagList)
-    oldTags[tag.key] = null;
-
-  let newTags = {};
-  let newTagList = aTags;
-  for (let tag of newTagList)
-    newTags[tag.key] = null;
-
-  let toAdd = newTagList.filter( tag => !(tag.key in oldTags));
-  let toRemove = oldTagList.filter( tag => !(tag.key in newTags));
-
-  let folder = aMsgHdr.folder;
-  let msgHdr = toXPCOMArray([aMsgHdr], Ci.nsIMutableArray);
-  folder.addKeywordsToMessages(msgHdr, toAdd.join(" "));
-  folder.removeKeywordsFromMessages(msgHdr, toRemove.join(" "));
-  aMsgHdr.folder.msgDatabase = null;
+function msgHdrSetTags(aMsgHdr, aTags) {
+    let oldTagList = msgHdrGetTags(aMsgHdr);
+    let oldTags = {}; // hashmap
+    for (let tag of oldTagList)
+        oldTags[tag.key] = null;
+
+    let newTags = {};
+    let newTagList = aTags;
+    for (let tag of newTagList)
+        newTags[tag.key] = null;
+
+    let toAdd = newTagList.filter(tag => !(tag.key in oldTags));
+    let toRemove = oldTagList.filter(tag => !(tag.key in newTags));
+
+    let folder = aMsgHdr.folder;
+    let msgHdr = toXPCOMArray([aMsgHdr], Ci.nsIMutableArray);
+    folder.addKeywordsToMessages(msgHdr, toAdd.join(" "));
+    folder.removeKeywordsFromMessages(msgHdr, toRemove.join(" "));
+    aMsgHdr.folder.msgDatabase = null;
 }
 
 /**
@@ -232,22 +238,25 @@ function msgHdrSetTags (aMsgHdr, aTags) {
  * @param {bool} read True to mark them read, false to mark them unread
  */
 function msgHdrsMarkAsRead(msgHdrs, read) {
-  let pending = {};
-  for each (let msgHdr in msgHdrs) {
-    if (msgHdr.isRead == read)
-      continue;
-    if (!pending[msgHdr.folder.URI]) {
-      pending[msgHdr.folder.URI] = {
-        folder: msgHdr.folder,
-        msgs: Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray)
-      };
+    let pending = {};
+    for each(let msgHdr in msgHdrs) {
+        if (msgHdr.isRead == read)
+            continue;
+        if (!pending[msgHdr.folder.URI]) {
+            pending[msgHdr.folder.URI] = {
+                folder: msgHdr.folder,
+                msgs: Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray)
+            };
+        }
+        pending[msgHdr.folder.URI].msgs.appendElement(msgHdr, false);
+    }
+    for each(let {
+        folder,
+        msgs
+    } in pending) {
+        folder.markMessagesRead(msgs, read);
+        folder.msgDatabase = null; /* don't leak */
     }
-    pending[msgHdr.folder.URI].msgs.appendElement(msgHdr, false);
-  }
-  for each (let { folder, msgs } in pending) {
-    folder.markMessagesRead(msgs, read);
-    folder.msgDatabase = null; /* don't leak */
-  }
 }
 
 /**
@@ -255,20 +264,23 @@ function msgHdrsMarkAsRead(msgHdrs, read) {
  * @param {nsIMsgDbHdr array} msgHdrs The message headers
  */
 function msgHdrsDelete(msgHdrs) {
-  let pending = {};
-  for each (let msgHdr in msgHdrs) {
-    if (!pending[msgHdr.folder.URI]) {
-      pending[msgHdr.folder.URI] = {
-        folder: msgHdr.folder,
-        msgs: Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray)
-      };
+    let pending = {};
+    for each(let msgHdr in msgHdrs) {
+        if (!pending[msgHdr.folder.URI]) {
+            pending[msgHdr.folder.URI] = {
+                folder: msgHdr.folder,
+                msgs: Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray)
+            };
+        }
+        pending[msgHdr.folder.URI].msgs.appendElement(msgHdr, false);
+    }
+    for each(let {
+        folder,
+        msgs
+    } in pending) {
+        folder.deleteMessages(msgs, getMail3Pane().msgWindow, false, false, null, true);
+        folder.msgDatabase = null; /* don't leak */
     }
-    pending[msgHdr.folder.URI].msgs.appendElement(msgHdr, false);
-  }
-  for each (let { folder, msgs } in pending) {
-    folder.deleteMessages(msgs, getMail3Pane().msgWindow, false, false, null, true);
-    folder.msgDatabase = null; /* don't leak */
-  }
 }
 
 /**
@@ -277,9 +289,9 @@ function msgHdrsDelete(msgHdrs) {
  * @return The window object for the main window.
  */
 function getMail3Pane() {
-  return Cc["@mozilla.org/appshell/window-mediator;1"]
-          .getService(Ci.nsIWindowMediator)
-          .getMostRecentWindow("mail:3pane");
+    return Cc["@mozilla.org/appshell/window-mediator;1"]
+        .getService(Ci.nsIWindowMediator)
+        .getMostRecentWindow("mail:3pane");
 }
 
 /**
@@ -287,18 +299,17 @@ function getMail3Pane() {
  * @param {nsIMsgDbHdr array} msgHdrs The message headers
  */
 function msgHdrsArchive(msgHdrs) {
-  /* See
-   * http://mxr.mozilla.org/comm-central/source/suite/mailnews/mailWindowOverlay.js#1337
-   *
-   * The window is here because otherwise we don't have access to
-   * BatchMessageMover.
-   * */
-  let mail3PaneWindow = getMail3Pane();
-  let batchMover = new mail3PaneWindow.BatchMessageMover();
-  batchMover.archiveMessages(msgHdrs.filter(
-    function (x)
-      !msgHdrIsArchive(x) && getMail3Pane().getIdentityForHeader(x).archiveEnabled
-  ));
+    /* See
+     * http://mxr.mozilla.org/comm-central/source/suite/mailnews/mailWindowOverlay.js#1337
+     *
+     * The window is here because otherwise we don't have access to
+     * BatchMessageMover.
+     * */
+    let mail3PaneWindow = getMail3Pane();
+    let batchMover = new mail3PaneWindow.BatchMessageMover();
+    batchMover.archiveMessages(msgHdrs.filter(
+        function (x) !msgHdrIsArchive(x) && getMail3Pane().getIdentityForHeader(x).archiveEnabled
+    ));
 }
 
 /**
@@ -307,7 +318,7 @@ function msgHdrsArchive(msgHdrs) {
  * @return {Bool}
  */
 function msgHdrIsRss(msgHdr)
-  (msgHdr.folder.server instanceof Ci.nsIRssIncomingServer)
+(msgHdr.folder.server instanceof Ci.nsIRssIncomingServer)
 
 /**
  * Tell if a message is a NNTP message
@@ -315,7 +326,7 @@ function msgHdrIsRss(msgHdr)
  * @return {Bool}
  */
 function msgHdrIsNntp(msgHdr)
-  (msgHdr.folder.server instanceof Ci.nsINntpIncomingServer)
+(msgHdr.folder.server instanceof Ci.nsINntpIncomingServer)
 
 /**
  * Tell if a message has been marked as junk.
@@ -323,17 +334,17 @@ function msgHdrIsNntp(msgHdr)
  * @return {Bool}
  */
 function msgHdrIsJunk(aMsgHdr)
-  aMsgHdr.getStringProperty("junkscore") == Ci.nsIJunkMailPlugin.IS_SPAM_SCORE
+aMsgHdr.getStringProperty("junkscore") == Ci.nsIJunkMailPlugin.IS_SPAM_SCORE
 
 /**
  * Recycling the HeaderHandlerBase from mimemsg.js
  */
 function HeaderHandler(aHeaders) {
-  this.headers = aHeaders;
+    this.headers = aHeaders;
 }
 
 HeaderHandler.prototype = {
-  __proto__: MimeMessage.prototype.__proto__, // == HeaderHandlerBase
+    __proto__: MimeMessage.prototype.__proto__, // == HeaderHandlerBase
 };
 
 /**
@@ -341,29 +352,27 @@ HeaderHandler.prototype = {
  * that has been read.
  */
 function createStreamListener(k) {
-  return {
-    _data: "",
-    _stream : null,
-
-    QueryInterface:
-      XPCOMUtils.generateQI([Ci.nsIStreamListener, Ci.nsIRequestObserver]),
-
-    // nsIRequestObserver
-    onStartRequest: function(aRequest, aContext) {
-    },
-    onStopRequest: function(aRequest, aContext, aStatusCode) {
-      k(this._data);
-    },
-
-    // nsIStreamListener
-    onDataAvailable: function(aRequest, aContext, aInputStream, aOffset, aCount) {
-      if (this._stream == null) {
-        this._stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(Ci.nsIScriptableInputStream);
-        this._stream.init(aInputStream);
-      }
-      this._data += this._stream.read(aCount);
-    }
-  };
+    return {
+        _data: "",
+        _stream: null,
+
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener, Ci.nsIRequestObserver]),
+
+        // nsIRequestObserver
+        onStartRequest: function (aRequest, aContext) {},
+        onStopRequest: function (aRequest, aContext, aStatusCode) {
+            k(this._data);
+        },
+
+        // nsIStreamListener
+        onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount) {
+            if (this._stream == null) {
+                this._stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(Ci.nsIScriptableInputStream);
+                this._stream.init(aInputStream);
+            }
+            this._data += this._stream.read(aCount);
+        }
+    };
 }
 
 /**
@@ -374,39 +383,41 @@ function createStreamListener(k) {
  *  strings corresponding to the multiple entries found for that header.
  */
 function msgHdrGetHeaders(aMsgHdr, k) {
-  let uri = msgHdrGetUri(aMsgHdr);
-  let messageService = MailServices.messenger.messageServiceFromURI(uri);
+    let uri = msgHdrGetUri(aMsgHdr);
+    let messageService = MailServices.messenger.messageServiceFromURI(uri);
 
-  let fallback = function ()
+    let fallback = function ()
     MsgHdrToMimeMessage(aMsgHdr, null, function (aMsgHdr, aMimeMsg) {
-      k(aMimeMsg);
+        k(aMimeMsg);
     }, true, {
-      partsOnDemand: true,
+        partsOnDemand: true,
     });
 
-  if ("streamHeaders" in messageService) {
-    try {
-      messageService.streamHeaders(uri, createStreamListener(function (aRawString) {
-        let re = /\r?\n\s+/g;
-        let str = aRawString.replace(re, " ");
-        let lines = str.split(/\r?\n/);
-        let obj = {};
-        for each (let [, line] in Iterator(lines)) {
-          let i = line.indexOf(":");
-          if (i < 0)
-            continue;
-          let k = line.substring(0, i).toLowerCase();
-          let v = line.substring(i+1).trim();
-          if (!(k in obj))
-            obj[k] = [];
-          obj[k].push(v);
+    if ("streamHeaders" in messageService) {
+        try {
+            messageService.streamHeaders(uri, createStreamListener(function (aRawString) {
+                let re = /\r?\n\s+/g;
+                let str = aRawString.replace(re, " ");
+                let lines = str.split(/\r?\n/);
+                let obj = {};
+                for each(let [, line] in Iterator(lines)) {
+                    let i = line.indexOf(":");
+                    if (i < 0)
+                        continue;
+                    let k = line.substring(0, i).toLowerCase();
+                    let v = line.substring(i + 1).trim();
+                    if (!(k in obj))
+                        obj[k] = [];
+                    obj[k].push(v);
+                }
+                k(new HeaderHandler(obj));
+            }), null, true);
         }
-        k(new HeaderHandler(obj));
-      }), null, true);
-    } catch (e) {
-      fallback();
+        catch (e) {
+            fallback();
+        }
+    }
+    else {
+        fallback();
     }
-  } else {
-    fallback();
-  }
 }
diff --git a/chrome/content/offlineCacheSettings.js b/chrome/content/offlineCacheSettings.js
index be4b685b..62e0b17e 100644
--- a/chrome/content/offlineCacheSettings.js
+++ b/chrome/content/offlineCacheSettings.js
@@ -39,153 +39,148 @@ var Ci = Components.interfaces;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm"); 
+Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calStorageHelpers.jsm");
 
-function exchOfflineCacheSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchOfflineCacheSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchOfflineCacheSettings.prototype = {
 
-	onLoad: function _onLoad(event) 
-	{
-		var calId = this._window.arguments[0].calendar.id;
-		var aCalendar = this._window.arguments[0].calendar;
-		
-
-		// Load cache preferences
-
-		this.oldUseOfflineCache = aCalendar.useOfflineCache;
-		if(aCalendar.useOfflineCache){
-			this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked=true;
-			this._document.getElementById("exchWebService-offlineCacheproperties-detaisvbox").removeAttribute("collapsed");
-			
-			var startDate = "no date";
-			var endDate = "no date";
-
-			if (aCalendar.offlineStartDate) {
-				startDate = aCalendar.offlineStartDate.toString().substring(0,10);
-			}
-			if (aCalendar.offlineEndDate) {
-				endDate = aCalendar.offlineEndDate.toString().substring(0,10);
-			}
-	
-			this._document.getElementById("exchWebService-offlineCacheproperties-cachingStartDateValue").value = startDate;
-			this._document.getElementById("exchWebService-offlineCacheproperties-cachingEndDateValue").value = endDate;
-			
-			this._document.getElementById("exchWebService-offlineCacheproperties-totalEventsValue").value=aCalendar.offlineEventItemCount;
-			this._document.getElementById("exchWebService-offlineCacheproperties-totalTasksValue").value=aCalendar.offlineToDoItemCount;
-			this._document.getElementById("exchWebService-memoryCache-totalItems").value=aCalendar.memoryCacheItemCount;
-
-			this._document.getElementById("exchWebService-offlineCacheproperties-maintainancegroupbox").removeAttribute("collapsed");
-			this._document.getElementById("exchWebService-offlineCacheproperties-preferencesgroupbox").removeAttribute("collapsed");
-
-			var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");
-			
-			this._document.getElementById("exchWebService-offlineCacheproperties-monthsBeforeToday").value=this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecOfflineCacheMonthsBeforeToday",1);
-			this._document.getElementById("exchWebService-offlineCacheproperties-monthsAfterToday").value=this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecOfflineCacheMonthsAfterToday",1);
-			
-		}
-
-	},
-	
-	doClearCache: function _doClearCache()
-	{	
-		var aCalendar = this._window.arguments[0].calendar;
-		this.clearCachedData(aCalendar);				
-	},
-
-	onSave: function _onSave()
-	{	
-		var calId = this._window.arguments[0].calendar.id;
-		var aCalendar = this._window.arguments[0].calendar;
-		tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(calId);
-
-		var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-						.getService(Ci.nsIPrefService)
-						.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");
-
-		// Save caching preferences
-		/*if(this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked){
-			exchWebServicesCalPrefs.setBoolPref("useOfflineCache", true);	
-		}
-		else{
-			exchWebServicesCalPrefs.setBoolPref("useOfflineCache", false);					
-		}*/
-		
-		exchWebServicesCalPrefs.setIntPref("ecOfflineCacheMonthsBeforeToday", this._document.getElementById("exchWebService-offlineCacheproperties-monthsBeforeToday").value); 
-		exchWebServicesCalPrefs.setIntPref("ecOfflineCacheMonthsAfterToday", this._document.getElementById("exchWebService-offlineCacheproperties-monthsAfterToday").value); 
-
-		if (this.oldUseOfflineCache != this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked) {
-			aCalendar.setProperty("exchWebService.useOfflineCache", this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked)
-		}
-	},
-	
-	getDBConn : function _aDBConn(aCalendar)
-	{	
-		var file = Cc["@mozilla.org/file/directory_service;1"]
-					.getService(Components.interfaces.nsIProperties)
-					.get("ProfD", Components.interfaces.nsIFile);
-			file.append("exchange-data");
-			file.append(aCalendar.id+".offlineCache.sqlite");
-		let mDBConn = Services.storage.openDatabase(file);
-		return mDBConn;
-	},
-
-	clearCachedData : function _clearCachedData(aCalendar)
-	{
-		let aDBConn = this.getDBConn(aCalendar);
-		if(aDBConn.connectionReady && aDBConn.tableExists("items")){
-				this.globalFunctions.LOG("clearCachedData");
-				let statement = aDBConn.createStatement("DELETE FROM items");
-				let statement1 = aDBConn.createStatement("DELETE FROM attachments");
-				let statement2 = aDBConn.createStatement("DELETE FROM attachments_per_item");
-								
-				try{	
-					statement.executeStep();
-					statement1.executeStep();
-					statement2.executeStep();					
-
-					statement.finalize();
-					statement1.finalize();
-					statement2.finalize();
-				}
-				catch(e){
-			       		this.globalFunctions.LOG("unable to clear tables"+e);					
-				}
-			alert("cache cleared!");
-			var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-			observerService.notifyObservers(aCalendar, "onCalReset", aCalendar.id);			
-			this.onLoad();		
-		}
-	},
-
-	doCheckOfflineCacheChanged: function _doCheckOfflineCacheChanged(aCheckBox)
-	{
-		if (this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked) {
-			this._document.getElementById("exchWebService-offlineCacheproperties-detaisvbox").setAttribute("collapsed", "false");
-			this._document.getElementById("exchWebService-offlineCacheproperties-maintainancegroupbox").setAttribute("collapsed", "false");
-			this._document.getElementById("exchWebService-offlineCacheproperties-preferencesgroupbox").setAttribute("collapsed", "false");
-		}
-		else {
-			this._document.getElementById("exchWebService-offlineCacheproperties-detaisvbox").setAttribute("collapsed", "true");
-			this._document.getElementById("exchWebService-offlineCacheproperties-maintainancegroupbox").setAttribute("collapsed", "true");
-			this._document.getElementById("exchWebService-offlineCacheproperties-preferencesgroupbox").setAttribute("collapsed", "true");
-		}
-	},
+    onLoad: function _onLoad(event) {
+        var calId = this._window.arguments[0].calendar.id;
+        var aCalendar = this._window.arguments[0].calendar;
+
+
+        // Load cache preferences
+
+        this.oldUseOfflineCache = aCalendar.useOfflineCache;
+        if (aCalendar.useOfflineCache) {
+            this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked = true;
+            this._document.getElementById("exchWebService-offlineCacheproperties-detaisvbox").removeAttribute("collapsed");
+
+            var startDate = "no date";
+            var endDate = "no date";
+
+            if (aCalendar.offlineStartDate) {
+                startDate = aCalendar.offlineStartDate.toString().substring(0, 10);
+            }
+            if (aCalendar.offlineEndDate) {
+                endDate = aCalendar.offlineEndDate.toString().substring(0, 10);
+            }
+
+            this._document.getElementById("exchWebService-offlineCacheproperties-cachingStartDateValue").value = startDate;
+            this._document.getElementById("exchWebService-offlineCacheproperties-cachingEndDateValue").value = endDate;
+
+            this._document.getElementById("exchWebService-offlineCacheproperties-totalEventsValue").value = aCalendar.offlineEventItemCount;
+            this._document.getElementById("exchWebService-offlineCacheproperties-totalTasksValue").value = aCalendar.offlineToDoItemCount;
+            this._document.getElementById("exchWebService-memoryCache-totalItems").value = aCalendar.memoryCacheItemCount;
+
+            this._document.getElementById("exchWebService-offlineCacheproperties-maintainancegroupbox").removeAttribute("collapsed");
+            this._document.getElementById("exchWebService-offlineCacheproperties-preferencesgroupbox").removeAttribute("collapsed");
+
+            var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+            this._document.getElementById("exchWebService-offlineCacheproperties-monthsBeforeToday").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecOfflineCacheMonthsBeforeToday", 1);
+            this._document.getElementById("exchWebService-offlineCacheproperties-monthsAfterToday").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecOfflineCacheMonthsAfterToday", 1);
+
+        }
+
+    },
+
+    doClearCache: function _doClearCache() {
+        var aCalendar = this._window.arguments[0].calendar;
+        this.clearCachedData(aCalendar);
+    },
+
+    onSave: function _onSave() {
+        var calId = this._window.arguments[0].calendar.id;
+        var aCalendar = this._window.arguments[0].calendar;
+        tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(calId);
+
+        var exchWebServicesCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+
+        // Save caching preferences
+        /*if(this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked){
+        	exchWebServicesCalPrefs.setBoolPref("useOfflineCache", true);	
+        }
+        else{
+        	exchWebServicesCalPrefs.setBoolPref("useOfflineCache", false);					
+        }*/
+
+        exchWebServicesCalPrefs.setIntPref("ecOfflineCacheMonthsBeforeToday", this._document.getElementById("exchWebService-offlineCacheproperties-monthsBeforeToday").value);
+        exchWebServicesCalPrefs.setIntPref("ecOfflineCacheMonthsAfterToday", this._document.getElementById("exchWebService-offlineCacheproperties-monthsAfterToday").value);
+
+        if (this.oldUseOfflineCache != this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked) {
+            aCalendar.setProperty("exchWebService.useOfflineCache", this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked)
+        }
+    },
+
+    getDBConn: function _aDBConn(aCalendar) {
+        var file = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Components.interfaces.nsIProperties)
+            .get("ProfD", Components.interfaces.nsIFile);
+        file.append("exchange-data");
+        file.append(aCalendar.id + ".offlineCache.sqlite");
+        let mDBConn = Services.storage.openDatabase(file);
+        return mDBConn;
+    },
+
+    clearCachedData: function _clearCachedData(aCalendar) {
+        let aDBConn = this.getDBConn(aCalendar);
+        if (aDBConn.connectionReady && aDBConn.tableExists("items")) {
+            this.globalFunctions.LOG("clearCachedData");
+            let statement = aDBConn.createStatement("DELETE FROM items");
+            let statement1 = aDBConn.createStatement("DELETE FROM attachments");
+            let statement2 = aDBConn.createStatement("DELETE FROM attachments_per_item");
+
+            try {
+                statement.executeStep();
+                statement1.executeStep();
+                statement2.executeStep();
+
+                statement.finalize();
+                statement1.finalize();
+                statement2.finalize();
+            }
+            catch (e) {
+                this.globalFunctions.LOG("unable to clear tables" + e);
+            }
+            alert("cache cleared!");
+            var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+            observerService.notifyObservers(aCalendar, "onCalReset", aCalendar.id);
+            this.onLoad();
+        }
+    },
+
+    doCheckOfflineCacheChanged: function _doCheckOfflineCacheChanged(aCheckBox) {
+        if (this._document.getElementById("exchWebService-offlineCacheproperties-cacheState").checked) {
+            this._document.getElementById("exchWebService-offlineCacheproperties-detaisvbox").setAttribute("collapsed", "false");
+            this._document.getElementById("exchWebService-offlineCacheproperties-maintainancegroupbox").setAttribute("collapsed", "false");
+            this._document.getElementById("exchWebService-offlineCacheproperties-preferencesgroupbox").setAttribute("collapsed", "false");
+        }
+        else {
+            this._document.getElementById("exchWebService-offlineCacheproperties-detaisvbox").setAttribute("collapsed", "true");
+            this._document.getElementById("exchWebService-offlineCacheproperties-maintainancegroupbox").setAttribute("collapsed", "true");
+            this._document.getElementById("exchWebService-offlineCacheproperties-preferencesgroupbox").setAttribute("collapsed", "true");
+        }
+    },
 
 }
 
 var tmpOfflineCacheSettings = new exchOfflineCacheSettings(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpOfflineCacheSettings.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpOfflineCacheSettings.onLoad();
+}, true);
diff --git a/chrome/content/oofSettings.js b/chrome/content/oofSettings.js
index 48c35727..6924a513 100644
--- a/chrome/content/oofSettings.js
+++ b/chrome/content/oofSettings.js
@@ -52,207 +52,208 @@ Cu.import("resource://exchangecalendar/erSetUserOofSettings.js");
 }
 */
 
-function exchOOFSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchOOFSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchOOFSettings.prototype = {
 
-//exchWebService.oofSettings = {
+    //exchWebService.oofSettings = {
 
-	calPrefs: null,
-	intOofSettings: {},
+    calPrefs: null,
+    intOofSettings: {},
 
-	onLoad: function _onLoad()
-	{
-		Cu.import("resource://calendar/modules/calUtils.jsm", this);
-		var calId = this._window.arguments[0].calendar.id;
+    onLoad: function _onLoad() {
+        Cu.import("resource://calendar/modules/calUtils.jsm", this);
+        var calId = this._window.arguments[0].calendar.id;
+
+        this.calPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + calId + ".");
+        this._document.getElementById("exchWebService-oofSettings-title").value = this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox", "null");
+        this.getOofSettings();
+
+        this.internalEditorElement = this._document.getElementById("exchWebService-oof-editor-internal");
+        this.externalEditorElement = this._document.getElementById("exchWebService-oof-editor-external");
+    },
+
+    onSave: function _onSave() {
+        this.setOofSettings();
+
+        Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService).savePrefFile(null);
+        return false;
+    },
+
+    getOofSettings: function _getOofSettings() {
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadingOofSettings", [], "exchangecalendar");
+
+        var self = this;
+        var tmpObject = new erGetUserOofSettingsRequest({
+                user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain", "null") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser", "null"),
+                mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox", "null"),
+                serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer", "null")
+            },
+            function (aGetUserOofSettingsRequest, aOofSettings) {
+                self.getOofSettingsOK(aGetUserOofSettingsRequest, aOofSettings);
+            },
+            function (aGetUserOofSettingsRequest, aCode, aMsg) {
+                self.getOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg);
+            });
+    },
+
+    getOofSettingsOK: function _getOofSettingsOK(aGetUserOofSettingsRequest, aOofSettings) {
+        this.intOofSettings = aOofSettings;
+
+        this.globalFunctions.LOG("intern:" + this.intOofSettings.internalReply);
+        this.globalFunctions.LOG("extern:" + this.intOofSettings.externalReply);
+
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadedOofSettings", [], "exchangecalendar");
+
+        this._document.getElementById("exchWebService_oofSettings_dialog").buttons = "accept,cancel";
+
+        this._document.getElementById("vbox-exchWebService-oof-settings").disabled = false;
+
+        this._document.getElementById("exchWebService-oof-status").value = (aOofSettings.oofState == "Disabled") ? "Disabled" : "Enabled";
+
+        this._document.getElementById("exchWebService-oof-scheduled").checked = (aOofSettings.oofState == "Scheduled");
+
+        if (aOofSettings.startTime) {
+            this._document.getElementById("exchWebService-oof-startdate").year = aOofSettings.startTime.year;
+            this._document.getElementById("exchWebService-oof-startdate").month = aOofSettings.startTime.month;
+            this._document.getElementById("exchWebService-oof-startdate").date = aOofSettings.startTime.day;
+
+            this._document.getElementById("exchWebService-oof-starttime").hour = aOofSettings.startTime.hour;
+            this._document.getElementById("exchWebService-oof-starttime").minute = aOofSettings.startTime.minute;
+        }
+
+        if (aOofSettings.endTime) {
+            this._document.getElementById("exchWebService-oof-enddate").year = aOofSettings.endTime.year;
+            this._document.getElementById("exchWebService-oof-enddate").month = aOofSettings.endTime.month;
+            this._document.getElementById("exchWebService-oof-enddate").date = aOofSettings.endTime.day;
+
+            this._document.getElementById("exchWebService-oof-endtime").hour = aOofSettings.endTime.hour;
+            this._document.getElementById("exchWebService-oof-endtime").minute = aOofSettings.endTime.minute;
+        }
+        this.doScheduledChanged();
+
+        this._document.getElementById("exchWebService-oof-externalaudience").value = aOofSettings.externalAudience;
+
+        if (this.internalEditorElement) {
+            this.internalEditorElement.content = this.intOofSettings.internalReply;
+        }
+
+        if (this.externalEditorElement) {
+            this.externalEditorElement.content = this.intOofSettings.externalReply;
+        }
+
+    },
+
+    getOofSettingsError: function _getOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg) {
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorLoadingOofSettings", [aMsg, aCode], "exchangecalendar");
+    },
+
+    doScheduledChanged: function _doScheduledChanged() {
+        // Enable or disable time/date pickers
+        this._document.getElementById("exchWebService-oof-startdate").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
+        this._document.getElementById("exchWebService-oof-starttime").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
+        this._document.getElementById("exchWebService-oof-enddate").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
+        this._document.getElementById("exchWebService-oof-endtime").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
+    },
+
+    setOofSettings: function _setOofSettings() {
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavingOofSettings", [], "exchangecalendar");
+
+        var oofState = "Disabled";
+        if (this._document.getElementById("exchWebService-oof-status").value == "Enabled") {
+            oofState = "Enabled";
+            if (this._document.getElementById("exchWebService-oof-scheduled").checked) {
+                oofState = "Scheduled";
+            }
+        }
+
+        var startTime = this.cal.createDateTime();
+        startTime.resetTo(this._document.getElementById("exchWebService-oof-startdate").year,
+            this._document.getElementById("exchWebService-oof-startdate").month,
+            this._document.getElementById("exchWebService-oof-startdate").date,
+            this._document.getElementById("exchWebService-oof-starttime").hour,
+            this._document.getElementById("exchWebService-oof-starttime").minute,
+            0,
+            this.globalFunctions.ecDefaultTimeZone());
+        startTime = startTime.getInTimezone(this.globalFunctions.ecUTC());
+
+        var endTime = this.cal.createDateTime();
+        endTime.resetTo(this._document.getElementById("exchWebService-oof-enddate").year,
+            this._document.getElementById("exchWebService-oof-enddate").month,
+            this._document.getElementById("exchWebService-oof-enddate").date,
+            this._document.getElementById("exchWebService-oof-endtime").hour,
+            this._document.getElementById("exchWebService-oof-endtime").minute,
+            0,
+            this.globalFunctions.ecDefaultTimeZone());
+        endTime = endTime.getInTimezone(this.globalFunctions.ecUTC());
+
+        var internalReply = this.intOofSettings.internalReply;
+        var externalReply = this.intOofSettings.externalReply;
+
+        internalReply = "<html>" + this.internalEditorElement.content + "</html>";
+
+        externalReply = "<html>" + this.externalEditorElement.content + "</html>";
+
+
+        var self = this;
+        var tmpObject = new erSetUserOofSettingsRequest({
+                user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain", "null") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser", "null"),
+                mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox", "null"),
+                serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer", "null"),
+
+                oofState: oofState,
+                externalAudience: this._document.getElementById("exchWebService-oof-externalaudience").value,
+                startTime: startTime,
+                endTime: endTime,
+                internalReply: internalReply,
+                externalReply: externalReply
+
+            },
+            function (aGetUserOofSettingsRequest) {
+                self.setOofSettingsOK(aGetUserOofSettingsRequest);
+            },
+            function (aGetUserOofSettingsRequest, aCode, aMsg) {
+                self.setOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg);
+            });
+    },
+
+    setOofSettingsOK: function _setOofSettingsOK(aGetUserOofSettingsRequest) {
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavedOofSettings", [], "exchangecalendar");
+        this.infoPopup(this._document.title, "Settings saved.");
+        this.getOofSettings();
+
+    },
+
+    setOofSettingsError: function _setOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg) {
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorSavingOofSettings", [aMsg, aCode], "exchangecalendar");
+        alert("Error saving settings. Msg:" + aMsg + ", Code:" + aCode);
+
+        this.getOofSettings();
+
+    },
+
+    infoPopup: function _infoPopup(title, msg) {
+        var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+        var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
+        getService(Components.interfaces.nsIWindowWatcher).
+        openWindow(null, 'chrome://global/content/alerts/alert.xul',
+            '_blank', 'chrome,titlebar=no,popup=yes', null);
+        win.arguments = [image, title, msg, true, ''];
+    },
 
-		this.calPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+calId+".");
-		this._document.getElementById("exchWebService-oofSettings-title").value = this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox", "null");
-		this.getOofSettings();
-
-		this.internalEditorElement = this._document.getElementById("exchWebService-oof-editor-internal");
-		this.externalEditorElement = this._document.getElementById("exchWebService-oof-editor-external");
-	},
-
-	onSave: function _onSave()
-	{
-		this.setOofSettings();
-
-		Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService).savePrefFile(null);
-		return false;
-	},
-
-	getOofSettings: function _getOofSettings()
-	{
-		this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadingOofSettings", [], "exchangecalendar");
-
-		var self = this;
-		var tmpObject = new erGetUserOofSettingsRequest(
-			{user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain", "null")+"\\"+this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser", "null"), 
-			 mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox", "null"),
-			 serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer", "null")}, 
-			function(aGetUserOofSettingsRequest, aOofSettings) { self.getOofSettingsOK(aGetUserOofSettingsRequest, aOofSettings);}, 
-			function(aGetUserOofSettingsRequest, aCode, aMsg) { self.getOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg);} );
-	},
-
-	getOofSettingsOK: function _getOofSettingsOK(aGetUserOofSettingsRequest, aOofSettings)
-	{
-		this.intOofSettings = aOofSettings;
-
-		this.globalFunctions.LOG("intern:"+this.intOofSettings.internalReply);
-		this.globalFunctions.LOG("extern:"+this.intOofSettings.externalReply);
-
-		this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadedOofSettings", [], "exchangecalendar");	
-	
-		this._document.getElementById("exchWebService_oofSettings_dialog").buttons = "accept,cancel";
-
-		this._document.getElementById("vbox-exchWebService-oof-settings").disabled = false;
-
-		this._document.getElementById("exchWebService-oof-status").value = (aOofSettings.oofState == "Disabled") ? "Disabled" : "Enabled";
-
-		this._document.getElementById("exchWebService-oof-scheduled").checked = (aOofSettings.oofState == "Scheduled");
-
-		if (aOofSettings.startTime) {
-			this._document.getElementById("exchWebService-oof-startdate").year = aOofSettings.startTime.year;
-			this._document.getElementById("exchWebService-oof-startdate").month = aOofSettings.startTime.month;
-			this._document.getElementById("exchWebService-oof-startdate").date = aOofSettings.startTime.day;
-
-			this._document.getElementById("exchWebService-oof-starttime").hour = aOofSettings.startTime.hour;
-			this._document.getElementById("exchWebService-oof-starttime").minute = aOofSettings.startTime.minute;
-		}
-
-		if (aOofSettings.endTime) {
-			this._document.getElementById("exchWebService-oof-enddate").year = aOofSettings.endTime.year;
-			this._document.getElementById("exchWebService-oof-enddate").month = aOofSettings.endTime.month;
-			this._document.getElementById("exchWebService-oof-enddate").date = aOofSettings.endTime.day;
-
-			this._document.getElementById("exchWebService-oof-endtime").hour = aOofSettings.endTime.hour;
-			this._document.getElementById("exchWebService-oof-endtime").minute = aOofSettings.endTime.minute;
-		}
-		this.doScheduledChanged();
-
-		this._document.getElementById("exchWebService-oof-externalaudience").value = aOofSettings.externalAudience;
-
-		if (this.internalEditorElement) {
-			this.internalEditorElement.content = this.intOofSettings.internalReply;
-		}
-
-		if (this.externalEditorElement) {
-			this.externalEditorElement.content = this.intOofSettings.externalReply;
-		}
-
-	},
-
-	getOofSettingsError: function _getOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg)
-	{
-		this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorLoadingOofSettings", [aMsg, aCode], "exchangecalendar");
-	},
-
-	doScheduledChanged: function _doScheduledChanged()
-	{
-		// Enable or disable time/date pickers
-		this._document.getElementById("exchWebService-oof-startdate").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
-		this._document.getElementById("exchWebService-oof-starttime").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
-		this._document.getElementById("exchWebService-oof-enddate").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
-		this._document.getElementById("exchWebService-oof-endtime").disabled = (!this._document.getElementById("exchWebService-oof-scheduled").checked);
-	},	
-
-	setOofSettings: function _setOofSettings()
-	{
-		this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavingOofSettings", [], "exchangecalendar");
-
-		var oofState = "Disabled";
-		if (this._document.getElementById("exchWebService-oof-status").value == "Enabled") {
-			oofState = "Enabled";
-			if (this._document.getElementById("exchWebService-oof-scheduled").checked) {
-				oofState = "Scheduled";
-			}
-		}
-	 
-		var startTime = this.cal.createDateTime();
-		startTime.resetTo(this._document.getElementById("exchWebService-oof-startdate").year,
-				this._document.getElementById("exchWebService-oof-startdate").month,
-				this._document.getElementById("exchWebService-oof-startdate").date,
-				this._document.getElementById("exchWebService-oof-starttime").hour,
-				this._document.getElementById("exchWebService-oof-starttime").minute,
-				0,
-				this.globalFunctions.ecDefaultTimeZone());
-		startTime = startTime.getInTimezone(this.globalFunctions.ecUTC());
-
-		var endTime = this.cal.createDateTime();
-		endTime.resetTo(this._document.getElementById("exchWebService-oof-enddate").year,
-				this._document.getElementById("exchWebService-oof-enddate").month,
-				this._document.getElementById("exchWebService-oof-enddate").date,
-				this._document.getElementById("exchWebService-oof-endtime").hour,
-				this._document.getElementById("exchWebService-oof-endtime").minute,
-				0,
-				this.globalFunctions.ecDefaultTimeZone());
-		endTime = endTime.getInTimezone(this.globalFunctions.ecUTC());
-
-		var internalReply = this.intOofSettings.internalReply;
-		var externalReply = this.intOofSettings.externalReply;
-		
-		internalReply = "<html>"+this.internalEditorElement.content+"</html>";
-		
-		externalReply = "<html>"+this.externalEditorElement.content+"</html>";
-
-
-		var self = this;
-		var tmpObject = new erSetUserOofSettingsRequest(
-			{user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain", "null")+"\\"+this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser", "null"), 
-			 mailbox: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecMailbox", "null"),
-			 serverUrl: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecServer", "null"),
-		
-			 oofState : oofState,
-			 externalAudience : this._document.getElementById("exchWebService-oof-externalaudience").value,
-			 startTime : startTime,
-			 endTime : endTime,
-			 internalReply : internalReply,
-			 externalReply : externalReply
-
-			}, 
-			function(aGetUserOofSettingsRequest){ self.setOofSettingsOK(aGetUserOofSettingsRequest);}, 
-			function(aGetUserOofSettingsRequest, aCode, aMsg) { self.setOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg);});
-	},
-
-	setOofSettingsOK: function _setOofSettingsOK(aGetUserOofSettingsRequest)
-	{
-		this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavedOofSettings", [], "exchangecalendar");
-		this.infoPopup( this._document.title ,"Settings saved.");
-		this.getOofSettings();
-
-	},
-
-	setOofSettingsError: function _setOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg)
-	{
-		this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorSavingOofSettings", [aMsg, aCode], "exchangecalendar");
-		alert("Error saving settings. Msg:"+aMsg+", Code:"+aCode);
-
-		this.getOofSettings();
-
-	},
-
-	infoPopup:function _infoPopup(title, msg) {
-		 var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
-		  var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
-		                      getService(Components.interfaces.nsIWindowWatcher).
-		                      openWindow(null, 'chrome://global/content/alerts/alert.xul',
-		                                  '_blank', 'chrome,titlebar=no,popup=yes', null);
-		  win.arguments = [image,  title, msg, true, ''];
-	},
-	
 }
 
 var tmpOOFSettings = new exchOOFSettings(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpOOFSettings.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpOOFSettings.onLoad();
+}, true);
diff --git a/chrome/content/otherPreferences.js b/chrome/content/otherPreferences.js
index 2d00abf2..1d3960b8 100644
--- a/chrome/content/otherPreferences.js
+++ b/chrome/content/otherPreferences.js
@@ -41,54 +41,52 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-function exchOtherPreferences(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchOtherPreferences(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchOtherPreferences.prototype = {
 
-	addOnDefault: function _addOnDefault()
-	{
-		this._document.getElementById("extensions.1st-setup.others.userAgent").value = "exchangecalendar@extensions.1st-setup.nl";
-	},
-	
-	mozillaDefault: function _mozillaDefault()
-	{
-		if ((this._window.navigator) && (this._window.navigator.userAgent)) {
-			this._document.getElementById("extensions.1st-setup.others.userAgent").value = this._window.navigator.userAgent;
-		}
-		else {
-			this._document.getElementById("extensions.1st-setup.others.userAgent").value = "Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20100101 Firefox/10.0";
-		}
-	},
+    addOnDefault: function _addOnDefault() {
+        this._document.getElementById("extensions.1st-setup.others.userAgent").value = "exchangecalendar@extensions.1st-setup.nl";
+    },
 
-	ieDefault: function _ieDefault()
-	{
-		this._document.getElementById("extensions.1st-setup.others.userAgent").value = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)";
-	},
-	
-	onLoad: function _onLoad()
-	{ 
-		this.restoreUpdateSettings();
-	},
-	
-	restoreUpdateSettings: function _restoreUpdateSettings(){ 
- 	    let othersPreference = Cc["@mozilla.org/preferences-service;1"].
-	    getService(Ci.nsIPrefBranch); 
- 	    let toUpdate = this.globalFunctions.safeGetBoolPref( othersPreference, "extensions.1st-setup.others.updateRequired"); 
- 		    if( toUpdate ===  false  ){
-		    	this._document.getElementById("exchangeWebService_others_prefs_groupbox2").hidden=true;  
-		    } 
- 		toUpdate=null;
-	    othersPreference=null;
-	},
+    mozillaDefault: function _mozillaDefault() {
+        if ((this._window.navigator) && (this._window.navigator.userAgent)) {
+            this._document.getElementById("extensions.1st-setup.others.userAgent").value = this._window.navigator.userAgent;
+        }
+        else {
+            this._document.getElementById("extensions.1st-setup.others.userAgent").value = "Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20100101 Firefox/10.0";
+        }
+    },
+
+    ieDefault: function _ieDefault() {
+        this._document.getElementById("extensions.1st-setup.others.userAgent").value = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)";
+    },
+
+    onLoad: function _onLoad() {
+        this.restoreUpdateSettings();
+    },
+
+    restoreUpdateSettings: function _restoreUpdateSettings() {
+        let othersPreference = Cc["@mozilla.org/preferences-service;1"].
+        getService(Ci.nsIPrefBranch);
+        let toUpdate = this.globalFunctions.safeGetBoolPref(othersPreference, "extensions.1st-setup.others.updateRequired");
+        if (toUpdate === false) {
+            this._document.getElementById("exchangeWebService_others_prefs_groupbox2").hidden = true;
+        }
+        toUpdate = null;
+        othersPreference = null;
+    },
 }
- 
+
 
 var tmpOtherPreferences = new exchOtherPreferences(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpOtherPreferences.onLoad(); }, true);
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpOtherPreferences.onLoad();
+}, true);
diff --git a/chrome/content/preInvitationResponse.js b/chrome/content/preInvitationResponse.js
index 4e86b37a..718bc110 100644
--- a/chrome/content/preInvitationResponse.js
+++ b/chrome/content/preInvitationResponse.js
@@ -40,43 +40,41 @@ var Cu = Components.utils;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.preInvitationResponse = {
 
-	onAccept: function _onAccept()
-	{
-		window.arguments[0].answer = "send";
-		window.arguments[0].response = document.getElementById("exchWebService_preInvitationResponse_radio").value;
-		return true;
-	},
+    onAccept: function _onAccept() {
+        window.arguments[0].answer = "send";
+        window.arguments[0].response = document.getElementById("exchWebService_preInvitationResponse_radio").value;
+        return true;
+    },
 
-	onLoad: function _onLoad()
-	{
-		var item = window.arguments[0].item;
+    onLoad: function _onLoad() {
+        var item = window.arguments[0].item;
 
-		document.getElementById("exchWebService_calendarName").value = item.calendar.name;
-		document.getElementById("exchWebService_itemTitle").value = item.title;
+        document.getElementById("exchWebService_calendarName").value = item.calendar.name;
+        document.getElementById("exchWebService_itemTitle").value = item.title;
 
-		let dtFormat = Cc["@mozilla.org/calendar/datetime-formatter;1"]
-		             .getService(Ci.calIDateTimeFormatter);
+        let dtFormat = Cc["@mozilla.org/calendar/datetime-formatter;1"]
+            .getService(Ci.calIDateTimeFormatter);
 
-		let tzService = Cc["@mozilla.org/calendar/timezone-service;1"]
-		             .getService(Ci.calITimezoneService);
+        let tzService = Cc["@mozilla.org/calendar/timezone-service;1"]
+            .getService(Ci.calITimezoneService);
 
-		let displayDate = item.startDate.getInTimezone(tzService.defaultTimezone);
-		document.getElementById("exchWebService_itemStart").value = dtFormat.formatDate(displayDate)+" "+dtFormat.formatTime(displayDate);
+        let displayDate = item.startDate.getInTimezone(tzService.defaultTimezone);
+        document.getElementById("exchWebService_itemStart").value = dtFormat.formatDate(displayDate) + " " + dtFormat.formatTime(displayDate);
 
-		document.getElementById("exchWebService_itemResponse").value = window.arguments[0].response;
+        document.getElementById("exchWebService_itemResponse").value = window.arguments[0].response;
 
-		if (item.organizer) {
-			document.getElementById("exchWebService_meetingOrganiser").value = item.organizer.commonName+" ("+item.organizer.id.replace(/^mailto:/i, '')+")";
-		}
-		else {
-			// Should never happen.
-			document.getElementById("exchWebService_meetingOrganiser").value = "(unknown)";
-		}
+        if (item.organizer) {
+            document.getElementById("exchWebService_meetingOrganiser").value = item.organizer.commonName + " (" + item.organizer.id.replace(/^mailto:/i, '') + ")";
+        }
+        else {
+            // Should never happen.
+            document.getElementById("exchWebService_meetingOrganiser").value = "(unknown)";
+        }
 
-	},
+    },
 
 }
diff --git a/chrome/content/priority-display.js b/chrome/content/priority-display.js
index 252e2c72..bfc6be32 100644
--- a/chrome/content/priority-display.js
+++ b/chrome/content/priority-display.js
@@ -1,46 +1,46 @@
 /* Enhanced priority display */
 
-var Cu=Components.utils;
-var Cc=Components.classes;
-var Ci=Components.interfaces;
+var Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
 Components.utils.import("resource://app/modules/gloda/public.js");
 Components.utils.import("resource://app/modules/gloda/explattr.js");
-Components.utils.import("resource:///modules/iteratorUtils.jsm"); 
-  
+Components.utils.import("resource:///modules/iteratorUtils.jsm");
+
 var importantTag;
 
-function getImportantTag(){
-	var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]  
-	                                    .getService(Components.interfaces.nsIMsgTagService);
-	           var tagArray = tagService.getAllTags({});  
-	           for (var i = 0; i < tagArray.length; ++i)  
-	           {  
-	             var taginfo = tagArray[i];   
-	             if( taginfo.tag === "Important" ){ 
-	            	 	importantTag=taginfo.key;
- 	            	 	return;
-	 	             }  
-	           }   
+function getImportantTag() {
+    var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
+        .getService(Components.interfaces.nsIMsgTagService);
+    var tagArray = tagService.getAllTags({});
+    for (var i = 0; i < tagArray.length; ++i) {
+        var taginfo = tagArray[i];
+        if (taginfo.tag === "Important") {
+            importantTag = taginfo.key;
+            return;
+        }
+    }
+}
+
+function tag(hdr) {
+    if (importantTag) {
+        toggleMessageTagPostEwsUpdate(importantTag, "addKeywordsToMessages", hdr);
+    }
 }
-           
-function tag(hdr){ 
-	if(importantTag){
-		         toggleMessageTagPostEwsUpdate(importantTag, "addKeywordsToMessages" ,hdr); } 
+
+function gCP(pref) {
+    var prefService = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService);
+    return prefService.getCharPref("extensions.extras." + pref);
 }
- 
-function gCP(pref) {  
-	var prefService = Cc["@mozilla.org/preferences-service;1"]
-			                    .getService(Ci.nsIPrefService);
-	return prefService.getCharPref("extensions.extras." + pref); 
-} 
-
-function gBP(pref) { 
-	var prefService = Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService);
- 	return prefService.getBoolPref("extensions.extras." + pref); 
-} 
-  
-function toggleMessageTagPostEwsUpdate(key, addKey,hdr) {
+
+function gBP(pref) {
+    var prefService = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService);
+    return prefService.getBoolPref("extensions.extras." + pref);
+}
+
+function toggleMessageTagPostEwsUpdate(key, addKey, hdr) {
     var messages = Components.classes["@mozilla.org/array;1"].createInstance(Components.interfaces.nsIMutableArray);
     var msg = Components.classes["@mozilla.org/array;1"].createInstance(Components.interfaces.nsIMutableArray);
     var selectedMessages = gFolderDisplay.selectedMessages;
@@ -74,161 +74,160 @@ function toggleMessageTagPostEwsUpdate(key, addKey,hdr) {
     }
     if (prevHdrFolder)
         prevHdrFolder[toggler](messages, key);
- } 
-
-function enhancePriority(){
-	this._document=document;
-	this._window=window; 
-} 
-
-enhancePriority.prototype={
- 
-		execute:function _execute() { 
- 
-			    var extrasObserver = {
- 					observe: function(aMsgFolder, aTopic, aData) {  
-			 		    if (gDBView) {
-				    			var columnHandler = {
-				    			    getCellText: function(row, col) {
-					    				if (gBP("Iconify"))
-					    			    return "";
-					    				return gDBView.cellTextForColumn(row, "priorityCol");
-				    			    },
-				
-				    			    getSortStringForRow: function(hdr) {
-					    				if (columnHandler.old)
-					    				    return columnHandler.old.getSortStringForRow(hdr);
-					    				return null;
-				    			    },
-				
-				    			    isString: function() {
-				    			    	return ! gBP("Iconify");
-				    			    },
-				
-				    			    _atoms: {},
-				    			    _getAtom: function(aName) {
-					    				if (!this._atoms[aName]) {
-					    				    var as = Cc["@mozilla.org/atom-service;1"].
-					    					getService(Ci.nsIAtomService);
-					    				    this._atoms[aName] = as.getAtom(aName);
-					    				}
-					    				return this._atoms[aName];
-				    			    },
-				
-				    			    setProperty: function(prop, value) {
-					    				if (prop) {
-					    				    prop.AppendElement(this._getAtom(value));
-					    				    return "";
-					    				} else {
-					    				    return " " + value;
-					    				}
-				    			    },
-				
-				    			    getExtensionProperties: function(row, props, which) { 
-				    			    },
-				
-				    			    getCellProperties: function(row, col, props) {
-										
-				    			    	
-				    			    },
-									
-									isEditable: function(row, col) {
-										return false;
-									},
-									cycleCell: function(row, col) {
-									},
-									
-				    			    getRowProperties: function(row, props) {
-				    			    	var properties = "";
-				    			     
-					    				var hdr = gDBView.getMsgHdrAt(row);
-					    				var priority = hdr.getStringProperty("priority");
-					    				var doHigh = gBP( "ShadeHigh");
-					    				var doLow = gBP( "ShadeLow");
-					    				var property;
-					    
-					    				switch (priority) {
-					    				case "6":
-					    				    if (doHigh)
-					    					property = gCP("HighestColor"); 
-					    				    if(gBP("tagImportant")){
-					    				    	tag(hdr);} 
-					    				    break;					    				    
-					    				case "5":
-					    				    if (doHigh)
-					    					property = gCP("HighestColor");
-					    				    if(gBP("tagImportant")){
-					    				    	tag(hdr);}	 
-					    				    break;
-					    				case "3":
-					    				    if (doLow)
-					    					property = gCP("LowestColor");
-					    				    break;
-					    				case "2":
-					    				    if (doLow)
-					    					property = gCP("LowestColor");
-					    				    break;
-					    				}
-					    				if (property) {  
-					    					property='lcolor-'+property.substr(1);
-					    				    properties += this.setProperty(props,property);
-					    				}
-    					    		                             
-					    				if (columnHandler.old)
-					    				    properties += (columnHandler.old.
-					    						   getRowProperties(row, props));
-					    				return properties;
-				    			    },
-				
-				    			    getImageSrc: function(row, col) {
-				    				if ( !gBP("Iconify"))
-				    				    return null;
-				    				var hdr = gDBView.getMsgHdrAt(row);
-				    				
-				    				var priority = hdr.getStringProperty("priority");
-				    					switch (priority) {
-						    				case "6":
-						    				    return gCP("HighestIcon");
-						    				case "5":
-						    				    return gCP("HighIcon");
-						    				case "3":
-						    				    return gCP("LowIcon");
-						    				case "2":
-						    				    return gCP("LowestIcon");
-						    				default:
-						    				    if (columnHandler.old)
-						    					return columnHandler.old.getImageSrc(row, col);
- 				    					}
-				    			    },
-				
-				    			    getSortLongForRow: function(hdr) {
-				    				if (columnHandler.old)
-				    				    return columnHandler.old.getSortLongForRow(hdr);
-				    				return null;
-				    			    }
-				    			}; //end-columnHandler
-				
-				    			try {
-				    			    columnHandler.old = gDBView.getColumnHandler("priorityCol");
-				    			}
-				    			catch (ex) {}
-				    			
-				    			gDBView.addColumnHandler("priorityCol", columnHandler); 
-				    			
-			    		    }//ifend
-			    		}
-				    };
-			var ObserverService = Cc["@mozilla.org/observer-service;1"]
-			    .getService(Ci.nsIObserverService);
-				ObserverService.addObserver( extrasObserver, "MsgCreateDBView", false);
-	    },
-	    
-		onload:function _onload(){  
-				getImportantTag();//get important tag
-	    },
-	
+}
+
+function enhancePriority() {
+    this._document = document;
+    this._window = window;
+}
+
+enhancePriority.prototype = {
+
+    execute: function _execute() {
+
+        var extrasObserver = {
+            observe: function (aMsgFolder, aTopic, aData) {
+                if (gDBView) {
+                    var columnHandler = {
+                        getCellText: function (row, col) {
+                            if (gBP("Iconify"))
+                                return "";
+                            return gDBView.cellTextForColumn(row, "priorityCol");
+                        },
+
+                        getSortStringForRow: function (hdr) {
+                            if (columnHandler.old)
+                                return columnHandler.old.getSortStringForRow(hdr);
+                            return null;
+                        },
+
+                        isString: function () {
+                            return !gBP("Iconify");
+                        },
+
+                        _atoms: {},
+                        _getAtom: function (aName) {
+                            if (!this._atoms[aName]) {
+                                var as = Cc["@mozilla.org/atom-service;1"].
+                                getService(Ci.nsIAtomService);
+                                this._atoms[aName] = as.getAtom(aName);
+                            }
+                            return this._atoms[aName];
+                        },
+
+                        setProperty: function (prop, value) {
+                            if (prop) {
+                                prop.AppendElement(this._getAtom(value));
+                                return "";
+                            }
+                            else {
+                                return " " + value;
+                            }
+                        },
+
+                        getExtensionProperties: function (row, props, which) {},
+
+                        getCellProperties: function (row, col, props) {
+
+
+                        },
+
+                        isEditable: function (row, col) {
+                            return false;
+                        },
+                        cycleCell: function (row, col) {},
+
+                        getRowProperties: function (row, props) {
+                            var properties = "";
+
+                            var hdr = gDBView.getMsgHdrAt(row);
+                            var priority = hdr.getStringProperty("priority");
+                            var doHigh = gBP("ShadeHigh");
+                            var doLow = gBP("ShadeLow");
+                            var property;
+
+                            switch (priority) {
+                            case "6":
+                                if (doHigh)
+                                    property = gCP("HighestColor");
+                                if (gBP("tagImportant")) {
+                                    tag(hdr);
+                                }
+                                break;
+                            case "5":
+                                if (doHigh)
+                                    property = gCP("HighestColor");
+                                if (gBP("tagImportant")) {
+                                    tag(hdr);
+                                }
+                                break;
+                            case "3":
+                                if (doLow)
+                                    property = gCP("LowestColor");
+                                break;
+                            case "2":
+                                if (doLow)
+                                    property = gCP("LowestColor");
+                                break;
+                            }
+                            if (property) {
+                                property = 'lcolor-' + property.substr(1);
+                                properties += this.setProperty(props, property);
+                            }
+
+                            if (columnHandler.old)
+                                properties += (columnHandler.old.getRowProperties(row, props));
+                            return properties;
+                        },
+
+                        getImageSrc: function (row, col) {
+                            if (!gBP("Iconify"))
+                                return null;
+                            var hdr = gDBView.getMsgHdrAt(row);
+
+                            var priority = hdr.getStringProperty("priority");
+                            switch (priority) {
+                            case "6":
+                                return gCP("HighestIcon");
+                            case "5":
+                                return gCP("HighIcon");
+                            case "3":
+                                return gCP("LowIcon");
+                            case "2":
+                                return gCP("LowestIcon");
+                            default:
+                                if (columnHandler.old)
+                                    return columnHandler.old.getImageSrc(row, col);
+                            }
+                        },
+
+                        getSortLongForRow: function (hdr) {
+                            if (columnHandler.old)
+                                return columnHandler.old.getSortLongForRow(hdr);
+                            return null;
+                        }
+                    }; //end-columnHandler
+
+                    try {
+                        columnHandler.old = gDBView.getColumnHandler("priorityCol");
+                    }
+                    catch (ex) {}
+
+                    gDBView.addColumnHandler("priorityCol", columnHandler);
+
+                } //ifend
+            }
+        };
+        var ObserverService = Cc["@mozilla.org/observer-service;1"]
+            .getService(Ci.nsIObserverService);
+        ObserverService.addObserver(extrasObserver, "MsgCreateDBView", false);
+    },
+
+    onload: function _onload() {
+        getImportantTag(); //get important tag
+    },
+
 };
-var tmpEnhancePriority=new enhancePriority(window,document);
+var tmpEnhancePriority = new enhancePriority(window, document);
 window.addEventListener("load", tmpEnhancePriority.onload(), false);
 window.addEventListener("load", tmpEnhancePriority.execute(), false);
- 
\ No newline at end of file
diff --git a/chrome/content/progress_panel.js b/chrome/content/progress_panel.js
index 92adcd4d..a773903f 100644
--- a/chrome/content/progress_panel.js
+++ b/chrome/content/progress_panel.js
@@ -35,171 +35,172 @@ var Cu = Components.utils;
 
 //if (! exchWebService) var exchWebService = {};
 
-function exchProgressPanel(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchProgressPanel(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchProgressPanel.prototype = {
 
-	queueSizeTotal: 0,
-	calendarQueues: {},
-	runningJobs: 0,
-	changeQueue: [],
-	busy: false,
-	isLoaded: false,
-	imageCounter: 1,
-	imageList: {    image1: "chrome://exchangecalendar-common/skin/images/arrow-circle.png",
-			image2: "chrome://exchangecalendar-common/skin/images/arrow-circle-315.png",
-			image3: "chrome://exchangecalendar-common/skin/images/arrow-circle-225.png",
-			image4: "chrome://exchangecalendar-common/skin/images/arrow-circle-135.png"
-			},
-	loadBalancer : Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer),  
-	timerRunning: false,
-
-	notify: function _notify() 
-	{
-		if (this.isLoaded) {
-
-			var jobList = this.loadBalancer.jobList;
-			var running = 0;
-			var waiting = 0;
-
-			// Update the tooltip
-			var mainVBox = this._document.getElementById("exchWebServiceProgressvbox");
-			if (mainVBox) {
-				var grid;
-				var rowCount = 0;
-				for (var server in jobList) {
-					if (!this._document.getElementById("exchWebServiceProgress.progress.grid"+rowCount)) {
-						grid = this._document.createElement("exchangeProgressGrid");
-						grid.setAttribute("id","exchWebServiceProgress.progress.grid"+rowCount);
-						grid.setAttribute("serverUrl",jobList[server].server);
-						mainVBox.appendChild(grid);
-					}
-					else {
-						grid = this._document.getElementById("exchWebServiceProgress.progress.grid"+rowCount);
-					}
-
-					running = running + jobList[server].runningJobs.length;
-					if (grid.beforeUpdate) {
-						grid.serverCount = jobList[server].runningJobs.length;
-						grid.beforeUpdate();
-					}
-					for (var calendarid in jobList[server].jobs) {
-
-						var calendarName =  jobList[server].calendarNames[calendarid];
-
-						if (grid.addCalendar) {
-							grid.addCalendar(jobList[server].calendarNames[calendarid], jobList[server].jobs[calendarid].length);
-						}
-
-						waiting = waiting +jobList[server].jobs[calendarid].length; 
-					}
-					if (grid.afterUpdate) {
-						grid.afterUpdate();
-					}
-
-					rowCount++;
-				}
-
-			}
-
-			if ((waiting == 0) && (running == 0)) {
-				this._document.getElementById("exchWebService-progress-panel").hidden = true;
-				this.timer.cancel();
-				this.timerRunning = false;
-			}
-			else {
-				if (this._document.getElementById("exchWebService-progress-panel").hidden) {
-					if ((waiting > 1) || (running > 0)) {
-						this._document.getElementById("exchWebService-progress-panel").hidden = false;
-						if (!this.timerRunning) {
-							this.timerRunning = true;
-							this.timer.initWithCallback(this, 200, this.timer.TYPE_REPEATING_SLACK);
-						}
-					}
-				}
-//				var tmpStr = running + "/" + waiting + " (r/w job";
-				var tmpStr = running + " running & " + waiting + " queued job";
-				if ((waiting+running) > 1) {
-					tmpStr = tmpStr + "s";
-				}
-//				tmpStr = tmpStr + ")";
-				this._document.getElementById("exchWebService-progress-label").value = tmpStr;
-			}
-
-
-			this.imageCounter = Number(this.imageCounter) + Number(1);
-			if (this.imageCounter > 4) {
-				this.imageCounter = 1;
-			}
-			if (this._document) {
-				this._document.getElementById("exchWebService-progress-image").style.listStyleImage = "url('"+this.imageList["image"+this.imageCounter]+"')";
-			}
-		}
-	},
-
-	observe: function _observe(subject, topic, data) 
-	{
-		if (topic == "onExchangeReadOnlyChange") {
-			calendarUpdateNewItemsCommand();
-			//document.commandDispatcher.updateCommands("calendar_commands");
-			return;
-		}
-
-		if (topic == "onExchangeProgressChange") {
-			if (!this.timerRunning) {
-				this.timerRunning = true;
-				this.timer.initWithCallback(this, 200, this.timer.TYPE_REPEATING_SLACK);
-			}
-		}
-        },
-
-	init: function _init()
-	{
-		this.observerService = Cc["@mozilla.org/observer-service;1"]  
-                          .getService(Ci.nsIObserverService);
-
-		this.observerService.addObserver(this, "onExchangeProgressChange", false);
-		this.observerService.addObserver(this, "onExchangeReadOnlyChange", false);
-
-		this.timer = Cc["@mozilla.org/timer;1"]
-				.createInstance(Ci.nsITimer);
-		this.timerRunning = false;
-
-	},
-
-	destroy: function _destroy()
-	{
-		this.observerService.removeObserver(this, "onExchangeProgressChange");
-		this.observerService.removeObserver(this, "onExchangeReadOnlyChange");
-	},
-
-	onLoad: function _onLoad(event) {
-		this.init();
-
-		// Do init
-		this.isLoaded = true;
-
-		// Add an unload function to the window so we don't leak any listeners
-		var self = this;
-		this._window.addEventListener("unload", function(){ self._window.removeEventListener("unload",arguments.callee,false); self.destroy();}, false);
-
-	},
-
-	openProgressDialog: function _openProgressDialog()
-	{
-	},
+    queueSizeTotal: 0,
+    calendarQueues: {},
+    runningJobs: 0,
+    changeQueue: [],
+    busy: false,
+    isLoaded: false,
+    imageCounter: 1,
+    imageList: {
+        image1: "chrome://exchangecalendar-common/skin/images/arrow-circle.png",
+        image2: "chrome://exchangecalendar-common/skin/images/arrow-circle-315.png",
+        image3: "chrome://exchangecalendar-common/skin/images/arrow-circle-225.png",
+        image4: "chrome://exchangecalendar-common/skin/images/arrow-circle-135.png"
+    },
+    loadBalancer: Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer),
+    timerRunning: false,
+
+    notify: function _notify() {
+        if (this.isLoaded) {
+
+            var jobList = this.loadBalancer.jobList;
+            var running = 0;
+            var waiting = 0;
+
+            // Update the tooltip
+            var mainVBox = this._document.getElementById("exchWebServiceProgressvbox");
+            if (mainVBox) {
+                var grid;
+                var rowCount = 0;
+                for (var server in jobList) {
+                    if (!this._document.getElementById("exchWebServiceProgress.progress.grid" + rowCount)) {
+                        grid = this._document.createElement("exchangeProgressGrid");
+                        grid.setAttribute("id", "exchWebServiceProgress.progress.grid" + rowCount);
+                        grid.setAttribute("serverUrl", jobList[server].server);
+                        mainVBox.appendChild(grid);
+                    }
+                    else {
+                        grid = this._document.getElementById("exchWebServiceProgress.progress.grid" + rowCount);
+                    }
+
+                    running = running + jobList[server].runningJobs.length;
+                    if (grid.beforeUpdate) {
+                        grid.serverCount = jobList[server].runningJobs.length;
+                        grid.beforeUpdate();
+                    }
+                    for (var calendarid in jobList[server].jobs) {
+
+                        var calendarName = jobList[server].calendarNames[calendarid];
+
+                        if (grid.addCalendar) {
+                            grid.addCalendar(jobList[server].calendarNames[calendarid], jobList[server].jobs[calendarid].length);
+                        }
+
+                        waiting = waiting + jobList[server].jobs[calendarid].length;
+                    }
+                    if (grid.afterUpdate) {
+                        grid.afterUpdate();
+                    }
+
+                    rowCount++;
+                }
+
+            }
+
+            if ((waiting == 0) && (running == 0)) {
+                this._document.getElementById("exchWebService-progress-panel").hidden = true;
+                this.timer.cancel();
+                this.timerRunning = false;
+            }
+            else {
+                if (this._document.getElementById("exchWebService-progress-panel").hidden) {
+                    if ((waiting > 1) || (running > 0)) {
+                        this._document.getElementById("exchWebService-progress-panel").hidden = false;
+                        if (!this.timerRunning) {
+                            this.timerRunning = true;
+                            this.timer.initWithCallback(this, 200, this.timer.TYPE_REPEATING_SLACK);
+                        }
+                    }
+                }
+                //				var tmpStr = running + "/" + waiting + " (r/w job";
+                var tmpStr = running + " running & " + waiting + " queued job";
+                if ((waiting + running) > 1) {
+                    tmpStr = tmpStr + "s";
+                }
+                //				tmpStr = tmpStr + ")";
+                this._document.getElementById("exchWebService-progress-label").value = tmpStr;
+            }
+
+
+            this.imageCounter = Number(this.imageCounter) + Number(1);
+            if (this.imageCounter > 4) {
+                this.imageCounter = 1;
+            }
+            if (this._document) {
+                this._document.getElementById("exchWebService-progress-image").style.listStyleImage = "url('" + this.imageList["image" + this.imageCounter] + "')";
+            }
+        }
+    },
+
+    observe: function _observe(subject, topic, data) {
+        if (topic == "onExchangeReadOnlyChange") {
+            calendarUpdateNewItemsCommand();
+            //document.commandDispatcher.updateCommands("calendar_commands");
+            return;
+        }
+
+        if (topic == "onExchangeProgressChange") {
+            if (!this.timerRunning) {
+                this.timerRunning = true;
+                this.timer.initWithCallback(this, 200, this.timer.TYPE_REPEATING_SLACK);
+            }
+        }
+    },
+
+    init: function _init() {
+        this.observerService = Cc["@mozilla.org/observer-service;1"]
+            .getService(Ci.nsIObserverService);
+
+        this.observerService.addObserver(this, "onExchangeProgressChange", false);
+        this.observerService.addObserver(this, "onExchangeReadOnlyChange", false);
+
+        this.timer = Cc["@mozilla.org/timer;1"]
+            .createInstance(Ci.nsITimer);
+        this.timerRunning = false;
+
+    },
+
+    destroy: function _destroy() {
+        this.observerService.removeObserver(this, "onExchangeProgressChange");
+        this.observerService.removeObserver(this, "onExchangeReadOnlyChange");
+    },
+
+    onLoad: function _onLoad(event) {
+        this.init();
+
+        // Do init
+        this.isLoaded = true;
+
+        // Add an unload function to the window so we don't leak any listeners
+        var self = this;
+        this._window.addEventListener("unload", function () {
+            self._window.removeEventListener("unload", arguments.callee, false);
+            self.destroy();
+        }, false);
+
+    },
+
+    openProgressDialog: function _openProgressDialog() {},
 }
 
 var myExchProgressPanel = new exchProgressPanel(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,true); dump("progress_panel\n"); myExchProgressPanel.onLoad(); }, true);
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, true);
+    dump("progress_panel\n");
+    myExchProgressPanel.onLoad();
+}, true);
 
 /**
  * Creates the given element in the XUL namespace.
@@ -210,4 +211,3 @@ window.addEventListener("load", function () { window.removeEventListener("load",
 function createXULElement(el) {
     return document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", el);
 }
-
diff --git a/chrome/content/rtews.js b/chrome/content/rtews.js
index 6dd336ab..b9173056 100644
--- a/chrome/content/rtews.js
+++ b/chrome/content/rtews.js
@@ -8,56 +8,58 @@
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
-var Cu = Components.utils; 
+var Cu = Components.utils;
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
-Cu.import("resource://gre/modules/Services.jsm");  
+Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://exchangecalendar/erGetItems.js");
 Cu.import("resource://exchangecalendar/erFindInboxFolder.js");
-Cu.import("resource://exchangecalendar/erSubscribe.js"); 
+Cu.import("resource://exchangecalendar/erSubscribe.js");
 Cu.import("resource://exchangecalendar/erGetEvents.js");
 Cu.import("resource://exchangecalendar/erFindItems.js");
 Cu.import("resource://exchangecalendar/erUpdateItem.js");
 Cu.import("resource://exchangecalendar/erUnsubscribe.js");
 
-const eventTypes = ["NewMailEvent","ModifiedEvent","MovedEvent","CopiedEvent","CreatedEvent"]; 
+const eventTypes = ["NewMailEvent", "ModifiedEvent", "MovedEvent", "CopiedEvent", "CreatedEvent"];
 
 const mivFunctions = Cc["@1st-setup.nl/global/functions;1"]
-	              	  	.getService(Ci.mivFunctions);  
+    .getService(Ci.mivFunctions);
 
-if( Cc["@1st-setup.nl/global/functions;1"]
-	              	  	.getService(Ci.mivFunctions)){
-	dump("\EwsTagging(exception) 2 :"); 
+if (Cc["@1st-setup.nl/global/functions;1"]
+    .getService(Ci.mivFunctions)) {
+    dump("\EwsTagging(exception) 2 :");
 }
 
-function globalLOG(msg,user){
-	if ( !debug ) return;
-	if(user){
-		mivFunctions.LOG("ewsTagger("+user+"): "+msg); }
-		else{
-		mivFunctions.LOG("ewsTagger-----: "+msg); } 
-} 
- 
-var tmpDebug = null;  
-
- try{
-	let prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-	let storedDebugLevel = mivFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true); 
-	tmpDebug = ( storedDebugLevel > 0);
-	
-	if (( storedDebugLevel == 0) || (! mivFunctions.shouldLog())) {
-		tmpDebug = false;
-	} 
- 
- }
- catch(e){
-	 dump("\EwsTagging(exception) 1 :"+e);
- }
- 
-  
-const debug = tmpDebug; 
-const  exchangeGlobalFunction = globalLOG;   
- 	
+function globalLOG(msg, user) {
+    if (!debug) return;
+    if (user) {
+        mivFunctions.LOG("ewsTagger(" + user + "): " + msg);
+    }
+    else {
+        mivFunctions.LOG("ewsTagger-----: " + msg);
+    }
+}
+
+var tmpDebug = null;
+
+try {
+    let prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+    let storedDebugLevel = mivFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true);
+    tmpDebug = (storedDebugLevel > 0);
+
+    if ((storedDebugLevel == 0) || (!mivFunctions.shouldLog())) {
+        tmpDebug = false;
+    }
+
+}
+catch (e) {
+    dump("\EwsTagging(exception) 1 :" + e);
+}
+
+
+const debug = tmpDebug;
+const exchangeGlobalFunction = globalLOG;
+
 //hold all array of ews objects
 var ewsTaggerObj = [];
 
@@ -66,48 +68,49 @@ var ewsTaggerObj = [];
  * Message updater
  *
  */
-rtews.UpdateMessage = function(updates) {
+rtews.UpdateMessage = function (updates) {
     this.updates = updates;
     this.pendingUpdates = [];
     this.pendingAttempts = 0;
 };
 
 rtews.UpdateMessage.prototype = {
-    update : function() {
+    update: function () {
         var that = this;
         var messageId = this.updates[0].msgId;
         var tags = this.updates[0].tags;
         var folderPath = this.updates[0].path;
-    	exchangeGlobalFunction("Going to update server messages, total - " + this.updates.length  );  
+        exchangeGlobalFunction("Going to update server messages, total - " + this.updates.length);
 
-        that.searchGloda(messageId, folderPath, function(msgHdrs) {
-        	exchangeGlobalFunction("Going to update local messages, total - " + msgHdrs.length  );  
-        	exchangeGlobalFunction("Searching Gloda for messageId - " + messageId  + " in  folderPath - "+ folderPath  );
+        that.searchGloda(messageId, folderPath, function (msgHdrs) {
+            exchangeGlobalFunction("Going to update local messages, total - " + msgHdrs.length);
+            exchangeGlobalFunction("Searching Gloda for messageId - " + messageId + " in  folderPath - " + folderPath);
             if (msgHdrs.length == 0) {
-            	exchangeGlobalFunction("Gloda did not find message for messageId - " + messageId  + " in  folderPath - "+ folderPath  ); 
-             } else {
-            	exchangeGlobalFunction("update messages with tags  " + String(tags) ); 
+                exchangeGlobalFunction("Gloda did not find message for messageId - " + messageId + " in  folderPath - " + folderPath);
+            }
+            else {
+                exchangeGlobalFunction("update messages with tags  " + String(tags));
                 for (var x = 0; x < msgHdrs.length; x++) {
-                	exchangeGlobalFunction("Remove messages tags  " + String(tags) );  
+                    exchangeGlobalFunction("Remove messages tags  " + String(tags));
                     rtews.removeAllMessageTagsPostEwsUpdate(msgHdrs[x]);
                     if (tags.length > 0) {
-                    	exchangeGlobalFunction("Toggle messages tags  " + String(tags) );  
+                        exchangeGlobalFunction("Toggle messages tags  " + String(tags));
                         that.addKeywordsToMessage(msgHdrs[x], tags);
                     }
                 }
             }
 
-            that.updates.shift(); 
+            that.updates.shift();
             if (that.updates.length > 0) {
                 that.update();
-            }    
-        }); 
+            }
+        });
     },
 
     /*
      * Upated message with categories received
      */
-    addKeywordsToMessage : function(msgHdr, keywords) {
+    addKeywordsToMessage: function (msgHdr, keywords) {
         try {
             var messages = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
             messages.appendElement(msgHdr, false);
@@ -116,8 +119,9 @@ rtews.UpdateMessage.prototype = {
             for (var t = 0; t < keywords.length; t++) {
                 msgHdr.folder[toggler](messages, keywords[t]);
             }
-        } catch(e) {
-        		exchangeGlobalFunction("addKeywordsToMessages.exception{1} "+ e);
+        }
+        catch (e) {
+            exchangeGlobalFunction("addKeywordsToMessages.exception{1} " + e);
         }
 
         OnTagsChange();
@@ -125,26 +129,23 @@ rtews.UpdateMessage.prototype = {
 
     /*
      * Search the GLODA for message
-      */
-    searchGloda : function(messageId, folderPath, callback) {
+     */
+    searchGloda: function (messageId, folderPath, callback) {
         try {
             var query = Gloda.newQuery(Gloda.NOUN_MESSAGE);
             query.headerMessageID(messageId);
 
             var queryListener = {
                 /* called when new items are returned by the database query or freshly indexed */
-                onItemsAdded : function queryListener_onItemsAdded(aItems, aCollection) {
-                },
+                onItemsAdded: function queryListener_onItemsAdded(aItems, aCollection) {},
                 /* called when items that are already in our collection get re-indexed */
-                onItemsModified : function queryListener_onItemsModified(aItems, aCollection) {
-                },
+                onItemsModified: function queryListener_onItemsModified(aItems, aCollection) {},
                 /* called when items that are in our collection are purged from the system */
-                onItemsRemoved : function queryListener_onItemsRemoved(aItems, aCollection) {
-                },
+                onItemsRemoved: function queryListener_onItemsRemoved(aItems, aCollection) {},
                 /* called when our database query completes */
-                onQueryCompleted : function queryListener_onQueryCompleted(aCollection) {
-                	 msgHdrs = [];
-       //             exchangeGlobalFunction("rtews:UpdateMessage.update , Found messages "+aCollection.items.length);
+                onQueryCompleted: function queryListener_onQueryCompleted(aCollection) {
+                    msgHdrs = [];
+                    //             exchangeGlobalFunction("rtews:UpdateMessage.update , Found messages "+aCollection.items.length);
                     try {
                         for (var j = 0; j < aCollection.items.length; j++) {
                             if (aCollection.items[j].folder.uri.toLowerCase().endsWith(folderPath.toLowerCase())) {
@@ -154,708 +155,760 @@ rtews.UpdateMessage.prototype = {
                             }
                         }
                         callback(msgHdrs);
-                    } catch (e) {
-                    	exchangeGlobalFunction("searchGloda.exception{1} "+ e);
+                    }
+                    catch (e) {
+                        exchangeGlobalFunction("searchGloda.exception{1} " + e);
                         callback(msgHdrs);
                     }
                 }
             };
             var collection = query.getCollection(queryListener);
-        } catch(e) {
-        	exchangeGlobalFunction("searchGloda.exception{2} "+ e);
+        }
+        catch (e) {
+            exchangeGlobalFunction("searchGloda.exception{2} " + e);
         }
     }
 };
- 
+
 rtews.Tags = {
-    tagService : Cc["@mozilla.org/messenger/tagservice;1"].getService(Ci.nsIMsgTagService),
+    tagService: Cc["@mozilla.org/messenger/tagservice;1"].getService(Ci.nsIMsgTagService),
 
-    getKeyForTag : function(name) {
+    getKeyForTag: function (name) {
         return this.tagService.getKeyForTag(name) ? this.tagService.getKeyForTag(name) : null;
     },
 
-    getTagForKey : function(key) {
+    getTagForKey: function (key) {
         try {
             return this.tagService.getTagForKey(key);
-        } catch (e) {
+        }
+        catch (e) {
 
         }
         return null;
     },
 
-    getTagsForKeys : function(keys) {
-        var tags = []; 
+    getTagsForKeys: function (keys) {
+        var tags = [];
         for (var x = 0; x < keys.length; x++) {
             var tag = this.getTagForKey(keys[x]);
             if (tag != null) {
                 tags.push(tag);
             }
-        } 
+        }
         return tags;
     },
 
-    addTag : function(name) {
-        this.tagService.addTag(name, "", ""); 
+    addTag: function (name) {
+        this.tagService.addTag(name, "", "");
         return this.getKeyForTag(name);
     }
 };
 
-function rtews(identity){  
-		this.identity = identity; 
-  	   // fixing bug #270 
-  
-		if (identity.username.indexOf("@") > -1) {
-				this.user = identity.username ;
-		}
-		else {
-			if (identity.domain == "") {
-					this.user = identity.username ;
-			}
-			else {
-					this.user = identity.domain +"\\"+identity.username ;
-			}
-		}
-		
-	    this.mailbox = identity.email ; 
-	    this.serverUrl = identity.ewsUrl ; 
-	    
-	    this.folderByImapPath = [];
-	    this.folderByEwsId = [];
-	    this.foldersByIdentity = {};
-	    
-	    this.session  = {
-			subscriptionId:"",
-			watermark:"",
-		};
-	    
-	   this.retry = true;
-
-	   this.globalFunctions = mivFunctions;
-	    
-	   this.prefs = identity.prefs ;
-	   
-	   if( this.prefs ){
-		   this.pollOffset = this.globalFunctions.safeGetIntPref(this.prefs, "syncMailItems.Interval" ,15) * 1000 ;//time for getevents   
-			this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-			                          .getService(Ci.mivExchangeLoadBalancer); 
-	   }
-	   else{
-		   this.prefs = null;
- 		   this.pollOffset = 30000;//time for getevents 
-	   }  
-	   
-	   this.subscriptionTimeout = "1440"; 
- }
-
-rtews.prototype = {  
-	/*
-	 *use Calendar queue for xml request
-	 */ 
-	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	{
-		if ( mivFunctions.safeGetBoolPref(this.prefs, "mailsync.active", false) ==  false ){
- 			exchangeGlobalFunction("Not adding to queue because we are disabled,  " + this.serverUrl ,this.user);  
- 			this.Running = false;  
-			return;
-		}
- 		//if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
-
-		this.loadBalancer.addToQueue({ calendar: this.prefs,
-				 ecRequest:aRequest,
-				 arguments: aArgument,
-				 cbOk: aCbOk,
-				 cbError: aCbError,
-				 listener: aListener});
-	},
-	/*
-	 * Gets the ItemId element from response of the FindItem SOAP request
-	 *
-	 */ 
- 	findFolders: function _findFolders(identity){
-		exchangeGlobalFunction("Find all the folderd in msgfolderroot,  " + this.serverUrl ,this.user); 
-	    //Call API
- 		var self = this;
- 		this.addToQueue(  erFindInboxFolderRequest,
-								{user:this.user, 
-								mailbox: this.mailbox,
-								serverUrl:this.serverUrl,
-								folderBase: "msgfolderroot",
-								folderPath: "",
-								actionStart: Date.now()}, 
-								function(erFindInboxFolderRequest, folders) { self.findFoldersOK(erFindInboxFolderRequest, folders);}, 
-								function(erFindInboxFolderRequest, aCode, aMsg) { self.findFoldersError(erFindInboxFolderRequest, aCode, aMsg);},
-								null);  
-	},
-	
-	findFoldersOK:  function _findFoldersOK(erFindInboxFolderRequest, afolders){
-		exchangeGlobalFunction("folders found, going to subscribe  " + JSON.stringify(afolders),this.user); 
- 		this.processFolders(afolders); 
-		var folders = this.getFoldersByIdentity(this.identity);  
- 		if (folders.length > 0) {
-			   this.subscribe(folders); 
-	    } 
-	},
-	 
-	subscribe: function _subscribe(folders){
-		exchangeGlobalFunction("Trying to subscribe  " ,this.user); 
-	  	var self = this;
-	  	this.addToQueue( erSubscribeRequest,
-				   		{user: this.user, 
-				   		mailbox: this.mailbox,
-				   		serverUrl: this.serverUrl,
-				   		folderBase: "",
-			   			changeKey: "" ,
-			   			folderIds : folders,
-			   			actionStart: Date.now(),
-			   			timeout: this.subscriptionTimeout,  			//Keep the subscription for one day i.e 1440 minutes 
-			   			eventTypes : eventTypes , }, 
-			   			function(erSubscribeRequest, subscriptionId, watermark) { self.subscribeOK(erSubscribeRequest, subscriptionId, watermark);}, 
-			   			function(erSubscribeRequest, aCode, aMsg) { self.subscribeError(erSubscribeRequest, aCode, aMsg);},
-			   			null);
-	},
-	
-	subscribeOK: function _subscribeOK(erSubscribeRequest, subscriptionId, watermark){
-		exchangeGlobalFunction("Subscribed,  subscriptionId - " + subscriptionId +  ",  watermark  " + watermark ,this.user);
-		exchangeGlobalFunction("Subscription Timeout set to " + this.subscriptionTimeout + "(minutes)" ,this.user);  
-		this.session.subscriptionId = subscriptionId;
-		this.session.watermark = watermark; 
- 		this.poll();
-	},
-	
-	unsubscribe: function _unsubscribe(){ 
-		exchangeGlobalFunction("Error occured Unsubscribing user.",this.user); 
-		this.Running = false; 
-		var that = this; 
-		this.addToQueue( erUnsubscribeRequest,
-						{user: this.user, 
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl, 
-						actionStart: Date.now(),
-						subscriptionId :  this.session.subscriptionId ,
-						watermark :  this.session.watermark , }, 
-						function(erUnsubscribeRequest, aResp) {  unsubscribeOK(erUnsubscribeRequest, aResp);}, 
-						function(erUnsubscribeRequest, aCode, aMsg) {  unsubscribeError(erUnsubscribeRequest, aCode, aMsg);},
-						null);  
-	},
-	
-	unsubscribeOK: function _unsubscribeOK(erUnsubscribeRequest, aResp){
-		exchangeGlobalFunction("Unsubscribed user.",this.user);
-	},
-	
-	unsubscribeError: function _unsubscribeError(erUnsubscribeRequest, aCode, aMsg){
- 		exchangeGlobalFunction("unsubscribeError: "+ aMsg);
-	},
-	
-	poll: function _poll() {
-	    var self = this;
-	    this.Running = false;  
-		exchangeGlobalFunction("Polltime set -  " + this.pollOffset + "(milliseconds)" ,this.user);
-		
-	    this.pollInterval = setInterval(function() { 
-			if (self.session == null) {
-		        return;
-		    }  
-		    exchangeGlobalFunction("Syncting TagItems now.", self.user);
-
-			if ( self.Running == true )  {
-				 exchangeGlobalFunction("Already Running", self.user);
-	        	 return; 
-			} 
-	        //Check for new event on the mail box
-			self.getEvents(); 
-	    },  this.pollOffset );
-	},
-	   
-	getItemsError: function _getItemsError(erGetItemsRequest, aCode, aMsg){ 
-		exchangeGlobalFunction("getItemsError: "+ aMsg);
-	},
-	 
-	getItemsOK: function _getItemsOK(erGetItemsRequest, aItems, aItemErrors){ 
-		exchangeGlobalFunction("getItemsOK, Received server items to update: " + aItems.length,this.user); 
-	 	if( aItems.length > 0 ){
-		 
-	 		 var getItem=function(aItem){ 
-			   	let id = xml2json.getAttributeByTag(aItem,'t:ItemId','Id'); 
-			   	let changeKey = xml2json.getAttributeByTag(aItem,'t:ItemId','ChangeKey');  
-		        return { "Id" : id , "ChangeKey": changeKey, };
-			}  
-			
-	 		var  getParentItem=function(aItem){ 
-			   	let id = xml2json.getAttributeByTag(aItem,'t:ParentFolderId','Id'); 
-			   	let changeKey = xml2json.getAttributeByTag(aItem,'t:ParentFolderId','ChangeKey');  
-		        return { "Id" : id , "ChangeKey": changeKey, };
-			}  
-	 		
-		var updates = []; 
-
-		for(var item = 0 ; item < aItems.length ; item++ ){ 
-	 		var itemId = getItem(aItems[item]);  
-	        var parentItemId = getParentItem(aItems[item]);  
-	        
-	        var messageIdElm = xml2json.XPath(aItems[item],"/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1035']");
-	        var messageId = null ;
-	        if (messageIdElm.length > 0) {
-				 messageId =  xml2json.getTagValue(messageIdElm[0], "t:Value", null);
-			}   
-	        messageId = messageId.replace('<', '').replace('>', '');   
-	        if ( messageId == undefined || messageId == null || messageId == ""  ) {
-	        	exchangeGlobalFunction("(warn?) messageId "+messageId+ " is invalid.",this.user);
-	            continue;
-	        } 
-	        var categories = [];
-	        var tags = []; 
-	       
-	        var categoriesElm = xml2json.XPath(aItems[item],'/t:Categories/t:String');
-	        for(var index = 0 ; index < categoriesElm.length ; index++ ) {  
-	        	categories.push(categoriesElm[index].c); 
-	        }
-	      
-	        if ( categories.length > 0 ) {
-	              var errCategory = [];
-	 
-	            for(var index = 0 ; index < categories.length ; index++ ) {  
-	            	var category = categories[index]; 
-	            	
-	            	if(category){
-		                var tKey = rtews.Tags.getKeyForTag(category);
-		
-	                     if (tKey != null) {
-	                        tags.push(tKey);
-	                    } 
-	                    else {
-	                        var newTagKey = rtews.Tags.addTag(category);
-	
-	                        if (newTagKey != null) {
-	                             tags.push(newTagKey);
-	                        } 
-	                        else {
-	                             errCategory.push(category);
-	                        }
-	                    }
-	            	}
-	            }
-	             //Prompt categories that were not converted to tags.
-	            if (errCategory.length) {
-	                var stringBundle = document.getElementById("string-bundle");
-	                Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService).alert(null, stringBundle.getString("rtews.title"), stringBundle.getString("rtews.tagAddError") + " " + errCategory.join(", "));
-	            } 
-	        } 
-	      	
-	        var folderEwsId = this.gerFolderByEwsId(parentItemId.Id); 
-		   	
-			if ( folderEwsId != null) {
-			        updates.push({
-			            msgId : messageId,
-			            tags : tags,
-			            path : folderEwsId.path
-			        }); 
-			}
-		}//Close received items update
-	 
-	   	exchangeGlobalFunction("Server getItemsOK, received items:  " +updates.length , this.user); 
-		if (updates.length) {
-		    setTimeout(function() {
-		        var updateMsg = new rtews.UpdateMessage(updates);
-		        updateMsg.update();
-		    }, 500);
-		}  
-	 	}
-	},
-	
-	getAndUpdateItems: function _getAndUpdateItems(aIds) { 
-		exchangeGlobalFunction("Received request to update messages,  total items to be requested - " + aIds.length, this.user);  
-		var that = this;   
-		this.addToQueue( erGetItemsRequest,
-				{user: this.user, 
-				 mailbox:  this.mailbox,
-	 			 serverUrl:  this.serverUrl,
-				 ids:  aIds,
-	 			 folderClass: "IPM.Note",  }, 
-				function(erGetItemsRequest, aIds, aItemErrors) { that.getItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
-				function(erGetItemsRequest, aCode, aMsg) { that.getItemsError(erGetItemsRequest, aCode, aMsg);},
-				null);  
-	},
-	 
-	getEvents: function _getEvents(){ 
-		//exchangeGlobalFunction("calling getEvents for user, ", this.user );
-		this.Running = true;  
-		var that = this;
-		      
-		this.addToQueue(  erGetEventsRequest,
-						{user: this.user, 
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl, 
-						actionStart: Date.now(),
-						subscriptionId :  this.session.subscriptionId ,
-						watermark :  this.session.watermark , }, 
-						function(erGetEventsRequest, aResp) {  getEventsOK(erGetEventsRequest, aResp);}, 
-						function(erGetEventsRequest, aCode, aMsg) {  getEventsError(erGetEventsRequest, aCode, aMsg);},
-						null);  
-		    
-		function getEventsOK(erGetEventsRequest, response){ 
-			exchangeGlobalFunction("Getting events finished..", that.user);
-			
-			if(response.length > 0 ){  
-				var note = response[0].XPath("/m:GetEventsResponseMessage/m:Notification");
-				var subscriptionId  = note[0].getTagValue("t:SubscriptionId");
-				var moreEvents  = note[0].getTagValue("t:MoreEvents");
-				var previousWatermark = note[0].getTagValue("t:PreviousWatermark");  
-				 
-			    var _Watermark = response[0].XPath("/m:GetEventsResponseMessage/m:Notification/*/t:Watermark");  
-			    var watermark =  _Watermark[_Watermark.length-1].value;
-				 
-				that.session.watermark = watermark;
-			    that.Running = false; 
-			    
-				var itemIds = []; 
-				var _itemIds = response[0].XPath("/m:GetEventsResponseMessage/m:Notification/*/t:ItemId"); 
-	   				if( _itemIds.length > 0) {
-	  					for ( var index = 0 ; index < _itemIds.length ; index++ ){ 
-		  					itemIds.push(_itemIds[index]);
-	  					}
-	  				}  
-	   				
-					exchangeGlobalFunction("Received update messages,  total items pending - " + itemIds.length, that.user);
-
-	  				if (itemIds.length == 0) {
-						exchangeGlobalFunction("No action needed. now going to sleep..", that.user);
-	  			        return;
-	  			    }
-	  
-	  				var  oldItemIds = [];
-	  				var _oldItemIds = response[0].XPath("/m:GetEventsResponseMessage/m:Notification/*/t:OldItemId"); 
-				if( _oldItemIds.length > 0) {
-					for ( var index = 0 ; index < _oldItemIds.length ; index++ ){ 
-	  					oldItemIds.push(_oldItemIds[index]);
-					}
-				}    
-				var newItemIds = [];
-				if (oldItemIds.length > 0) {
-	  		        for (var itemId = 0; itemId < itemIds.length; itemId++) {
-	  		            var id = itemIds[itemId].getAttribute("Id");
-	  		            
-	  		            for (var oldItemId = 0; oldItemId < oldItemIds.length; oldItemId++) {
-	  		                var oId = oldItemIds[oldItemId].getAttribute("Id");
-	  		                if (id != oId) {
-	  		                    newItemIds.push(itemIds[itemId]);
-	  		                }
-	  		            }
-	  		        }
-	  		    } 
-	  			else {
-	  				newItemIds = itemIds.splice(0);
-	  		    }
-				
-				var getItem = function(aItem){ 
-				   	let id = aItem.getAttribute('Id'); 
-					let changeKey = aItem.getAttribute('ChangeKey');  
-					return { "Id" : id , "ChangeKey": changeKey, };
-				}  
-				
-			   if ( newItemIds.length == 0)  return;  
-			   var itemList = []; 
-			   for(var index = 0; index < newItemIds.length; index++) { 
-				   itemList.push( getItem(newItemIds[index] ));
-			   } 
-			   try{
-				   that.getAndUpdateItems(itemList);
-			   }
-			   catch(e){}
-				  
-			}
-			else{ 
-				exchangeGlobalFunction("Get events returned with resonse error. going to sleep.. ", that.user);
-				that.Running = false;
-			}
-		}
-		   
-	    function getEventsError(erGetEventsRequest, aCode, aMsg){
-	    	exchangeGlobalFunction("getEventsError aCode:" + aCode + " aMsg: " +  aMsg );  
-			that.Running = false ;   
-			
-			//If error reset tags syncing 
-			if( that.retry ) that.reset();		
-			that.retry = false;
-		} 
-	},
-	
-	reset: function _reset(){
-    	exchangeGlobalFunction("Received error while gettign error", this.user);    
-		this.pollInterval = 0; 
-    	exchangeGlobalFunction("Stop syncing  now.. "+ this.pollInterval , this.user);   
- 		this.unsubscribe();
-    	exchangeGlobalFunction("Going to unsubscribe current subsciption. "+ this.session.subscriptionId , this.user);   
-    	exchangeGlobalFunction("Resume syncing tags for user", this.user);   
-		this.processIdentity();		
-	},
-	
-	getIdentities: function _getIdentities(){
-	//	exchangeGlobalFunction("getIdentities " , this.user);
-
-		var pref = getCalendarPref(this.identity.email);
-		if(pref){
-			this.session.subscriptionId = this.globalFunctions.safeGetCharPref(pref,"subscriptionId");
-		}
-	},
-	
-	saveIdentities:function _saveIdentities(){
-	//	exchangeGlobalFunction("saveIdentities ", this.user);
-
-		var pref = getCalendarPref(this.identity.email);
-		if(pref){
-			pref.setCharPref("subscriptionId",this.session.subscriptionId);
-		}
-		
-	},
-	  
-	subscribeError: function _subscribeError(erSubscribeRequest, aCode, aMsg){ 
-		exchangeGlobalFunction("subscribeError aCode:" + aCode + " aMsg: " +  aMsg ); 
-	},
-	
-	getFoldersByIdentity: function _getFoldersByIdentity(identity) {
-	    return this.foldersByIdentity[this.identity.email] != undefined ? this.foldersByIdentity[this.identity.email] : null;
-	},
-	
-	gerFolderByEwsId: function _gerFolderByEwsId(id) {
-	    return this.folderByEwsId[id] != undefined ? this.folderByEwsId[id] : null;
-	},
-	
-	gerFolderByImapPath: function _gerFolderByImapPath(path) {
- 	    return this.folderByImapPath[path.toLowerCase()] != undefined ? this.folderByImapPath[path.toLowerCase()] : null;
-	},
-	 
-	findFoldersError: function _findFoldersError(erFindInboxFolderRequest, aCode, aMsg){
-		exchangeGlobalFunction("findFoldersError aCode:" + aCode + " aMsg: " +  aMsg ); 
-	},
-	
-	processFolders: function _processFolders(response) {  
-		var identity = this.identity; 
-		
-	    var folderElms = response;
-	    var folders = [];
-	    var obj = {};
-	
-		function Folder(id, name, parentId, changeKey) {
-	       this.id = id;
-	       this.name = name;
-	       this.pId = parentId;
-	       this.changeKey = changeKey;
-	       this.path = "";
-	    }
-
-	    for (var x = 0, len = folderElms.length; x < len; x++) {
-	       var folderClass = folderElms[x].folderClass;
-	       if (folderClass == "IPF.Note") {
-	           var fId = folderElms[x].id;
-	           var fName = folderElms[x].name;
-	           var fPId = folderElms[x].pId;
-	           
-	           var fo = new Folder(fId, fName, fPId, null);
-	
-	           obj[fId] = fo;
-	       }
-	    } 
-	    
-	   //Find path of the folder
-	    var __parents = [];
-	   //Find parent of the given objects. Loops parent of parent to build the path
-	    function getParent(o) {
-	       var parent = obj[o.pId]; 
-	       __parents.push(o.name); 
-	       if (parent) {
-	           getParent(parent);
-	       }
-	    } 
-	    
-	    this.foldersByIdentity[identity.email] = [];   
-	   
-	    for (var p in obj) { 
-	       __parents = []; 
-	       getParent(obj[p]); 
-	       var path = [];
-	       path.push(identity.serverURI);
-	       path.push(__parents.reverse().join("/")); 
-	       obj[p].path = path.join("/").toLowerCase(); 
-	       folders.push(obj[p]);  
-	       this.folderByEwsId[obj[p].id] = obj[p];
-	       this.folderByImapPath[obj[p].path] = obj[p];
- 	       this.foldersByIdentity[identity.email].push(obj[p]); 
- 	    }   
-	}, 
-	/*
-	 * Initialize each identity.  
-	 */
-	processIdentity: function _processIdentity() {
-	    this.findFolders(); 
-	}, 
-	/*
-	 * Event handler for Sync Tags menu item. s
-	 */
-	syncTags: function _syncTags() {
-	    var selectedMessages = gFolderDisplay.selectedMessages;
-	    var that = this;
-	    for (var i = 0; i < selectedMessages.length; ++i) {
-	        var msgHdr = selectedMessages[i];
-	        var messageId = '<' + msgHdr.messageId + '>';
-	        var folder = this.gerFolderByImapPath(msgHdr.folder.URI);
-	
-	        exchangeGlobalFunction("Syncing Tags for message id - " +  messageId, this.user);
-	
-	        if (!folder) {
-	            continue;
-	        } 
-	        
-	        this.addToQueue(  erFindItemsRequest,
-					{user: this.user, 
-					mailbox: this.mailbox,
-					serverUrl: this.serverUrl, 
-					actionStart: Date.now(),
-					folderID : folder.id ,
-					messageId: messageId, }, 
-					function(erFindItemsRequest, aIds) {
-								//findItemOk Callback 
-				    			exchangeGlobalFunction("Syncing tags found items on server returned total - " + aIds.length , that.user);
-					        	if( aIds.length > 0 ){  
-					    			   that.getAndUpdateItems(aIds); 
-					         	}
-					        	else{
-						    		exchangeGlobalFunction("Syncing tags not finding any items in server for Ids. " + JSON.stringify(messageId), that.user);
- 					        	} 
-					}, 
-					function(erFindItemsRequest, aCode, aMsg) { 
-							exchangeGlobalFunction("findItemsError:  aCode:" + aCode + " aMsg: " +  aMsg );  
-			        },
-					null);   
-	    } 
-	},   
-	/*
-	 * Updates the tags (categories) on exchange server before updating locally. 
-	 */
-	toggleTags:function _toggleTags(msgHdr, identity, toggleType, categories, key, addKey) {
-		
-	    var folder = this.gerFolderByImapPath(msgHdr.folder.URI);
-	    var messageId = '<' + msgHdr.messageId + '>';
-	
-	    exchangeGlobalFunction("Toggle tags on message id - "+  messageId, this.user);
- 	   
-	    var that = this;
-	    if (!folder) {
-	        return;
-	    }
-	    
-	    function findItemsOK(erFindItemsRequest, aIds){
-	    	exchangeGlobalFunction("Toggle tags found items on server returned total - " + aIds.length , that.user);
-	    	if( aIds.length > 0 ){  
-	    		that.updateItem(aIds,msgHdr, identity, toggleType, categories, key, addKey); 
-	     	}
-	    	else{
-	    		exchangeGlobalFunction("Toggle tags not finding any items in server for Ids. " + JSON.stringify(messageId), that.user);
-	    		//when no mail item is find toggle tags locally
-	    		exchangeGlobalFunction("Update tags locally",that.user); 
-	    		rtews.fallBackTagUpdate(msgHdr, identity, toggleType, categories, key, addKey); 
-	    	}
-	    } 
-	    
-	    function findItemsError(erFindItemsRequest, aCode, aMsg){
-	    	exchangeGlobalFunction("findItemsError:  aCode:" + aCode + " aMsg: " +  aMsg ); 
- 	    }  
-	    
-	    this.addToQueue( erFindItemsRequest,
-				{user: this.user, 
-				mailbox: this.mailbox,
-				serverUrl: this.serverUrl, 
-				actionStart: Date.now(),
-				folderID : folder.id ,
-				messageId: messageId, }, 
-				function(erFindItemsRequest, aIds) {  findItemsOK(erFindItemsRequest, aIds);}, 
-				function(erFindItemsRequest, aCode, aMsg) {  findItemsError(erFindItemsRequest, aCode, aMsg);},
-				null);  
-	     
-	},
-	/*
-	 * Update Mail item with category
-	 */
-	updateItem: function _updateItem(aIds, msgHdr, identity, toggleType, categories, key, addKey){  
-		exchangeGlobalFunction("updating Item(s), aIds total -  " + aIds.length + " ,   toggleType " + toggleType , this.user);
-		
-		var that = this;
-			
-		var item = aIds[0]; 
-		
-		var changes =  '<nsTypes:ItemChange>';
-			changes += '<nsTypes:ItemId Id="' + item.Id + '" ChangeKey="' + item.ChangeKey + '" />';
-	    	changes += '<nsTypes:Updates>';
-			changes += '<nsTypes:SetItemField>';
-			changes += '<nsTypes:FieldURI FieldURI="item:Categories"/>';
-			changes += '<nsTypes:Message>';
-			changes += '<nsTypes:Categories>'; 
-			if( categories.length > 0 ){
-			   for (var index  in  categories  ) {
-					changes += '<nsTypes:String>' + categories[index] + '</nsTypes:String>';
-			    } 
-			}  
-		    changes += '</nsTypes:Categories>'; 
-		    changes += '</nsTypes:Message>';
-		    changes += '</nsTypes:SetItemField>';
-		    changes += '</nsTypes:Updates>';
-		    changes += '</nsTypes:ItemChange>';
-	  
-		exchangeGlobalFunction("UpdateItem with changes " + changes, this.user);
-	
-		this.addToQueue( erUpdateItemRequest,
-				{user: this.user, 
-				 mailbox: this.mailbox,
-				 folderBase: this.folderBase,
-				 serverUrl: this.serverUrl,
-	  			 updateReq: changes,
-	 	 		 actionStart: Date.now(),
-	 			 onlySnoozeChanges:false, }, 
-				function(erUpdateItemRequest, aId, aChangeKey) {  updateItemOK(erUpdateItemRequest, aId, aChangeKey);}, 
-				function(erUpdateItemRequest, aCode, aMsg) {  updateItemError(erUpdateItemRequest, aCode, aMsg);},
-				null);	
-		
-		function updateItemOK(erUpdateItemRequest, aId, aChangeKey){
-			exchangeGlobalFunction("Updated item with id  = " + aId + " and ChangeKey =  " +  aChangeKey, that.user);
-			if (toggleType == "removeAll") {  
-		        rtews.removeAllMessageTagsPostEwsUpdate(msgHdr);
-		    } else { 
- 		    	rtews.toggleMessageTagPostEwsUpdate(key, addKey, msgHdr);
-		    }
-		}
-		
-		function updateItemError(erUpdateItemRequest, aCode, aMsg){
-			exchangeGlobalFunction("updateItemError:  aCode:" + aCode + " aMsg: " +  aMsg );   
-		}
-	}, 
-	/*
-	 *  Initialize 
-	 */
-	load: function _load() { 
-    		this.processIdentity();    
-	 },
- };
+function rtews(identity) {
+    this.identity = identity;
+    // fixing bug #270 
+
+    if (identity.username.indexOf("@") > -1) {
+        this.user = identity.username;
+    }
+    else {
+        if (identity.domain == "") {
+            this.user = identity.username;
+        }
+        else {
+            this.user = identity.domain + "\\" + identity.username;
+        }
+    }
+
+    this.mailbox = identity.email;
+    this.serverUrl = identity.ewsUrl;
+
+    this.folderByImapPath = [];
+    this.folderByEwsId = [];
+    this.foldersByIdentity = {};
+
+    this.session = {
+        subscriptionId: "",
+        watermark: "",
+    };
+
+    this.retry = true;
+
+    this.globalFunctions = mivFunctions;
+
+    this.prefs = identity.prefs;
+
+    if (this.prefs) {
+        this.pollOffset = this.globalFunctions.safeGetIntPref(this.prefs, "syncMailItems.Interval", 15) * 1000; //time for getevents   
+        this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+            .getService(Ci.mivExchangeLoadBalancer);
+    }
+    else {
+        this.prefs = null;
+        this.pollOffset = 30000; //time for getevents 
+    }
+
+    this.subscriptionTimeout = "1440";
+}
+
+rtews.prototype = {
+    /*
+     *use Calendar queue for xml request
+     */
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        if (mivFunctions.safeGetBoolPref(this.prefs, "mailsync.active", false) == false) {
+            exchangeGlobalFunction("Not adding to queue because we are disabled,  " + this.serverUrl, this.user);
+            this.Running = false;
+            return;
+        }
+        //if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
+
+        this.loadBalancer.addToQueue({
+            calendar: this.prefs,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+    /*
+     * Gets the ItemId element from response of the FindItem SOAP request
+     *
+     */
+    findFolders: function _findFolders(identity) {
+        exchangeGlobalFunction("Find all the folderd in msgfolderroot,  " + this.serverUrl, this.user);
+        //Call API
+        var self = this;
+        this.addToQueue(erFindInboxFolderRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                folderBase: "msgfolderroot",
+                folderPath: "",
+                actionStart: Date.now()
+            },
+            function (erFindInboxFolderRequest, folders) {
+                self.findFoldersOK(erFindInboxFolderRequest, folders);
+            },
+            function (erFindInboxFolderRequest, aCode, aMsg) {
+                self.findFoldersError(erFindInboxFolderRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    findFoldersOK: function _findFoldersOK(erFindInboxFolderRequest, afolders) {
+        exchangeGlobalFunction("folders found, going to subscribe  " + JSON.stringify(afolders), this.user);
+        this.processFolders(afolders);
+        var folders = this.getFoldersByIdentity(this.identity);
+        if (folders.length > 0) {
+            this.subscribe(folders);
+        }
+    },
+
+    subscribe: function _subscribe(folders) {
+        exchangeGlobalFunction("Trying to subscribe  ", this.user);
+        var self = this;
+        this.addToQueue(erSubscribeRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                folderBase: "",
+                changeKey: "",
+                folderIds: folders,
+                actionStart: Date.now(),
+                timeout: this.subscriptionTimeout, //Keep the subscription for one day i.e 1440 minutes 
+                eventTypes: eventTypes,
+            },
+            function (erSubscribeRequest, subscriptionId, watermark) {
+                self.subscribeOK(erSubscribeRequest, subscriptionId, watermark);
+            },
+            function (erSubscribeRequest, aCode, aMsg) {
+                self.subscribeError(erSubscribeRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    subscribeOK: function _subscribeOK(erSubscribeRequest, subscriptionId, watermark) {
+        exchangeGlobalFunction("Subscribed,  subscriptionId - " + subscriptionId + ",  watermark  " + watermark, this.user);
+        exchangeGlobalFunction("Subscription Timeout set to " + this.subscriptionTimeout + "(minutes)", this.user);
+        this.session.subscriptionId = subscriptionId;
+        this.session.watermark = watermark;
+        this.poll();
+    },
+
+    unsubscribe: function _unsubscribe() {
+        exchangeGlobalFunction("Error occured Unsubscribing user.", this.user);
+        this.Running = false;
+        var that = this;
+        this.addToQueue(erUnsubscribeRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                actionStart: Date.now(),
+                subscriptionId: this.session.subscriptionId,
+                watermark: this.session.watermark,
+            },
+            function (erUnsubscribeRequest, aResp) {
+                unsubscribeOK(erUnsubscribeRequest, aResp);
+            },
+            function (erUnsubscribeRequest, aCode, aMsg) {
+                unsubscribeError(erUnsubscribeRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    unsubscribeOK: function _unsubscribeOK(erUnsubscribeRequest, aResp) {
+        exchangeGlobalFunction("Unsubscribed user.", this.user);
+    },
+
+    unsubscribeError: function _unsubscribeError(erUnsubscribeRequest, aCode, aMsg) {
+        exchangeGlobalFunction("unsubscribeError: " + aMsg);
+    },
+
+    poll: function _poll() {
+        var self = this;
+        this.Running = false;
+        exchangeGlobalFunction("Polltime set -  " + this.pollOffset + "(milliseconds)", this.user);
+
+        this.pollInterval = setInterval(function () {
+            if (self.session == null) {
+                return;
+            }
+            exchangeGlobalFunction("Syncting TagItems now.", self.user);
+
+            if (self.Running == true) {
+                exchangeGlobalFunction("Already Running", self.user);
+                return;
+            }
+            //Check for new event on the mail box
+            self.getEvents();
+        }, this.pollOffset);
+    },
+
+    getItemsError: function _getItemsError(erGetItemsRequest, aCode, aMsg) {
+        exchangeGlobalFunction("getItemsError: " + aMsg);
+    },
+
+    getItemsOK: function _getItemsOK(erGetItemsRequest, aItems, aItemErrors) {
+        exchangeGlobalFunction("getItemsOK, Received server items to update: " + aItems.length, this.user);
+        if (aItems.length > 0) {
+
+            var getItem = function (aItem) {
+                let id = xml2json.getAttributeByTag(aItem, 't:ItemId', 'Id');
+                let changeKey = xml2json.getAttributeByTag(aItem, 't:ItemId', 'ChangeKey');
+                return {
+                    "Id": id,
+                    "ChangeKey": changeKey,
+                };
+            }
+
+            var getParentItem = function (aItem) {
+                let id = xml2json.getAttributeByTag(aItem, 't:ParentFolderId', 'Id');
+                let changeKey = xml2json.getAttributeByTag(aItem, 't:ParentFolderId', 'ChangeKey');
+                return {
+                    "Id": id,
+                    "ChangeKey": changeKey,
+                };
+            }
+
+            var updates = [];
+
+            for (var item = 0; item < aItems.length; item++) {
+                var itemId = getItem(aItems[item]);
+                var parentItemId = getParentItem(aItems[item]);
+
+                var messageIdElm = xml2json.XPath(aItems[item], "/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1035']");
+                var messageId = null;
+                if (messageIdElm.length > 0) {
+                    messageId = xml2json.getTagValue(messageIdElm[0], "t:Value", null);
+                }
+                messageId = messageId.replace('<', '').replace('>', '');
+                if (messageId == undefined || messageId == null || messageId == "") {
+                    exchangeGlobalFunction("(warn?) messageId " + messageId + " is invalid.", this.user);
+                    continue;
+                }
+                var categories = [];
+                var tags = [];
+
+                var categoriesElm = xml2json.XPath(aItems[item], '/t:Categories/t:String');
+                for (var index = 0; index < categoriesElm.length; index++) {
+                    categories.push(categoriesElm[index].c);
+                }
+
+                if (categories.length > 0) {
+                    var errCategory = [];
+
+                    for (var index = 0; index < categories.length; index++) {
+                        var category = categories[index];
+
+                        if (category) {
+                            var tKey = rtews.Tags.getKeyForTag(category);
+
+                            if (tKey != null) {
+                                tags.push(tKey);
+                            }
+                            else {
+                                var newTagKey = rtews.Tags.addTag(category);
+
+                                if (newTagKey != null) {
+                                    tags.push(newTagKey);
+                                }
+                                else {
+                                    errCategory.push(category);
+                                }
+                            }
+                        }
+                    }
+                    //Prompt categories that were not converted to tags.
+                    if (errCategory.length) {
+                        var stringBundle = document.getElementById("string-bundle");
+                        Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService).alert(null, stringBundle.getString("rtews.title"), stringBundle.getString("rtews.tagAddError") + " " + errCategory.join(", "));
+                    }
+                }
+
+                var folderEwsId = this.gerFolderByEwsId(parentItemId.Id);
+
+                if (folderEwsId != null) {
+                    updates.push({
+                        msgId: messageId,
+                        tags: tags,
+                        path: folderEwsId.path
+                    });
+                }
+            } //Close received items update
+
+            exchangeGlobalFunction("Server getItemsOK, received items:  " + updates.length, this.user);
+            if (updates.length) {
+                setTimeout(function () {
+                    var updateMsg = new rtews.UpdateMessage(updates);
+                    updateMsg.update();
+                }, 500);
+            }
+        }
+    },
+
+    getAndUpdateItems: function _getAndUpdateItems(aIds) {
+        exchangeGlobalFunction("Received request to update messages,  total items to be requested - " + aIds.length, this.user);
+        var that = this;
+        this.addToQueue(erGetItemsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                ids: aIds,
+                folderClass: "IPM.Note",
+            },
+            function (erGetItemsRequest, aIds, aItemErrors) {
+                that.getItemsOK(erGetItemsRequest, aIds, aItemErrors);
+            },
+            function (erGetItemsRequest, aCode, aMsg) {
+                that.getItemsError(erGetItemsRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    getEvents: function _getEvents() {
+        //exchangeGlobalFunction("calling getEvents for user, ", this.user );
+        this.Running = true;
+        var that = this;
+
+        this.addToQueue(erGetEventsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                actionStart: Date.now(),
+                subscriptionId: this.session.subscriptionId,
+                watermark: this.session.watermark,
+            },
+            function (erGetEventsRequest, aResp) {
+                getEventsOK(erGetEventsRequest, aResp);
+            },
+            function (erGetEventsRequest, aCode, aMsg) {
+                getEventsError(erGetEventsRequest, aCode, aMsg);
+            },
+            null);
+
+        function getEventsOK(erGetEventsRequest, response) {
+            exchangeGlobalFunction("Getting events finished..", that.user);
+
+            if (response.length > 0) {
+                var note = response[0].XPath("/m:GetEventsResponseMessage/m:Notification");
+                var subscriptionId = note[0].getTagValue("t:SubscriptionId");
+                var moreEvents = note[0].getTagValue("t:MoreEvents");
+                var previousWatermark = note[0].getTagValue("t:PreviousWatermark");
+
+                var _Watermark = response[0].XPath("/m:GetEventsResponseMessage/m:Notification/*/t:Watermark");
+                var watermark = _Watermark[_Watermark.length - 1].value;
+
+                that.session.watermark = watermark;
+                that.Running = false;
+
+                var itemIds = [];
+                var _itemIds = response[0].XPath("/m:GetEventsResponseMessage/m:Notification/*/t:ItemId");
+                if (_itemIds.length > 0) {
+                    for (var index = 0; index < _itemIds.length; index++) {
+                        itemIds.push(_itemIds[index]);
+                    }
+                }
+
+                exchangeGlobalFunction("Received update messages,  total items pending - " + itemIds.length, that.user);
+
+                if (itemIds.length == 0) {
+                    exchangeGlobalFunction("No action needed. now going to sleep..", that.user);
+                    return;
+                }
+
+                var oldItemIds = [];
+                var _oldItemIds = response[0].XPath("/m:GetEventsResponseMessage/m:Notification/*/t:OldItemId");
+                if (_oldItemIds.length > 0) {
+                    for (var index = 0; index < _oldItemIds.length; index++) {
+                        oldItemIds.push(_oldItemIds[index]);
+                    }
+                }
+                var newItemIds = [];
+                if (oldItemIds.length > 0) {
+                    for (var itemId = 0; itemId < itemIds.length; itemId++) {
+                        var id = itemIds[itemId].getAttribute("Id");
+
+                        for (var oldItemId = 0; oldItemId < oldItemIds.length; oldItemId++) {
+                            var oId = oldItemIds[oldItemId].getAttribute("Id");
+                            if (id != oId) {
+                                newItemIds.push(itemIds[itemId]);
+                            }
+                        }
+                    }
+                }
+                else {
+                    newItemIds = itemIds.splice(0);
+                }
+
+                var getItem = function (aItem) {
+                    let id = aItem.getAttribute('Id');
+                    let changeKey = aItem.getAttribute('ChangeKey');
+                    return {
+                        "Id": id,
+                        "ChangeKey": changeKey,
+                    };
+                }
+
+                if (newItemIds.length == 0) return;
+                var itemList = [];
+                for (var index = 0; index < newItemIds.length; index++) {
+                    itemList.push(getItem(newItemIds[index]));
+                }
+                try {
+                    that.getAndUpdateItems(itemList);
+                }
+                catch (e) {}
+
+            }
+            else {
+                exchangeGlobalFunction("Get events returned with resonse error. going to sleep.. ", that.user);
+                that.Running = false;
+            }
+        }
+
+        function getEventsError(erGetEventsRequest, aCode, aMsg) {
+            exchangeGlobalFunction("getEventsError aCode:" + aCode + " aMsg: " + aMsg);
+            that.Running = false;
+
+            //If error reset tags syncing 
+            if (that.retry) that.reset();
+            that.retry = false;
+        }
+    },
+
+    reset: function _reset() {
+        exchangeGlobalFunction("Received error while gettign error", this.user);
+        this.pollInterval = 0;
+        exchangeGlobalFunction("Stop syncing  now.. " + this.pollInterval, this.user);
+        this.unsubscribe();
+        exchangeGlobalFunction("Going to unsubscribe current subsciption. " + this.session.subscriptionId, this.user);
+        exchangeGlobalFunction("Resume syncing tags for user", this.user);
+        this.processIdentity();
+    },
+
+    getIdentities: function _getIdentities() {
+        //	exchangeGlobalFunction("getIdentities " , this.user);
+
+        var pref = getCalendarPref(this.identity.email);
+        if (pref) {
+            this.session.subscriptionId = this.globalFunctions.safeGetCharPref(pref, "subscriptionId");
+        }
+    },
+
+    saveIdentities: function _saveIdentities() {
+        //	exchangeGlobalFunction("saveIdentities ", this.user);
+
+        var pref = getCalendarPref(this.identity.email);
+        if (pref) {
+            pref.setCharPref("subscriptionId", this.session.subscriptionId);
+        }
+
+    },
+
+    subscribeError: function _subscribeError(erSubscribeRequest, aCode, aMsg) {
+        exchangeGlobalFunction("subscribeError aCode:" + aCode + " aMsg: " + aMsg);
+    },
+
+    getFoldersByIdentity: function _getFoldersByIdentity(identity) {
+        return this.foldersByIdentity[this.identity.email] != undefined ? this.foldersByIdentity[this.identity.email] : null;
+    },
+
+    gerFolderByEwsId: function _gerFolderByEwsId(id) {
+        return this.folderByEwsId[id] != undefined ? this.folderByEwsId[id] : null;
+    },
+
+    gerFolderByImapPath: function _gerFolderByImapPath(path) {
+        return this.folderByImapPath[path.toLowerCase()] != undefined ? this.folderByImapPath[path.toLowerCase()] : null;
+    },
+
+    findFoldersError: function _findFoldersError(erFindInboxFolderRequest, aCode, aMsg) {
+        exchangeGlobalFunction("findFoldersError aCode:" + aCode + " aMsg: " + aMsg);
+    },
+
+    processFolders: function _processFolders(response) {
+        var identity = this.identity;
+
+        var folderElms = response;
+        var folders = [];
+        var obj = {};
+
+        function Folder(id, name, parentId, changeKey) {
+            this.id = id;
+            this.name = name;
+            this.pId = parentId;
+            this.changeKey = changeKey;
+            this.path = "";
+        }
+
+        for (var x = 0, len = folderElms.length; x < len; x++) {
+            var folderClass = folderElms[x].folderClass;
+            if (folderClass == "IPF.Note") {
+                var fId = folderElms[x].id;
+                var fName = folderElms[x].name;
+                var fPId = folderElms[x].pId;
+
+                var fo = new Folder(fId, fName, fPId, null);
+
+                obj[fId] = fo;
+            }
+        }
+
+        //Find path of the folder
+        var __parents = [];
+        //Find parent of the given objects. Loops parent of parent to build the path
+        function getParent(o) {
+            var parent = obj[o.pId];
+            __parents.push(o.name);
+            if (parent) {
+                getParent(parent);
+            }
+        }
+
+        this.foldersByIdentity[identity.email] = [];
+
+        for (var p in obj) {
+            __parents = [];
+            getParent(obj[p]);
+            var path = [];
+            path.push(identity.serverURI);
+            path.push(__parents.reverse().join("/"));
+            obj[p].path = path.join("/").toLowerCase();
+            folders.push(obj[p]);
+            this.folderByEwsId[obj[p].id] = obj[p];
+            this.folderByImapPath[obj[p].path] = obj[p];
+            this.foldersByIdentity[identity.email].push(obj[p]);
+        }
+    },
+    /*
+     * Initialize each identity.  
+     */
+    processIdentity: function _processIdentity() {
+        this.findFolders();
+    },
+    /*
+     * Event handler for Sync Tags menu item. s
+     */
+    syncTags: function _syncTags() {
+        var selectedMessages = gFolderDisplay.selectedMessages;
+        var that = this;
+        for (var i = 0; i < selectedMessages.length; ++i) {
+            var msgHdr = selectedMessages[i];
+            var messageId = '<' + msgHdr.messageId + '>';
+            var folder = this.gerFolderByImapPath(msgHdr.folder.URI);
+
+            exchangeGlobalFunction("Syncing Tags for message id - " + messageId, this.user);
+
+            if (!folder) {
+                continue;
+            }
+
+            this.addToQueue(erFindItemsRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    serverUrl: this.serverUrl,
+                    actionStart: Date.now(),
+                    folderID: folder.id,
+                    messageId: messageId,
+                },
+                function (erFindItemsRequest, aIds) {
+                    //findItemOk Callback 
+                    exchangeGlobalFunction("Syncing tags found items on server returned total - " + aIds.length, that.user);
+                    if (aIds.length > 0) {
+                        that.getAndUpdateItems(aIds);
+                    }
+                    else {
+                        exchangeGlobalFunction("Syncing tags not finding any items in server for Ids. " + JSON.stringify(messageId), that.user);
+                    }
+                },
+                function (erFindItemsRequest, aCode, aMsg) {
+                    exchangeGlobalFunction("findItemsError:  aCode:" + aCode + " aMsg: " + aMsg);
+                },
+                null);
+        }
+    },
+    /*
+     * Updates the tags (categories) on exchange server before updating locally. 
+     */
+    toggleTags: function _toggleTags(msgHdr, identity, toggleType, categories, key, addKey) {
+
+        var folder = this.gerFolderByImapPath(msgHdr.folder.URI);
+        var messageId = '<' + msgHdr.messageId + '>';
+
+        exchangeGlobalFunction("Toggle tags on message id - " + messageId, this.user);
+
+        var that = this;
+        if (!folder) {
+            return;
+        }
+
+        function findItemsOK(erFindItemsRequest, aIds) {
+            exchangeGlobalFunction("Toggle tags found items on server returned total - " + aIds.length, that.user);
+            if (aIds.length > 0) {
+                that.updateItem(aIds, msgHdr, identity, toggleType, categories, key, addKey);
+            }
+            else {
+                exchangeGlobalFunction("Toggle tags not finding any items in server for Ids. " + JSON.stringify(messageId), that.user);
+                //when no mail item is find toggle tags locally
+                exchangeGlobalFunction("Update tags locally", that.user);
+                rtews.fallBackTagUpdate(msgHdr, identity, toggleType, categories, key, addKey);
+            }
+        }
+
+        function findItemsError(erFindItemsRequest, aCode, aMsg) {
+            exchangeGlobalFunction("findItemsError:  aCode:" + aCode + " aMsg: " + aMsg);
+        }
+
+        this.addToQueue(erFindItemsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                actionStart: Date.now(),
+                folderID: folder.id,
+                messageId: messageId,
+            },
+            function (erFindItemsRequest, aIds) {
+                findItemsOK(erFindItemsRequest, aIds);
+            },
+            function (erFindItemsRequest, aCode, aMsg) {
+                findItemsError(erFindItemsRequest, aCode, aMsg);
+            },
+            null);
+
+    },
+    /*
+     * Update Mail item with category
+     */
+    updateItem: function _updateItem(aIds, msgHdr, identity, toggleType, categories, key, addKey) {
+        exchangeGlobalFunction("updating Item(s), aIds total -  " + aIds.length + " ,   toggleType " + toggleType, this.user);
+
+        var that = this;
+
+        var item = aIds[0];
+
+        var changes = '<nsTypes:ItemChange>';
+        changes += '<nsTypes:ItemId Id="' + item.Id + '" ChangeKey="' + item.ChangeKey + '" />';
+        changes += '<nsTypes:Updates>';
+        changes += '<nsTypes:SetItemField>';
+        changes += '<nsTypes:FieldURI FieldURI="item:Categories"/>';
+        changes += '<nsTypes:Message>';
+        changes += '<nsTypes:Categories>';
+        if (categories.length > 0) {
+            for (var index in categories) {
+                changes += '<nsTypes:String>' + categories[index] + '</nsTypes:String>';
+            }
+        }
+        changes += '</nsTypes:Categories>';
+        changes += '</nsTypes:Message>';
+        changes += '</nsTypes:SetItemField>';
+        changes += '</nsTypes:Updates>';
+        changes += '</nsTypes:ItemChange>';
+
+        exchangeGlobalFunction("UpdateItem with changes " + changes, this.user);
+
+        this.addToQueue(erUpdateItemRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                updateReq: changes,
+                actionStart: Date.now(),
+                onlySnoozeChanges: false,
+            },
+            function (erUpdateItemRequest, aId, aChangeKey) {
+                updateItemOK(erUpdateItemRequest, aId, aChangeKey);
+            },
+            function (erUpdateItemRequest, aCode, aMsg) {
+                updateItemError(erUpdateItemRequest, aCode, aMsg);
+            },
+            null);
+
+        function updateItemOK(erUpdateItemRequest, aId, aChangeKey) {
+            exchangeGlobalFunction("Updated item with id  = " + aId + " and ChangeKey =  " + aChangeKey, that.user);
+            if (toggleType == "removeAll") {
+                rtews.removeAllMessageTagsPostEwsUpdate(msgHdr);
+            }
+            else {
+                rtews.toggleMessageTagPostEwsUpdate(key, addKey, msgHdr);
+            }
+        }
+
+        function updateItemError(erUpdateItemRequest, aCode, aMsg) {
+            exchangeGlobalFunction("updateItemError:  aCode:" + aCode + " aMsg: " + aMsg);
+        }
+    },
+    /*
+     *  Initialize 
+     */
+    load: function _load() {
+        this.processIdentity();
+    },
+};
 
 
 /*
  * On remote fails
  */
-rtews.fallBackTagUpdate = function(msgHdr, identity, toggleType, categories, key, addKey){  
-  		if (toggleType == "removeAll") {  
-	        	rtews.removeAllMessageTagsPostEwsUpdate(msgHdr);
-	    } else { 
-		    	rtews.toggleMessageTagPostEwsUpdate(key, addKey, msgHdr);
-	    }  
+rtews.fallBackTagUpdate = function (msgHdr, identity, toggleType, categories, key, addKey) {
+    if (toggleType == "removeAll") {
+        rtews.removeAllMessageTagsPostEwsUpdate(msgHdr);
+    }
+    else {
+        rtews.toggleMessageTagPostEwsUpdate(key, addKey, msgHdr);
+    }
 };
 
 /*
  * Custom method for remove all tags menuitem 
  */
-rtews.removeAllMessageTagsPostEwsUpdate = function(msgHdr) {
-     //Check if a message header is passed
+rtews.removeAllMessageTagsPostEwsUpdate = function (msgHdr) {
+    //Check if a message header is passed
     //Else use the selected messages
     if (msgHdr == undefined) {
         var selectedMessages = gFolderDisplay.selectedMessages;
-    } else {
+    }
+    else {
         var selectedMessages = [msgHdr];
     }
 
@@ -896,20 +949,21 @@ rtews.removeAllMessageTagsPostEwsUpdate = function(msgHdr) {
     if (prevHdrFolder)
         prevHdrFolder.removeKeywordsFromMessages(messages, allKeys);
     OnTagsChange();
-};  
+};
 /*
  * Custom method to handle tag menu click event 
- */   
-rtews.toggleMessageTagPostEwsUpdate = function(key, addKey,msgHdr) {
+ */
+rtews.toggleMessageTagPostEwsUpdate = function (key, addKey, msgHdr) {
     var messages = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
     var msg = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
-    
+
     if (msgHdr == undefined) {
         var selectedMessages = gFolderDisplay.selectedMessages;
-    } else {
+    }
+    else {
         var selectedMessages = [msgHdr];
     }
-    
+
     var toggler = addKey ? "addKeywordsToMessages" : "removeKeywordsFromMessages";
     var prevHdrFolder = null;
     // this crudely handles cross-folder virtual folders with selected messages
@@ -918,7 +972,7 @@ rtews.toggleMessageTagPostEwsUpdate = function(key, addKey,msgHdr) {
     // better, but nsIMsgDBView doesn't handle commands with arguments,
     // and (un)tag takes a key argument.
     for (var i = 0; i < selectedMessages.length; ++i) {
-          msgHdr = selectedMessages[i];
+        msgHdr = selectedMessages[i];
 
         if (msgHdr.label) {
             // Since we touch all these messages anyway, migrate the label now.
@@ -943,9 +997,9 @@ rtews.toggleMessageTagPostEwsUpdate = function(key, addKey,msgHdr) {
     OnTagsChange();
 };
 
-rtews.syncTags = function(event){
-	 var identity = rtews.getIdentity(gFolderDisplay.displayedFolder.server.prettyName); 
-	 rtewsObj(identity).syncTags();
+rtews.syncTags = function (event) {
+    var identity = rtews.getIdentity(gFolderDisplay.displayedFolder.server.prettyName);
+    rtewsObj(identity).syncTags();
 };
 
 rtews.addSyncMenu = function (menuPopup) {
@@ -962,274 +1016,274 @@ rtews.addSyncMenu = function (menuPopup) {
 /*
  * Fetch configured identity based on the email
  */
-rtews.getIdentity = function(server) {
+rtews.getIdentity = function (server) {
     var ids = identities;
-    if( ids ){
-	    for (var x = 0, len = ids.length; x < len; x++) {
-	        if (ids[x] && ids[x].enabled == true && ids[x].server == server) {
-	            return ids[x];
-	        }
-	    }
+    if (ids) {
+        for (var x = 0, len = ids.length; x < len; x++) {
+            if (ids[x] && ids[x].enabled == true && ids[x].server == server) {
+                return ids[x];
+            }
+        }
     }
-    return null;    
-};  
+    return null;
+};
 
 //Get all the identities 
-const identities = getAllAccounts();   
+const identities = getAllAccounts();
 
 /*
  * Initialilize 
  */
-function init(){ 
-		exchangeGlobalFunction("Initializing Remote tagger.");
-		exchangeGlobalFunction("Total accounts after filtering -  " + identities.length );  
-		
-		exchangeGlobalFunction("debug =  "+ debug);  
-	    for (var account = 0, len =  identities.length; account < len; account++) {
-	        if (identities[account].ewsUrl && identities[account].enabled) {
- 	            
-	        	var tmp = new rtews(identities[account]);
-	        	tmp.load();
-	        	ewsTaggerObj[account] = tmp;
-	        	if(tmp){
-	        		exchangeGlobalFunction("Initialized {"+(account+1)+"} - "+ identities[account].email ); 
-	        	}
-	        	tmp = null;
-// 	             exchangeGlobalFunction("xxxxxxxxxxxxxxxxx account: " + ewsTaggerObj[account].identity.email +  JSON.stringify(identities[account]) );
-	        }  
-	    }  
+function init() {
+    exchangeGlobalFunction("Initializing Remote tagger.");
+    exchangeGlobalFunction("Total accounts after filtering -  " + identities.length);
+
+    exchangeGlobalFunction("debug =  " + debug);
+    for (var account = 0, len = identities.length; account < len; account++) {
+        if (identities[account].ewsUrl && identities[account].enabled) {
+
+            var tmp = new rtews(identities[account]);
+            tmp.load();
+            ewsTaggerObj[account] = tmp;
+            if (tmp) {
+                exchangeGlobalFunction("Initialized {" + (account + 1) + "} - " + identities[account].email);
+            }
+            tmp = null;
+            // 	             exchangeGlobalFunction("xxxxxxxxxxxxxxxxx account: " + ewsTaggerObj[account].identity.email +  JSON.stringify(identities[account]) );
+        }
+    }
 }
 /*
  * Get ews obj of respective mail account
  */
-function rtewsObj(identity){
-	if(!identity){
-		return null;
-	}
-	for(var obj in ewsTaggerObj ){
-		 if( ( ewsTaggerObj[obj].identity.email == identity.email  ) &&  ( ewsTaggerObj[obj].identity.serverURI == identity.serverURI  )){
-			 return ewsTaggerObj[obj]; 
-		 }
-	} 
-	return null; 
-} 
-
-function removeDuplicateAccount(identities){ 
-	exchangeGlobalFunction("Account available total -  " + identities.length );
- 
-	if( identities.length > 0 ){
-		var newidentities = [];
-	    
-		find = function(arr, key, val) { //Find array element which has a key value of val 
-		  for (var ai, i = arr.length; i--;){
-		    if ((ai = arr[i]) && ai[key] == val){
-		      return true;}
-		    else{
-		    	return null;
-		    }
-		  }
-		}
-	    
-	    for (var account in identities) {
-	    	if( identities[account].email != null ){
-		    	if( account == 0 ){
-		    		newidentities.push(identities[account]);
-		    		continue;
-	 	    	}
-		    	
-		    	var test  = find(newidentities,"serverURI",identities[account].serverURI); 
-		    	if(!test){
-		    		newidentities.push(identities[account]); 
-		    	} 
-		    	else {
-			    	exchangeGlobalFunction("Removing duplicate account with email address ,  "+ identities[account].email );
-		    	}
-		    	test=null;
-	    	}
-	    } 
-	    
-	    //return filtered accounts
-	    return newidentities;
-	}
-	else {
-		return [];
-	} 
+function rtewsObj(identity) {
+    if (!identity) {
+        return null;
+    }
+    for (var obj in ewsTaggerObj) {
+        if ((ewsTaggerObj[obj].identity.email == identity.email) && (ewsTaggerObj[obj].identity.serverURI == identity.serverURI)) {
+            return ewsTaggerObj[obj];
+        }
+    }
+    return null;
+}
+
+function removeDuplicateAccount(identities) {
+    exchangeGlobalFunction("Account available total -  " + identities.length);
+
+    if (identities.length > 0) {
+        var newidentities = [];
+
+        find = function (arr, key, val) { //Find array element which has a key value of val 
+            for (var ai, i = arr.length; i--;) {
+                if ((ai = arr[i]) && ai[key] == val) {
+                    return true;
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+
+        for (var account in identities) {
+            if (identities[account].email != null) {
+                if (account == 0) {
+                    newidentities.push(identities[account]);
+                    continue;
+                }
+
+                var test = find(newidentities, "serverURI", identities[account].serverURI);
+                if (!test) {
+                    newidentities.push(identities[account]);
+                }
+                else {
+                    exchangeGlobalFunction("Removing duplicate account with email address ,  " + identities[account].email);
+                }
+                test = null;
+            }
+        }
+
+        //return filtered accounts
+        return newidentities;
+    }
+    else {
+        return [];
+    }
+}
+
+function getAllAccounts() {
+    var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+        .getService(Components.interfaces.nsIXULAppInfo);
+    var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+        .getService(Components.interfaces.nsIVersionComparator);
+    var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
+        .getService(Components.interfaces.nsIMsgAccountManager);
+    var accounts = acctMgr.accounts;
+    //  exchangeGlobalFunction("rtews:getAllAccounts " + versionChecker.compare(appInfo.version, "20.0") +accounts.length );
+    if (accounts) {
+        if (versionChecker.compare(appInfo.version, "20.0") >= 0) {
+            var _accounts = [];
+
+            for (var i = 0; i < accounts.length; i++) {
+
+                var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);
+                var identities = account.identities;
+                for (var index = 0; index < identities.length; index++) {
+                    var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
+                    var calAccount = getCalendarPref(identity.email);
+                    var enabled = false;
+                    exchangeGlobalFunction("Account exists  for email address -  " + identity.email);
+
+                    var details = null;
+
+                    if (calAccount && mivFunctions) {
+                        enabled = mivFunctions.safeGetBoolPref(calAccount, "mailsync.active", false);
+                        details = {
+                            "server": account.incomingServer.prettyName,
+                            "serverURI": account.incomingServer.serverURI,
+                            "email": mivFunctions.safeGetCharPref(calAccount, "ecMailbox"),
+                            "username": mivFunctions.safeGetCharPref(calAccount, "ecUser"),
+                            "name": identity.fullName,
+                            "domain": mivFunctions.safeGetCharPref(calAccount, "ecDomain"),
+                            "enabled": enabled,
+                            "ewsUrl": mivFunctions.safeGetCharPref(calAccount, "ecServer"),
+                            "prefs": calAccount,
+                        };
+                    }
+
+                    if (details != null) {
+                        if (details.enabled == true) {
+                            _accounts.push(details);
+                        }
+                    }
+                }
+            }
+            var _newaccounts = removeDuplicateAccount(_accounts);
+            return _newaccounts;
+
+        }
+        else {
+            let _accounts = [];
+
+            for (let i = 0; i < accounts.length; i++) {
+
+                let account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);
+                let identities = account.identities;
+                for (let index = 0; index < identities.length; index++) {
+                    let identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
+                    let calAccount = getCalendarPref(identity.email);
+                    let enabled = false;
+                    exchangeGlobalFunction("Account exists  for email address -  " + identity.email);
+
+                    let details = null;
+
+                    if (calAccount && mivFunctions) {
+                        enabled = mivFunctions.safeGetBoolPref(calAccount, "mailsync.active", false);
+                        details = {
+                            "server": account.incomingServer.prettyName,
+                            "serverURI": account.incomingServer.serverURI,
+                            "email": mivFunctions.safeGetCharPref(calAccount, "ecMailbox"),
+                            "username": mivFunctions.safeGetCharPref(calAccount, "ecUser"),
+                            "name": identity.fullName,
+                            "domain": mivFunctions.safeGetCharPref(calAccount, "ecDomain"),
+                            "enabled": enabled,
+                            "ewsUrl": mivFunctions.safeGetCharPref(calAccount, "ecServer"),
+                            "prefs": calAccount,
+                        };
+                    }
+                    if (details != null) {
+                        if (details.enabled == true) {
+                            _accounts.push(details);
+                        }
+                    }
+                }
+            }
+
+            let _newaccounts = removeDuplicateAccount(_accounts);
+            return _newaccounts;
+
+        }
+    }
+    else {
+        var _newaccounts = [];
+        return _newaccounts;
+    }
+
 }
- 
-function getAllAccounts(){   
-     var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                                     .getService(Components.interfaces.nsIXULAppInfo);
-     var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                                .getService(Components.interfaces.nsIVersionComparator);
-	 var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
-                         .getService(Components.interfaces.nsIMsgAccountManager);
-     var accounts = acctMgr.accounts;
-   //  exchangeGlobalFunction("rtews:getAllAccounts " + versionChecker.compare(appInfo.version, "20.0") +accounts.length );
-     if(accounts){
-	     if (versionChecker.compare(appInfo.version, "20.0") >= 0){ 
-	    	 var _accounts = [];
-	    	 
-	    	 for (var i = 0; i < accounts.length; i++) {
-	         	     
-	         	    	var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);   
-	         			var identities = account.identities;
-	         			for (var index=0; index < identities.length; index++) {
-	         				var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
-	         				var calAccount = getCalendarPref(identity.email);  
-	         				var enabled = false; 
-	         				exchangeGlobalFunction("Account exists  for email address -  " + identity.email);   
-	         				
-	         				var details = null;
-	         				
-	         				if(calAccount && mivFunctions ){
-	         							enabled =  mivFunctions.safeGetBoolPref(calAccount, "mailsync.active", false) ; 
-				     					details = {
-		 				 						"server":account.incomingServer.prettyName,
-		 										"serverURI":account.incomingServer.serverURI,
-		 				                	  	"email":mivFunctions.safeGetCharPref(calAccount,"ecMailbox"),
-		 				                	  	"username":mivFunctions.safeGetCharPref(calAccount,"ecUser"),
-		 				                	  	"name":identity.fullName,
-		 				                	  	"domain":mivFunctions.safeGetCharPref(calAccount,"ecDomain"),
-		 				                 	  	"enabled":enabled,
-		 				                	  	"ewsUrl":mivFunctions.safeGetCharPref(calAccount,"ecServer"),
-		 				                	  	"prefs" : calAccount ,
-		 				                }; 
-	         				}
- 		     				
-	         				if ( details != null ){
-		         				if( details.enabled == true){
-			     					_accounts.push(details);  
-			     				}
-	         				}
-	          			} 
-	          } 
-			     var _newaccounts = removeDuplicateAccount(_accounts);
-			     return _newaccounts;
-		 		
-	     }
-	     else{
-	    	 	let _accounts = [];
-	    	 	
- 		 		for (let i = 0; i < accounts.length; i++) {  
-	        	     
-	     	    	let account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);   
-	     			let identities = account.identities;
-	     			for (let index=0; index < identities.length; index++) {
-	     				let identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
- 	     				let calAccount = getCalendarPref(identity.email);  
-	     				let enabled = false;
-         				exchangeGlobalFunction("Account exists  for email address -  " + identity.email);   
-         				
-	     				let details = null;
-	     				
-	    				if(calAccount && mivFunctions ){
-	    					enabled =  mivFunctions.safeGetBoolPref(calAccount, "mailsync.active", false) ;
-	     					details = {
-				 						"server":account.incomingServer.prettyName,
-										"serverURI":account.incomingServer.serverURI,
-				                	  	"email":mivFunctions.safeGetCharPref(calAccount,"ecMailbox"),
-				                	  	"username":mivFunctions.safeGetCharPref(calAccount,"ecUser"),
-				                	  	"name":identity.fullName,
-				                	  	"domain":mivFunctions.safeGetCharPref(calAccount,"ecDomain"),
-				                 	  	"enabled":enabled,
-				                	  	"ewsUrl":mivFunctions.safeGetCharPref(calAccount,"ecServer"),
-				                	  	"prefs" : calAccount ,
-				                }; 
-	    				}
-	    				if (details != null ){
-	 	     				if( details.enabled == true ){
-		     					_accounts.push(details);  
-		     				}
-	    				}
- 	      			}  
-		 		} 
- 		 		 
- 			     let _newaccounts = removeDuplicateAccount(_accounts);
- 			     return _newaccounts;
- 		 		
-	     }   
-     }
-     else
-     {   
-    	 var _newaccounts = [];
-    	 return _newaccounts; 
-     }
-   
-} 
 
 function findAccountFromFolder(aFolder) {
-    if (!aFolder)  
-        return null;  
-     var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                                     .getService(Components.interfaces.nsIXULAppInfo);
-     var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                                .getService(Components.interfaces.nsIVersionComparator);
-     var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
-                         .getService(Components.interfaces.nsIMsgAccountManager);
-     var accounts = acctMgr.accounts;
-     if (versionChecker.compare(appInfo.version, "20.0") >= 0){
-    	 for (var i = 0; i < accounts.length; i++) {
-         	    var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount); 
-
-		        var rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
-		        if (rootFolder.hasSubFolders) {  
-		            var subFolders = rootFolder.subFolders; // nsIMsgFolder  
-		            while(subFolders.hasMoreElements()) {  
-		                if (aFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))  
-		                    return account.QueryInterface(Components.interfaces.nsIMsgAccount);  
-		            }  
-		        }   
-         }
-     }
-     else{
-	 	for (let i = 0; i < accounts.Count(); i++) {
-	 	    let account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount); 
-	
-	        let rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
-	        if (rootFolder.hasSubFolders) {  
-	            let subFolders = rootFolder.subFolders; // nsIMsgFolder  
-	            while(subFolders.hasMoreElements()) {  
-	                if (aFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))  
-	                    return account.QueryInterface(Components.interfaces.nsIMsgAccount);  
-	            }  
-	    	}  
-	     }
-     }  
-    return null;  
+    if (!aFolder)
+        return null;
+    var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+        .getService(Components.interfaces.nsIXULAppInfo);
+    var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+        .getService(Components.interfaces.nsIVersionComparator);
+    var acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
+        .getService(Components.interfaces.nsIMsgAccountManager);
+    var accounts = acctMgr.accounts;
+    if (versionChecker.compare(appInfo.version, "20.0") >= 0) {
+        for (var i = 0; i < accounts.length; i++) {
+            var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount);
+
+            var rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
+            if (rootFolder.hasSubFolders) {
+                var subFolders = rootFolder.subFolders; // nsIMsgFolder  
+                while (subFolders.hasMoreElements()) {
+                    if (aFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))
+                        return account.QueryInterface(Components.interfaces.nsIMsgAccount);
+                }
+            }
+        }
+    }
+    else {
+        for (let i = 0; i < accounts.Count(); i++) {
+            let account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
+
+            let rootFolder = account.incomingServer.rootFolder; // nsIMsgFolder  
+            if (rootFolder.hasSubFolders) {
+                let subFolders = rootFolder.subFolders; // nsIMsgFolder  
+                while (subFolders.hasMoreElements()) {
+                    if (aFolder == subFolders.getNext().QueryInterface(Components.interfaces.nsIMsgFolder))
+                        return account.QueryInterface(Components.interfaces.nsIMsgAccount);
+                }
+            }
+        }
+    }
+    return null;
 }
 
-function getCalendarPref(aEmail){ 
-	if (!aEmail)  
-		return null;
- 
-	///Get Calendar manager
-	var calManager = Cc["@mozilla.org/calendar/manager;1"]
-	        			.getService(Ci.calICalendarManager);
-	var cals = calManager.getCalendars({});
-	
-	for( var i = 0; i < cals.length; i++ ){
-		var cal = cals[i]; 
-		if( cal.type == "exchangecalendar" ){
-		
-			if( cal.mailbox == aEmail ){  
-				try{
-					var calPref =  Cc["@mozilla.org/preferences-service;1"]
-					            .getService(Ci.nsIPrefService)
-					            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+  cal.id +".");
-					
-					if( calPref.getCharPref("ecFolderbase") == "calendar" ){ 
-						return calPref;
-					} 
-					
-				}
-				catch(e){
-					exchangeGlobalFunction("rtews: e2 "+e);
-				}
-			}
-		}
-	} 
-	return null;
- } 
+function getCalendarPref(aEmail) {
+    if (!aEmail)
+        return null;
+
+    ///Get Calendar manager
+    var calManager = Cc["@mozilla.org/calendar/manager;1"]
+        .getService(Ci.calICalendarManager);
+    var cals = calManager.getCalendars({});
+
+    for (var i = 0; i < cals.length; i++) {
+        var cal = cals[i];
+        if (cal.type == "exchangecalendar") {
+
+            if (cal.mailbox == aEmail) {
+                try {
+                    var calPref = Cc["@mozilla.org/preferences-service;1"]
+                        .getService(Ci.nsIPrefService)
+                        .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + cal.id + ".");
+
+                    if (calPref.getCharPref("ecFolderbase") == "calendar") {
+                        return calPref;
+                    }
+
+                }
+                catch (e) {
+                    exchangeGlobalFunction("rtews: e2 " + e);
+                }
+            }
+        }
+    }
+    return null;
+}
 /*
  * Overrides default method for applying tag.
  *
@@ -1239,7 +1293,7 @@ function ToggleMessageTag(key, addKey) {
 
     //if we don't have the id configured run the default toggle functionality
     if (identity == null) {
-    	rtews.toggleMessageTagPostEwsUpdate(key, addKey);
+        rtews.toggleMessageTagPostEwsUpdate(key, addKey);
         return;
     }
 
@@ -1251,15 +1305,16 @@ function ToggleMessageTag(key, addKey) {
 
         if (addKey) {
             keywords.push(key);
-        } else {
+        }
+        else {
             keywords.splice(keywords.indexOf(key), 1);
         }
 
         var categories = rtews.Tags.getTagsForKeys(keywords);
- 
+
         rtewsObj(identity).toggleTags(msgHdr, identity, "single", categories, key, addKey);
     }
-}  
+}
 
 /*
  * Overrides default remove all method.
@@ -1267,7 +1322,7 @@ function ToggleMessageTag(key, addKey) {
  */
 function RemoveAllMessageTags() {
     var identity = rtews.getIdentity(gFolderDisplay.displayedFolder.server.prettyName);
-     //if we don't have the id configured run the default toggle functionality
+    //if we don't have the id configured run the default toggle functionality
     if (identity == null) {
         rtews.removeAllMessageTagsPostEwsUpdate();
         return;
@@ -1276,10 +1331,10 @@ function RemoveAllMessageTags() {
     var selectedMessages = gFolderDisplay.selectedMessages;
 
     for (var i = 0; i < selectedMessages.length; ++i) {
-        var msgHdr = selectedMessages[i];        
+        var msgHdr = selectedMessages[i];
         rtewsObj(identity).toggleTags(msgHdr, identity, "removeAll", []);
     }
-} 
+}
 /*
  * Overrides default method for initialize tag menu
  *
@@ -1299,9 +1354,9 @@ function InitMessageTags(menuPopup) {
     var tagRemoveLabel = document.getElementById("bundle_messenger").getString("mailnews.tags.remove");
     SetMessageTagLabel(menuPopup.lastChild.previousSibling, 0, tagRemoveLabel);
 
-    var identity = rtews.getIdentity(gFolderDisplay.displayedFolder.server.prettyName); 
-    if( identity != null ){
-    	rtews.addSyncMenu(menuPopup);
+    var identity = rtews.getIdentity(gFolderDisplay.displayedFolder.server.prettyName);
+    if (identity != null) {
+        rtews.addSyncMenu(menuPopup);
     }
     // now rebuild the list
     var msgHdr = gFolderDisplay.selectedMessage;
@@ -1327,6 +1382,4 @@ function InitMessageTags(menuPopup) {
 }
 
 //Lets initialize
-window.addEventListener("load",init(),false);
- 
- 
\ No newline at end of file
+window.addEventListener("load", init(), false);
diff --git a/chrome/content/selectEWSUrl.js b/chrome/content/selectEWSUrl.js
index a8305c0b..c38b5cf1 100644
--- a/chrome/content/selectEWSUrl.js
+++ b/chrome/content/selectEWSUrl.js
@@ -38,44 +38,42 @@ var Cu = Components.utils;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.selectEWSurl = {
 
-	onAccept: function _onAccept()
-	{
-		window.arguments[1].value = document.getElementById("exchWebService_selectEWSurl_urllist").selectedItem.value;
-		return true;
-	},
+    onAccept: function _onAccept() {
+        window.arguments[1].value = document.getElementById("exchWebService_selectEWSurl_urllist").selectedItem.value;
+        return true;
+    },
 
-	onLoad: function _onLoad()
-	{
-		var ewsUrls = window.arguments[0];
-		var firstItem = false;		
-		var results = new Array();
+    onLoad: function _onLoad() {
+        var ewsUrls = window.arguments[0];
+        var firstItem = false;
+        var results = new Array();
 
-		for (var index in ewsUrls) {
-			// Check if this one is not in the list.
-			exchWebService.commonFunctions.LOG("onLoad: index:"+index+", ewsUrls="+ewsUrls[index].value);
-			var inList = false;
-			for (var index2 in results) {
-				if (ewsUrls[index].value == results[index2]) {
-					inList = true;
-					break;
-				}
-			}
-			if (!inList) {
-				results.push(ewsUrls[index].value);
-			}
-		}
-		
-		for (var i= 0; i < results.length; i++) {
-			var newItem = document.getElementById("exchWebService_selectEWSurl_urllist").appendItem( results[i].toString(), results[i].toString(), results[i].toString() );
+        for (var index in ewsUrls) {
+            // Check if this one is not in the list.
+            exchWebService.commonFunctions.LOG("onLoad: index:" + index + ", ewsUrls=" + ewsUrls[index].value);
+            var inList = false;
+            for (var index2 in results) {
+                if (ewsUrls[index].value == results[index2]) {
+                    inList = true;
+                    break;
+                }
+            }
+            if (!inList) {
+                results.push(ewsUrls[index].value);
+            }
+        }
 
-			if (!firstItem) {
-				document.getElementById("exchWebService_selectEWSurl_urllist").selectedItem = newItem;
-				firstItem = true;
-			}
-		}
-	},
+        for (var i = 0; i < results.length; i++) {
+            var newItem = document.getElementById("exchWebService_selectEWSurl_urllist").appendItem(results[i].toString(), results[i].toString(), results[i].toString());
+
+            if (!firstItem) {
+                document.getElementById("exchWebService_selectEWSurl_urllist").selectedItem = newItem;
+                firstItem = true;
+            }
+        }
+    },
 }
diff --git a/chrome/content/sendUpdateTo.js b/chrome/content/sendUpdateTo.js
index b076a375..f873dff5 100644
--- a/chrome/content/sendUpdateTo.js
+++ b/chrome/content/sendUpdateTo.js
@@ -41,18 +41,16 @@ var Cu = Components.utils;
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.sendUpdateTo = {
 
-	onLoad: function _onLoad()
-	{
-		document.getElementById("exchWebService_sendUpdateTo_calendaritem-title").value = window.arguments[0].item.title;
+    onLoad: function _onLoad() {
+        document.getElementById("exchWebService_sendUpdateTo_calendaritem-title").value = window.arguments[0].item.title;
 
-	},
+    },
 
-	onAccept: function _onAccept()
-	{
-		window.arguments[0].response = document.getElementById("exchWebService_sendUpdateTo_radio-sendto").value;
-	},
+    onAccept: function _onAccept() {
+        window.arguments[0].response = document.getElementById("exchWebService_sendUpdateTo_radio-sendto").value;
+    },
 }
diff --git a/chrome/content/sharedCalendarParser.js b/chrome/content/sharedCalendarParser.js
index 2fcb5703..10505738 100644
--- a/chrome/content/sharedCalendarParser.js
+++ b/chrome/content/sharedCalendarParser.js
@@ -32,114 +32,107 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("chrome://exchangecalendar/content/msgHdrUtils.js");
 Cu.import("resource:///modules/gloda/utils.js");
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.hdrView = {
 
-	theHeaders: null,
-
-	msgHdrViewLoad: function _msgHdrViewLoad(event)
-	{
-		exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: this.msgHdrViewLoad");
-
-		var listener = {
-			onBeforeShowHeaderPane: function _listener_onBeforeShowHeaderPane() 
-			{
-				exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: _listener_onBeforeShowHeaderPane");
-			},
-
-			onStartHeaders: function _listener_onStartHeaders ()
-			{
-				exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: _listener_onStartHeaders");
-	
-				exchWebService.hdrView.statusBarHide();
-			},
-	
-			onEndHeaders: function _listener_onEndHeaders ()
-			{
-				exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: _listener_onEndHeaders");
-				exchWebService.hdrView.statusBarHide();
-
-				msgHdrGetHeaders(gFolderDisplay.selectedMessage, function (aHeaders) { 
-
-						if ((exchWebService.check4Lightning) && (exchWebService.check4Lightning.lightningIsInstalled != 2)) {
-							return;
-						}
-
-						exchWebService.hdrView.theHeaders = null;
-
-						if ( (aHeaders.has("x-sharing-remote-uid")) &&  
-						     (aHeaders.has("x-sharing-local-type"))  &&  
-						     (aHeaders.has("x-sharing-remote-name")) ) {
-							if (aHeaders.get("x-sharing-local-type") == "IPF.Appointment") {
-								exchWebService.commonFunctions.LOG("This message has a x-sharing-remote-uid header; its value is "+aHeaders.get("x-sharing-remote-uid"));  
-								document.getElementById("exchWebServiceSharedCalendarLabel").value = GlodaUtils.deMime(aHeaders.get("x-sharing-remote-name"));
-								exchWebService.hdrView.theHeaders = aHeaders;
-								exchWebService.hdrView.statusBarShow();
-							}
-						}
-						else {
-							exchWebService.commonFunctions.LOG("NO x-sharing-remote-uid header");
-						}
-					});
-			},
-	
-		};
-
-		gMessageListeners.push(listener);
-
-		// Next part is to hide the bar when the user changes to another folder and
-		// a new message is not selected. Otherwise it will stay visible.
-        	listener.tbHideMessageHeaderPane = HideMessageHeaderPane;
-		HideMessageHeaderPane = function exchWebServiceHideMessageHeaderPane() {
-				exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: exchWebServiceHideMessageHeaderPane");
-				try {
-					exchWebService.hdrView.statusBarHide();
-				}
-				catch (ex) {};
-				listener.tbHideMessageHeaderPane.apply(null, arguments);
-			};
-
-	},
-
-	hdrViewUnload: function _hdrViewUnload()
-	{
-		exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: this.hdrViewUnLoad");
-		this.statusBarHide();
-	},
-
-	statusBarHide: function _statusBarHide()
-	{
-		var exchWebServiceSharedCalendarBox = document.getElementById("exchWebServiceSharedCalendarBox");
-		try {
-			exchWebServiceSharedCalendarBox.setAttribute("collapsed", "true")
-			//Enigmail.msg.setAttachmentReveal(null);
-		}
-		catch (ex) {}
-	},
-
-	statusBarShow: function _statusBarShow()
-	{
-		var exchWebServiceSharedCalendarBox = document.getElementById("exchWebServiceSharedCalendarBox");
-		try {
-			exchWebServiceSharedCalendarBox.removeAttribute("collapsed");
-		}
-		catch (ex) { exchWebService.commonFunctions.LOG("ERROR:"+ex); }
-	},
-
-
-	doAddSharedCalendar: function _doAddSharedCalendar()
-	{
-		exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: this.doAddSharedCalendar");
-		if (this.theHeaders) {
-			exchWebService.commonFunctions.LOG("  uid:"+this.theHeaders.get("x-sharing-remote-uid"));
-			exchWebService.commonFunctions.LOG(" name:"+GlodaUtils.deMime(this.theHeaders.get("x-sharing-remote-name")));
-
-		}
-	},
+    theHeaders: null,
+
+    msgHdrViewLoad: function _msgHdrViewLoad(event) {
+        exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: this.msgHdrViewLoad");
+
+        var listener = {
+            onBeforeShowHeaderPane: function _listener_onBeforeShowHeaderPane() {
+                exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: _listener_onBeforeShowHeaderPane");
+            },
+
+            onStartHeaders: function _listener_onStartHeaders() {
+                exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: _listener_onStartHeaders");
+
+                exchWebService.hdrView.statusBarHide();
+            },
+
+            onEndHeaders: function _listener_onEndHeaders() {
+                exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: _listener_onEndHeaders");
+                exchWebService.hdrView.statusBarHide();
+
+                msgHdrGetHeaders(gFolderDisplay.selectedMessage, function (aHeaders) {
+
+                    if ((exchWebService.check4Lightning) && (exchWebService.check4Lightning.lightningIsInstalled != 2)) {
+                        return;
+                    }
+
+                    exchWebService.hdrView.theHeaders = null;
+
+                    if ((aHeaders.has("x-sharing-remote-uid"))
+                        && (aHeaders.has("x-sharing-local-type"))
+                        && (aHeaders.has("x-sharing-remote-name"))) {
+                        if (aHeaders.get("x-sharing-local-type") == "IPF.Appointment") {
+                            exchWebService.commonFunctions.LOG("This message has a x-sharing-remote-uid header; its value is " + aHeaders.get("x-sharing-remote-uid"));
+                            document.getElementById("exchWebServiceSharedCalendarLabel").value = GlodaUtils.deMime(aHeaders.get("x-sharing-remote-name"));
+                            exchWebService.hdrView.theHeaders = aHeaders;
+                            exchWebService.hdrView.statusBarShow();
+                        }
+                    }
+                    else {
+                        exchWebService.commonFunctions.LOG("NO x-sharing-remote-uid header");
+                    }
+                });
+            },
+
+        };
+
+        gMessageListeners.push(listener);
+
+        // Next part is to hide the bar when the user changes to another folder and
+        // a new message is not selected. Otherwise it will stay visible.
+        listener.tbHideMessageHeaderPane = HideMessageHeaderPane;
+        HideMessageHeaderPane = function exchWebServiceHideMessageHeaderPane() {
+            exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: exchWebServiceHideMessageHeaderPane");
+            try {
+                exchWebService.hdrView.statusBarHide();
+            }
+            catch (ex) {};
+            listener.tbHideMessageHeaderPane.apply(null, arguments);
+        };
+
+    },
+
+    hdrViewUnload: function _hdrViewUnload() {
+        exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: this.hdrViewUnLoad");
+        this.statusBarHide();
+    },
+
+    statusBarHide: function _statusBarHide() {
+        var exchWebServiceSharedCalendarBox = document.getElementById("exchWebServiceSharedCalendarBox");
+        try {
+            exchWebServiceSharedCalendarBox.setAttribute("collapsed", "true")
+                //Enigmail.msg.setAttachmentReveal(null);
+        }
+        catch (ex) {}
+    },
+
+    statusBarShow: function _statusBarShow() {
+        var exchWebServiceSharedCalendarBox = document.getElementById("exchWebServiceSharedCalendarBox");
+        try {
+            exchWebServiceSharedCalendarBox.removeAttribute("collapsed");
+        }
+        catch (ex) {
+            exchWebService.commonFunctions.LOG("ERROR:" + ex);
+        }
+    },
+
+
+    doAddSharedCalendar: function _doAddSharedCalendar() {
+        exchWebService.commonFunctions.LOG("exchWebService.sharedCalendarParser.js: this.doAddSharedCalendar");
+        if (this.theHeaders) {
+            exchWebService.commonFunctions.LOG("  uid:" + this.theHeaders.get("x-sharing-remote-uid"));
+            exchWebService.commonFunctions.LOG(" name:" + GlodaUtils.deMime(this.theHeaders.get("x-sharing-remote-name")));
+
+        }
+    },
 }
 
 // Currently turned of because not yet ready for version 1.7.13
 //addEventListener('messagepane-loaded', exchWebService.hdrView.msgHdrViewLoad, true);
 //addEventListener('messagepane-unloaded', exchWebService.hdrView.hdrViewUnload, true);
-
diff --git a/chrome/content/timezonePreference.js b/chrome/content/timezonePreference.js
index 193e4125..fb9c72da 100644
--- a/chrome/content/timezonePreference.js
+++ b/chrome/content/timezonePreference.js
@@ -3,40 +3,40 @@ var Ci = Components.interfaces;
 var Cu = Components.utils;
 
 var prefs = Cc["@mozilla.org/preferences-service;1"]
-               .getService(Ci.nsIPrefService); 
+    .getService(Ci.nsIPrefService);
 var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-    				.getService(Ci.mivFunctions);
+    .getService(Ci.mivFunctions);
 
-function autoTimezone(aState){
-	
-	if( aState == true  ){
- 		prefs.setCharPref("calendar.timezone.local","");  
- 		infoPopup( document.title , "Timezone is changed to to system." );
- 		document.getElementById("calendar-timezone-menulist").setAttribute("disabled","true");
-	} 
-	else{
- 		infoPopup( document.title , "System timezone is not set." ); 
- 		document.getElementById("calendar-timezone-menulist").removeAttribute("disabled"); 
-	}
+function autoTimezone(aState) {
+
+    if (aState == true) {
+        prefs.setCharPref("calendar.timezone.local", "");
+        infoPopup(document.title, "Timezone is changed to to system.");
+        document.getElementById("calendar-timezone-menulist").setAttribute("disabled", "true");
+    }
+    else {
+        infoPopup(document.title, "System timezone is not set.");
+        document.getElementById("calendar-timezone-menulist").removeAttribute("disabled");
+    }
 }
 
 function infoPopup(title, msg) {
-	 var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
-	  var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
-	                      getService(Components.interfaces.nsIWindowWatcher).
-	                      openWindow(null, 'chrome://global/content/alerts/alert.xul',
-	                                  '_blank', 'chrome,titlebar=no,popup=yes', null);
-	  win.arguments = [image,  title, msg, true, ''];
+    var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+    var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
+    getService(Components.interfaces.nsIWindowWatcher).
+    openWindow(null, 'chrome://global/content/alerts/alert.xul',
+        '_blank', 'chrome,titlebar=no,popup=yes', null);
+    win.arguments = [image, title, msg, true, ''];
 }
 
-function checkUserTimezoneMenu(){  
-	var resetTimezone =  globalFunctions.safeGetBoolPref( prefs, "calendar.timezone.local.auto"); 
-	if( resetTimezone ==  true  ){ 
- 		document.getElementById("calendar-timezone-menulist").setAttribute("disabled","true");
-	} 
-	else{ 
- 		document.getElementById("calendar-timezone-menulist").removeAttribute("disabled"); 
-	}  
+function checkUserTimezoneMenu() {
+    var resetTimezone = globalFunctions.safeGetBoolPref(prefs, "calendar.timezone.local.auto");
+    if (resetTimezone == true) {
+        document.getElementById("calendar-timezone-menulist").setAttribute("disabled", "true");
+    }
+    else {
+        document.getElementById("calendar-timezone-menulist").removeAttribute("disabled");
+    }
 }
 
 //temporarily disable this feature in b3.4beta2 because it caused stuck queue jobs
diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index 9ae16595..5ff412b8 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -50,7 +50,7 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
-var EXPORTED_SYMBOLS = ["ExchangeRequest", "nsSoapStr","nsTypesStr","nsMessagesStr","nsAutodiscoverResponseStr1", "nsAutodiscoverResponseStr2", "nsAutodiscover2010Str", "nsErrors", "nsWSAStr", "nsXSIStr", "xml_tag"];
+var EXPORTED_SYMBOLS = ["ExchangeRequest", "nsSoapStr", "nsTypesStr", "nsMessagesStr", "nsAutodiscoverResponseStr1", "nsAutodiscoverResponseStr2", "nsAutodiscover2010Str", "nsErrors", "nsWSAStr", "nsXSIStr", "xml_tag"];
 
 var xml_tag = '<?xml version="1.0" encoding="utf-8"?>\n';
 
@@ -66,1524 +66,1611 @@ const nsErrors = "http://schemas.microsoft.com/exchange/services/2006/errors";
 
 var gExchangeRequestVersion = "0.1";
 
-if (! exchWebService) {
-	var exchWebService = {};
+if (!exchWebService) {
+    var exchWebService = {};
 }
 
 exchWebService.prePasswords = {};
 
-function ExchangeRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mData = "";
-	this.mArgument = aArgument;
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-	this.retries = 0;
-	this.urllist = [];
-	this.currentUrl = "";
-	this.listener = aListener;
-	this.retryCount = 0;
+function ExchangeRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mData = "";
+    this.mArgument = aArgument;
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+    this.retries = 0;
+    this.urllist = [];
+    this.currentUrl = "";
+    this.listener = aListener;
+    this.retryCount = 0;
 
-	this.mAuthFail = 0;
-	this.xmlReq = null;
-	this.shutdown = false;
-	this.badCert = false;
-	this.badCertCount = 0;
-	this.channelCallbackEcAuthPrompt2 = null;
+    this.mAuthFail = 0;
+    this.xmlReq = null;
+    this.shutdown = false;
+    this.badCert = false;
+    this.badCertCount = 0;
+    this.channelCallbackEcAuthPrompt2 = null;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-		.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this.uuid = this.globalFunctions.getUUID();
+    this.uuid = this.globalFunctions.getUUID();
 
-	this.prePassword = "";
+    this.prePassword = "";
 
-	this.kerberos = true;
+    this.kerberos = true;
 
-	this.prefB = Cc["@mozilla.org/preferences-service;1"]
-		.getService(Ci.nsIPrefBranch);
+    this.prefB = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefBranch);
 
-	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-		.getService(Ci.mivExchangeStatistics);
+    this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+        .getService(Ci.mivExchangeStatistics);
 
-	this.exchangeBadCertListener2 = Cc["@1st-setup.nl/exchange/badcertlistener2;1"]
-		.getService(Ci.mivExchangeBadCertListener2);
+    this.exchangeBadCertListener2 = Cc["@1st-setup.nl/exchange/badcertlistener2;1"]
+        .getService(Ci.mivExchangeBadCertListener2);
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]
-		.getService(Ci.nsIObserverService);
-	this.observerService.addObserver(this, "http-on-modify-request", true);
+    this.observerService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
+    this.observerService.addObserver(this, "http-on-modify-request", true);
 
-	this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-		.getService(Ci.mivExchangeTimeZones);
+    this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
+        .getService(Ci.mivExchangeTimeZones);
 
-	this.xml2json = false;
+    this.xml2json = false;
 }
 
 ExchangeRequest.prototype = {
-	ER_ERROR_EMPTY_FOLDERPATH: -2,
-	ER_ERROR_INVALID_URL: -6, 	// "No url to send request to."
-	ER_ERROR_RESPONS_NOT_VALID: -7, // "Respons does not contain expected field"
-	ER_ERROR_SOAP_ERROR: -8,	// "Error on creating item:"+responseCode
-	ER_ERROR_RESOLVING_HOST: -9,    // "Error during resolving of hostname"
-	ER_ERROR_CONNECTING_TO: -10,    // "Error during connecting to hostname"
-	ER_ERROR_CREATING_ITEM_UNKNOWN: -13, // "Error. Unknown item creation:"+String(aResp)
-
-	ER_ERROR_CONNECED_TO: -14, // "Error during connection to hostname '"
-	ER_ERROR_SENDING_TO: -15,  // "Error during sending data to hostname '"
-	ER_ERROR_WAITING_FOR: -16, // "Error during waiting for data of hostname '" 
-	ER_ERROR_RECEIVING_FROM: -17, // "Error during receiving of data from hostname '"
-	ER_ERROR_UNKNOWN_CONNECTION: -18, // "Unknown error during communication with hostname 
-	ER_ERROR_HTTP_ERROR4XX: -19,  // A HTTP 4XX error code was returned.
-
-	ER_ERROR_USER_ABORT_AUTHENTICATION: -20,	// "User aborted authentication credentials"
-	ER_ERROR_USER_ABORT_ADD_CERTIFICATE: -30,	// "User aborted adding required certificate"
-	ER_ERROR_OPEN_FAILED: -100,	// "Could not connect to specified host:"+err
-	ER_ERROR_FROM_SERVER: -101,	// HTTP error from server.
-	ER_ERROR_AUTODISCOVER_GET_EWSULR: -200,  // During auto discovery no EWS URL were discoverd in respons.
-	ER_ERROR_FINDFOLDER_NO_TOTALITEMSVIEW: -201, // Field totalitemsview missing in soap response.
-	ER_ERROR_FINDFOLDER_FOLDERID_DETAILS: -202, // Could not find folderid details in soap response.
-	ER_ERROR_FINDFOLDER_MULTIPLE_RESULTS: -203, // Found more than one results in the findfolder soap response.
-	ER_ERROR_FINDOCCURRENCES_INVALIDIDMALFORMED: -204, // Found an malformed id during find occurrences.
-	ER_ERROR_GETOCCURRENCEINDEX_NOTFOUND: -205,  // Could not found occurrence index.
-	ER_ERROR_SOAP_RESPONSECODE_NOTFOUND: -206, // Could not find the responce field in the soap response.
-	ER_ERROR_PRIMARY_SMTP_NOTFOUND: -207, // Primary SMTP address could not be found in soap response.
-	ER_ERROR_PRIMARY_SMTP_UNKNOWN: -208,  // Unknown error during Primary SMTP check.
-	ER_ERROR_UNKNOWN_MEETING_REPSONSE: -209, // Unknown Meeting Response.
-	ER_ERROR_SYNCFOLDERITEMS_UNKNOWN: -210, // Unknown error during SyncFolders.
-	ER_ERROR_ITEM_UPDATE_UNKNOWN: -211,  // Unknown error during item ipdate.
-	ER_ERROR_SPECIFIED_SMTP_NOTFOUND: -212, // Specified SMTP address does not exist.
-	ER_ERROR_CONVERTID: -214, // Specified SMTP address does not exist.
-	ER_ERROR_NOACCESSTOFREEBUSY: -215, // Specified user has no access to free/busy information of specified mailbox.
-	ER_ERROR_FINDOCCURRENCES_UNKNOWN: -216, // We received an unkown error while trying to get the occurrences. 
-
-	ERR_PASSWORD_ERROR: -300, // To many password errors.
-
-	QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver]),
-
-	/*
-	In Mozilla bug 1221320, changes were done to XMLHttpRequest so that the authPrompt dialog only appears
-	if neither username nor password is set in the request URL. So you only asyncPromptAuth called when both
-	are blank. But Exchange calendar sets a username on the first authentication attempt (supporting Basic
-	and Kerberos), expecting a callback to asyncPromptAuth if that fails, which it does for NTLM.
-
-	Further changes to authentication are all controlled through these asyncPromptAuth calls which never occur, hence failure. What we
-	do with the observer is reverse the effect of that bug, adding back the calls to asyncPromptAuth
-	*/
-	observe(aSubject, aTopic, aData) {
-		let channel = aSubject.QueryInterface(Components.interfaces.nsIHttpChannel);
-		this.logInfo("ecExchangeRequest observing http-on-modify-request for URI " + channel.URI.spec +
-		             " originalURI " + (channel.originalURI ? channel.originalURI.spec : "none"));
-
-		// Only respond to our host
-		let myHost = this.xmlReq && this.xmlReq.channel && this.xmlReq.channel.URI.host;
-		let theirHost = channel.URI.host;
-		if (myHost && (myHost != theirHost)) {
-			this.logInfo("Host does not match, theirs: " + theirHost + " mine: " + myHost);
-			return;
-		}
-
-		let internalChannel = channel.QueryInterface(Ci.nsIHttpChannelInternal);
-		if (internalChannel.blockAuthPrompt) {
-			this.logInfo("unblocking request");
-			internalChannel.blockAuthPrompt = false;
-		}
-		else
-			this.logInfo("Already unblocked");
-	},
-
-	get debug()
-	{
-		if ((this.debuglevel === 0) || (!this.globalFunctions.shouldLog())) {
-			return false;
-		}
-
-		return this.globalFunctions.safeGetBoolPref(this.prefB, "extensions.1st-setup.network.debug", false, true);
-	},
-
-	get debuglevel()
-	{
-		return this.globalFunctions.safeGetIntPref(this.prefB, "extensions.1st-setup.network.debuglevel", 0, true);
-	},
-
-	logInfo: function _logInfo(aMsg, aLevel)
-	{
-		if (!aLevel) {
-			aLevel = 1;
-		}
-
-		if ((this.debug) && (aLevel <= this.debuglevel)) {
-			this.globalFunctions.LOG(this.uuid+": "+aMsg);
-		}
-	},
-
-	get argument() {
-		return this.mArgument;
-	},
-
-	get user() 
-	{
-		return this.argument.user;
-	},
-
-	set user(aValue)
-	{
-		this.argument.user = aValue;
-	},
-
-	stopRequest: function _stopRequest()
-	{
-		this.shutdown = true;
-		this.xmlReq.abort();
-	},
-
-	sendRequest: function(aData, aUrl)
-	{
-		// Stop process while exchangecalendar is shutted down
-		if (this.shutdown) {
-			return;
-		}
-
-		//////////////////////////////////
-		// Looking for URL to send data //
-		//////////////////////////////////
-		this.currentUrl = null;
-
-		// If no URL is given, try cached next known URL
-		// This handle the process of AutoDiscovery while list of URLs to try is not empty
-		if ((!aUrl) && (this.urllist.length > 0 )) {
-			aUrl = this.urllist[0];
-			this.urllist.shift();
-		}
-
-		// If no URL is given and we have tried every known URL, stop process
-		if ((!aUrl) || (aUrl === "") || (aUrl === undefined)) {
-			this.fail(this.ER_ERROR_INVALID_URL,
-				"No url to send request to (sendRequest).");
-			return;
-		}
-
-		// If previously user canceled request on the "Certification issue dialog" for this URL,
-		// we have to not go further with this one
-		if (this.exchangeBadCertListener2.userCanceledCertProblem(aUrl)) {
-			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
-				"User previously canceled adding server certificate for url=" + aUrl + ". Aborting this request.");
-			return;
-		}
-
-		// We found an URL to send data, save it to current process
-		this.currentUrl = aUrl;
-
-		/////////////////////////////
-		// Processing data to send //
-		/////////////////////////////
-		this.mData = aData;
-
-		//////////////////////////////////////
-		// Looking for user authentications //
-		////////////////////////////////////
-		var openUser = this.mArgument.user;
-		var password = null;
-
-		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(
-			Ci.mivExchangeAuthPrompt2);
-
-		if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
-			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
-				"User canceled providing a valid password for url="
-				+ this.currentUrl + ". Aborting this request.");
-			return;
-		}
-
-		try {
-			password = myAuthPrompt2.getPassword(null, openUser, this.currentUrl);
-		}
-		catch(err) {
-			this.logInfo(err);
-			this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
-				"User canceled providing a valid password for url="
-				+ this.currentUrl + ". Aborting this request.");
-			myAuthPrompt2 = null;
-			return;
-		}
-		myAuthPrompt2 = null;
-
-		////////////////////////////////////////////////////
-		// Sending data through standard XML HTTP Request //
-		////////////////////////////////////////////////////
-		// http://dvcs.w3.org/hg/progress/raw-file/tip/Overview.html
-		// https://developer.mozilla.org/en/XPCOM_Interface_Reference/nsIXMLHttpRequestEventTarget
-
-		this.xmlReq = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
-		this.mXmlReq = this.xmlReq;
-
-		var currentEcRequest = this;
-
-		// Add listeners to the request so we have more details on the current state
-		this.xmlReq.addEventListener("loadstart",
-			function(evt) { currentEcRequest.loadstart(evt); },
-			false);
-		this.xmlReq.addEventListener("progress",
-			function(evt) { currentEcRequest.progress(evt); },
-			false);
-		this.xmlReq.addEventListener("error",
-			function(evt) { currentEcRequest.error(evt); },
-			false);
-		this.xmlReq.addEventListener("abort",
-			function(evt) { currentEcRequest.abort(evt); },
-			false);
-		this.xmlReq.addEventListener("load",
-			function(evt) { currentEcRequest.onLoad(evt); },
-			false);
-		this.xmlReq.addEventListener("loadend",
-			function(evt) { currentEcRequest.loadend(evt); },
-			false);
-
-		if (this.debug) {
-			this.logInfo(": 1 ExchangeRequest.sendRequest : user="
-				+ this.mArgument.user +", url=" + this.currentUrl);
-		}
-
-		// Open XML HTTP Request channel we'll use to coummunicate with the server
-		try {
-			// If a password is already known, we can try basic authentication diretcly.
-			if (password) {
-				if (this.debug) this.logInfo("We have a prePassword: *******");
-				this.xmlReq.open("POST", this.currentUrl, true, openUser, password);
-			}
-			else {
-				// If we don't have a password, we need to reach one time the URL
-				// to get a NTML challenge
-				// TODO: check if this comment is correct
-				this.xmlReq.open("POST", this.currentUrl, true, openUser);
-			}
-		}
-		catch(err) {
-			if (this.debug) {
-				this.logInfo(": ERROR on ExchangeRequest.sendRequest to URL:"
-					+ this.currentUrl + ". err:" + err);
-			}
-
-			// Try another URL if possible
-			if (this.tryNextURL()) {
-				return;
-			}
-
-			this.fail(this.ER_ERROR_OPEN_FAILED, "Could not connect to specified host:" + err);
-			return;
-		}
-
-		// Update HTTP Headers
-		this.xmlReq.overrideMimeType('text/xml');
-		this.xmlReq.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
-		this.xmlReq.setRequestHeader("User-Agent", this.globalFunctions.safeGetCharPref(this.prefB, "extensions.1st-setup.others.userAgent", "exchangecalendar@extensions.1st-setup.nl", true));
-
-		// This is required for NTLM authenticated sessions. Which is default for a default EWS install.
-		this.xmlReq.setRequestHeader("Connection", "keep-alive");
-
-		/* set channel notifications for password processing */
-		this.channelCallbackEcAuthPrompt2 = new ecnsIAuthPrompt2(this);
-		this.xmlReq.channel.notificationCallbacks = this.channelCallbackEcAuthPrompt2;
-		this.xmlReq.channel.loadGroup = null;
-
-		var httpChannel = this.xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
-
-		// XXX we want to preserve POST across 302 redirects
-		// TODO: This might go away because header params are copyied right now.
-		httpChannel.redirectionLimit = 0;
-		try{
-			httpChannel.allowPipelining = false;
-		}
-		catch(err) {
-			this.logInfo("sendRequest: ERROR on httpChannel.allowPipelining to err:"+err);
-		}
-
-		if (this.debug) {
-			this.logInfo(": sendRequest Sending: " + this.mData+"\n", 2);
-		}
-
-		// Finally, send data through the channel
-		this.xmlReq.send(this.mData);
-	},
-
-	/*
-	 * loadstart: XML HTTP Request callback
-	 */
-	loadstart: function _loadtstart(evt)
-	{
-		if (this.debug) this.logInfo(": ExchangeRequest.loadstart");
-		this.shutdown = false;
-		this.badCert = false;
-	},
-
-	/*
-	 * loadend: XML HTTP Request callback
-	 */
-	loadend: function _loadend(evt)
-	{
-		if (this.debug) {
-			this.logInfo(": ExchangeRequest.loadend :"
-				+ evt.type + ", readyState:" + this.mXmlReq.readyState
-				+ ", status:" + this.mXmlReq.status);
-			this.logInfo(": ExchangeRequest.loadend :"
-				+ this.mXmlReq.responseText,2);
-		}
-	},
-
-	/*
-	 * progress: XML HTTP Request callback
-	 */
-	progress: function _progress(evt)
-	{
-		if (this.debug) {
-			this.logInfo(": ExchangeRequest.progress. loaded:"
-				+ evt.loaded + ", total:" + evt.total);
-		}
-	},
-
-	/*
-	 * error: XML HTTP Request callback
-	 * Depending on error received we try to recover if possible
-	 */
-	error: function _error(evt)
-	{
-		let xmlReq = this.mXmlReq;
-
-		if (this.debug) {
-			this.logInfo(": ExchangeRequest.error :" + evt.type
-				+ ", readyState:" + xmlReq.readyState + ", status:" + xmlReq.status
-				+ ", lastStatus:" + this.channelCallbackEcAuthPrompt2.lastStatus);
-			this.logInfo(": ExchangeRequest.error :" + xmlReq.responseText, 2);
-			this.logInfo(': xmlReq.getResponseHeader("Location") :'
-				+ xmlReq.getResponseHeader("Location"), 2);
-		}
-
-		//////////////////////////////////////////////////////////
-		// Check if error is related to TLS certification issue //
-		// Connection is terminated and HTTP status is 0 (none) //
-		//////////////////////////////////////////////////////////
-		if ((!this.shutdown)
-			&& (xmlReq.readyState === xmlReq.DONE)
-			&& (xmlReq.status === 0)) {
-			this.logInfo(": ExchangeRequest.error : badCert going to check if it is a cert problem.");
-			var result = null;
-
-			try {
-				result = this.exchangeBadCertListener2.checkAndSolveCertProblem(this.currentUrl);
-			}
-			catch(err) {
-				this.logInfo(": ExchangeRequest.error : this.exchangeBadCertListener2.checkAndSolveCertProblem Error:" + err);
-			}
-
-			if (result.hadProblem) {
-				if (result.solved) {
-					this.logInfo(": ExchangeRequest.error : badCert problem but solved. going to retry url.");
-					this.retryCurrentUrl();
-					return;
-				}
-				else {
-					this.logInfo(": ExchangeRequest.error : badCert problem and NOT solved. going to fail.");
-				}
-			}
-			else {
-				this.logInfo(": ExchangeRequest.error : badCert no problem.");
-			}
-		}
-
-		// Stop if we are able to resolve the error following redirection or trying next URL
-		if (this.isHTTPRedirect(evt) || this.tryNextURL()) {
-			return;
-		}
-
-		this.observerService.notifyObservers(this.channelCallbackEcAuthPrompt2,
-			"onExchangeConnectionError",
-			this.currentUrl + "|" + this.channelCallbackEcAuthPrompt2.lastStatus
-			+ "|" + this.channelCallbackEcAuthPrompt2.lastStatusArg);
-
-		switch (this.channelCallbackEcAuthPrompt2.lastStatus) {
-			// On these status, we abort current connection, reset try counter and return
-			case 0x804b0003:
-			case 0x804b000b:
-				this.fail(this.ER_ERROR_RESOLVING_HOST,
-					"Error resolving hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg
-					+ "'. Did you type the right hostname. (STATUS_RESOLVED)");
-				xmlReq.abort();
-				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-				}
-				return;
-			case 0x804b0007:
-				this.fail(this.ER_ERROR_CONNECTING_TO, "Error during connecting to hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg
-					+ "'. Is the host down?. (STATUS_CONNECTING_TO)");
-				xmlReq.abort();
-				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-				}
-				return;
-			// On these status we just reset try counter and continue
-			case 0x804b0004:
-				this.fail(this.ER_ERROR_CONNECED_TO, "Error during connection to hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_CONNECTED_TO)");
-				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-				}
-				break;
-			case 0x804b0005:
-				this.fail(this.ER_ERROR_SENDING_TO, "Error during sending data to hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_SENDING_TO)");
-				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-				}
-				break;
-			case 0x804b000a:
-				this.fail(this.ER_ERROR_WAITING_FOR, "Error during waiting for data of hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_WAITING_FOR)");
-				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-				}
-				break;
-			case 0x804b0006:
-				this.fail(this.ER_ERROR_RECEIVING_FROM, "Error during receiving of data from hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_RECEIVING_FROM)");
-				if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-					exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-				}
-				break;
-			// Unknown status
-			default:
-				this.fail(this.ER_ERROR_UNKNOWN_CONNECTION, "Unknown error during communication with hostname '"
-					+ this.channelCallbackEcAuthPrompt2.lastStatusArg
-					+ "'. (" + this.channelCallbackEcAuthPrompt2.lastStatus + ")");
-		}
-
-	},
-
-	/*
-	 * abort: XML HTTP Request callback
-	 */
-	abort: function _abort(evt)
-	{
-		if (this.debug) {
-			this.logInfo("ExchangeRequest.abort: type:" + evt.type);
-		}
-	},
-
-	onUserStop: function _onUserStop(aCode, aMsg)
-	{
-		if (this.debug) {
-			this.logInfo("ecExchangeRequest.onUserStop: aCode:"+aCode+", aMsg:"+aMsg);
-		}
-
-		this.mXmlReq.abort();
-		this.fail(aCode, aMsg);
-	},
-
-	/*
-	 * isHTTPRedirect: check if URL has bee redirected and try to go through redirection
-	 */
-	isHTTPRedirect: function(evt)
-	{
-		let xmlReq = this.mXmlReq;
-
-		if (this.debug) {
-			this.logInfo("exchangeRequest.isHTTPRedirect.xmlReq. xmlReq.readyState:"
-				+ xmlReq.readyState + ", xmlReq.status:" + xmlReq.status);
-		}
-
-		if (xmlReq.readyState != xmlReq.DONE) {
-			return false;
-		}
-
-		// Read status to find redirection
-		switch (xmlReq.status) {
-			case 301:  // Moved Permanently
-			case 302:  // Found
-			case 307:  // Temporary redirect (since HTTP/1.1)
-				if (this.debug) {
-					this.logInfo(": ExchangeRequest.redirect :"
-						+ evt.type + ", readyState:" + xmlReq.readyState
-						+ ", status:" + xmlReq.status);
-				}
-
-				// Read new location from HTTP headers
-				let httpChannel = xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
-				let loc = httpChannel.getResponseHeader("Location");
-
-				// The location could be a relative path
-				if (loc.indexOf("http") === -1) {
-					if (this.debug) {
-						this.logInfo("new location looks to be relative.");
-					}
-
-					// Relative to the root of the server
-					if (loc.indexOf("/") === 0) {
-						if (this.debug) {
-							this.logInfo("Relative to the root of the server.");
-						}
-
-						// Retrieve current root path by looking for the third slash
-						// for the currenty requested URL (like https://xxx.yyy/)
-						// If there's not 3 slash, so the URL is already the root path
-						var rootUrlPath = null
-						var slashCounter = 0;
-						var pos = 0;
-						while ((slashCounter < 3) && (pos < this.currentUrl.length)) {
-							if (this.currentUrl.substr(pos, 1) === "/") {
-								slashCounter++;
-
-								if (slashCounter === 3) {
-									rootUrlPath = this.currentUrl.substr(0, pos);
-									break;
-								}
-							}
-							pos++;
-						}
-
-						if (rootUrlPath) {
-							loc = rootUrlPath + loc;
-						}
-						else {
-							loc = this.currentUrl + loc;
-						}
-					}
-					else {
-						// Relative to last dir.
-						if (this.debug){
-							this.logInfo("it is relative to the last dir. Currently not able to handle this.");
-						}
-					}
-				}
-
-				if (this.debug){
-					this.logInfo(": Redirect: " + loc + "\n");
-				}
-
-				// XXX pheer loops.
-				xmlReq.abort();
-				this.sendRequest(this.mData, loc);
-
-				// This is a redirection and we are alreday trying a new URL
-				return true;
-		}
-
-		// That wasn't a redirection
-		return false;
-	},
-
-	/*
-	 * Revert chunk process on data:
-	 * this function take string splitted in big pieces of data
-	 * and gather them in one big string.
-	 */
-	unchunk: function _unchunk(aChunkedString)
-	{
-		var pos = aChunkedString.indexOf("\r\n");
-		if ((pos > -1) && (pos < 5)) {
-			var chunkCounter = 1;
-			var chunkLength = parseInt(aChunkedString.substr(0,pos), 16);
-
-			if (isNaN(chunkLength)) {
-				if (this.debug){
-					this.logInfo("unchunk: 1st chunk is not a number:" + aChunkedString.substr(0,pos));
-				}
-				return "";
-			}
-
-			if (this.debug) {
-				this.logInfo("unchunk: 1st chunk has length:" + chunkLength);
-			}
-
-			var gatheredString = "";
-			while (chunkLength > 0) {
-				var bytesToCopy = chunkLength;
-				pos = pos + 2;
-				var charCode;
-				while (bytesToCopy > 0) {
-					gatheredString = gatheredString + aChunkedString.substr(pos, 1);
-					charCode = aChunkedString.charCodeAt(pos);
-					if (charCode <= 0xFF) {
-						bytesToCopy--;
-					}
-					else {
-						if (charCode <= 0xFFFF) {
-							if (this.debug) {
-								this.logInfo("unchunk: TWO bytes copied '" + aChunkedString.substr(pos, 1) + "'="+charCode);
-							}
-							bytesToCopy = bytesToCopy - 2;
-
-						}
-						else {
-							if (charCode <= 0xFFFFFF) {
-								if (this.debug) {
-									this.logInfo("unchunk: THREE bytes copied '" + aChunkedString.substr(pos, 1) + "'="+charCode);
-								}
-								bytesToCopy = bytesToCopy - 3;
-							}
-						}
-					}
-					pos++;
-				}
-
-				if (this.debug) {
-					this.logInfo("unchunk: pos:" + pos + ", CunkStr:" + gatheredString + "|");
-				}
-
-				// Next two bytes should be \r\n
-				var check = aChunkedString.substr(pos, 2);
-				if (check != "\r\n") {
-					if (this.debug) {
-						this.logInfo("unchunk: Strange. Expected 0D0A (Cr+Lf) but found:"
-							+ check + ". Stopping processing of this chunked message.");
-					}
-					return "";
-				}
-				pos = pos + 2;
-				var tmpStr = aChunkedString.substr(pos, 6);
-				var pos2 = tmpStr.indexOf("\r\n");
-				chunkCounter++;
-				if (pos2 > -1) {
-					if (this.debug) {
-						this.logInfo("unchunk: Found next chunk. Number:"+chunkCounter+", LengthStr:"+tmpStr.substr(0,pos2));
-					}
-
-					chunkLength = parseInt(tmpStr.substr(0,pos2), 16);
-					if (isNaN(chunkLength)) {
-						if (this.debug) {
-							this.logInfo("unchunk: Chunk '"+chunkCounter+"' is not a number:"+tmpStr);
-						}
-						return "";
-					}
-					if (this.debug) {
-						this.logInfo("unchunk: Chunk '"+chunkCounter+"' has length:"+chunkLength);
-					}
-					pos = pos + pos2;
-				}
-				else {
-					if (this.debug) {
-						this.logInfo("unchunk: Trying to determine chunk '"+chunkCounter+"' length but it is more than 4 bytes big!! size:"+tmpStr);
-					}
-					return "";
-				}
-			}
-			return gatheredString;
-		}
-		else {
-			if (this.debug) {
-				this.logInfo("unchunk: Trying to determine first chunk length but it is very big...!! size:" + pos);
-			}
-			return aChunkedString;
-		}
-	},
-
-	saveToFile: function _saveToFile(aFilename, aContent)
-	{
-		var file = Cc["@mozilla.org/file/directory_service;1"]
-			.getService(Components.interfaces.nsIProperties)
-			.get("ProfD", Components.interfaces.nsIFile);
-
-		file.append("exchange-data");
-		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
-		}
-
-		file.append("responses");
-		if ( !file.exists() || !file.isDirectory() ) {
-			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
-		}
-
-		if (!this.fileCount) {
-			this.fileCount = 0;
-		}
-		else {
-			this.fileCount++;
-		}
-
-		if (this.fileCount < 10) {
-			file.append(this.uuid+"-00" + this.fileCount + "."+aFilename);
-		}
-		else if (this.fileCount < 100) {
-			file.append(this.uuid+"-0" + this.fileCount + "." + aFilename);
-		}
-		else {
-			file.append(this.uuid+"-" + this.fileCount + "."+aFilename);
-		}
-
-		if (file.exists()) {
-			file.remove(false);
-		}
-
-		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
-			createInstance(Components.interfaces.nsIFileOutputStream);
-		foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);
-
-		var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
-			createInstance(Components.interfaces.nsIConverterOutputStream);
-		converter.init(foStream, "UTF-8", 0, 0);
-		converter.writeString(aContent);
-		converter.close(); // this closes foStream
-
-		return 0;
-	},
-
-
-	onLoad:function _onLoad(evt)
-	{
-		let xmlReq = this.mXmlReq;
-
-		if (this.debug) {
-			this.logInfo(": ExchangeRequest.onLoad :" + evt.type
-				+ ", readyState:" + xmlReq.readyState
-				+ ", status:" + xmlReq.status);
-			this.logInfo(": ExchangeRequest.onLoad :"
-				+ xmlReq.getAllResponseHeaders(), 2);
-			this.logInfo(": ExchangeRequest.onLoad :" + xmlReq.responseText, 2);
-		}
-
-		if (xmlReq.readyState != xmlReq.DONE) {
-			if (this.debug) {
-				this.logInfo("readyState is not DONE inside the onLoad internal function. THIS SHOULD NEVER HAPPEN. PLEASE REPORT.");
-			}
-			this.fail(this.ER_ERROR_OPEN_FAILED,
-				"Ready state != 4, readyState:" + xmlReq.readyState);
-			return;
-		}
-
-		// Check redirection and follow it if possible
-		// Check if this is an HTTP Error
-		if (this.isHTTPRedirect(evt) || this.isHTTPError()) {
-			return;
-		}
-
-		var xml = xmlReq.responseText; // bug 270553
-		var newXML;
-
-		// Initiate XML parser
-		try {
-			if (this.xml2json === true) {
-				newXML = xml2json.newJSON();
-			}
-			else {
-				newXML = new mivIxml2jxon('', 0, null);
-			}
-		}
-		catch(exc) {
-			if (this.debug) {
-				this.logInfo("createInstance error:"+exc);
-			}
-		}
-
-		// Parse XML data
-		try {
-			if (this.xml2json === true) {
-				xml2json.parseXML(newXML, xml);
-			}
-			else {
-				newXML.addNameSpace("s", nsSoapStr);
-				newXML.addNameSpace("m", nsMessagesStr);
-				newXML.addNameSpace("t", nsTypesStr);
-				newXML.addNameSpace("a1", nsAutodiscoverResponseStr1);
-				newXML.addNameSpace("a2", nsAutodiscoverResponseStr2);
-				newXML.processXMLString(xml, 0, null);
-			}
-		}
-		catch(exc) {
-			if (this.debug) {
-				this.logInfo("processXMLString error:" + exc.name + ","
-					+ exc.message + "\n" + xml);
-			}
-		}
-
-		this.mAuthFail = 0;
-		this.mRunning  = false;
-
-		if (this.mCbOk) {
-			// Try to get server version and store it.
-			try {
-				if (this.xml2json === true) {
-					let serverVersion = xml2json.XPath(newXML,"/Envelope/Header/ServerVersionInfo");
-					if (serverVersion.length > 0
-						&& xml2json.getAttribute(serverVersion[0], "Version") !== null) {
-						this.exchangeStatistics.setServerVersion(this.currentUrl,
-							xml2json.getAttribute(serverVersion[0], "Version"),
-							xml2json.getAttribute(serverVersion[0], "MajorVersion"),
-							xml2json.getAttribute(serverVersion[0], "MinorVersion"));
-					}
-					serverVersion = null;
-				}
-				else {
-					let serverVersion = newXML.XPath("/s:Header/ServerVersionInfo");
-					if (serverVersion.length > 0
-						&& serverVersion[0].getAttribute("Version") != "") {
-						this.exchangeStatistics.setServerVersion(this.currentUrl,
-							serverVersion[0].getAttribute("Version"),
-							serverVersion[0].getAttribute("MajorVersion"),
-							serverVersion[0].getAttribute("MinorVersion"));
-					}
-					serverVersion[0] = null;
-					serverVersion = null;
-				}
-			}
-			catch(err) {
-			}
-
-			this.retryCount = 0;
-			if (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-				exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-			}
-
-			try {
-				this.mCbOk(this, newXML);
-			}
-			catch(err)
-			{
-				if (this.debug) {
-					this.logInfo("onLoad: err:" + err);
-					this.logInfo("onLoad: stack:" + this.globalFunctions.STACK());
-					this.logInfo("onLoad: xml:" + xml);
-				}
-			}
-			this.originalReq = null;
-		}
-
-		newXML = null;
-		this.observerService.notifyObservers(this.channelCallbackEcAuthPrompt2, "onExchangeConnectionOk", this.currentUrl);
-	},
-
-	retryCurrentUrl: function()
-	{
-		this.sendRequest(this.mData, this.currentUrl);
-	},
-
-	tryNextURL: function _tryNextURL()
-	{
-		if (this.debug) {
-			this.logInfo("exchangeRequest.tryNextURL");
-		}
-
-		let xmlReq = this.mXmlReq;
-
-		if (xmlReq.readyState != xmlReq.DONE) {
-			xmlReq.abort();
-		}
-
-		if (this.urllist.length > 0) {
-			if (this.debug) this.logInfo("exchangeRequest.tryNextURL: We have another URL to try the request on.");
-			this.sendRequest(this.mData);
-			return true;
-		}
-		return false;
-	},
-
-	getPrePassword: function _getPrePassword(aCurrentUrl, aUser)
-	{
-		var tmpURL = aCurrentUrl;
-		if (aUser != "") {
-			// We insert the username into the URL the prePassword needs it.
-			// https://webmail.example.com/ews/exchange.asmx
-
-			var tmpColon = tmpURL.indexOf("://");
-			tmpURL = tmpURL.substr(0, tmpColon + 3) + aUser + "@" + tmpURL.substr(tmpColon+3);
-		}
-		return this.channelCallbackEcAuthPrompt2.getPrePassword(aUser, tmpURL);
-	},
-
-	isHTTPError: function()
-	{
-		let xmlReq = this.mXmlReq;
-
-		if (xmlReq.status != 200) {
-			if (xmlReq.status ==  303) {  // See Other (since HTTP/1.1) new request should be a GET instead of a POST.
-				this.fail(this.ER_ERROR_HTTP_ERROR4XX,
-					"HTTP Redirection " + xmlReq.status + ": See Other\n"
-					+ xmlReq.responseText.substr(0,300) + "\n\n");
-				return true;
-			}
-
-			if ((xmlReq.status > 399) && (xmlReq.status < 500)) {
-				var errMsg = "";
-				switch (xmlReq.status) {
-					case 400: errMsg = "Bad request"; break;
-					case 401: errMsg = "Unauthorized"; break;
-					case 402: errMsg = "Payment required"; break;
-					case 403: errMsg = "Forbidden"; break;
-					case 404: errMsg = "Not found"; break;
-					case 405: errMsg = "Method not allowed"; break;
-					case 406: errMsg = "Not acceptable"; break;
-					case 407: errMsg = "Proxy athentication required"; break;
-					case 408: errMsg = "Request timeout"; break;
-					case 409: errMsg = "Conflict"; break;
-					case 410: errMsg = "Gone"; break;
-					case 411: errMsg = "Length required"; break;
-					case 412: errMsg = "Precondition failed"; break;
-					case 413: errMsg = "Request entity too large"; break;
-					case 414: errMsg = "Request-URI too long"; break;
-					case 415: errMsg = "Unsupported media type"; break;
-					case 416: errMsg = "Request range not satisfiable"; break;
-					case 417: errMsg = "Expectation failed"; break;
-					case 418: errMsg = "I'm a teapot(RFC 2324)"; break;
-					case 420: errMsg = "Enhance your calm (Twitter)"; break;
-					case 422: errMsg = "Unprocessable entity (WebDAV)(RFC 4918)"; break;
-					case 423: errMsg = "Locked (WebDAV)(RFC 4918)"; break;
-					case 424: errMsg = "Failed dependency (WebDAV)(RFC 4918)"; break;
-					case 425: errMsg = "Unordered collection (RFC 3648)"; break;
-					case 426: errMsg = "Upgrade required (RFC2817)"; break;
-					case 428: errMsg = "Precondition required"; break;
-					case 429: errMsg = "Too many requests"; break;
-					case 431: errMsg = "Request header fields too large"; break;
-					case 444: errMsg = "No response"; break;
-					case 449: errMsg = "Retry with"; break;
-					case 450: errMsg = "Blocked by Windows Parental Controls"; break;
-					case 499: errMsg = "Client closed request"; break;
-				}
-
-				if (this.debug) {
-					this.logInfo(": isConnError req.status=" + xmlReq.status
-						+ ": " +errMsg + "\nURL:" + this.currentUrl + "\n"
-						+ xmlReq.responseText, 2);
-				}
-
-				var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-				if (this.urllist.length > 0 && !myAuthPrompt2.getUserCanceled(this.currentUrl)) {
-					if (this.tryNextURL()) {
-						return true;
-					}
-					this.fail(this.ER_ERROR_HTTP_ERROR4XX,
-						"HTTP Client error " + xmlReq.status + ": "
-						+ errMsg + "\nURL:" + this.currentUrl + "\n"
-						+ xmlReq.responseText.substr(0,300)+"\n\n");
-				}
-				else if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
-					this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
-						"User canceled providing a valid password for url="
-						+ this.currentUrl + ". Aborting this request.");
-				}
-				else {
-					this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Client error "
-						+ xmlReq.status + ": " +errMsg +"\nURL:" + this.currentUrl
-						+ "\n" + xmlReq.responseText.substr(0,300)+"\n\n");
-				}
-
-				return true;
-			}
-
-			if ((xmlReq.status > 499) && (xmlReq.status < 600)) {
-				var errMsg = "";
-				switch (xmlReq.status) {
-					case 500: errMsg = "Internal server error";
-						// First check if we have a version mismatch and we need a lower version. This sometimes happens.
-						if (xmlReq.responseText.indexOf("ErrorInvalidServerVersion") > -1) {
-							if (this.debug) {
-								this.logInfo(" ErrorInvalidServerVersion -> RequestServerVersion wrong:"+this.version+".", 2);
-							}
-
-							// We are going to retry with a different server version.
-							var tryAgain = false;
-							switch(this.version) {
-								case "Exchange2010":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2007_SP1", null, null);
-									tryAgain = true;
-									break;
-								case "Exchange2010_SP1":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
-									tryAgain = true;
-									break;
-								case "Exchange2010_SP2":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
-									tryAgain = true;
-									break;
-								case "Exchange2013":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
-									tryAgain = true;
-									break;
-								default:
-									tryAgain = false;
-							}
-							if (tryAgain) {
-								if (this.debug) {
-									this.logInfo("Going to retry with lower server version", 2);
-								}
-								this.sendRequest(this.makeSoapMessage(this.originalReq), this.currentUrl);
-								return true;
-							}
-						}
-						// Next check if we have a version mismatch and we need a higher version. This sometimes happens.
-						if (xmlReq.responseText.indexOf("ErrorIncorrectSchemaVersion") > -1
-							&& xmlReq.responseText.indexOf("RequestServerVersion") > -1) {
-							if (this.debug){
-								this.logInfo(" ErrorIncorrectSchemaVersion -> RequestServerVersion wrong:"+this.version+".", 2);
-							}
-							// We are going to retry with a different serverversion.
-							var tryAgain = false;
-							switch(this.version) {
-								case "Exchange2007_SP1":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
-									tryAgain = true;
-									break;
-								case "Exchange2010":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
-									tryAgain = true;
-									break;
-								case "Exchange2010_SP1":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
-									tryAgain = true;
-									break;
-								case "Exchange2010_SP2":
-									this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2013", null, null);
-									tryAgain = true;
-									break;
-								default:
-									tryAgain = false;
-							}
-							if (tryAgain) {
-								if (this.debug) {
-									this.logInfo("Going to retry with higher server version", 2);
-								}
-								this.sendRequest(this.makeSoapMessage(this.originalReq), this.currentUrl);
-								return true;
-							}
-						}
-
-						// This might be generated because of a password not yet supplied in open function during a request so we try again
-						if	((!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl])
-							 || (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount < 3)) {
-							if (this.debug) {
-								this.logInfo("isHTTPError: We are going to ask the user or password store for a password and try again.");
-							}
-							this.prePassword = this.getPrePassword(this.currentUrl, this.mArgument.user);
-
-							if (this.prePassword) {
-								if (this.debug) {
-									this.logInfo("isHTTPError: We received a prePassword. Going to retry current URL");
-								}
-
-								if (!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-									exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl] = {};
-									exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-								}
-								exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].prePassword = this.prePassword;
-								exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount++;
-
-								xmlReq.abort();
-								this.retryCurrentUrl();
-
-								return true;
-							}
-							if (this.debug) {
-								this.logInfo("isHTTPError: User canceled request for prePassword.");
-							}
-						}
-
-						// Password were given and that's the third try we have an error
-						if	((exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl])
-							 && (exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount > 2)) {
-							// Failed three times. Remove password also from password store.
-							if (this.debug) {
-								this.logInfo("isHTTPError: Failed password "
-									+ exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount
-									+ " times. Stopping communication.");
-							}
-							var title = "Microsoft Exchange EWS";
-							var tmpURL = this.currentUrl;
-							if (this.mArgument.user != "") {
-								// We insert the username into the URL the prePassword needs it.
-								// https://webmail.example.com/ews/exchange.asmx
-
-								var tmpColon = tmpURL.indexOf("://");
-								tmpURL = tmpURL.substr(0, tmpColon+3) + this.mArgument.user + "@" + tmpURL.substr(tmpColon+3);
-							}
-							this.channelCallbackEcAuthPrompt2.passwordManagerRemove(this.mArgument.user, tmpURL, title);
-						}
-
-						// Finally reset password cache
-						if (!exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl]) {
-							exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl] = {};
-						}
-
-						exchWebService.prePasswords[this.mArgument.user+"@"+this.currentUrl].tryCount = 0;
-
-						this.prePassword = null;
-						break;
-					case 501: errMsg = "Not implemented"; break;
-					case 502: errMsg = "Bad gateway"; break;
-					case 503: errMsg = "Service unavailable"; break;
-					case 504: errMsg = "Gateway timeout"; break;
-					case 505: errMsg = "HTTP version not supported"; break;
-					case 506: errMsg = "Variant also negotiates (RFC 2295)"; break;
-					case 507: errMsg = "Insufficient Storage (WebDAV)(RFC 4918)"; break;
-					case 508: errMsg = "Loop detected (WebDAV)(RFC 4918)"; break;
-					case 509: errMsg = "Bandwith limit exceeded (Apache bw/limited extension)"; break;
-					case 510: errMsg = "Not extended (RFC 2774)"; break;
-					case 511: errMsg = "Network authentication required"; break;
-					case 598: errMsg = "Network read timeout error"; break;
-					case 599: errMsg = "Network connect timeout error"; break;
-				}
-
-				if (this.debug) {
-					this.logInfo(": isConnError req.status="
-						+ xmlReq.status + ": " + errMsg
-						+ "\nURL:" + this.currentUrl + "\n"
-						+ xmlReq.responseText, 2);
-				}
-
-				if (this.tryNextURL()) {
-					return true;
-				}
-
-				this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Server error "+xmlReq.status+": "+errMsg+"\nURL:"+this.currentUrl+"\n"+xmlReq.responseText.substr(0,300)+"\n\n");
-				return true;
-			} // End of error status 5xx
-
-			if (this.tryNextURL()) {
-				return true;
-			}
-
-			// XXX parse it
- 			this.fail(this.ER_ERROR_FROM_SERVER, "Unknown error from server"
- 				+ xmlReq.status + ": " + errMsg + "\nURL:"+this.currentUrl
- 				+ "\n" + xmlReq.responseText.substr(0,300) + "\n\n");
-			return true;
-		} // Received HTTP 200 OK
-
-		// That wasn't an HTTP error
-		return false;
-	},
-
-	fail: function(aCode, aMsg)
-	{
-		if (this.debug) {
-			this.logInfo("ecExchangeRequest.fail: aCode:"+aCode+", aMsg:"+aMsg);
-		}
-
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-
-		this.originalReq = null;
-	},
-
-	/*
-	 * Generate SOAP message by xml2json
-	 */
-	makeSoapMessage2: function erMakeSoapMessage2(aReq)
-	{
-		this.originalReq = aReq;
-
-		var root = xml2json.newJSON();
-		var msg = xml2json.addTag(root, "Envelope", "nsSoap");
-		xml2json.setAttribute(msg, "xmlns:nsSoap", nsSoapStr);
-		xml2json.setAttribute(msg, "xmlns:nsMessages", nsMessagesStr);
-		xml2json.setAttribute(msg, "xmlns:nsTypes", nsTypesStr);
-
-		this.version = this.exchangeStatistics.getServerVersion(this.mArgument.serverUrl);
-
-		var header = xml2json.addTag(msg,"Header", "nsSoap", null);
-
-		var requestServerVersion = xml2json.addTag(header, "RequestServerVersion", "nsTypes", null);
-		xml2json.setAttribute(requestServerVersion, "Version", this.version);
-
-		var exchTimeZone = this.timeZones.getExchangeTimeZoneByCalTimeZone(this.globalFunctions.ecDefaultTimeZone(), this.mArgument.serverUrl, cal.now());
-
-		if (exchTimeZone) {
-			let timeZoneContext = xml2json.addTag(header, "TimeZoneContext", "nsTypes", null);
-			let tmpTimeZone = xml2json.addTag(timeZoneContext, "TimeZoneDefinition", "nsTypes");
-			if (this.version.indexOf("2007") < 0) {
-				xml2json.setAttribute(tmpTimeZone, "Name",exchTimeZone.name);
-			}
-			xml2json.setAttribute(tmpTimeZone, "Id",exchTimeZone.id);
-			tmpTimeZone = null;
-			timeZoneContext = null;
-		}
-		header = null;
-
-		let body = xml2json.addTag(msg, "Body", "nsSoap", null);
-		xml2json.addTagObject(body, aReq);
-		body = null;
-
-		var tmpStr = xml_tag + xml2json.toString(root);
-		msg = null;
-		root = null;
-		return tmpStr;
-	},
-
-	/*
-	 * Generate SOAP message by mivIxml2jxon
-	 */
-	makeSoapMessage: function erMakeSoapMessage(aReq)
-	{
-		this.originalReq = aReq;
-
-		var msg = new mivIxml2jxon('<nsSoap:Envelope xmlns:nsSoap="'+nsSoapStr+'" xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>', 0, null);
-
-		this.version = this.exchangeStatistics.getServerVersion(this.mArgument.serverUrl);
-
-		var header = msg.addChildTag("Header", "nsSoap", null);
-		header.addChildTag("RequestServerVersion", "nsTypes", null).setAttribute("Version", this.version);
-
-		var exchTimeZone = this.timeZones.getExchangeTimeZoneByCalTimeZone(this.globalFunctions.ecDefaultTimeZone(), this.mArgument.serverUrl, cal.now());
-
-		if (exchTimeZone) {
-			if (this.version.indexOf("2007") > -1) {
-				var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>',0,null);
-				tmpTimeZone.setAttribute("Id",exchTimeZone.id);
-			}
-			else {
-				var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>',0,null);
-				tmpTimeZone.setAttribute("Name",exchTimeZone.name);
-				tmpTimeZone.setAttribute("Id",exchTimeZone.id);
-			}
-			header.addChildTag("TimeZoneContext", "nsTypes", null).addChildTagObject(tmpTimeZone);
-			tmpTimeZone = null;
-		}
-		header = null;
-
-		msg.addChildTag("Body", "nsSoap", null).addChildTagObject(aReq);
-
-		var tmpStr = xml_tag + msg.toString();
-		msg = null;
-		return tmpStr;
-	},
-
-	getSoapErrorMsg: function _getSoapErrorMsg(aResp)
-	{
-		if (this.xml2json) {
-			var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/*/m:ResponseMessages/*[@ResponseClass='Error']");
-			var result;
-			if (rm.length > 0) {
-				result = xml2json.getTagValue(rm[0], "m:MessageText").value+"("+xml2json.getTagValue(rm[0], "m:ResponseCode")+")";
-			}
-			else {
-				result = null;
-			}
-		}
-		else {
-			var rm = aResp.XPath("/s:Envelope/s:Body/*/m:ResponseMessages/*[@ResponseClass='Error']");
-			var result;
-			if (rm.length > 0) {
-				result = rm[0].getTagValue("m:MessageText").value+"("+rm[0].getTagValue("m:ResponseCode")+")";
-			}
-			else {
-				result = null;
-			}
-
-		}
-		rm = null;
-		return result
-	},
-
-	passwordError: function erPasswordError(aMsg)
-	{
-		this.fail(this.ERR_PASSWORD_ERROR, aMsg);
-	},
+    ER_ERROR_EMPTY_FOLDERPATH: -2,
+    ER_ERROR_INVALID_URL: -6, // "No url to send request to."
+    ER_ERROR_RESPONS_NOT_VALID: -7, // "Respons does not contain expected field"
+    ER_ERROR_SOAP_ERROR: -8, // "Error on creating item:"+responseCode
+    ER_ERROR_RESOLVING_HOST: -9, // "Error during resolving of hostname"
+    ER_ERROR_CONNECTING_TO: -10, // "Error during connecting to hostname"
+    ER_ERROR_CREATING_ITEM_UNKNOWN: -13, // "Error. Unknown item creation:"+String(aResp)
+
+    ER_ERROR_CONNECED_TO: -14, // "Error during connection to hostname '"
+    ER_ERROR_SENDING_TO: -15, // "Error during sending data to hostname '"
+    ER_ERROR_WAITING_FOR: -16, // "Error during waiting for data of hostname '" 
+    ER_ERROR_RECEIVING_FROM: -17, // "Error during receiving of data from hostname '"
+    ER_ERROR_UNKNOWN_CONNECTION: -18, // "Unknown error during communication with hostname 
+    ER_ERROR_HTTP_ERROR4XX: -19, // A HTTP 4XX error code was returned.
+
+    ER_ERROR_USER_ABORT_AUTHENTICATION: -20, // "User aborted authentication credentials"
+    ER_ERROR_USER_ABORT_ADD_CERTIFICATE: -30, // "User aborted adding required certificate"
+    ER_ERROR_OPEN_FAILED: -100, // "Could not connect to specified host:"+err
+    ER_ERROR_FROM_SERVER: -101, // HTTP error from server.
+    ER_ERROR_AUTODISCOVER_GET_EWSULR: -200, // During auto discovery no EWS URL were discoverd in respons.
+    ER_ERROR_FINDFOLDER_NO_TOTALITEMSVIEW: -201, // Field totalitemsview missing in soap response.
+    ER_ERROR_FINDFOLDER_FOLDERID_DETAILS: -202, // Could not find folderid details in soap response.
+    ER_ERROR_FINDFOLDER_MULTIPLE_RESULTS: -203, // Found more than one results in the findfolder soap response.
+    ER_ERROR_FINDOCCURRENCES_INVALIDIDMALFORMED: -204, // Found an malformed id during find occurrences.
+    ER_ERROR_GETOCCURRENCEINDEX_NOTFOUND: -205, // Could not found occurrence index.
+    ER_ERROR_SOAP_RESPONSECODE_NOTFOUND: -206, // Could not find the responce field in the soap response.
+    ER_ERROR_PRIMARY_SMTP_NOTFOUND: -207, // Primary SMTP address could not be found in soap response.
+    ER_ERROR_PRIMARY_SMTP_UNKNOWN: -208, // Unknown error during Primary SMTP check.
+    ER_ERROR_UNKNOWN_MEETING_REPSONSE: -209, // Unknown Meeting Response.
+    ER_ERROR_SYNCFOLDERITEMS_UNKNOWN: -210, // Unknown error during SyncFolders.
+    ER_ERROR_ITEM_UPDATE_UNKNOWN: -211, // Unknown error during item ipdate.
+    ER_ERROR_SPECIFIED_SMTP_NOTFOUND: -212, // Specified SMTP address does not exist.
+    ER_ERROR_CONVERTID: -214, // Specified SMTP address does not exist.
+    ER_ERROR_NOACCESSTOFREEBUSY: -215, // Specified user has no access to free/busy information of specified mailbox.
+    ER_ERROR_FINDOCCURRENCES_UNKNOWN: -216, // We received an unkown error while trying to get the occurrences. 
+
+    ERR_PASSWORD_ERROR: -300, // To many password errors.
+
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver]),
+
+    /*
+    In Mozilla bug 1221320, changes were done to XMLHttpRequest so that the authPrompt dialog only appears
+    if neither username nor password is set in the request URL. So you only asyncPromptAuth called when both
+    are blank. But Exchange calendar sets a username on the first authentication attempt (supporting Basic
+    and Kerberos), expecting a callback to asyncPromptAuth if that fails, which it does for NTLM.
+
+    Further changes to authentication are all controlled through these asyncPromptAuth calls which never occur, hence failure. What we
+    do with the observer is reverse the effect of that bug, adding back the calls to asyncPromptAuth
+    */
+    observe(aSubject, aTopic, aData) {
+        let channel = aSubject.QueryInterface(Components.interfaces.nsIHttpChannel);
+        this.logInfo("ecExchangeRequest observing http-on-modify-request for URI " + channel.URI.spec
+            + " originalURI " + (channel.originalURI ? channel.originalURI.spec : "none"));
+
+        // Only respond to our host
+        let myHost = this.xmlReq && this.xmlReq.channel && this.xmlReq.channel.URI.host;
+        let theirHost = channel.URI.host;
+        if (myHost && (myHost != theirHost)) {
+            this.logInfo("Host does not match, theirs: " + theirHost + " mine: " + myHost);
+            return;
+        }
+
+        let internalChannel = channel.QueryInterface(Ci.nsIHttpChannelInternal);
+        if (internalChannel.blockAuthPrompt) {
+            this.logInfo("unblocking request");
+            internalChannel.blockAuthPrompt = false;
+        }
+        else
+            this.logInfo("Already unblocked");
+    },
+
+    get debug() {
+        if ((this.debuglevel === 0) || (!this.globalFunctions.shouldLog())) {
+            return false;
+        }
+
+        return this.globalFunctions.safeGetBoolPref(this.prefB, "extensions.1st-setup.network.debug", false, true);
+    },
+
+    get debuglevel() {
+        return this.globalFunctions.safeGetIntPref(this.prefB, "extensions.1st-setup.network.debuglevel", 0, true);
+    },
+
+    logInfo: function _logInfo(aMsg, aLevel) {
+        if (!aLevel) {
+            aLevel = 1;
+        }
+
+        if ((this.debug) && (aLevel <= this.debuglevel)) {
+            this.globalFunctions.LOG(this.uuid + ": " + aMsg);
+        }
+    },
+
+    get argument() {
+        return this.mArgument;
+    },
+
+    get user() {
+        return this.argument.user;
+    },
+
+    set user(aValue) {
+        this.argument.user = aValue;
+    },
+
+    stopRequest: function _stopRequest() {
+        this.shutdown = true;
+        this.xmlReq.abort();
+    },
+
+    sendRequest: function (aData, aUrl) {
+        // Stop process while exchangecalendar is shutted down
+        if (this.shutdown) {
+            return;
+        }
+
+        //////////////////////////////////
+        // Looking for URL to send data //
+        //////////////////////////////////
+        this.currentUrl = null;
+
+        // If no URL is given, try cached next known URL
+        // This handle the process of AutoDiscovery while list of URLs to try is not empty
+        if ((!aUrl) && (this.urllist.length > 0)) {
+            aUrl = this.urllist[0];
+            this.urllist.shift();
+        }
+
+        // If no URL is given and we have tried every known URL, stop process
+        if ((!aUrl) || (aUrl === "") || (aUrl === undefined)) {
+            this.fail(this.ER_ERROR_INVALID_URL,
+                "No url to send request to (sendRequest).");
+            return;
+        }
+
+        // If previously user canceled request on the "Certification issue dialog" for this URL,
+        // we have to not go further with this one
+        if (this.exchangeBadCertListener2.userCanceledCertProblem(aUrl)) {
+            this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+                "User previously canceled adding server certificate for url=" + aUrl + ". Aborting this request.");
+            return;
+        }
+
+        // We found an URL to send data, save it to current process
+        this.currentUrl = aUrl;
+
+        /////////////////////////////
+        // Processing data to send //
+        /////////////////////////////
+        this.mData = aData;
+
+        //////////////////////////////////////
+        // Looking for user authentications //
+        ////////////////////////////////////
+        var openUser = this.mArgument.user;
+        var password = null;
+
+        var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(
+            Ci.mivExchangeAuthPrompt2);
+
+        if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
+            this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+                "User canceled providing a valid password for url="
+                + this.currentUrl + ". Aborting this request.");
+            return;
+        }
+
+        try {
+            password = myAuthPrompt2.getPassword(null, openUser, this.currentUrl);
+        }
+        catch (err) {
+            this.logInfo(err);
+            this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+                "User canceled providing a valid password for url="
+                + this.currentUrl + ". Aborting this request.");
+            myAuthPrompt2 = null;
+            return;
+        }
+        myAuthPrompt2 = null;
+
+        ////////////////////////////////////////////////////
+        // Sending data through standard XML HTTP Request //
+        ////////////////////////////////////////////////////
+        // http://dvcs.w3.org/hg/progress/raw-file/tip/Overview.html
+        // https://developer.mozilla.org/en/XPCOM_Interface_Reference/nsIXMLHttpRequestEventTarget
+
+        this.xmlReq = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
+        this.mXmlReq = this.xmlReq;
+
+        var currentEcRequest = this;
+
+        // Add listeners to the request so we have more details on the current state
+        this.xmlReq.addEventListener("loadstart",
+            function (evt) {
+                currentEcRequest.loadstart(evt);
+            },
+            false);
+        this.xmlReq.addEventListener("progress",
+            function (evt) {
+                currentEcRequest.progress(evt);
+            },
+            false);
+        this.xmlReq.addEventListener("error",
+            function (evt) {
+                currentEcRequest.error(evt);
+            },
+            false);
+        this.xmlReq.addEventListener("abort",
+            function (evt) {
+                currentEcRequest.abort(evt);
+            },
+            false);
+        this.xmlReq.addEventListener("load",
+            function (evt) {
+                currentEcRequest.onLoad(evt);
+            },
+            false);
+        this.xmlReq.addEventListener("loadend",
+            function (evt) {
+                currentEcRequest.loadend(evt);
+            },
+            false);
+
+        if (this.debug) {
+            this.logInfo(": 1 ExchangeRequest.sendRequest : user="
+                + this.mArgument.user + ", url=" + this.currentUrl);
+        }
+
+        // Open XML HTTP Request channel we'll use to coummunicate with the server
+        try {
+            // If a password is already known, we can try basic authentication diretcly.
+            if (password) {
+                if (this.debug) this.logInfo("We have a prePassword: *******");
+                this.xmlReq.open("POST", this.currentUrl, true, openUser, password);
+            }
+            else {
+                // If we don't have a password, we need to reach one time the URL
+                // to get a NTML challenge
+                // TODO: check if this comment is correct
+                this.xmlReq.open("POST", this.currentUrl, true, openUser);
+            }
+        }
+        catch (err) {
+            if (this.debug) {
+                this.logInfo(": ERROR on ExchangeRequest.sendRequest to URL:"
+                    + this.currentUrl + ". err:" + err);
+            }
+
+            // Try another URL if possible
+            if (this.tryNextURL()) {
+                return;
+            }
+
+            this.fail(this.ER_ERROR_OPEN_FAILED, "Could not connect to specified host:" + err);
+            return;
+        }
+
+        // Update HTTP Headers
+        this.xmlReq.overrideMimeType('text/xml');
+        this.xmlReq.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
+        this.xmlReq.setRequestHeader("User-Agent", this.globalFunctions.safeGetCharPref(this.prefB, "extensions.1st-setup.others.userAgent", "exchangecalendar@extensions.1st-setup.nl", true));
+
+        // This is required for NTLM authenticated sessions. Which is default for a default EWS install.
+        this.xmlReq.setRequestHeader("Connection", "keep-alive");
+
+        /* set channel notifications for password processing */
+        this.channelCallbackEcAuthPrompt2 = new ecnsIAuthPrompt2(this);
+        this.xmlReq.channel.notificationCallbacks = this.channelCallbackEcAuthPrompt2;
+        this.xmlReq.channel.loadGroup = null;
+
+        var httpChannel = this.xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
+
+        // XXX we want to preserve POST across 302 redirects
+        // TODO: This might go away because header params are copyied right now.
+        httpChannel.redirectionLimit = 0;
+        try {
+            httpChannel.allowPipelining = false;
+        }
+        catch (err) {
+            this.logInfo("sendRequest: ERROR on httpChannel.allowPipelining to err:" + err);
+        }
+
+        if (this.debug) {
+            this.logInfo(": sendRequest Sending: " + this.mData + "\n", 2);
+        }
+
+        // Finally, send data through the channel
+        this.xmlReq.send(this.mData);
+    },
+
+    /*
+     * loadstart: XML HTTP Request callback
+     */
+    loadstart: function _loadtstart(evt) {
+        if (this.debug) this.logInfo(": ExchangeRequest.loadstart");
+        this.shutdown = false;
+        this.badCert = false;
+    },
+
+    /*
+     * loadend: XML HTTP Request callback
+     */
+    loadend: function _loadend(evt) {
+        if (this.debug) {
+            this.logInfo(": ExchangeRequest.loadend :"
+                + evt.type + ", readyState:" + this.mXmlReq.readyState
+                + ", status:" + this.mXmlReq.status);
+            this.logInfo(": ExchangeRequest.loadend :"
+                + this.mXmlReq.responseText, 2);
+        }
+    },
+
+    /*
+     * progress: XML HTTP Request callback
+     */
+    progress: function _progress(evt) {
+        if (this.debug) {
+            this.logInfo(": ExchangeRequest.progress. loaded:"
+                + evt.loaded + ", total:" + evt.total);
+        }
+    },
+
+    /*
+     * error: XML HTTP Request callback
+     * Depending on error received we try to recover if possible
+     */
+    error: function _error(evt) {
+        let xmlReq = this.mXmlReq;
+
+        if (this.debug) {
+            this.logInfo(": ExchangeRequest.error :" + evt.type
+                + ", readyState:" + xmlReq.readyState + ", status:" + xmlReq.status
+                + ", lastStatus:" + this.channelCallbackEcAuthPrompt2.lastStatus);
+            this.logInfo(": ExchangeRequest.error :" + xmlReq.responseText, 2);
+            this.logInfo(': xmlReq.getResponseHeader("Location") :'
+                + xmlReq.getResponseHeader("Location"), 2);
+        }
+
+        //////////////////////////////////////////////////////////
+        // Check if error is related to TLS certification issue //
+        // Connection is terminated and HTTP status is 0 (none) //
+        //////////////////////////////////////////////////////////
+        if ((!this.shutdown)
+            && (xmlReq.readyState === xmlReq.DONE)
+            && (xmlReq.status === 0)) {
+            this.logInfo(": ExchangeRequest.error : badCert going to check if it is a cert problem.");
+            var result = null;
+
+            try {
+                result = this.exchangeBadCertListener2.checkAndSolveCertProblem(this.currentUrl);
+            }
+            catch (err) {
+                this.logInfo(": ExchangeRequest.error : this.exchangeBadCertListener2.checkAndSolveCertProblem Error:" + err);
+            }
+
+            if (result.hadProblem) {
+                if (result.solved) {
+                    this.logInfo(": ExchangeRequest.error : badCert problem but solved. going to retry url.");
+                    this.retryCurrentUrl();
+                    return;
+                }
+                else {
+                    this.logInfo(": ExchangeRequest.error : badCert problem and NOT solved. going to fail.");
+                }
+            }
+            else {
+                this.logInfo(": ExchangeRequest.error : badCert no problem.");
+            }
+        }
+
+        // Stop if we are able to resolve the error following redirection or trying next URL
+        if (this.isHTTPRedirect(evt) || this.tryNextURL()) {
+            return;
+        }
+
+        this.observerService.notifyObservers(this.channelCallbackEcAuthPrompt2,
+            "onExchangeConnectionError",
+            this.currentUrl + "|" + this.channelCallbackEcAuthPrompt2.lastStatus
+            + "|" + this.channelCallbackEcAuthPrompt2.lastStatusArg);
+
+        switch (this.channelCallbackEcAuthPrompt2.lastStatus) {
+            // On these status, we abort current connection, reset try counter and return
+        case 0x804b0003:
+        case 0x804b000b:
+            this.fail(this.ER_ERROR_RESOLVING_HOST,
+                "Error resolving hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg
+                + "'. Did you type the right hostname. (STATUS_RESOLVED)");
+            xmlReq.abort();
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+            return;
+        case 0x804b0007:
+            this.fail(this.ER_ERROR_CONNECTING_TO, "Error during connecting to hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg
+                + "'. Is the host down?. (STATUS_CONNECTING_TO)");
+            xmlReq.abort();
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+            return;
+            // On these status we just reset try counter and continue
+        case 0x804b0004:
+            this.fail(this.ER_ERROR_CONNECED_TO, "Error during connection to hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_CONNECTED_TO)");
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+            break;
+        case 0x804b0005:
+            this.fail(this.ER_ERROR_SENDING_TO, "Error during sending data to hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_SENDING_TO)");
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+            break;
+        case 0x804b000a:
+            this.fail(this.ER_ERROR_WAITING_FOR, "Error during waiting for data of hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_WAITING_FOR)");
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+            break;
+        case 0x804b0006:
+            this.fail(this.ER_ERROR_RECEIVING_FROM, "Error during receiving of data from hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg + "'. (STATUS_RECEIVING_FROM)");
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+            break;
+            // Unknown status
+        default:
+            this.fail(this.ER_ERROR_UNKNOWN_CONNECTION, "Unknown error during communication with hostname '"
+                + this.channelCallbackEcAuthPrompt2.lastStatusArg
+                + "'. (" + this.channelCallbackEcAuthPrompt2.lastStatus + ")");
+        }
+
+    },
+
+    /*
+     * abort: XML HTTP Request callback
+     */
+    abort: function _abort(evt) {
+        if (this.debug) {
+            this.logInfo("ExchangeRequest.abort: type:" + evt.type);
+        }
+    },
+
+    onUserStop: function _onUserStop(aCode, aMsg) {
+        if (this.debug) {
+            this.logInfo("ecExchangeRequest.onUserStop: aCode:" + aCode + ", aMsg:" + aMsg);
+        }
+
+        this.mXmlReq.abort();
+        this.fail(aCode, aMsg);
+    },
+
+    /*
+     * isHTTPRedirect: check if URL has bee redirected and try to go through redirection
+     */
+    isHTTPRedirect: function (evt) {
+        let xmlReq = this.mXmlReq;
+
+        if (this.debug) {
+            this.logInfo("exchangeRequest.isHTTPRedirect.xmlReq. xmlReq.readyState:"
+                + xmlReq.readyState + ", xmlReq.status:" + xmlReq.status);
+        }
+
+        if (xmlReq.readyState != xmlReq.DONE) {
+            return false;
+        }
+
+        // Read status to find redirection
+        switch (xmlReq.status) {
+        case 301: // Moved Permanently
+        case 302: // Found
+        case 307: // Temporary redirect (since HTTP/1.1)
+            if (this.debug) {
+                this.logInfo(": ExchangeRequest.redirect :"
+                    + evt.type + ", readyState:" + xmlReq.readyState
+                    + ", status:" + xmlReq.status);
+            }
+
+            // Read new location from HTTP headers
+            let httpChannel = xmlReq.channel.QueryInterface(Ci.nsIHttpChannel);
+            let loc = httpChannel.getResponseHeader("Location");
+
+            // The location could be a relative path
+            if (loc.indexOf("http") === -1) {
+                if (this.debug) {
+                    this.logInfo("new location looks to be relative.");
+                }
+
+                // Relative to the root of the server
+                if (loc.indexOf("/") === 0) {
+                    if (this.debug) {
+                        this.logInfo("Relative to the root of the server.");
+                    }
+
+                    // Retrieve current root path by looking for the third slash
+                    // for the currenty requested URL (like https://xxx.yyy/)
+                    // If there's not 3 slash, so the URL is already the root path
+                    var rootUrlPath = null
+                    var slashCounter = 0;
+                    var pos = 0;
+                    while ((slashCounter < 3) && (pos < this.currentUrl.length)) {
+                        if (this.currentUrl.substr(pos, 1) === "/") {
+                            slashCounter++;
+
+                            if (slashCounter === 3) {
+                                rootUrlPath = this.currentUrl.substr(0, pos);
+                                break;
+                            }
+                        }
+                        pos++;
+                    }
+
+                    if (rootUrlPath) {
+                        loc = rootUrlPath + loc;
+                    }
+                    else {
+                        loc = this.currentUrl + loc;
+                    }
+                }
+                else {
+                    // Relative to last dir.
+                    if (this.debug) {
+                        this.logInfo("it is relative to the last dir. Currently not able to handle this.");
+                    }
+                }
+            }
+
+            if (this.debug) {
+                this.logInfo(": Redirect: " + loc + "\n");
+            }
+
+            // XXX pheer loops.
+            xmlReq.abort();
+            this.sendRequest(this.mData, loc);
+
+            // This is a redirection and we are alreday trying a new URL
+            return true;
+        }
+
+        // That wasn't a redirection
+        return false;
+    },
+
+    /*
+     * Revert chunk process on data:
+     * this function take string splitted in big pieces of data
+     * and gather them in one big string.
+     */
+    unchunk: function _unchunk(aChunkedString) {
+        var pos = aChunkedString.indexOf("\r\n");
+        if ((pos > -1) && (pos < 5)) {
+            var chunkCounter = 1;
+            var chunkLength = parseInt(aChunkedString.substr(0, pos), 16);
+
+            if (isNaN(chunkLength)) {
+                if (this.debug) {
+                    this.logInfo("unchunk: 1st chunk is not a number:" + aChunkedString.substr(0, pos));
+                }
+                return "";
+            }
+
+            if (this.debug) {
+                this.logInfo("unchunk: 1st chunk has length:" + chunkLength);
+            }
+
+            var gatheredString = "";
+            while (chunkLength > 0) {
+                var bytesToCopy = chunkLength;
+                pos = pos + 2;
+                var charCode;
+                while (bytesToCopy > 0) {
+                    gatheredString = gatheredString + aChunkedString.substr(pos, 1);
+                    charCode = aChunkedString.charCodeAt(pos);
+                    if (charCode <= 0xFF) {
+                        bytesToCopy--;
+                    }
+                    else {
+                        if (charCode <= 0xFFFF) {
+                            if (this.debug) {
+                                this.logInfo("unchunk: TWO bytes copied '" + aChunkedString.substr(pos, 1) + "'=" + charCode);
+                            }
+                            bytesToCopy = bytesToCopy - 2;
+
+                        }
+                        else {
+                            if (charCode <= 0xFFFFFF) {
+                                if (this.debug) {
+                                    this.logInfo("unchunk: THREE bytes copied '" + aChunkedString.substr(pos, 1) + "'=" + charCode);
+                                }
+                                bytesToCopy = bytesToCopy - 3;
+                            }
+                        }
+                    }
+                    pos++;
+                }
+
+                if (this.debug) {
+                    this.logInfo("unchunk: pos:" + pos + ", CunkStr:" + gatheredString + "|");
+                }
+
+                // Next two bytes should be \r\n
+                var check = aChunkedString.substr(pos, 2);
+                if (check != "\r\n") {
+                    if (this.debug) {
+                        this.logInfo("unchunk: Strange. Expected 0D0A (Cr+Lf) but found:"
+                            + check + ". Stopping processing of this chunked message.");
+                    }
+                    return "";
+                }
+                pos = pos + 2;
+                var tmpStr = aChunkedString.substr(pos, 6);
+                var pos2 = tmpStr.indexOf("\r\n");
+                chunkCounter++;
+                if (pos2 > -1) {
+                    if (this.debug) {
+                        this.logInfo("unchunk: Found next chunk. Number:" + chunkCounter + ", LengthStr:" + tmpStr.substr(0, pos2));
+                    }
+
+                    chunkLength = parseInt(tmpStr.substr(0, pos2), 16);
+                    if (isNaN(chunkLength)) {
+                        if (this.debug) {
+                            this.logInfo("unchunk: Chunk '" + chunkCounter + "' is not a number:" + tmpStr);
+                        }
+                        return "";
+                    }
+                    if (this.debug) {
+                        this.logInfo("unchunk: Chunk '" + chunkCounter + "' has length:" + chunkLength);
+                    }
+                    pos = pos + pos2;
+                }
+                else {
+                    if (this.debug) {
+                        this.logInfo("unchunk: Trying to determine chunk '" + chunkCounter + "' length but it is more than 4 bytes big!! size:" + tmpStr);
+                    }
+                    return "";
+                }
+            }
+            return gatheredString;
+        }
+        else {
+            if (this.debug) {
+                this.logInfo("unchunk: Trying to determine first chunk length but it is very big...!! size:" + pos);
+            }
+            return aChunkedString;
+        }
+    },
+
+    saveToFile: function _saveToFile(aFilename, aContent) {
+        var file = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Components.interfaces.nsIProperties)
+            .get("ProfD", Components.interfaces.nsIFile);
+
+        file.append("exchange-data");
+        if (!file.exists() || !file.isDirectory()) {
+            file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
+        }
+
+        file.append("responses");
+        if (!file.exists() || !file.isDirectory()) {
+            file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
+        }
+
+        if (!this.fileCount) {
+            this.fileCount = 0;
+        }
+        else {
+            this.fileCount++;
+        }
+
+        if (this.fileCount < 10) {
+            file.append(this.uuid + "-00" + this.fileCount + "." + aFilename);
+        }
+        else if (this.fileCount < 100) {
+            file.append(this.uuid + "-0" + this.fileCount + "." + aFilename);
+        }
+        else {
+            file.append(this.uuid + "-" + this.fileCount + "." + aFilename);
+        }
+
+        if (file.exists()) {
+            file.remove(false);
+        }
+
+        var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
+        createInstance(Components.interfaces.nsIFileOutputStream);
+        foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);
+
+        var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
+        createInstance(Components.interfaces.nsIConverterOutputStream);
+        converter.init(foStream, "UTF-8", 0, 0);
+        converter.writeString(aContent);
+        converter.close(); // this closes foStream
+
+        return 0;
+    },
+
+
+    onLoad: function _onLoad(evt) {
+        let xmlReq = this.mXmlReq;
+
+        if (this.debug) {
+            this.logInfo(": ExchangeRequest.onLoad :" + evt.type
+                + ", readyState:" + xmlReq.readyState
+                + ", status:" + xmlReq.status);
+            this.logInfo(": ExchangeRequest.onLoad :"
+                + xmlReq.getAllResponseHeaders(), 2);
+            this.logInfo(": ExchangeRequest.onLoad :" + xmlReq.responseText, 2);
+        }
+
+        if (xmlReq.readyState != xmlReq.DONE) {
+            if (this.debug) {
+                this.logInfo("readyState is not DONE inside the onLoad internal function. THIS SHOULD NEVER HAPPEN. PLEASE REPORT.");
+            }
+            this.fail(this.ER_ERROR_OPEN_FAILED,
+                "Ready state != 4, readyState:" + xmlReq.readyState);
+            return;
+        }
+
+        // Check redirection and follow it if possible
+        // Check if this is an HTTP Error
+        if (this.isHTTPRedirect(evt) || this.isHTTPError()) {
+            return;
+        }
+
+        var xml = xmlReq.responseText; // bug 270553
+        var newXML;
+
+        // Initiate XML parser
+        try {
+            if (this.xml2json === true) {
+                newXML = xml2json.newJSON();
+            }
+            else {
+                newXML = new mivIxml2jxon('', 0, null);
+            }
+        }
+        catch (exc) {
+            if (this.debug) {
+                this.logInfo("createInstance error:" + exc);
+            }
+        }
+
+        // Parse XML data
+        try {
+            if (this.xml2json === true) {
+                xml2json.parseXML(newXML, xml);
+            }
+            else {
+                newXML.addNameSpace("s", nsSoapStr);
+                newXML.addNameSpace("m", nsMessagesStr);
+                newXML.addNameSpace("t", nsTypesStr);
+                newXML.addNameSpace("a1", nsAutodiscoverResponseStr1);
+                newXML.addNameSpace("a2", nsAutodiscoverResponseStr2);
+                newXML.processXMLString(xml, 0, null);
+            }
+        }
+        catch (exc) {
+            if (this.debug) {
+                this.logInfo("processXMLString error:" + exc.name + ","
+                    + exc.message + "\n" + xml);
+            }
+        }
+
+        this.mAuthFail = 0;
+        this.mRunning = false;
+
+        if (this.mCbOk) {
+            // Try to get server version and store it.
+            try {
+                if (this.xml2json === true) {
+                    let serverVersion = xml2json.XPath(newXML, "/Envelope/Header/ServerVersionInfo");
+                    if (serverVersion.length > 0
+                        && xml2json.getAttribute(serverVersion[0], "Version") !== null) {
+                        this.exchangeStatistics.setServerVersion(this.currentUrl,
+                            xml2json.getAttribute(serverVersion[0], "Version"),
+                            xml2json.getAttribute(serverVersion[0], "MajorVersion"),
+                            xml2json.getAttribute(serverVersion[0], "MinorVersion"));
+                    }
+                    serverVersion = null;
+                }
+                else {
+                    let serverVersion = newXML.XPath("/s:Header/ServerVersionInfo");
+                    if (serverVersion.length > 0
+                        && serverVersion[0].getAttribute("Version") != "") {
+                        this.exchangeStatistics.setServerVersion(this.currentUrl,
+                            serverVersion[0].getAttribute("Version"),
+                            serverVersion[0].getAttribute("MajorVersion"),
+                            serverVersion[0].getAttribute("MinorVersion"));
+                    }
+                    serverVersion[0] = null;
+                    serverVersion = null;
+                }
+            }
+            catch (err) {}
+
+            this.retryCount = 0;
+            if (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+            }
+
+            try {
+                this.mCbOk(this, newXML);
+            }
+            catch (err) {
+                if (this.debug) {
+                    this.logInfo("onLoad: err:" + err);
+                    this.logInfo("onLoad: stack:" + this.globalFunctions.STACK());
+                    this.logInfo("onLoad: xml:" + xml);
+                }
+            }
+            this.originalReq = null;
+        }
+
+        newXML = null;
+        this.observerService.notifyObservers(this.channelCallbackEcAuthPrompt2, "onExchangeConnectionOk", this.currentUrl);
+    },
+
+    retryCurrentUrl: function () {
+        this.sendRequest(this.mData, this.currentUrl);
+    },
+
+    tryNextURL: function _tryNextURL() {
+        if (this.debug) {
+            this.logInfo("exchangeRequest.tryNextURL");
+        }
+
+        let xmlReq = this.mXmlReq;
+
+        if (xmlReq.readyState != xmlReq.DONE) {
+            xmlReq.abort();
+        }
+
+        if (this.urllist.length > 0) {
+            if (this.debug) this.logInfo("exchangeRequest.tryNextURL: We have another URL to try the request on.");
+            this.sendRequest(this.mData);
+            return true;
+        }
+        return false;
+    },
+
+    getPrePassword: function _getPrePassword(aCurrentUrl, aUser) {
+        var tmpURL = aCurrentUrl;
+        if (aUser != "") {
+            // We insert the username into the URL the prePassword needs it.
+            // https://webmail.example.com/ews/exchange.asmx
+
+            var tmpColon = tmpURL.indexOf("://");
+            tmpURL = tmpURL.substr(0, tmpColon + 3) + aUser + "@" + tmpURL.substr(tmpColon + 3);
+        }
+        return this.channelCallbackEcAuthPrompt2.getPrePassword(aUser, tmpURL);
+    },
+
+    isHTTPError: function () {
+        let xmlReq = this.mXmlReq;
+
+        if (xmlReq.status != 200) {
+            if (xmlReq.status == 303) { // See Other (since HTTP/1.1) new request should be a GET instead of a POST.
+                this.fail(this.ER_ERROR_HTTP_ERROR4XX,
+                    "HTTP Redirection " + xmlReq.status + ": See Other\n"
+                    + xmlReq.responseText.substr(0, 300) + "\n\n");
+                return true;
+            }
+
+            if ((xmlReq.status > 399) && (xmlReq.status < 500)) {
+                var errMsg = "";
+                switch (xmlReq.status) {
+                case 400:
+                    errMsg = "Bad request";
+                    break;
+                case 401:
+                    errMsg = "Unauthorized";
+                    break;
+                case 402:
+                    errMsg = "Payment required";
+                    break;
+                case 403:
+                    errMsg = "Forbidden";
+                    break;
+                case 404:
+                    errMsg = "Not found";
+                    break;
+                case 405:
+                    errMsg = "Method not allowed";
+                    break;
+                case 406:
+                    errMsg = "Not acceptable";
+                    break;
+                case 407:
+                    errMsg = "Proxy athentication required";
+                    break;
+                case 408:
+                    errMsg = "Request timeout";
+                    break;
+                case 409:
+                    errMsg = "Conflict";
+                    break;
+                case 410:
+                    errMsg = "Gone";
+                    break;
+                case 411:
+                    errMsg = "Length required";
+                    break;
+                case 412:
+                    errMsg = "Precondition failed";
+                    break;
+                case 413:
+                    errMsg = "Request entity too large";
+                    break;
+                case 414:
+                    errMsg = "Request-URI too long";
+                    break;
+                case 415:
+                    errMsg = "Unsupported media type";
+                    break;
+                case 416:
+                    errMsg = "Request range not satisfiable";
+                    break;
+                case 417:
+                    errMsg = "Expectation failed";
+                    break;
+                case 418:
+                    errMsg = "I'm a teapot(RFC 2324)";
+                    break;
+                case 420:
+                    errMsg = "Enhance your calm (Twitter)";
+                    break;
+                case 422:
+                    errMsg = "Unprocessable entity (WebDAV)(RFC 4918)";
+                    break;
+                case 423:
+                    errMsg = "Locked (WebDAV)(RFC 4918)";
+                    break;
+                case 424:
+                    errMsg = "Failed dependency (WebDAV)(RFC 4918)";
+                    break;
+                case 425:
+                    errMsg = "Unordered collection (RFC 3648)";
+                    break;
+                case 426:
+                    errMsg = "Upgrade required (RFC2817)";
+                    break;
+                case 428:
+                    errMsg = "Precondition required";
+                    break;
+                case 429:
+                    errMsg = "Too many requests";
+                    break;
+                case 431:
+                    errMsg = "Request header fields too large";
+                    break;
+                case 444:
+                    errMsg = "No response";
+                    break;
+                case 449:
+                    errMsg = "Retry with";
+                    break;
+                case 450:
+                    errMsg = "Blocked by Windows Parental Controls";
+                    break;
+                case 499:
+                    errMsg = "Client closed request";
+                    break;
+                }
+
+                if (this.debug) {
+                    this.logInfo(": isConnError req.status=" + xmlReq.status
+                        + ": " + errMsg + "\nURL:" + this.currentUrl + "\n"
+                        + xmlReq.responseText, 2);
+                }
+
+                var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+                if (this.urllist.length > 0 && !myAuthPrompt2.getUserCanceled(this.currentUrl)) {
+                    if (this.tryNextURL()) {
+                        return true;
+                    }
+                    this.fail(this.ER_ERROR_HTTP_ERROR4XX,
+                        "HTTP Client error " + xmlReq.status + ": "
+                        + errMsg + "\nURL:" + this.currentUrl + "\n"
+                        + xmlReq.responseText.substr(0, 300) + "\n\n");
+                }
+                else if (myAuthPrompt2.getUserCanceled(this.currentUrl)) {
+                    this.fail(this.ER_ERROR_USER_ABORT_AUTHENTICATION,
+                        "User canceled providing a valid password for url="
+                        + this.currentUrl + ". Aborting this request.");
+                }
+                else {
+                    this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Client error "
+                        + xmlReq.status + ": " + errMsg + "\nURL:" + this.currentUrl
+                        + "\n" + xmlReq.responseText.substr(0, 300) + "\n\n");
+                }
+
+                return true;
+            }
+
+            if ((xmlReq.status > 499) && (xmlReq.status < 600)) {
+                var errMsg = "";
+                switch (xmlReq.status) {
+                case 500:
+                    errMsg = "Internal server error";
+                    // First check if we have a version mismatch and we need a lower version. This sometimes happens.
+                    if (xmlReq.responseText.indexOf("ErrorInvalidServerVersion") > -1) {
+                        if (this.debug) {
+                            this.logInfo(" ErrorInvalidServerVersion -> RequestServerVersion wrong:" + this.version + ".", 2);
+                        }
+
+                        // We are going to retry with a different server version.
+                        var tryAgain = false;
+                        switch (this.version) {
+                        case "Exchange2010":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2007_SP1", null, null);
+                            tryAgain = true;
+                            break;
+                        case "Exchange2010_SP1":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
+                            tryAgain = true;
+                            break;
+                        case "Exchange2010_SP2":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
+                            tryAgain = true;
+                            break;
+                        case "Exchange2013":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
+                            tryAgain = true;
+                            break;
+                        default:
+                            tryAgain = false;
+                        }
+                        if (tryAgain) {
+                            if (this.debug) {
+                                this.logInfo("Going to retry with lower server version", 2);
+                            }
+                            this.sendRequest(this.makeSoapMessage(this.originalReq), this.currentUrl);
+                            return true;
+                        }
+                    }
+                    // Next check if we have a version mismatch and we need a higher version. This sometimes happens.
+                    if (xmlReq.responseText.indexOf("ErrorIncorrectSchemaVersion") > -1
+                        && xmlReq.responseText.indexOf("RequestServerVersion") > -1) {
+                        if (this.debug) {
+                            this.logInfo(" ErrorIncorrectSchemaVersion -> RequestServerVersion wrong:" + this.version + ".", 2);
+                        }
+                        // We are going to retry with a different serverversion.
+                        var tryAgain = false;
+                        switch (this.version) {
+                        case "Exchange2007_SP1":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010", null, null);
+                            tryAgain = true;
+                            break;
+                        case "Exchange2010":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP1", null, null);
+                            tryAgain = true;
+                            break;
+                        case "Exchange2010_SP1":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2010_SP2", null, null);
+                            tryAgain = true;
+                            break;
+                        case "Exchange2010_SP2":
+                            this.exchangeStatistics.setServerVersion(this.mArgument.serverUrl, "Exchange2013", null, null);
+                            tryAgain = true;
+                            break;
+                        default:
+                            tryAgain = false;
+                        }
+                        if (tryAgain) {
+                            if (this.debug) {
+                                this.logInfo("Going to retry with higher server version", 2);
+                            }
+                            this.sendRequest(this.makeSoapMessage(this.originalReq), this.currentUrl);
+                            return true;
+                        }
+                    }
+
+                    // This might be generated because of a password not yet supplied in open function during a request so we try again
+                    if ((!exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl])
+                        || (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount < 3)) {
+                        if (this.debug) {
+                            this.logInfo("isHTTPError: We are going to ask the user or password store for a password and try again.");
+                        }
+                        this.prePassword = this.getPrePassword(this.currentUrl, this.mArgument.user);
+
+                        if (this.prePassword) {
+                            if (this.debug) {
+                                this.logInfo("isHTTPError: We received a prePassword. Going to retry current URL");
+                            }
+
+                            if (!exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl] = {};
+                                exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+                            }
+                            exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].prePassword = this.prePassword;
+                            exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount++;
+
+                            xmlReq.abort();
+                            this.retryCurrentUrl();
+
+                            return true;
+                        }
+                        if (this.debug) {
+                            this.logInfo("isHTTPError: User canceled request for prePassword.");
+                        }
+                    }
+
+                    // Password were given and that's the third try we have an error
+                    if ((exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl])
+                        && (exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount > 2)) {
+                        // Failed three times. Remove password also from password store.
+                        if (this.debug) {
+                            this.logInfo("isHTTPError: Failed password "
+                                + exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount
+                                + " times. Stopping communication.");
+                        }
+                        var title = "Microsoft Exchange EWS";
+                        var tmpURL = this.currentUrl;
+                        if (this.mArgument.user != "") {
+                            // We insert the username into the URL the prePassword needs it.
+                            // https://webmail.example.com/ews/exchange.asmx
+
+                            var tmpColon = tmpURL.indexOf("://");
+                            tmpURL = tmpURL.substr(0, tmpColon + 3) + this.mArgument.user + "@" + tmpURL.substr(tmpColon + 3);
+                        }
+                        this.channelCallbackEcAuthPrompt2.passwordManagerRemove(this.mArgument.user, tmpURL, title);
+                    }
+
+                    // Finally reset password cache
+                    if (!exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl]) {
+                        exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl] = {};
+                    }
+
+                    exchWebService.prePasswords[this.mArgument.user + "@" + this.currentUrl].tryCount = 0;
+
+                    this.prePassword = null;
+                    break;
+                case 501:
+                    errMsg = "Not implemented";
+                    break;
+                case 502:
+                    errMsg = "Bad gateway";
+                    break;
+                case 503:
+                    errMsg = "Service unavailable";
+                    break;
+                case 504:
+                    errMsg = "Gateway timeout";
+                    break;
+                case 505:
+                    errMsg = "HTTP version not supported";
+                    break;
+                case 506:
+                    errMsg = "Variant also negotiates (RFC 2295)";
+                    break;
+                case 507:
+                    errMsg = "Insufficient Storage (WebDAV)(RFC 4918)";
+                    break;
+                case 508:
+                    errMsg = "Loop detected (WebDAV)(RFC 4918)";
+                    break;
+                case 509:
+                    errMsg = "Bandwith limit exceeded (Apache bw/limited extension)";
+                    break;
+                case 510:
+                    errMsg = "Not extended (RFC 2774)";
+                    break;
+                case 511:
+                    errMsg = "Network authentication required";
+                    break;
+                case 598:
+                    errMsg = "Network read timeout error";
+                    break;
+                case 599:
+                    errMsg = "Network connect timeout error";
+                    break;
+                }
+
+                if (this.debug) {
+                    this.logInfo(": isConnError req.status="
+                        + xmlReq.status + ": " + errMsg
+                        + "\nURL:" + this.currentUrl + "\n"
+                        + xmlReq.responseText, 2);
+                }
+
+                if (this.tryNextURL()) {
+                    return true;
+                }
+
+                this.fail(this.ER_ERROR_HTTP_ERROR4XX, "HTTP Server error " + xmlReq.status + ": " + errMsg + "\nURL:" + this.currentUrl + "\n" + xmlReq.responseText.substr(0, 300) + "\n\n");
+                return true;
+            } // End of error status 5xx
+
+            if (this.tryNextURL()) {
+                return true;
+            }
+
+            // XXX parse it
+            this.fail(this.ER_ERROR_FROM_SERVER, "Unknown error from server"
+                + xmlReq.status + ": " + errMsg + "\nURL:" + this.currentUrl
+                + "\n" + xmlReq.responseText.substr(0, 300) + "\n\n");
+            return true;
+        } // Received HTTP 200 OK
+
+        // That wasn't an HTTP error
+        return false;
+    },
+
+    fail: function (aCode, aMsg) {
+        if (this.debug) {
+            this.logInfo("ecExchangeRequest.fail: aCode:" + aCode + ", aMsg:" + aMsg);
+        }
+
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+
+        this.originalReq = null;
+    },
+
+    /*
+     * Generate SOAP message by xml2json
+     */
+    makeSoapMessage2: function erMakeSoapMessage2(aReq) {
+        this.originalReq = aReq;
+
+        var root = xml2json.newJSON();
+        var msg = xml2json.addTag(root, "Envelope", "nsSoap");
+        xml2json.setAttribute(msg, "xmlns:nsSoap", nsSoapStr);
+        xml2json.setAttribute(msg, "xmlns:nsMessages", nsMessagesStr);
+        xml2json.setAttribute(msg, "xmlns:nsTypes", nsTypesStr);
+
+        this.version = this.exchangeStatistics.getServerVersion(this.mArgument.serverUrl);
+
+        var header = xml2json.addTag(msg, "Header", "nsSoap", null);
+
+        var requestServerVersion = xml2json.addTag(header, "RequestServerVersion", "nsTypes", null);
+        xml2json.setAttribute(requestServerVersion, "Version", this.version);
+
+        var exchTimeZone = this.timeZones.getExchangeTimeZoneByCalTimeZone(this.globalFunctions.ecDefaultTimeZone(), this.mArgument.serverUrl, cal.now());
+
+        if (exchTimeZone) {
+            let timeZoneContext = xml2json.addTag(header, "TimeZoneContext", "nsTypes", null);
+            let tmpTimeZone = xml2json.addTag(timeZoneContext, "TimeZoneDefinition", "nsTypes");
+            if (this.version.indexOf("2007") < 0) {
+                xml2json.setAttribute(tmpTimeZone, "Name", exchTimeZone.name);
+            }
+            xml2json.setAttribute(tmpTimeZone, "Id", exchTimeZone.id);
+            tmpTimeZone = null;
+            timeZoneContext = null;
+        }
+        header = null;
+
+        let body = xml2json.addTag(msg, "Body", "nsSoap", null);
+        xml2json.addTagObject(body, aReq);
+        body = null;
+
+        var tmpStr = xml_tag + xml2json.toString(root);
+        msg = null;
+        root = null;
+        return tmpStr;
+    },
+
+    /*
+     * Generate SOAP message by mivIxml2jxon
+     */
+    makeSoapMessage: function erMakeSoapMessage(aReq) {
+        this.originalReq = aReq;
+
+        var msg = new mivIxml2jxon('<nsSoap:Envelope xmlns:nsSoap="' + nsSoapStr + '" xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>', 0, null);
+
+        this.version = this.exchangeStatistics.getServerVersion(this.mArgument.serverUrl);
+
+        var header = msg.addChildTag("Header", "nsSoap", null);
+        header.addChildTag("RequestServerVersion", "nsTypes", null).setAttribute("Version", this.version);
+
+        var exchTimeZone = this.timeZones.getExchangeTimeZoneByCalTimeZone(this.globalFunctions.ecDefaultTimeZone(), this.mArgument.serverUrl, cal.now());
+
+        if (exchTimeZone) {
+            if (this.version.indexOf("2007") > -1) {
+                var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>', 0, null);
+                tmpTimeZone.setAttribute("Id", exchTimeZone.id);
+            }
+            else {
+                var tmpTimeZone = new mivIxml2jxon('<t:TimeZoneDefinition xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>', 0, null);
+                tmpTimeZone.setAttribute("Name", exchTimeZone.name);
+                tmpTimeZone.setAttribute("Id", exchTimeZone.id);
+            }
+            header.addChildTag("TimeZoneContext", "nsTypes", null).addChildTagObject(tmpTimeZone);
+            tmpTimeZone = null;
+        }
+        header = null;
+
+        msg.addChildTag("Body", "nsSoap", null).addChildTagObject(aReq);
+
+        var tmpStr = xml_tag + msg.toString();
+        msg = null;
+        return tmpStr;
+    },
+
+    getSoapErrorMsg: function _getSoapErrorMsg(aResp) {
+        if (this.xml2json) {
+            var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/*/m:ResponseMessages/*[@ResponseClass='Error']");
+            var result;
+            if (rm.length > 0) {
+                result = xml2json.getTagValue(rm[0], "m:MessageText").value + "(" + xml2json.getTagValue(rm[0], "m:ResponseCode") + ")";
+            }
+            else {
+                result = null;
+            }
+        }
+        else {
+            var rm = aResp.XPath("/s:Envelope/s:Body/*/m:ResponseMessages/*[@ResponseClass='Error']");
+            var result;
+            if (rm.length > 0) {
+                result = rm[0].getTagValue("m:MessageText").value + "(" + rm[0].getTagValue("m:ResponseCode") + ")";
+            }
+            else {
+                result = null;
+            }
+
+        }
+        rm = null;
+        return result
+    },
+
+    passwordError: function erPasswordError(aMsg) {
+        this.fail(this.ERR_PASSWORD_ERROR, aMsg);
+    },
 }; // End of ExchangeRequest prototype
 
 var ecPasswordErrorList = {};
 
-function ecnsIAuthPrompt2(aExchangeRequest)
-{
-	this.exchangeRequest = aExchangeRequest;
+function ecnsIAuthPrompt2(aExchangeRequest) {
+    this.exchangeRequest = aExchangeRequest;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-		.getService(Ci.mivFunctions);
-	this.uuid = this.globalFunctions.getUUID();
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
+    this.uuid = this.globalFunctions.getUUID();
 
-	this.callback = null;
-	this.context = null;
-	this.level = null;
-	this.authInfo = null;
-	this.channel = null;
-	this.trycount = 0;
+    this.callback = null;
+    this.context = null;
+    this.level = null;
+    this.authInfo = null;
+    this.channel = null;
+    this.trycount = 0;
 
-	this.username = null;
-	this.password = null;
-	this.URL = null;
-	this.lastStatus = 0;  // set by nsIProgressEventSink onStatus.
+    this.username = null;
+    this.password = null;
+    this.URL = null;
+    this.lastStatus = 0; // set by nsIProgressEventSink onStatus.
 
-	this.timer = Cc["@mozilla.org/timer;1"]
-		.createInstance(Ci.nsITimer);
+    this.timer = Cc["@mozilla.org/timer;1"]
+        .createInstance(Ci.nsITimer);
 }
 
 ecnsIAuthPrompt2.prototype = {
-	QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2, Ci.nsIBadCertListener2, Ci.nsIProgressEventSink, 
-						Ci.nsISecureBrowserUI, Ci.nsIDocShellTreeItem, Ci.nsIAuthPromptProvider,
-						Ci.nsIChannelEventSink, Ci.nsIRedirectResultListener]),
-
-	getInterface: function(iid)
-	{
-		if ((Ci.nsIAuthPrompt2) && (iid.equals(Ci.nsIAuthPrompt2))) {    // id == 651395eb-8612-4876-8ac0-a88d4dce9e1e
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIAuthPrompt2");
-			return 	Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-		} 
-
-		if ((Ci.nsIBadCertListener2) && (iid.equals(Ci.nsIBadCertListener2))) {
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIBadCertListener2");
-			return Cc["@1st-setup.nl/exchange/badcertlistener2;1"].getService(Ci.mivExchangeBadCertListener2);
-		} 
-
-		if ((Ci.nsIProgressEventSink) && (iid.equals(Ci.nsIProgressEventSink))) {   // iid == d974c99e-4148-4df9-8d98-de834a2f6462
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIProgressEventSink");
-			return this;
-		}
-
-		if ((Ci.nsISecureBrowserUI) && (iid.equals(Ci.nsISecureBrowserUI))) {   // iid == 081e31e0-a144-11d3-8c7c-00609792278c
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsISecureBrowserUI");
-			return this;
-		} 
-
-		if ((Ci.nsIDocShellTreeItem) && (iid.equals(Ci.nsIDocShellTreeItem))) {   // iid == 09b54ec1-d98a-49a9-bc95-3219e8b55089
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIDocShellTreeItem");
-			return Cr.NS_NOINTERFACE;
-		}
-
-		if ((Ci.nsIAuthPromptProvider) && (iid.equals(Ci.nsIAuthPromptProvider))) {   // iid == bd9dc0fa-68ce-47d0-8859-6418c2ae8576
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIAuthPromptProvider");
-			return 	Cc["@1st-setup.nl/exchange/authpromptprovider;1"].getService();
-		} 
-
-		if ((Ci.nsIChannelEventSink) && (iid.equals(Ci.nsIChannelEventSink))) {   // iid == a430d870-df77-4502-9570-d46a8de33154
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIChannelEventSink");
-			return this;
-		} 
-
-		if ((Ci.nsIRedirectResultListener) && (iid.equals(Ci.nsIRedirectResultListener))) {   // iid == 85cd2640-e91e-41ac-bdca-1dbf10dc131e
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIRedirectResultListener");
-			return this;
-		} 
-
-		// The next iid is available sine TB 13.
-		if ((Ci.nsILoadContext) && (iid.equals(Ci.nsILoadContext))) {   // iid == 386806c3-c4cb-4b3d-b05d-c08ea10f5585 also exists as iid == 48b5bf16-e0c7-11e1-b28e-91726188709b
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsILoadContext");
-			return Cr.NS_NOINTERFACE;  // We do not support this.
-		}
-
-		// The next iid is called when the TB goes into offline mode.
-		if ((Ci.nsIApplicationCacheContainer) && (iid.equals(Ci.nsIApplicationCacheContainer))) {   // iid == bbb80700-1f7f-4258-aff4-1743cc5a7d23
-			this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIApplicationCacheContainer");
-			return Cr.NS_NOINTERFACE;  // We do not support this.
-		}
-
-		throw Cr.NS_NOINTERFACE;
-	},
-
-	// nsIProgressEventSink
-	onProgress: function _nsIProgressEventSink_onProgress(aRequest, aContext, aProgress, aProgressMax)
-	{
-		if (aRequest  instanceof Ci.nsIChannel) {
-			this.logInfo("  --- ecnsIAuthPrompt2.onProgress: this is a nsIChannel");
-		}
-		this.logInfo("  --- ecnsIAuthPrompt2.onProgress:"+aProgress+" of "+aProgressMax);
-	},
-
-	// nsIProgressEventSink
-	onStatus: function _nsIProgressEventSink_onStatus(aRequest, aContext, aStatus, aStatusArg)
-	{
-		this.lastStatus = aStatus;
-		this.lastStatusArg = aStatusArg;
-		switch (aStatus) {
-			case 0x804b0003: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVING of "+aStatusArg); break;
-			case 0x804b000b: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVED of "+aStatusArg); break;
-			case 0x804b0007: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTING_TO of "+aStatusArg); break;
-			case 0x804b0004: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTED_TO of "+aStatusArg); break;
-			case 0x804b0005: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_SENDING_TO of "+aStatusArg); break;
-			case 0x804b000a: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_WAITING_FOR of "+aStatusArg); break;
-			case 0x804b0006: this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RECEIVING_FROM of "+aStatusArg); break;
-			default:
-				this.logInfo("  --- ecnsIAuthPrompt2.onStatus:"+aStatus+" of "+aStatusArg);
-		}
-	},
-
-	// nsISecureBrowserUI
-	// void init(in nsIDOMWindow window);
-	init: function _nsISecureBrowserUI_init(window)
-	{
-		this.logInfo("  --- ecnsIAuthPrompt2.init (nsISecureBrowserUI):");
-		this.nsISecureBrowserUI_Window = window;
-	},
-
-	// nsISecureBrowserUI
-	//readonly attribute unsigned long state;
-	get state()
-	{
-		this.logInfo("  --- ecnsIAuthPrompt2.state (nsISecureBrowserUI):");
-	},
-
-	// nsISecureBrowserUI
-	//readonly attribute AString tooltipText;
-	get tooltipText()
-	{
-		this.logInfo("  --- ecnsIAuthPrompt2.tooltipText (nsISecureBrowserUI):");
-		return "ecnsIAuthPrompt2.tooltipText";
-	},
-
-	// nsIChannelEventSink
-	//void asyncOnChannelRedirect(in nsIChannel oldChannel, 
-	//	in nsIChannel newChannel,
-	//	in unsigned long flags,
-	//	in nsIAsyncVerifyRedirectCallback callback);
-	asyncOnChannelRedirect: function _nsIChannelEventSink_asyncOnChannelRedirect(oldChannel, newChannel, flags, callback)
-	{
-		var tmpStr = "";
-		if (flags & 1) {
-			tmpStr += "REDIRECT_TEMPORARY";
-		}
-		if (flags & 2) {
-			tmpStr += " REDIRECT_PERMANENT";
-		}
-		if (flags & 4) {
-			tmpStr += " REDIRECT_INTERNAL";
-		}
-
-		this.logInfo("  --- nsIChannelEventSink.asyncOnChannelRedirect :flags:"+flags+"="+tmpStr);
-
-		var url1 = "";
-		var url2 = "";
-
-		try { url1 = oldChannel.originalURI.spec; } catch(er) { url1 = "unknown"; }
-		try { url2 = newChannel.originalURI.spec; } catch(er) { url2 = "unknown"; }
-
-		this.logInfo("We are going to allow the redirect from '"+url1+"' to '"+url2+"'.");
-
-		newChannel.notificationCallbacks = this;
-		callback.onRedirectVerifyCallback(Cr.NS_OK);
-	},
-
-	// nsIRedirectResultListener
-	//void onRedirectResult(in boolean proceeding);
-	onRedirectResult: function _nsIRedirectResultListener_onRedirectResult(proceeding)
-	{
-		this.logInfo("  --- nsIRedirectResultListener.nsIRedirectResultListener :proceeding:"+proceeding);
-	},
-
-	getPrePassword: function _getPrePassword(aUsername, aURL)
-	{
-		this.logInfo("getPrePassword for user:"+aUsername+", server url:"+aURL);
-		this.username = aUsername;
-		this.URL = aURL;
-
-		var password;
-		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-		if (myAuthPrompt2.getUserCanceled(aURL)) {
-			return null;
-		}
-		var openUser = aUsername;
-
-		try {
-			password = myAuthPrompt2.getPassword(null,openUser, aURL);
-		}
-		catch(err) {
-		}
-
-		return password;
-	},
-
-	logInfo: function _logInfo(aMsg)
-	{
-		var prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
-
-		this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
-		if (this.debug) {
-			this.globalFunctions.LOG(this.uuid+": "+aMsg);
-		}
-	},
-} // End of ecnsIAuthPrompt2 prototype
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2, Ci.nsIBadCertListener2, Ci.nsIProgressEventSink,
+            Ci.nsISecureBrowserUI, Ci.nsIDocShellTreeItem, Ci.nsIAuthPromptProvider,
+            Ci.nsIChannelEventSink, Ci.nsIRedirectResultListener
+        ]),
+
+        getInterface: function (iid) {
+            if ((Ci.nsIAuthPrompt2) && (iid.equals(Ci.nsIAuthPrompt2))) { // id == 651395eb-8612-4876-8ac0-a88d4dce9e1e
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIAuthPrompt2");
+                return Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+            }
+
+            if ((Ci.nsIBadCertListener2) && (iid.equals(Ci.nsIBadCertListener2))) {
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIBadCertListener2");
+                return Cc["@1st-setup.nl/exchange/badcertlistener2;1"].getService(Ci.mivExchangeBadCertListener2);
+            }
+
+            if ((Ci.nsIProgressEventSink) && (iid.equals(Ci.nsIProgressEventSink))) { // iid == d974c99e-4148-4df9-8d98-de834a2f6462
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIProgressEventSink");
+                return this;
+            }
+
+            if ((Ci.nsISecureBrowserUI) && (iid.equals(Ci.nsISecureBrowserUI))) { // iid == 081e31e0-a144-11d3-8c7c-00609792278c
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsISecureBrowserUI");
+                return this;
+            }
+
+            if ((Ci.nsIDocShellTreeItem) && (iid.equals(Ci.nsIDocShellTreeItem))) { // iid == 09b54ec1-d98a-49a9-bc95-3219e8b55089
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIDocShellTreeItem");
+                return Cr.NS_NOINTERFACE;
+            }
+
+            if ((Ci.nsIAuthPromptProvider) && (iid.equals(Ci.nsIAuthPromptProvider))) { // iid == bd9dc0fa-68ce-47d0-8859-6418c2ae8576
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIAuthPromptProvider");
+                return Cc["@1st-setup.nl/exchange/authpromptprovider;1"].getService();
+            }
+
+            if ((Ci.nsIChannelEventSink) && (iid.equals(Ci.nsIChannelEventSink))) { // iid == a430d870-df77-4502-9570-d46a8de33154
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIChannelEventSink");
+                return this;
+            }
+
+            if ((Ci.nsIRedirectResultListener) && (iid.equals(Ci.nsIRedirectResultListener))) { // iid == 85cd2640-e91e-41ac-bdca-1dbf10dc131e
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIRedirectResultListener");
+                return this;
+            }
+
+            // The next iid is available sine TB 13.
+            if ((Ci.nsILoadContext) && (iid.equals(Ci.nsILoadContext))) { // iid == 386806c3-c4cb-4b3d-b05d-c08ea10f5585 also exists as iid == 48b5bf16-e0c7-11e1-b28e-91726188709b
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsILoadContext");
+                return Cr.NS_NOINTERFACE; // We do not support this.
+            }
+
+            // The next iid is called when the TB goes into offline mode.
+            if ((Ci.nsIApplicationCacheContainer) && (iid.equals(Ci.nsIApplicationCacheContainer))) { // iid == bbb80700-1f7f-4258-aff4-1743cc5a7d23
+                this.logInfo("ecnsIAuthPrompt2.getInterface: Ci.nsIApplicationCacheContainer");
+                return Cr.NS_NOINTERFACE; // We do not support this.
+            }
+
+            throw Cr.NS_NOINTERFACE;
+        },
+
+        // nsIProgressEventSink
+        onProgress: function _nsIProgressEventSink_onProgress(aRequest, aContext, aProgress, aProgressMax) {
+            if (aRequest instanceof Ci.nsIChannel) {
+                this.logInfo("  --- ecnsIAuthPrompt2.onProgress: this is a nsIChannel");
+            }
+            this.logInfo("  --- ecnsIAuthPrompt2.onProgress:" + aProgress + " of " + aProgressMax);
+        },
+
+        // nsIProgressEventSink
+        onStatus: function _nsIProgressEventSink_onStatus(aRequest, aContext, aStatus, aStatusArg) {
+            this.lastStatus = aStatus;
+            this.lastStatusArg = aStatusArg;
+            switch (aStatus) {
+            case 0x804b0003:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVING of " + aStatusArg);
+                break;
+            case 0x804b000b:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RESOLVED of " + aStatusArg);
+                break;
+            case 0x804b0007:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTING_TO of " + aStatusArg);
+                break;
+            case 0x804b0004:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_CONNECTED_TO of " + aStatusArg);
+                break;
+            case 0x804b0005:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_SENDING_TO of " + aStatusArg);
+                break;
+            case 0x804b000a:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_WAITING_FOR of " + aStatusArg);
+                break;
+            case 0x804b0006:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus: STATUS_RECEIVING_FROM of " + aStatusArg);
+                break;
+            default:
+                this.logInfo("  --- ecnsIAuthPrompt2.onStatus:" + aStatus + " of " + aStatusArg);
+            }
+        },
+
+        // nsISecureBrowserUI
+        // void init(in nsIDOMWindow window);
+        init: function _nsISecureBrowserUI_init(window) {
+            this.logInfo("  --- ecnsIAuthPrompt2.init (nsISecureBrowserUI):");
+            this.nsISecureBrowserUI_Window = window;
+        },
+
+        // nsISecureBrowserUI
+        //readonly attribute unsigned long state;
+        get state() {
+            this.logInfo("  --- ecnsIAuthPrompt2.state (nsISecureBrowserUI):");
+        },
+
+        // nsISecureBrowserUI
+        //readonly attribute AString tooltipText;
+        get tooltipText() {
+            this.logInfo("  --- ecnsIAuthPrompt2.tooltipText (nsISecureBrowserUI):");
+            return "ecnsIAuthPrompt2.tooltipText";
+        },
+
+        // nsIChannelEventSink
+        //void asyncOnChannelRedirect(in nsIChannel oldChannel, 
+        //	in nsIChannel newChannel,
+        //	in unsigned long flags,
+        //	in nsIAsyncVerifyRedirectCallback callback);
+        asyncOnChannelRedirect: function _nsIChannelEventSink_asyncOnChannelRedirect(oldChannel, newChannel, flags, callback) {
+            var tmpStr = "";
+            if (flags & 1) {
+                tmpStr += "REDIRECT_TEMPORARY";
+            }
+            if (flags & 2) {
+                tmpStr += " REDIRECT_PERMANENT";
+            }
+            if (flags & 4) {
+                tmpStr += " REDIRECT_INTERNAL";
+            }
+
+            this.logInfo("  --- nsIChannelEventSink.asyncOnChannelRedirect :flags:" + flags + "=" + tmpStr);
+
+            var url1 = "";
+            var url2 = "";
+
+            try {
+                url1 = oldChannel.originalURI.spec;
+            }
+            catch (er) {
+                url1 = "unknown";
+            }
+            try {
+                url2 = newChannel.originalURI.spec;
+            }
+            catch (er) {
+                url2 = "unknown";
+            }
+
+            this.logInfo("We are going to allow the redirect from '" + url1 + "' to '" + url2 + "'.");
+
+            newChannel.notificationCallbacks = this;
+            callback.onRedirectVerifyCallback(Cr.NS_OK);
+        },
+
+        // nsIRedirectResultListener
+        //void onRedirectResult(in boolean proceeding);
+        onRedirectResult: function _nsIRedirectResultListener_onRedirectResult(proceeding) {
+            this.logInfo("  --- nsIRedirectResultListener.nsIRedirectResultListener :proceeding:" + proceeding);
+        },
+
+        getPrePassword: function _getPrePassword(aUsername, aURL) {
+            this.logInfo("getPrePassword for user:" + aUsername + ", server url:" + aURL);
+            this.username = aUsername;
+            this.URL = aURL;
+
+            var password;
+            var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+            if (myAuthPrompt2.getUserCanceled(aURL)) {
+                return null;
+            }
+            var openUser = aUsername;
+
+            try {
+                password = myAuthPrompt2.getPassword(null, openUser, aURL);
+            }
+            catch (err) {}
+
+            return password;
+        },
+
+        logInfo: function _logInfo(aMsg) {
+            var prefB = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefBranch);
+
+            this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
+            if (this.debug) {
+                this.globalFunctions.LOG(this.uuid + ": " + aMsg);
+            }
+        },
+    } // End of ecnsIAuthPrompt2 prototype
diff --git a/components/ecFunctions.js b/components/ecFunctions.js
index d0babaf2..7e39a281 100644
--- a/components/ecFunctions.js
+++ b/components/ecFunctions.js
@@ -30,119 +30,117 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/Services.jsm");
 
-var EXPORTED_SYMBOLS = ["exchWebService" ];
+var EXPORTED_SYMBOLS = ["exchWebService"];
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.commonFunctions = {
 
-	CreateSimpleEnumerator: function _CreateSimpleEnumerator(aArray) {
-	  return {
-	    _i: 0,
-	    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
-	    hasMoreElements: function CSE_hasMoreElements() {
-	      return this._i < aArray.length;
-	    },
-	    getNext: function CSE_getNext() {
-	      return aArray[this._i++];
-	    }
-	  };
-	},
-
-	CreateSimpleObjectEnumerator: function _CreateSimpleObjectEnumerator(aObj) {
-	  return {
-	    _i: 0,
-	    _keys: Object.keys(aObj),
-	    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
-	    hasMoreElements: function CSOE_hasMoreElements() {
-	      return this._i < this._keys.length;
-	    },
-	    getNext: function CSOE_getNext() {
-	      return aObj[this._keys[this._i++]];
-	    }
-	  };
-	},
-
-/*	copyCalendarSettings: function _copyCalendarSettings(aFromId, aToId)
-	{
-		var fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+aFromId+".");
-
-		if (aToId == undefined) {
-			var toId = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).getUUID();
-		}
-		else {
-			var toId = aToId;
-		}
-
-		var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+toId+".");
-
-		
-		Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).copyPreferences(fromCalPrefs, toCalPrefs);
-		toCalPrefs.deleteBranch("folderProperties");
-
-		fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+aFromId+".");
-
-		toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+toId+".");
-
-		Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).copyPreferences(fromCalPrefs, toCalPrefs);
-
-		return toId;
-	},
-*/
-/*	addCalendarById: function _addCalendarById(aId)
-	{
-		var ioService = Cc["@mozilla.org/network/io-service;1"]  
-				.getService(Ci.nsIIOService);  
-		var tmpURI = ioService.newURI("https://auto/"+aId, null, null);  
-
-		var calManager = Cc["@mozilla.org/calendar/manager;1"]
-			.getService(Ci.calICalendarManager);
-		var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
-
-		newCal.id = aId;
-
-		calManager.registerCalendar(newCal);
-	},*/
+    CreateSimpleEnumerator: function _CreateSimpleEnumerator(aArray) {
+        return {
+            _i: 0,
+            QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+            hasMoreElements: function CSE_hasMoreElements() {
+                return this._i < aArray.length;
+            },
+            getNext: function CSE_getNext() {
+                return aArray[this._i++];
+            }
+        };
+    },
+
+    CreateSimpleObjectEnumerator: function _CreateSimpleObjectEnumerator(aObj) {
+        return {
+            _i: 0,
+            _keys: Object.keys(aObj),
+            QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+            hasMoreElements: function CSOE_hasMoreElements() {
+                return this._i < this._keys.length;
+            },
+            getNext: function CSOE_getNext() {
+                return aObj[this._keys[this._i++]];
+            }
+        };
+    },
+
+    /*	copyCalendarSettings: function _copyCalendarSettings(aFromId, aToId)
+    	{
+    		var fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+    		            .getService(Ci.nsIPrefService)
+    			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+aFromId+".");
+
+    		if (aToId == undefined) {
+    			var toId = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).getUUID();
+    		}
+    		else {
+    			var toId = aToId;
+    		}
+
+    		var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+    		            .getService(Ci.nsIPrefService)
+    			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+toId+".");
+
+    		
+    		Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).copyPreferences(fromCalPrefs, toCalPrefs);
+    		toCalPrefs.deleteBranch("folderProperties");
+
+    		fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+    		            .getService(Ci.nsIPrefService)
+    			    .getBranch("calendar.registry."+aFromId+".");
+
+    		toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+    		            .getService(Ci.nsIPrefService)
+    			    .getBranch("calendar.registry."+toId+".");
+
+    		Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).copyPreferences(fromCalPrefs, toCalPrefs);
+
+    		return toId;
+    	},
+    */
+    /*	addCalendarById: function _addCalendarById(aId)
+    	{
+    		var ioService = Cc["@mozilla.org/network/io-service;1"]  
+    				.getService(Ci.nsIIOService);  
+    		var tmpURI = ioService.newURI("https://auto/"+aId, null, null);  
+
+    		var calManager = Cc["@mozilla.org/calendar/manager;1"]
+    			.getService(Ci.calICalendarManager);
+    		var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
+
+    		newCal.id = aId;
+
+    		calManager.registerCalendar(newCal);
+    	},*/
 
 }
 
 var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
-exchWebService.commonFunctions.doEncodeFolderSpecialChars	= mivFunctions.doEncodeFolderSpecialChars;
-exchWebService.commonFunctions.encodeFolderSpecialChars		= mivFunctions.encodeFolderSpecialChars;
-exchWebService.commonFunctions.doDecodeFolderSpecialChars	= mivFunctions.doDecodeFolderSpecialChars;
-exchWebService.commonFunctions.decodeFolderSpecialChars		= mivFunctions.decodeFolderSpecialChars;
-exchWebService.commonFunctions.ecTZService			= mivFunctions.ecTZService;
-exchWebService.commonFunctions.ecDefaultTimeZone		= mivFunctions.ecDefaultTimeZone;
-exchWebService.commonFunctions.ecUTC				= mivFunctions.ecUTC;
-exchWebService.commonFunctions.splitUriGetParams		= mivFunctions.splitUriGetParams;
-exchWebService.commonFunctions.getBranch			= mivFunctions.getBranch;
-exchWebService.commonFunctions.safeGetCharPref			= mivFunctions.safeGetCharPref;
-exchWebService.commonFunctions.safeGetBoolPref			= mivFunctions.safeGetBoolPref;
-exchWebService.commonFunctions.safeGetIntPref			= mivFunctions.safeGetIntPref;
-exchWebService.commonFunctions.getStringBundle			= mivFunctions.getStringBundle;
-exchWebService.commonFunctions.getString			= mivFunctions.getString;
-exchWebService.commonFunctions.getUUID				= mivFunctions.getUUID;
-exchWebService.commonFunctions.shouldLog			= mivFunctions.shouldLog;
-exchWebService.commonFunctions.LOG				= mivFunctions.LOG;
-exchWebService.commonFunctions.writeToLogFile			= mivFunctions.writeToLogFile;
-exchWebService.commonFunctions.WARN				= mivFunctions.WARN;
-exchWebService.commonFunctions.ERROR				= mivFunctions.ERROR;
-exchWebService.commonFunctions.STACK				= mivFunctions.STACK;
-exchWebService.commonFunctions.STACKshort			= mivFunctions.STACKshort;
-exchWebService.commonFunctions.ASSERT				= mivFunctions.ASSERT;
-exchWebService.commonFunctions.trim				= mivFunctions.trim;
-exchWebService.commonFunctions.copyPreferences			= mivFunctions.copyPreferences;
-exchWebService.commonFunctions.xmlToJxon			= mivFunctions.xmlToJxon;
-exchWebService.commonFunctions.splitOnCharacter			= mivFunctions.splitOnCharacter;
-exchWebService.commonFunctions.addCalendarById			= mivFunctions.addCalendarById;
-exchWebService.commonFunctions.copyCalendarSettings 		= mivFunctions.copyCalendarSettings;
-
-
+exchWebService.commonFunctions.doEncodeFolderSpecialChars = mivFunctions.doEncodeFolderSpecialChars;
+exchWebService.commonFunctions.encodeFolderSpecialChars = mivFunctions.encodeFolderSpecialChars;
+exchWebService.commonFunctions.doDecodeFolderSpecialChars = mivFunctions.doDecodeFolderSpecialChars;
+exchWebService.commonFunctions.decodeFolderSpecialChars = mivFunctions.decodeFolderSpecialChars;
+exchWebService.commonFunctions.ecTZService = mivFunctions.ecTZService;
+exchWebService.commonFunctions.ecDefaultTimeZone = mivFunctions.ecDefaultTimeZone;
+exchWebService.commonFunctions.ecUTC = mivFunctions.ecUTC;
+exchWebService.commonFunctions.splitUriGetParams = mivFunctions.splitUriGetParams;
+exchWebService.commonFunctions.getBranch = mivFunctions.getBranch;
+exchWebService.commonFunctions.safeGetCharPref = mivFunctions.safeGetCharPref;
+exchWebService.commonFunctions.safeGetBoolPref = mivFunctions.safeGetBoolPref;
+exchWebService.commonFunctions.safeGetIntPref = mivFunctions.safeGetIntPref;
+exchWebService.commonFunctions.getStringBundle = mivFunctions.getStringBundle;
+exchWebService.commonFunctions.getString = mivFunctions.getString;
+exchWebService.commonFunctions.getUUID = mivFunctions.getUUID;
+exchWebService.commonFunctions.shouldLog = mivFunctions.shouldLog;
+exchWebService.commonFunctions.LOG = mivFunctions.LOG;
+exchWebService.commonFunctions.writeToLogFile = mivFunctions.writeToLogFile;
+exchWebService.commonFunctions.WARN = mivFunctions.WARN;
+exchWebService.commonFunctions.ERROR = mivFunctions.ERROR;
+exchWebService.commonFunctions.STACK = mivFunctions.STACK;
+exchWebService.commonFunctions.STACKshort = mivFunctions.STACKshort;
+exchWebService.commonFunctions.ASSERT = mivFunctions.ASSERT;
+exchWebService.commonFunctions.trim = mivFunctions.trim;
+exchWebService.commonFunctions.copyPreferences = mivFunctions.copyPreferences;
+exchWebService.commonFunctions.xmlToJxon = mivFunctions.xmlToJxon;
+exchWebService.commonFunctions.splitOnCharacter = mivFunctions.splitOnCharacter;
+exchWebService.commonFunctions.addCalendarById = mivFunctions.addCalendarById;
+exchWebService.commonFunctions.copyCalendarSettings = mivFunctions.copyCalendarSettings;
diff --git a/components/erAddDelegateRequest.js b/components/erAddDelegateRequest.js
index 7184dd88..d2882c84 100644
--- a/components/erAddDelegateRequest.js
+++ b/components/erAddDelegateRequest.js
@@ -19,140 +19,139 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js"); 
+Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erAddDelegateRequest"];
-function erAddDelegateRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-	this.delegateemail=aArgument.delegateemail;
-	this.delegateproperties=aArgument.delegateproperties;
-	this.delegatingItem = aArgument.delegatingItem;
-
-    this.permission = ""; 
-	switch( this.delegatingItem ){
-		case "calendar":
-			 this.permission = "CalendarFolderPermissionLevel";
-			break;
-		case  "tasks":
-			 this.permission = "TasksFolderPermissionLevel";
-			break;
-		case  "inbox":
-			 this.permission = "InboxFolderPermissionLevel";
-			break;
-		case "contacts":
-			 this.permission = "ContactsFolderPermissionLevel";  
-			break;
-		case "notes":
-			 this.permission = "NotesFolderPermissionLevel";
-			break;
-		case "journal":
-			 this.permission = "JournalFolderPermissionLevel";
-			break;
-		default:
- 	}
-	
-	this.isRunning = true;
-	this.execute();
+
+function erAddDelegateRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+    this.delegateemail = aArgument.delegateemail;
+    this.delegateproperties = aArgument.delegateproperties;
+    this.delegatingItem = aArgument.delegatingItem;
+
+    this.permission = "";
+    switch (this.delegatingItem) {
+    case "calendar":
+        this.permission = "CalendarFolderPermissionLevel";
+        break;
+    case "tasks":
+        this.permission = "TasksFolderPermissionLevel";
+        break;
+    case "inbox":
+        this.permission = "InboxFolderPermissionLevel";
+        break;
+    case "contacts":
+        this.permission = "ContactsFolderPermissionLevel";
+        break;
+    case "notes":
+        this.permission = "NotesFolderPermissionLevel";
+        break;
+    case "journal":
+        this.permission = "JournalFolderPermissionLevel";
+        break;
+    default:
+    }
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erAddDelegateRequest.prototype = {
 
-	execute: function _execute()
-	{
- 		exchWebService.commonFunctions.LOG("erAddDelegateRequest.execute\n");
-
- 		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:AddDelegate xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
- 		var mailBox = req.addChildTag("Mailbox", "nsMessages", null);  
-		mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox );  
- 		 
-		var delegateusers = req.addChildTag("DelegateUsers","nsMessages", null);  
-		var delegateuser=delegateusers.addChildTag("DelegateUser","nsTypes", null);  
-		var userid=delegateuser.addChildTag("UserId","nsTypes", null);  
-		userid.addChildTag("PrimarySmtpAddress","nsTypes",this.delegateemail);   
-		
-		var delegatepermissions = delegateuser.addChildTag("DelegatePermissions","nsTypes", null); 
-		delegatepermissions.addChildTag(this.permission,"nsTypes", this.delegateproperties.DelegatePermissions );
-		delegateuser.addChildTag("ReceiveCopiesOfMeetingMessages","nsTypes", this.delegateproperties.ReceiveCopiesOfMeetingMessages); 
-		delegateuser.addChildTag("ViewPrivateItems","nsTypes", this.delegateproperties.ViewPrivateItems ); 
-		req.addChildTag("DeliverMeetingRequests", "nsMessages",this.delegateproperties.DeliverMeetingRequests );     
-	
-		exchWebService.commonFunctions.LOG("erAddDelegateRequest.execute2 " + req + "\n" );
-		
-		this.parent.xml2jxon = true;
+    execute: function _execute() {
+        exchWebService.commonFunctions.LOG("erAddDelegateRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:AddDelegate xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var mailBox = req.addChildTag("Mailbox", "nsMessages", null);
+        mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox);
+
+        var delegateusers = req.addChildTag("DelegateUsers", "nsMessages", null);
+        var delegateuser = delegateusers.addChildTag("DelegateUser", "nsTypes", null);
+        var userid = delegateuser.addChildTag("UserId", "nsTypes", null);
+        userid.addChildTag("PrimarySmtpAddress", "nsTypes", this.delegateemail);
+
+        var delegatepermissions = delegateuser.addChildTag("DelegatePermissions", "nsTypes", null);
+        delegatepermissions.addChildTag(this.permission, "nsTypes", this.delegateproperties.DelegatePermissions);
+        delegateuser.addChildTag("ReceiveCopiesOfMeetingMessages", "nsTypes", this.delegateproperties.ReceiveCopiesOfMeetingMessages);
+        delegateuser.addChildTag("ViewPrivateItems", "nsTypes", this.delegateproperties.ViewPrivateItems);
+        req.addChildTag("DeliverMeetingRequests", "nsMessages", this.delegateproperties.DeliverMeetingRequests);
+
+        exchWebService.commonFunctions.LOG("erAddDelegateRequest.execute2 " + req + "\n");
+
+        this.parent.xml2jxon = true;
         this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erAddDelegateRequest.onSendOk: " + aResp +"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:AddDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:"+responseCode);
-			return;
-		}
- 
-		var delegates=[];
-		if ( rm.length > 0) 
-		{  
- 			for( index=0;index<rm.length;index++)
-			{ 
-			  //   exchWebService.commonFunctions.LOG("erAddDelegateRequest.onSendOk:  " + index + " : " +  rm[index] + " \n");  
- 				//m:DeliverMeetingRequests
-			    var delegateUser = rm[index].getTag("m:DelegateUser");   
-			    if ( delegateUser )  {
-					 delegates[index]={ 
-						  SID: delegateUser.getTag("t:UserId").getTagValue("t:SID") ,
-						  PrimarySmtpAddress: delegateUser.getTag("t:UserId").getTagValue("t:PrimarySmtpAddress"),
-						  DisplayName: delegateUser.getTag("t:UserId").getTagValue("t:DisplayName"), 
-						  /*adding local permission so we receive no response for that */ 
-						  DelegatePermissions: this.delegateproperties.DelegatePermissions  ,
-						  ReceiveCopiesOfMeetingMessages:delegateUser.getTagValue("t:ReceiveCopiesOfMeetingMessages"),
-						  ViewPrivateItems: delegateUser.getTagValue("t:ViewPrivateItems"),
-						  DeliverMeetingRequests:this.delegateproperties.DeliverMeetingRequests ,
-				 	}; 
-			    }
-			}  
-		} 
-		
-		rm = null; 
-		if (this.mCbOk) {
-			this.mCbOk(this,delegates); 
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		 exchWebService.commonFunctions.LOG("erAddDelegateRequest.onSendError: "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erAddDelegateRequest.onSendOk: " + aResp + "\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:AddDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:" + responseCode);
+            return;
+        }
+
+        var delegates = [];
+        if (rm.length > 0) {
+            for (index = 0; index < rm.length; index++) {
+                //   exchWebService.commonFunctions.LOG("erAddDelegateRequest.onSendOk:  " + index + " : " +  rm[index] + " \n");  
+                //m:DeliverMeetingRequests
+                var delegateUser = rm[index].getTag("m:DelegateUser");
+                if (delegateUser) {
+                    delegates[index] = {
+                        SID: delegateUser.getTag("t:UserId").getTagValue("t:SID"),
+                        PrimarySmtpAddress: delegateUser.getTag("t:UserId").getTagValue("t:PrimarySmtpAddress"),
+                        DisplayName: delegateUser.getTag("t:UserId").getTagValue("t:DisplayName"),
+                        /*adding local permission so we receive no response for that */
+                        DelegatePermissions: this.delegateproperties.DelegatePermissions,
+                        ReceiveCopiesOfMeetingMessages: delegateUser.getTagValue("t:ReceiveCopiesOfMeetingMessages"),
+                        ViewPrivateItems: delegateUser.getTagValue("t:ViewPrivateItems"),
+                        DeliverMeetingRequests: this.delegateproperties.DeliverMeetingRequests,
+                    };
+                }
+            }
+        }
+
+        rm = null;
+        if (this.mCbOk) {
+            this.mCbOk(this, delegates);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("erAddDelegateRequest.onSendError: " + aMsg + "\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
 
 /*
diff --git a/components/erAutoDiscover.js b/components/erAutoDiscover.js
index ac32deff..c17f45dd 100644
--- a/components/erAutoDiscover.js
+++ b/components/erAutoDiscover.js
@@ -49,153 +49,151 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erAutoDiscoverRequest"];
 
-function erAutoDiscoverRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-	this.mArgument = aArgument;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.mailbox = aArgument.mailbox;
-
-	this.isRunning = true;
-	this.execute();
+function erAutoDiscoverRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+    this.mArgument = aArgument;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.mailbox = aArgument.mailbox;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erAutoDiscoverRequest.prototype = {
 
-	execute: function _execute()
-	{
-		// This autodiscover is of the type POX (http://msdn.microsoft.com/en-us/library/bb204189.aspx)
-		// This is compatible with exchange 2007 and 2010. For 2010 we could also 
-		// use SOAP (http://msdn.microsoft.com/en-us/library/dd877096%28v=EXCHG.140%29.aspx)
-
-//		exchWebService.commonFunctions.LOG("sendAutodiscover\n");
-		var email = this.mailbox;
-                var parts = email.split("@");
-                var domain = parts[1];
-		exchWebService.commonFunctions.LOG("autodiscover email:"+email+", domain:"+domain+"\n");
-
-		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-		myAuthPrompt2.removeUserCanceled("https://" + domain + "/autodiscover/autodiscover.xml");
-		myAuthPrompt2.removeUserCanceled("https://autodiscover." + domain + "/autodiscover/autodiscover.xml");
-		myAuthPrompt2.removeUserCanceled("http://autodiscover." + domain + "/autodiscover/autodiscover.xml");
-		myAuthPrompt2.removePasswordCache(null, "https://" + domain + "/autodiscover/autodiscover.xml");
-		myAuthPrompt2.removePasswordCache(null, "https://autodiscover." + domain + "/autodiscover/autodiscover.xml");
-		myAuthPrompt2.removePasswordCache(null, "http://autodiscover." + domain + "/autodiscover/autodiscover.xml");
-
-		this.parent.urllist = [
-			"https://" + domain + "/autodiscover/autodiscover.xml",
-			"https://autodiscover." + domain + "/autodiscover/autodiscover.xml",
-			"http://autodiscover." + domain + "/autodiscover/autodiscover.xml"
-		];
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006"/>');
-		var request = req.addChildTag("Request", null, null);
-		request.addChildTag("EMailAddress", null, email);
-		request.addChildTag("AcceptableResponseSchema", null, "http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a");
-		request = null;
-
-		exchWebService.commonFunctions.LOG("sendAutodiscover.execute:"+req.toString()+"\n");
- 		this.parent.xml2jxon = true;
-		this.parent.sendRequest(xml_tag + req.toString());
-		req = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("sendAutodiscover.onSendOk:"+String(aResp));
-		var DisplayName = "";
-		var SMTPaddress = "";
-		var redirectAddr = null;
-		var ewsUrls = "";
-		var aError = true;
-		var aCode = -1;
-		var aMsg = String(aResp);
-
-		// Try to see if we get a redirectAddr Action
-		var account = aResp.XPath("/a1:Autodiscover/a2:Response/a2:Account[a2:Action ='redirectAddr']");
-		if (account.length > 0) {
-			// We have an redirectAddr. Send OK back but with the redirectAddr set.
-			redirectAddr = account[0].getTagValue("a2:RedirectAddr", null);
-			if ((this.mCbOk) && (redirectAddr)) {
-				//this.isRunning = false;
-				this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
-			}
-			if (aError) {
-				this.onSendError(aExchangeRequest, aCode, aMsg);
-			}
-			this.isRunning = false;
-			return;
-		}
-		account = null;
-
-		// Try to get the Displayname if it is available
-		var tag = aResp.XPath("/a1:Autodiscover/a2:Response/a2:User/a2:DisplayName");
-		if (tag.length > 0) {
-			DisplayName = tag[0].value;
-		}
-		else {
-			exchWebService.commonFunctions.LOG("autodiscoverOk but Displayname is not available.");
-		}
-		tag = null;
-
-		// Try to get the SMTP address if it is available
-		var tag = aResp.XPath("/a1:Autodiscover/a2:Response/a2:User/a2:AutoDiscoverSMTPAddress");
-		if (tag.length > 0) {
-			SMTPaddress = tag[0].value;
-		}
-		else {
-			exchWebService.commonFunctions.LOG("autodiscoverOk but AutoDiscoverSMTPAddress is not available.");
-		}
-		tag = null;
-
-		// Try to get the EWS urls if they are available
-		ewsUrls = aResp.XPath("/a1:Autodiscover/a2:Response/a2:Account/a2:Protocol[a2:Type='WEB']/*/a2:Protocol/a2:ASUrl");
-		if (ewsUrls.length > 0) {
-			exchWebService.commonFunctions.LOG(" cc protocol type WEB:"+ewsUrls+".");
-			aError = false;
-		}
-		else {
-			ewsUrls = aResp.XPath("/a1:Autodiscover/a2:Response/a2:Account/a2:Protocol[a2:Type='EXCH']/a2:EwsUrl");
-			if (ewsUrls.length > 0) {
-				exchWebService.commonFunctions.LOG(" cc protocol type EXCH:"+ewsUrls+".");
-				aError = false;
-			}
-			else {
-				aMsg = "autodiscoverOk error getting ewsUrls from:"+this.parent.currentUrl;
-				aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
-				aError = true;
-			}
-		}
-	
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
-			}
-		}
-		this.isRunning = false;
-		ewsUrls = null;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		exchWebService.commonFunctions.LOG("sendAutodiscover.onSendError: aCode:"+aCode+", aMsg:"+aMsg);
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        // This autodiscover is of the type POX (http://msdn.microsoft.com/en-us/library/bb204189.aspx)
+        // This is compatible with exchange 2007 and 2010. For 2010 we could also 
+        // use SOAP (http://msdn.microsoft.com/en-us/library/dd877096%28v=EXCHG.140%29.aspx)
+
+        //		exchWebService.commonFunctions.LOG("sendAutodiscover\n");
+        var email = this.mailbox;
+        var parts = email.split("@");
+        var domain = parts[1];
+        exchWebService.commonFunctions.LOG("autodiscover email:" + email + ", domain:" + domain + "\n");
+
+        var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+        myAuthPrompt2.removeUserCanceled("https://" + domain + "/autodiscover/autodiscover.xml");
+        myAuthPrompt2.removeUserCanceled("https://autodiscover." + domain + "/autodiscover/autodiscover.xml");
+        myAuthPrompt2.removeUserCanceled("http://autodiscover." + domain + "/autodiscover/autodiscover.xml");
+        myAuthPrompt2.removePasswordCache(null, "https://" + domain + "/autodiscover/autodiscover.xml");
+        myAuthPrompt2.removePasswordCache(null, "https://autodiscover." + domain + "/autodiscover/autodiscover.xml");
+        myAuthPrompt2.removePasswordCache(null, "http://autodiscover." + domain + "/autodiscover/autodiscover.xml");
+
+        this.parent.urllist = [
+            "https://" + domain + "/autodiscover/autodiscover.xml",
+            "https://autodiscover." + domain + "/autodiscover/autodiscover.xml",
+            "http://autodiscover." + domain + "/autodiscover/autodiscover.xml"
+        ];
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006"/>');
+        var request = req.addChildTag("Request", null, null);
+        request.addChildTag("EMailAddress", null, email);
+        request.addChildTag("AcceptableResponseSchema", null, "http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a");
+        request = null;
+
+        exchWebService.commonFunctions.LOG("sendAutodiscover.execute:" + req.toString() + "\n");
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(xml_tag + req.toString());
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("sendAutodiscover.onSendOk:" + String(aResp));
+        var DisplayName = "";
+        var SMTPaddress = "";
+        var redirectAddr = null;
+        var ewsUrls = "";
+        var aError = true;
+        var aCode = -1;
+        var aMsg = String(aResp);
+
+        // Try to see if we get a redirectAddr Action
+        var account = aResp.XPath("/a1:Autodiscover/a2:Response/a2:Account[a2:Action ='redirectAddr']");
+        if (account.length > 0) {
+            // We have an redirectAddr. Send OK back but with the redirectAddr set.
+            redirectAddr = account[0].getTagValue("a2:RedirectAddr", null);
+            if ((this.mCbOk) && (redirectAddr)) {
+                //this.isRunning = false;
+                this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
+            }
+            if (aError) {
+                this.onSendError(aExchangeRequest, aCode, aMsg);
+            }
+            this.isRunning = false;
+            return;
+        }
+        account = null;
+
+        // Try to get the Displayname if it is available
+        var tag = aResp.XPath("/a1:Autodiscover/a2:Response/a2:User/a2:DisplayName");
+        if (tag.length > 0) {
+            DisplayName = tag[0].value;
+        }
+        else {
+            exchWebService.commonFunctions.LOG("autodiscoverOk but Displayname is not available.");
+        }
+        tag = null;
+
+        // Try to get the SMTP address if it is available
+        var tag = aResp.XPath("/a1:Autodiscover/a2:Response/a2:User/a2:AutoDiscoverSMTPAddress");
+        if (tag.length > 0) {
+            SMTPaddress = tag[0].value;
+        }
+        else {
+            exchWebService.commonFunctions.LOG("autodiscoverOk but AutoDiscoverSMTPAddress is not available.");
+        }
+        tag = null;
+
+        // Try to get the EWS urls if they are available
+        ewsUrls = aResp.XPath("/a1:Autodiscover/a2:Response/a2:Account/a2:Protocol[a2:Type='WEB']/*/a2:Protocol/a2:ASUrl");
+        if (ewsUrls.length > 0) {
+            exchWebService.commonFunctions.LOG(" cc protocol type WEB:" + ewsUrls + ".");
+            aError = false;
+        }
+        else {
+            ewsUrls = aResp.XPath("/a1:Autodiscover/a2:Response/a2:Account/a2:Protocol[a2:Type='EXCH']/a2:EwsUrl");
+            if (ewsUrls.length > 0) {
+                exchWebService.commonFunctions.LOG(" cc protocol type EXCH:" + ewsUrls + ".");
+                aError = false;
+            }
+            else {
+                aMsg = "autodiscoverOk error getting ewsUrls from:" + this.parent.currentUrl;
+                aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
+                aError = true;
+            }
+        }
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
+            }
+        }
+        this.isRunning = false;
+        ewsUrls = null;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("sendAutodiscover.onSendError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erAutoDiscoverySOAP.js b/components/erAutoDiscoverySOAP.js
index e0f618c9..c8ba8bb9 100644
--- a/components/erAutoDiscoverySOAP.js
+++ b/components/erAutoDiscoverySOAP.js
@@ -49,173 +49,171 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erAutoDiscoverySOAPRequest"];
 
-function erAutoDiscoverySOAPRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-	this.mArgument = aArgument;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.mailbox = aArgument.mailbox;
-
-	this.isRunning = true;
-	this.execute();
+function erAutoDiscoverySOAPRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+    this.mArgument = aArgument;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.mailbox = aArgument.mailbox;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erAutoDiscoverySOAPRequest.prototype = {
 
-	execute: function _execute()
-	{
-		// This autodiscover is of the type SOAP (http://msdn.microsoft.com/en-us/library/exchange/dd877096%28v=exchg.140%29.aspx)
-		// This is compatible with exchange 2010.
-
-//		exchWebService.commonFunctions.LOG("sendAutodiscover\n");
-		var email = this.mailbox;
-                var parts = email.split("@");
-                var domain = parts[1];
-		exchWebService.commonFunctions.LOG("autodiscoverSOAP email:"+email+", domain:"+domain+"\n");
-
-		var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-		myAuthPrompt2.removeUserCanceled("https://" + domain + "/autodiscover/autodiscover.svc");
-		myAuthPrompt2.removeUserCanceled("https://autodiscover." + domain + "/autodiscover/autodiscover.svc");
-		myAuthPrompt2.removeUserCanceled("http://autodiscover." + domain + "/autodiscover/autodiscover.svc");
-		myAuthPrompt2.removePasswordCache(null, "https://" + domain + "/autodiscover/autodiscover.svc");
-		myAuthPrompt2.removePasswordCache(null, "https://autodiscover." + domain + "/autodiscover/autodiscover.svc");
-		myAuthPrompt2.removePasswordCache(null, "http://autodiscover." + domain + "/autodiscover/autodiscover.svc");
-
-		this.parent.urllist = [
-			"https://" + domain + "/autodiscover/autodiscover.svc",
-			"https://autodiscover." + domain + "/autodiscover/autodiscover.svc",
-			"http://autodiscover." + domain + "/autodiscover/autodiscover.svc"
-		];
-
-		var msg = exchWebService.commonFunctions.xmlToJxon('<nsSoap:Envelope xmlns:a="'+nsAutodiscover2010Str+'" xmlns:wsa="'+nsWSAStr+'" xmlns:xsi="'+nsXSIStr+'" xmlns:nsSoap="'+nsSoapStr+'"/>');
-		var header = msg.addChildTag("Header", "nsSoap", null);
-		header.addChildTag("RequestedServerVersion", "a", "Exchange2010");
-		header.addChildTag("Action", "wsa", "http://schemas.microsoft.com/exchange/2010/Autodiscover/Autodiscover/GetUserSettings");
-		header.addChildTag("To", "wsa", "https://" + domain + "/autodiscover/autodiscover.svc");
-		header = null;
-
-		var body = msg.addChildTag("Body", "nsSoap", null);
-		var getUserSettingsRequest = body.addChildTag("GetUserSettingsRequestMessage", "a", null);
-		body = null;
-
-		var request = getUserSettingsRequest.addChildTag("Request", "a", null);
-		request.addChildTag("Users", "a", null).addChildTag("User", "a", null).addChildTag("Mailbox", "a", email);
-
-		var requestedSettings = request.addChildTag("RequestedSettings", "a", null);
-		requestedSettings.addChildTag("Setting", "a", "UserDisplayName");
-		requestedSettings.addChildTag("Setting", "a", "UserDN");
-		requestedSettings.addChildTag("Setting", "a", "InternalEwsUrl");
-		requestedSettings.addChildTag("Setting", "a", "ExternalEwsUrl");
-		requestedSettings.addChildTag("Setting", "a", "AlternateMailboxes");
-		requestedSettings.addChildTag("Setting", "a", "EwsSupportedSchemas");
-		requestedSettings.addChildTag("Setting", "a", "AutoDiscoverSMTPAddress");
-		requestedSettings = null;
-
-		exchWebService.commonFunctions.LOG("sendAutodiscoverySOAP.execute:"+msg.toString()+"\n");
- 		this.parent.xml2jxon = true;
-		this.parent.sendRequest(xml_tag + msg.toString());
-		msg = null;
-		request = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("sendAutodiscoverySOAP.onSendOk:"+String(aResp));
-		var DisplayName = "";
-		var SMTPaddress = "";
-		var redirectAddr = null;
-		var ewsUrls = new Array();
-		var aError = true;
-		var aCode = -1;
-		var aMsg = String(aResp);
-
-		// Check if we received and RedirectAddress errorcode.
-		var rm = aResp.XPath("/s:Envelope/s:Body/_default_:GetUserSettingsResponseMessage/_default_:Response[_default_:ErrorCode='NoError']/_default_:UserResponses/_default_:UserResponse[_default_:ErrorCode='RedirectAddress']");
-		if (rm.length > 0) {
-			redirectAddr = rm[0].getTagValue("_default_:RedirectTarget", null);
-			if ((this.mCbOk) && (redirectAddr)) {
-				//this.isRunning = false;
-				this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
-			}
-			if (aError) {
-				this.onSendError(aExchangeRequest, aCode, aMsg);
-			}
-			this.isRunning = false;
-			rm = null;
-			return;
-		}
-		rm = null;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/_default_:GetUserSettingsResponseMessage/_default_:Response[_default_:ErrorCode='NoError']/_default_:UserResponses/_default_:UserResponse[_default_:ErrorCode='NoError']/_default_:UserSettings/_default_:UserSetting");
-
-		if (rm.length > 0) {
-			for each(var userSetting in rm) {
-				var name = userSetting.getTagValue("_default_:Name", "");
-				switch (name) {
-				case "UserDisplayName": 
-					DisplayName = userSetting.getTagValue("_default_:Value", ""); 
-					exchWebService.commonFunctions.LOG("autodiscoverySOAPOk UserDisplayName:"+DisplayName);
-					break;
-				case "AutoDiscoverSMTPAddress": 
-					SMTPaddress = userSetting.getTagValue("_default_:Value", ""); 
-					exchWebService.commonFunctions.LOG("autodiscoverySOAPOk SMTPaddress:"+SMTPaddress);
-					break;
-				case "InternalEwsUrl": 
-				case "ExternalEwsUrl": 
-					exchWebService.commonFunctions.LOG("autodiscoverySOAPOk EwsUrl:"+userSetting.getTagValue("_default_:Value", ""));
-					ewsUrls.push(userSetting.getTag("_default_:Value")); 
-					break;
-				}
-			}
-			aError = false;
-		}
-		else {
-			exchWebService.commonFunctions.LOG("autodiscoverySOAPOk but no settings returned.");
-			aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
-		}
-		rm = null;
-
-		// Try to get the SMTP address if it is available
-		if ((!aError) && (SMTPaddress == "")) {
-			exchWebService.commonFunctions.LOG("autodiscoverySOAPOk but AutoDiscoverSMTPAddress is not available.");
-			aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
-			aError = true;
-		}
-
-		if ((!aError) && (ewsUrls.length == 0)) {
-			aMsg = "autodiscoverySOAPOk error getting ewsUrls from:"+this.parent.currentUrl;
-			aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
-			aError = true;
-		}
-	
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
-			}
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		exchWebService.commonFunctions.LOG("sendAutodiscoverySOAP.onSendError: aCode:"+aCode+", aMsg:"+aMsg);
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        // This autodiscover is of the type SOAP (http://msdn.microsoft.com/en-us/library/exchange/dd877096%28v=exchg.140%29.aspx)
+        // This is compatible with exchange 2010.
+
+        //		exchWebService.commonFunctions.LOG("sendAutodiscover\n");
+        var email = this.mailbox;
+        var parts = email.split("@");
+        var domain = parts[1];
+        exchWebService.commonFunctions.LOG("autodiscoverSOAP email:" + email + ", domain:" + domain + "\n");
+
+        var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+        myAuthPrompt2.removeUserCanceled("https://" + domain + "/autodiscover/autodiscover.svc");
+        myAuthPrompt2.removeUserCanceled("https://autodiscover." + domain + "/autodiscover/autodiscover.svc");
+        myAuthPrompt2.removeUserCanceled("http://autodiscover." + domain + "/autodiscover/autodiscover.svc");
+        myAuthPrompt2.removePasswordCache(null, "https://" + domain + "/autodiscover/autodiscover.svc");
+        myAuthPrompt2.removePasswordCache(null, "https://autodiscover." + domain + "/autodiscover/autodiscover.svc");
+        myAuthPrompt2.removePasswordCache(null, "http://autodiscover." + domain + "/autodiscover/autodiscover.svc");
+
+        this.parent.urllist = [
+            "https://" + domain + "/autodiscover/autodiscover.svc",
+            "https://autodiscover." + domain + "/autodiscover/autodiscover.svc",
+            "http://autodiscover." + domain + "/autodiscover/autodiscover.svc"
+        ];
+
+        var msg = exchWebService.commonFunctions.xmlToJxon('<nsSoap:Envelope xmlns:a="' + nsAutodiscover2010Str + '" xmlns:wsa="' + nsWSAStr + '" xmlns:xsi="' + nsXSIStr + '" xmlns:nsSoap="' + nsSoapStr + '"/>');
+        var header = msg.addChildTag("Header", "nsSoap", null);
+        header.addChildTag("RequestedServerVersion", "a", "Exchange2010");
+        header.addChildTag("Action", "wsa", "http://schemas.microsoft.com/exchange/2010/Autodiscover/Autodiscover/GetUserSettings");
+        header.addChildTag("To", "wsa", "https://" + domain + "/autodiscover/autodiscover.svc");
+        header = null;
+
+        var body = msg.addChildTag("Body", "nsSoap", null);
+        var getUserSettingsRequest = body.addChildTag("GetUserSettingsRequestMessage", "a", null);
+        body = null;
+
+        var request = getUserSettingsRequest.addChildTag("Request", "a", null);
+        request.addChildTag("Users", "a", null).addChildTag("User", "a", null).addChildTag("Mailbox", "a", email);
+
+        var requestedSettings = request.addChildTag("RequestedSettings", "a", null);
+        requestedSettings.addChildTag("Setting", "a", "UserDisplayName");
+        requestedSettings.addChildTag("Setting", "a", "UserDN");
+        requestedSettings.addChildTag("Setting", "a", "InternalEwsUrl");
+        requestedSettings.addChildTag("Setting", "a", "ExternalEwsUrl");
+        requestedSettings.addChildTag("Setting", "a", "AlternateMailboxes");
+        requestedSettings.addChildTag("Setting", "a", "EwsSupportedSchemas");
+        requestedSettings.addChildTag("Setting", "a", "AutoDiscoverSMTPAddress");
+        requestedSettings = null;
+
+        exchWebService.commonFunctions.LOG("sendAutodiscoverySOAP.execute:" + msg.toString() + "\n");
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(xml_tag + msg.toString());
+        msg = null;
+        request = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("sendAutodiscoverySOAP.onSendOk:" + String(aResp));
+        var DisplayName = "";
+        var SMTPaddress = "";
+        var redirectAddr = null;
+        var ewsUrls = new Array();
+        var aError = true;
+        var aCode = -1;
+        var aMsg = String(aResp);
+
+        // Check if we received and RedirectAddress errorcode.
+        var rm = aResp.XPath("/s:Envelope/s:Body/_default_:GetUserSettingsResponseMessage/_default_:Response[_default_:ErrorCode='NoError']/_default_:UserResponses/_default_:UserResponse[_default_:ErrorCode='RedirectAddress']");
+        if (rm.length > 0) {
+            redirectAddr = rm[0].getTagValue("_default_:RedirectTarget", null);
+            if ((this.mCbOk) && (redirectAddr)) {
+                //this.isRunning = false;
+                this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
+            }
+            if (aError) {
+                this.onSendError(aExchangeRequest, aCode, aMsg);
+            }
+            this.isRunning = false;
+            rm = null;
+            return;
+        }
+        rm = null;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/_default_:GetUserSettingsResponseMessage/_default_:Response[_default_:ErrorCode='NoError']/_default_:UserResponses/_default_:UserResponse[_default_:ErrorCode='NoError']/_default_:UserSettings/_default_:UserSetting");
+
+        if (rm.length > 0) {
+            for each(var userSetting in rm) {
+                var name = userSetting.getTagValue("_default_:Name", "");
+                switch (name) {
+                case "UserDisplayName":
+                    DisplayName = userSetting.getTagValue("_default_:Value", "");
+                    exchWebService.commonFunctions.LOG("autodiscoverySOAPOk UserDisplayName:" + DisplayName);
+                    break;
+                case "AutoDiscoverSMTPAddress":
+                    SMTPaddress = userSetting.getTagValue("_default_:Value", "");
+                    exchWebService.commonFunctions.LOG("autodiscoverySOAPOk SMTPaddress:" + SMTPaddress);
+                    break;
+                case "InternalEwsUrl":
+                case "ExternalEwsUrl":
+                    exchWebService.commonFunctions.LOG("autodiscoverySOAPOk EwsUrl:" + userSetting.getTagValue("_default_:Value", ""));
+                    ewsUrls.push(userSetting.getTag("_default_:Value"));
+                    break;
+                }
+            }
+            aError = false;
+        }
+        else {
+            exchWebService.commonFunctions.LOG("autodiscoverySOAPOk but no settings returned.");
+            aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
+        }
+        rm = null;
+
+        // Try to get the SMTP address if it is available
+        if ((!aError) && (SMTPaddress == "")) {
+            exchWebService.commonFunctions.LOG("autodiscoverySOAPOk but AutoDiscoverSMTPAddress is not available.");
+            aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
+            aError = true;
+        }
+
+        if ((!aError) && (ewsUrls.length == 0)) {
+            aMsg = "autodiscoverySOAPOk error getting ewsUrls from:" + this.parent.currentUrl;
+            aCode = this.parent.ER_ERROR_AUTODISCOVER_GET_EWSULR;
+            aError = true;
+        }
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(ewsUrls, DisplayName, SMTPaddress, redirectAddr);
+            }
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("sendAutodiscoverySOAP.onSendError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erBrowseFolder.js b/components/erBrowseFolder.js
index 4f08583d..2d9fbc32 100644
--- a/components/erBrowseFolder.js
+++ b/components/erBrowseFolder.js
@@ -46,136 +46,136 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erBrowseFolderRequest"];
 
-function erBrowseFolderRequest(aArgument, aCbOk, aCbError)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		null);
-
-	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-
-	this.isRunning = true;
-	this.execute();
+function erBrowseFolderRequest(aArgument, aCbOk, aCbError) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        null);
+
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erBrowseFolderRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erBrowseFolderRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindFolder xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("Traversal", "Shallow");
-
-		req.addChildTag("FolderShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "AllProperties"); 
-
-		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2jxon = true;
-
-		exchWebService.commonFunctions.LOG("erBrowseFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-
-		//exchWebService.commonFunctions.LOG("erBrowseFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erBrowseFolderRequest.onSendOk:"+String(aResp));
-		// Get FolderID and ChangeKey
-		var aContinue = true;
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-		var childFolders = [];
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindFolderResponse/m:ResponseMessages/m:FindFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var rootFolder = rm[0].getTag("m:RootFolder");
-			if (rootFolder) {
-				if (rootFolder.getAttribute("IncludesLastItemInRange") == "true") {
-					// Process results.
-					var folders = rootFolder.XPath("/t:Folders/*");
-					exchWebService.commonFunctions.LOG("Found '"+folders.length+"' folders.");
-					for (var index in folders) {
-						exchWebService.commonFunctions.LOG("Adding folder:"+folders[index].getTagValue("t:DisplayName"));
-						var tmpFolderClass = folders[index].getTagValue("t:FolderClass", "");
-						childFolders.push({ user: this.argument.user, 
-									mailbox: this.argument.mailbox,
-									folderBase: this.argument.folderBase,
-									serverUrl: this.argument.serverUrl,
-									folderID: folders[index].getAttributeByTag("t:FolderId", "Id"),
-									changeKey: folders[index].getAttributeByTag("t:FolderId", "ChangeKey"),
-									foldername: folders[index].getTagValue("t:DisplayName", ""), 
-									isContainer: (folders[index].getTagValue("t:ChildFolderCount", 0) > 0),
-									isContainerOpen : false,
-									isContainerEmpty: (folders[index].getTagValue("t:ChildFolderCount", 0) == 0),
-									level: this.argument.level+1,
-									children: [],
-									folderClass: tmpFolderClass });
-					}
-					folders = null;
-				}
-				else {
-					// We do not know how to handle this yet. Do not know if it ever happens. We did not restrict MaxEntriesReturned.
-					exchWebService.commonFunctions.LOG("SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: IncludesLastItemInRange == false in FindFolderResponse.");
-				}
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "No RootFolder found in FindFolderResponse.";
-			}
-		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_CONVERTID;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(this, childFolders);
-			}
-			this.isRunning = false;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erBrowseFolderRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindFolder xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Shallow");
+
+        req.addChildTag("FolderShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "AllProperties");
+
+        var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2jxon = true;
+
+        exchWebService.commonFunctions.LOG("erBrowseFolderRequest.execute:" + String(this.parent.makeSoapMessage(req)));
+
+        //exchWebService.commonFunctions.LOG("erBrowseFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erBrowseFolderRequest.onSendOk:" + String(aResp));
+        // Get FolderID and ChangeKey
+        var aContinue = true;
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+        var childFolders = [];
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindFolderResponse/m:ResponseMessages/m:FindFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            var rootFolder = rm[0].getTag("m:RootFolder");
+            if (rootFolder) {
+                if (rootFolder.getAttribute("IncludesLastItemInRange") == "true") {
+                    // Process results.
+                    var folders = rootFolder.XPath("/t:Folders/*");
+                    exchWebService.commonFunctions.LOG("Found '" + folders.length + "' folders.");
+                    for (var index in folders) {
+                        exchWebService.commonFunctions.LOG("Adding folder:" + folders[index].getTagValue("t:DisplayName"));
+                        var tmpFolderClass = folders[index].getTagValue("t:FolderClass", "");
+                        childFolders.push({
+                            user: this.argument.user,
+                            mailbox: this.argument.mailbox,
+                            folderBase: this.argument.folderBase,
+                            serverUrl: this.argument.serverUrl,
+                            folderID: folders[index].getAttributeByTag("t:FolderId", "Id"),
+                            changeKey: folders[index].getAttributeByTag("t:FolderId", "ChangeKey"),
+                            foldername: folders[index].getTagValue("t:DisplayName", ""),
+                            isContainer: (folders[index].getTagValue("t:ChildFolderCount", 0) > 0),
+                            isContainerOpen: false,
+                            isContainerEmpty: (folders[index].getTagValue("t:ChildFolderCount", 0) == 0),
+                            level: this.argument.level + 1,
+                            children: [],
+                            folderClass: tmpFolderClass
+                        });
+                    }
+                    folders = null;
+                }
+                else {
+                    // We do not know how to handle this yet. Do not know if it ever happens. We did not restrict MaxEntriesReturned.
+                    exchWebService.commonFunctions.LOG("SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: IncludesLastItemInRange == false in FindFolderResponse.");
+                }
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "No RootFolder found in FindFolderResponse.";
+            }
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_CONVERTID;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(this, childFolders);
+            }
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erConvertID.js b/components/erConvertID.js
index d050f62f..79307b2f 100644
--- a/components/erConvertID.js
+++ b/components/erConvertID.js
@@ -45,104 +45,103 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erConvertIDRequest"];
 
-function erConvertIDRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
+function erConvertIDRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
 
-	var self = this;
+    var self = this;
 
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
 
-	this.parent.debug = true;
+    this.parent.debug = true;
 
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderId = aArgument.folderId;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderId = aArgument.folderId;
 
-	this.isRunning = true;
-	this.execute();
+    this.isRunning = true;
+    this.execute();
 }
 
 erConvertIDRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erConvertIDRequest.Execute");
-		// We are going to do a dummy FindItem. It will return the real primarySMTP
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ConvertId xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("DestinationFormat", "EwsId");
-
-		var alternateId = req.addChildTag("SourceIds", "nsMessages", null).addChildTag("AlternateId", "nsTypes", null);
-		alternateId.setAttribute("Format", "HexEntryId");
-		alternateId.setAttribute("Id", this.folderId);
-		alternateId.setAttribute("Mailbox", this.mailbox);
-
-		//exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
-
-//		exchWebService.commonFunctions.LOG("erConvertIDRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erConvertIDRequest.onSendOk: "+String(aResp));
-
-		var aContinue = true;
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:ConvertIdResponse/m:ResponseMessages/m:ConvertIdResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-
-//          <m:AlternateId xsi:type="t:AlternateIdType" Format="EwsId" Id="AAMkADNjZmIwYzQyLTdjYmEtNGFlMi05ZGE5LTBlYzRkNzYzODRhOAAuAAAAAAC8WradQ3BFT7SAoV2yp+k8AQDcsp8GsIe7Q5tUJHDnpdbjAAAtr+rqAAA=" Mailbox="jane@example.com"/>
-
-			var alternateId = rm[0].getAttributeByTag("m:AlternateId","Id");
-			var realMailbox = rm[0].getAttributeByTag("m:AlternateId","Mailbox");
-		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_CONVERTID;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(alternateId, realMailbox);
-			}
-			this.isRunning = false;
-		}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erConvertIDRequest.Execute");
+        // We are going to do a dummy FindItem. It will return the real primarySMTP
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ConvertId xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("DestinationFormat", "EwsId");
+
+        var alternateId = req.addChildTag("SourceIds", "nsMessages", null).addChildTag("AlternateId", "nsTypes", null);
+        alternateId.setAttribute("Format", "HexEntryId");
+        alternateId.setAttribute("Id", this.folderId);
+        alternateId.setAttribute("Mailbox", this.mailbox);
+
+        //exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
+
+        //		exchWebService.commonFunctions.LOG("erConvertIDRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erConvertIDRequest.onSendOk: " + String(aResp));
+
+        var aContinue = true;
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:ConvertIdResponse/m:ResponseMessages/m:ConvertIdResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+
+            //          <m:AlternateId xsi:type="t:AlternateIdType" Format="EwsId" Id="AAMkADNjZmIwYzQyLTdjYmEtNGFlMi05ZGE5LTBlYzRkNzYzODRhOAAuAAAAAAC8WradQ3BFT7SAoV2yp+k8AQDcsp8GsIe7Q5tUJHDnpdbjAAAtr+rqAAA=" Mailbox="jane@example.com"/>
+
+            var alternateId = rm[0].getAttributeByTag("m:AlternateId", "Id");
+            var realMailbox = rm[0].getAttributeByTag("m:AlternateId", "Mailbox");
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_CONVERTID;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(alternateId, realMailbox);
+            }
+            this.isRunning = false;
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
 
 exchWebService.commonFunctions.LOG("++==--++");
-
diff --git a/components/erCreateAttachment.js b/components/erCreateAttachment.js
index fcd12a84..abfa8c71 100644
--- a/components/erCreateAttachment.js
+++ b/components/erCreateAttachment.js
@@ -54,154 +54,154 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erCreateAttachmentRequest"];
 
-function erCreateAttachmentRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.parentItemId = aArgument.parentItemId;
-	this.parentItemChangeKey = aArgument.parentItemChangeKey;
-
-	this.createAttachments = aArgument.attachmentsUpdates.create;
-
-	this.isRunning = true;
-	this.execute();
+function erCreateAttachmentRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.parentItemId = aArgument.parentItemId;
+    this.parentItemChangeKey = aArgument.parentItemChangeKey;
+
+    this.createAttachments = aArgument.attachmentsUpdates.create;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erCreateAttachmentRequest.prototype = {
 
-	readFile: function _readFile(aFile)
-	{
-		exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.readFile: Going to read file:"+aFile.path);
-		var data = "";  
-		var fstream = Cc["@mozilla.org/network/file-input-stream;1"].  
-			      createInstance(Ci.nsIFileInputStream);  
-		fstream.init(aFile, -1, 0, 0);  
-
-		var bstream = Components.classes["@mozilla.org/binaryinputstream;1"].  
-			      createInstance(Components.interfaces.nsIBinaryInputStream);  
-		bstream.setInputStream(fstream);  
-		  
-		var bytesRead = 0;
-		var bytesToRead = bstream.available();
-		while (bytesToRead > 0) {
-			var bytes = bstream.readBytes(bytesToRead); 
-			bytesRead += bytesToRead;
-			data += btoa(bytes); 
-			bytesToRead = bstream.available();
-		}
-		  
-		bstream.close();
-
-		return { content: data, size: bytesRead } ;
-	},
-
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateAttachment xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var parentItemId = req.addChildTag("ParentItemId", "nsMessages", null);
-		parentItemId.setAttribute("Id", this.parentItemId);
-		parentItemId.setAttribute("ChangeKey", this.parentItemChangeKey);
-
-		var attachments = req.addChildTag("Attachments", "nsMessages", null);
-
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-
-		for (var index in this.createAttachments) {
-			var fileData = this.readFile(this.createAttachments[index].uri.QueryInterface(Ci.nsIFileURL).file);
-
-			var attachment = exchWebService.commonFunctions.xmlToJxon('<nsTypes:FileAttachment xmlns:nsTypes="'+nsTypesStr+'"/>');
-			attachment.addChildTag("Name", "nsTypes", this.createAttachments[index].uri.QueryInterface(Ci.nsIFileURL).file.leafName);
-			if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
-				attachment.addChildTag("Size", "nsTypes", fileData.size);
-			}
-			attachment.addChildTag("Content", "nsTypes", fileData.content);
-
-			attachments.addChildTagObject(attachment);
-			attachment = null;
-			
-		}
-
-		this.parent.xml2jxon = true;
-		
-		//exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.execute>"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-		attachments = null;
-		parentItemId = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.onSendOk: "+String(aResp)+"\n");
-
-		// The response could contain the result of creating multiple attachments. One could be ok and another not. So check all.
-
-		var weHaveAnError = false;
-		var createAttachmentResponseMessages = aResp.XPath("/s:Envelope/s:Body/m:CreateAttachmentResponse/m:ResponseMessages/m:CreateAttachmentResponseMessage");
-		var errorCount = 0;
-		var okCount = 0;
-
-		for each(var createAttachmentResponseMessage in createAttachmentResponseMessages) {
-			if (createAttachmentResponseMessage.getAttribute("ResponseClass") != "Success") {
-				weHaveAnError = true;
-				errorCount++;
-			}
-			else {
-				okCount++;
-			}
-		}
-		oofSettingsResponse = null;
-
-		exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.onSendOk: errorCount:"+errorCount+", okCount:"+okCount);
-
-		if (weHaveAnError) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on creating attachments:("+errorCount+" errors and "+okCount+" ok) "+String(aResp));
-			return;
-		}
-		else {
-			var aAttachments = aResp.XPath("/s:Envelope/s:Body/m:CreateAttachmentResponse/m:ResponseMessages/m:CreateAttachmentResponseMessage/m:Attachments/*");
-
-			if (aAttachments.length > 0) {
-				var attachmentId = aAttachments[0].getAttributeByTag("t:AttachmentId", "Id");
-				var RootItemId = aAttachments[0].getAttributeByTag("t:AttachmentId", "RootItemId");
-				var RootItemChangeKey = aAttachments[0].getAttributeByTag("t:AttachmentId", "RootItemChangeKey");
-			}
-			else {
-				this.onSendError(aExchangeRequest, this.parent.ER_ERROR_CREATING_ITEM_UNKNOWN, "Error. Valid createattachment request but receive no update details:"+String(aResp));
-				aAttachments = null;
-				return;
-			}
-			aAttachments = null;
-		}
-
-		if (this.mCbOk) {
-			this.mCbOk(this, attachmentId, RootItemId, RootItemChangeKey);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    readFile: function _readFile(aFile) {
+        exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.readFile: Going to read file:" + aFile.path);
+        var data = "";
+        var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
+        createInstance(Ci.nsIFileInputStream);
+        fstream.init(aFile, -1, 0, 0);
+
+        var bstream = Components.classes["@mozilla.org/binaryinputstream;1"].
+        createInstance(Components.interfaces.nsIBinaryInputStream);
+        bstream.setInputStream(fstream);
+
+        var bytesRead = 0;
+        var bytesToRead = bstream.available();
+        while (bytesToRead > 0) {
+            var bytes = bstream.readBytes(bytesToRead);
+            bytesRead += bytesToRead;
+            data += btoa(bytes);
+            bytesToRead = bstream.available();
+        }
+
+        bstream.close();
+
+        return {
+            content: data,
+            size: bytesRead
+        };
+    },
+
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateAttachment xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var parentItemId = req.addChildTag("ParentItemId", "nsMessages", null);
+        parentItemId.setAttribute("Id", this.parentItemId);
+        parentItemId.setAttribute("ChangeKey", this.parentItemChangeKey);
+
+        var attachments = req.addChildTag("Attachments", "nsMessages", null);
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+        for (var index in this.createAttachments) {
+            var fileData = this.readFile(this.createAttachments[index].uri.QueryInterface(Ci.nsIFileURL).file);
+
+            var attachment = exchWebService.commonFunctions.xmlToJxon('<nsTypes:FileAttachment xmlns:nsTypes="' + nsTypesStr + '"/>');
+            attachment.addChildTag("Name", "nsTypes", this.createAttachments[index].uri.QueryInterface(Ci.nsIFileURL).file.leafName);
+            if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
+                attachment.addChildTag("Size", "nsTypes", fileData.size);
+            }
+            attachment.addChildTag("Content", "nsTypes", fileData.content);
+
+            attachments.addChildTagObject(attachment);
+            attachment = null;
+
+        }
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.execute>"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+        attachments = null;
+        parentItemId = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.onSendOk: "+String(aResp)+"\n");
+
+        // The response could contain the result of creating multiple attachments. One could be ok and another not. So check all.
+
+        var weHaveAnError = false;
+        var createAttachmentResponseMessages = aResp.XPath("/s:Envelope/s:Body/m:CreateAttachmentResponse/m:ResponseMessages/m:CreateAttachmentResponseMessage");
+        var errorCount = 0;
+        var okCount = 0;
+
+        for each(var createAttachmentResponseMessage in createAttachmentResponseMessages) {
+            if (createAttachmentResponseMessage.getAttribute("ResponseClass") != "Success") {
+                weHaveAnError = true;
+                errorCount++;
+            }
+            else {
+                okCount++;
+            }
+        }
+        oofSettingsResponse = null;
+
+        exchWebService.commonFunctions.LOG("erCreateAttachmentRequest.onSendOk: errorCount:" + errorCount + ", okCount:" + okCount);
+
+        if (weHaveAnError) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on creating attachments:(" + errorCount + " errors and " + okCount + " ok) " + String(aResp));
+            return;
+        }
+        else {
+            var aAttachments = aResp.XPath("/s:Envelope/s:Body/m:CreateAttachmentResponse/m:ResponseMessages/m:CreateAttachmentResponseMessage/m:Attachments/*");
+
+            if (aAttachments.length > 0) {
+                var attachmentId = aAttachments[0].getAttributeByTag("t:AttachmentId", "Id");
+                var RootItemId = aAttachments[0].getAttributeByTag("t:AttachmentId", "RootItemId");
+                var RootItemChangeKey = aAttachments[0].getAttributeByTag("t:AttachmentId", "RootItemChangeKey");
+            }
+            else {
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_CREATING_ITEM_UNKNOWN, "Error. Valid createattachment request but receive no update details:" + String(aResp));
+                aAttachments = null;
+                return;
+            }
+            aAttachments = null;
+        }
+
+        if (this.mCbOk) {
+            this.mCbOk(this, attachmentId, RootItemId, RootItemChangeKey);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erCreateItem.js b/components/erCreateItem.js
index 1a6ba45d..07a97440 100644
--- a/components/erCreateItem.js
+++ b/components/erCreateItem.js
@@ -50,107 +50,105 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erCreateItemRequest"];
 
-function erCreateItemRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.createReq = aArgument.createReq;
-
-	this.isRunning = true;
-	this.execute("AutoResolve");
+function erCreateItemRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.createReq = aArgument.createReq;
+
+    this.isRunning = true;
+    this.execute("AutoResolve");
 }
 
 erCreateItemRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erCreateItemRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		if (publicFoldersMap[this.argument.folderBase]) {
-			var SendMeetingInvitations = "SendToNone";
-		}
-		else {
-			// When noone else is invited we want an appointment and not a meeting
-			if ((this.argument.item) && (this.argument.item.getAttendees({}).length == 0)) {
-				var SendMeetingInvitations = "SendToNone";
-			}
-			else {
-				var SendMeetingInvitations = "SendToAllAndSaveCopy";
-			}
-		}
-
-		if (cal.isEvent(this.argument.item)) {
-			req.setAttribute("SendMeetingInvitations", SendMeetingInvitations);
-		}	
-
-		// Following two are only needed for emails.
-		//req.setAttribute("MessageDisposition", "SaveOnly");
-
-		var savedItemFolderId = makeParentFolderIds2("SavedItemFolderId", this.argument);
-		req.addChildTagObject(savedItemFolderId);
-		savedItemFolderId = null;
-
-		var Items = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Items xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'">'+String(this.createReq)+'</nsMessages:Items>');
-		req.addChildTagObject(Items);
-		Items = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erCreateItemRequest.execute>"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erCreateItemRequest.onSendOk: "+String(aResp)+"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Respons does not contain expected field.");
-			return;
-		}
-		rm = null;
-
-		var aItem = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage/m:Items/*");
-
-		if (aItem.length > 0) {
-			var itemId = aItem[0].getAttributeByTag("t:ItemId","Id");
-			var changeKey = aItem[0].getAttributeByTag("t:ItemId","ChangeKey");
-		}
-		else {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_CREATING_ITEM_UNKNOWN, "Error. Valid createitem request but received no update details:"+String(aResp));
-			aItem = null;
-			return;
-		}
-		aItem = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, itemId, changeKey);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erCreateItemRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        if (publicFoldersMap[this.argument.folderBase]) {
+            var SendMeetingInvitations = "SendToNone";
+        }
+        else {
+            // When noone else is invited we want an appointment and not a meeting
+            if ((this.argument.item) && (this.argument.item.getAttendees({}).length == 0)) {
+                var SendMeetingInvitations = "SendToNone";
+            }
+            else {
+                var SendMeetingInvitations = "SendToAllAndSaveCopy";
+            }
+        }
+
+        if (cal.isEvent(this.argument.item)) {
+            req.setAttribute("SendMeetingInvitations", SendMeetingInvitations);
+        }
+
+        // Following two are only needed for emails.
+        //req.setAttribute("MessageDisposition", "SaveOnly");
+
+        var savedItemFolderId = makeParentFolderIds2("SavedItemFolderId", this.argument);
+        req.addChildTagObject(savedItemFolderId);
+        savedItemFolderId = null;
+
+        var Items = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Items xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '">' + String(this.createReq) + '</nsMessages:Items>');
+        req.addChildTagObject(Items);
+        Items = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erCreateItemRequest.execute>"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erCreateItemRequest.onSendOk: "+String(aResp)+"\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Respons does not contain expected field.");
+            return;
+        }
+        rm = null;
+
+        var aItem = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage/m:Items/*");
+
+        if (aItem.length > 0) {
+            var itemId = aItem[0].getAttributeByTag("t:ItemId", "Id");
+            var changeKey = aItem[0].getAttributeByTag("t:ItemId", "ChangeKey");
+        }
+        else {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_CREATING_ITEM_UNKNOWN, "Error. Valid createitem request but received no update details:" + String(aResp));
+            aItem = null;
+            return;
+        }
+        aItem = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, itemId, changeKey);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erDeleteAttachment.js b/components/erDeleteAttachment.js
index d3181656..58ebca2d 100644
--- a/components/erDeleteAttachment.js
+++ b/components/erDeleteAttachment.js
@@ -52,102 +52,100 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erDeleteAttachmentRequest"];
 
-function erDeleteAttachmentRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
+function erDeleteAttachmentRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
 
-	var self = this;
+    var self = this;
 
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
 
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
 
-	this.deleteAttachments = aArgument.attachmentsUpdates.delete;
+    this.deleteAttachments = aArgument.attachmentsUpdates.delete;
 
-	this.isRunning = true;
-	this.execute();
+    this.isRunning = true;
+    this.execute();
 }
 
 erDeleteAttachmentRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:DeleteAttachment xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var attachmentIds = req.addChildTag("AttachmentIds", "nsMessages", null);
-
-		for (var index in this.deleteAttachments) {
-			attachmentIds.addChildTag("AttachmentId", "nsTypes", null).setAttribute("Id", this.deleteAttachments[index].getParameter("X-AttachmentId"));
-		}
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.execute>"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.onSendOk: "+String(aResp)+"\n");
-		// The response could contain the result of creating multiple attachments. One could be ok and another not. So check all.
-
-		var weHaveAnError = false;
-		var deleteAttachmentResponseMessages = aResp.XPath("/s:Envelope/s:Body/m:DeleteAttachmentResponse/m:ResponseMessages/m:DeleteAttachmentResponseMessage");
-		var errorCount = 0;
-		var okCount = 0;
-
-		for each(var deleteAttachmentResponseMessage in deleteAttachmentResponseMessages) {
-			if (deleteAttachmentResponseMessage.getAttribute("ResponseClass") != "Success") {
-				weHaveAnError = true;
-				errorCount++;
-			}
-			else {
-				okCount++;
-			}
-		}
-
-		exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.onSendOk: errorCount:"+errorCount+", okCount:"+okCount);
-
-		if (weHaveAnError) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on deleting attachments:("+errorCount+" errors and "+okCount+" ok) "+String(aResp));
-			deleteAttachmentResponseMessages = null;
-			return;
-		}
-		else {
-			if (deleteAttachmentResponseMessages.length > 0) {
-				var RootItemId = deleteAttachmentResponseMessages[0].getAttributeByTag("m:RootItemId", "RootItemId");
-				var RootItemChangeKey = deleteAttachmentResponseMessages[0].getAttributeByTag("m:RootItemId", "RootItemChangeKey");
-			}
-			else {
-				this.onSendError(aExchangeRequest, this.parent.ER_ERROR_CREATING_ITEM_UNKNOWN, "Error. Unknown item deletion:"+String(aResp));
-				deleteAttachmentResponseMessages = null;
-				return;
-			}
-		}
-		deleteAttachmentResponseMessages = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, RootItemId, RootItemChangeKey);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:DeleteAttachment xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var attachmentIds = req.addChildTag("AttachmentIds", "nsMessages", null);
+
+        for (var index in this.deleteAttachments) {
+            attachmentIds.addChildTag("AttachmentId", "nsTypes", null).setAttribute("Id", this.deleteAttachments[index].getParameter("X-AttachmentId"));
+        }
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.execute>"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.onSendOk: "+String(aResp)+"\n");
+        // The response could contain the result of creating multiple attachments. One could be ok and another not. So check all.
+
+        var weHaveAnError = false;
+        var deleteAttachmentResponseMessages = aResp.XPath("/s:Envelope/s:Body/m:DeleteAttachmentResponse/m:ResponseMessages/m:DeleteAttachmentResponseMessage");
+        var errorCount = 0;
+        var okCount = 0;
+
+        for each(var deleteAttachmentResponseMessage in deleteAttachmentResponseMessages) {
+            if (deleteAttachmentResponseMessage.getAttribute("ResponseClass") != "Success") {
+                weHaveAnError = true;
+                errorCount++;
+            }
+            else {
+                okCount++;
+            }
+        }
+
+        exchWebService.commonFunctions.LOG("erDeleteAttachmentRequest.onSendOk: errorCount:" + errorCount + ", okCount:" + okCount);
+
+        if (weHaveAnError) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on deleting attachments:(" + errorCount + " errors and " + okCount + " ok) " + String(aResp));
+            deleteAttachmentResponseMessages = null;
+            return;
+        }
+        else {
+            if (deleteAttachmentResponseMessages.length > 0) {
+                var RootItemId = deleteAttachmentResponseMessages[0].getAttributeByTag("m:RootItemId", "RootItemId");
+                var RootItemChangeKey = deleteAttachmentResponseMessages[0].getAttributeByTag("m:RootItemId", "RootItemChangeKey");
+            }
+            else {
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_CREATING_ITEM_UNKNOWN, "Error. Unknown item deletion:" + String(aResp));
+                deleteAttachmentResponseMessages = null;
+                return;
+            }
+        }
+        deleteAttachmentResponseMessages = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, RootItemId, RootItemChangeKey);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erDeleteItem.js b/components/erDeleteItem.js
index 69003342..ff8e0eba 100644
--- a/components/erDeleteItem.js
+++ b/components/erDeleteItem.js
@@ -50,152 +50,150 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erDeleteItemRequest"];
 
-function erDeleteItemRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	if (aArgument.item) {
-		this.id = aArgument.item.id;
-		this.changeKey = aArgument.item.changeKey;
-	}
-	else {
-		this.id = aArgument.id;
-		this.changeKey = aArgument.changeKey;
-	}
-	this.itemIndex = aArgument.itemIndex;
-	this.itemType = aArgument.itemType;
-	this.isRunning = true;
-
-	this.execute();
+function erDeleteItemRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    if (aArgument.item) {
+        this.id = aArgument.item.id;
+        this.changeKey = aArgument.item.changeKey;
+    }
+    else {
+        this.id = aArgument.id;
+        this.changeKey = aArgument.changeKey;
+    }
+    this.itemIndex = aArgument.itemIndex;
+    this.itemType = aArgument.itemType;
+    this.isRunning = true;
+
+    this.execute();
 }
 
 erDeleteItemRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.execute\n");
-
-		if ((publicFoldersMap[this.argument.folderBase]) || (this.itemType == "response")) {
-			var sendMeetingCancellations = "SendToNone";
-		}
-		else {
-			var sendMeetingCancellations = "SendToAllAndSaveCopy";
-		}
-
-		var affectedTaskOccurrences = "";
-
-		var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		if (this.argument.whichOccurrence == "all_occurrences") {
-			this.itemType = "master";  // Seems if we want to delete all occurrences then we need to delete the master.
-		}
-
-		switch (this.itemType) {
-			case "single" :
-				var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
-				itemId.setAttribute("Id", this.id);
-				itemId.setAttribute("ChangeKey", this.changeKey);
-
-				if (cal.isToDo(this.argument.item)) {
-					affectedTaskOccurrences='AllOccurrences';
-				}
-				break;
-			case "occurrence" :
-				var occurrenceItemId = itemids.addChildTag("OccurrenceItemId", "nsTypes", null);
-				occurrenceItemId.setAttribute("RecurringMasterId", this.argument.masterID);
-				occurrenceItemId.setAttribute("ChangeKey", this.argument.masterChangeKey);
-				occurrenceItemId.setAttribute("InstanceIndex", this.itemIndex);
-
-				if (this.argument.whichOccurrence == "single_occurence") {
-					affectedTaskOccurrences='SpecifiedOccurrenceOnly';
-				}
-				else {
-					affectedTaskOccurrences='AllOccurrences';
-				}
-				break;
-			case "master" :
-				var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
-				itemId.setAttribute("Id", this.id);
-				itemId.setAttribute("ChangeKey", this.changeKey);
-
-				if (this.argument.whichOccurrence == "single_occurence") {
-					affectedTaskOccurrences='SpecifiedOccurrenceOnly';
-				}
-				else {
-					affectedTaskOccurrences='AllOccurrences';
-				}
-				break;
-			case "meeting":
-			case "response":
-				var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
-				itemId.setAttribute("Id", this.id);
-				itemId.setAttribute("ChangeKey", this.changeKey);
-
-				break;
-		}
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:DeleteItem DeleteType="HardDelete" xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		if ((this.itemType != "meeting") && (cal.isEvent(this.argument.item))) {
-			req.setAttribute("SendMeetingCancellations", sendMeetingCancellations);
-		}	
-
-		if (affectedTaskOccurrences != "") {
-			req.setAttribute("AffectedTaskOccurrences", affectedTaskOccurrences);
-		}
-
-		req.addChildTagObject(itemids);
-		itemids = null;
-
-		this.parent.xml2jxon = true;
-		
-		//exchWebService.commonFunctions.LOG("erDeleteItemRequest.execute>"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erDeleteItemRequest.onSendOk>"+String(aResp));
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:DeleteItemResponse/m:ResponseMessages/m:DeleteItemResponseMessage/m:ResponseCode");
-
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
-			return;
-		}
-
-		var responseCode = rm[0].value;
-
-		if ((responseCode != "NoError") && (responseCode != "ErrorItemNotFound")) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on deleting item:"+responseCode);
-			return;
-		}
-
-		if (this.mCbOk) {
-			this.mCbOk(this);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.execute\n");
+
+        if ((publicFoldersMap[this.argument.folderBase]) || (this.itemType == "response")) {
+            var sendMeetingCancellations = "SendToNone";
+        }
+        else {
+            var sendMeetingCancellations = "SendToAllAndSaveCopy";
+        }
+
+        var affectedTaskOccurrences = "";
+
+        var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        if (this.argument.whichOccurrence == "all_occurrences") {
+            this.itemType = "master"; // Seems if we want to delete all occurrences then we need to delete the master.
+        }
+
+        switch (this.itemType) {
+        case "single":
+            var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
+            itemId.setAttribute("Id", this.id);
+            itemId.setAttribute("ChangeKey", this.changeKey);
+
+            if (cal.isToDo(this.argument.item)) {
+                affectedTaskOccurrences = 'AllOccurrences';
+            }
+            break;
+        case "occurrence":
+            var occurrenceItemId = itemids.addChildTag("OccurrenceItemId", "nsTypes", null);
+            occurrenceItemId.setAttribute("RecurringMasterId", this.argument.masterID);
+            occurrenceItemId.setAttribute("ChangeKey", this.argument.masterChangeKey);
+            occurrenceItemId.setAttribute("InstanceIndex", this.itemIndex);
+
+            if (this.argument.whichOccurrence == "single_occurence") {
+                affectedTaskOccurrences = 'SpecifiedOccurrenceOnly';
+            }
+            else {
+                affectedTaskOccurrences = 'AllOccurrences';
+            }
+            break;
+        case "master":
+            var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
+            itemId.setAttribute("Id", this.id);
+            itemId.setAttribute("ChangeKey", this.changeKey);
+
+            if (this.argument.whichOccurrence == "single_occurence") {
+                affectedTaskOccurrences = 'SpecifiedOccurrenceOnly';
+            }
+            else {
+                affectedTaskOccurrences = 'AllOccurrences';
+            }
+            break;
+        case "meeting":
+        case "response":
+            var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
+            itemId.setAttribute("Id", this.id);
+            itemId.setAttribute("ChangeKey", this.changeKey);
+
+            break;
+        }
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:DeleteItem DeleteType="HardDelete" xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        if ((this.itemType != "meeting") && (cal.isEvent(this.argument.item))) {
+            req.setAttribute("SendMeetingCancellations", sendMeetingCancellations);
+        }
+
+        if (affectedTaskOccurrences != "") {
+            req.setAttribute("AffectedTaskOccurrences", affectedTaskOccurrences);
+        }
+
+        req.addChildTagObject(itemids);
+        itemids = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erDeleteItemRequest.execute>"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erDeleteItemRequest.onSendOk>"+String(aResp));
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:DeleteItemResponse/m:ResponseMessages/m:DeleteItemResponseMessage/m:ResponseCode");
+
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
+            return;
+        }
+
+        var responseCode = rm[0].value;
+
+        if ((responseCode != "NoError") && (responseCode != "ErrorItemNotFound")) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on deleting item:" + responseCode);
+            return;
+        }
+
+        if (this.mCbOk) {
+            this.mCbOk(this);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erExpandDL.js b/components/erExpandDL.js
index 6751dd38..180e0c12 100644
--- a/components/erExpandDL.js
+++ b/components/erExpandDL.js
@@ -35,104 +35,102 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erExpandDLRequest"];
 
-function erExpandDLRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-	this.emailAddress = aArgument.emailAddress;
-	this.itemId = aArgument.itemId;
-
-	this.isRunning = true;
-	this.execute();
+function erExpandDLRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    this.emailAddress = aArgument.emailAddress;
+    this.itemId = aArgument.itemId;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erExpandDLRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erExpandDLRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ExpandDL xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var mailBox = req.addChildTag("Mailbox", "nsMessages", null); 
-
-		if (this.emailAddress) {
-			mailBox.addChildTag("EmailAddress", "nsTypes", this.emailAddress);
-		}
-		if (this.itemId) {
-			var itemId = mailBox.addChildTag("ItemId", "nsTypes", null);
-			itemId.setAttribute("Id", this.itemId.id);
-			if (this.itemId.changeKey) {
-				itemId.setAttribute("ChangeKey", this.itemId.changeKey);
-			}
-		}
-
-		this.parent.xml2jxon = true;
-
-		exchWebService.commonFunctions.LOG("erExpandDLRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erExpandDLRequest.onSendOk:"+String(aResp));
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:ExpandDLResponse/m:ResponseMessages/m:ExpandDLResponseMessage[@ResponseClass='Success' and m:ResponseCode = 'NoError']");
-
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
-			return;
-		}
-
-		var dlExpansion = rm[0].getTags("m:DLExpansion");
-		rm = null;
-
-		var allMailboxes = new Array();
-		for each(var expansion in dlExpansion) {
-
-			var totalItemsInView = expansion.getAttribute("TotalItemsInView", 0);
-			var includesLastItem = expansion.getAttribute("IncludesLastItemInRange", "false");
-
-			var mailboxes = expansion.getTags("t:Mailbox");
-			for each(var mailbox in mailboxes) {
-				allMailboxes.push(mailbox);
-			}
-			mailboxes = null;
-		
-		}
-		dlExpansion = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, allMailboxes);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erExpandDLRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ExpandDL xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var mailBox = req.addChildTag("Mailbox", "nsMessages", null);
+
+        if (this.emailAddress) {
+            mailBox.addChildTag("EmailAddress", "nsTypes", this.emailAddress);
+        }
+        if (this.itemId) {
+            var itemId = mailBox.addChildTag("ItemId", "nsTypes", null);
+            itemId.setAttribute("Id", this.itemId.id);
+            if (this.itemId.changeKey) {
+                itemId.setAttribute("ChangeKey", this.itemId.changeKey);
+            }
+        }
+
+        this.parent.xml2jxon = true;
+
+        exchWebService.commonFunctions.LOG("erExpandDLRequest.execute:" + String(this.parent.makeSoapMessage(req)));
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erExpandDLRequest.onSendOk:" + String(aResp));
 
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:ExpandDLResponse/m:ResponseMessages/m:ExpandDLResponseMessage[@ResponseClass='Success' and m:ResponseCode = 'NoError']");
 
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
+            return;
+        }
+
+        var dlExpansion = rm[0].getTags("m:DLExpansion");
+        rm = null;
+
+        var allMailboxes = new Array();
+        for each(var expansion in dlExpansion) {
+
+            var totalItemsInView = expansion.getAttribute("TotalItemsInView", 0);
+            var includesLastItem = expansion.getAttribute("IncludesLastItemInRange", "false");
+
+            var mailboxes = expansion.getTags("t:Mailbox");
+            for each(var mailbox in mailboxes) {
+                allMailboxes.push(mailbox);
+            }
+            mailboxes = null;
+
+        }
+        dlExpansion = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, allMailboxes);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erFindCalendarItems.js b/components/erFindCalendarItems.js
index 35ccd8f6..25fa07df 100644
--- a/components/erFindCalendarItems.js
+++ b/components/erFindCalendarItems.js
@@ -51,251 +51,252 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erFindCalendarItemsRequest"];
 
-function convDate(aDate)
-{
-	if (aDate) {
-		var d = aDate.clone();
+function convDate(aDate) {
+    if (aDate) {
+        var d = aDate.clone();
 
-		d.isDate = false;
-		return cal.toRFC3339(d);
-	}
+        d.isDate = false;
+        return cal.toRFC3339(d);
+    }
 
-	return null;
+    return null;
 }
 
-function erFindCalendarItemsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.rangeStart = aArgument.rangeStart;
-	this.rangeEnd = aArgument.rangeEnd;
-
-	this.count = aArgument.count;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.itemFilter = aArgument.itemFilter;
-
-	this.uid = aArgument.uid;
-
-	this.recurringMasters = [];
-	this.occurrences = [];
-	this.occurrenceIds = [];
-	this.ids = [];
-
-	this.isRunning = true;
-	this.execute();
+function erFindCalendarItemsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.rangeStart = aArgument.rangeStart;
+    this.rangeEnd = aArgument.rangeEnd;
+
+    this.count = aArgument.count;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.itemFilter = aArgument.itemFilter;
+
+    this.uid = aArgument.uid;
+
+    this.recurringMasters = [];
+    this.occurrences = [];
+    this.occurrenceIds = [];
+    this.ids = [];
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erFindCalendarItemsRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erFindCalendarItemsRequest.execute\n");
-
-		var root = xml2json.newJSON();
-		var req = xml2json.addTag(root, "FindItem", "nsMessages", null);
-		xml2json.setAttribute(req, "xmlns:nsMessages", nsMessagesStr);
-		xml2json.setAttribute(req, "xmlns:nsTypes", nsTypesStr);
-		xml2json.setAttribute(req, "Traversal", "Shallow");
-
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		var baseShape = xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
-
-		var additionalProperties = xml2json.addTag(itemShape, "AdditionalProperties", "nsTypes", null);
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:UID'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:CalendarItemType'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Start'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:End'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ItemClass'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Subject'/>");
-
-		var view = xml2json.addTag(req, "CalendarView", "nsMessages", null); 
-
-		if (this.newStartDate) {
-				xml2json.setAttribute(view, "StartDate", this.newStartDate);
-		}
-		else {
-			if (this.rangeStart) {
-				xml2json.setAttribute(view, "StartDate", convDate(this.rangeStart));
-			}
-			else {
-				xml2json.setAttribute(view, "StartDate", "1900-01-01T00:00:00-00:00");
-			}
-		}
-
-		if (this.rangeEnd) {
-			xml2json.setAttribute(view, "EndDate", convDate(this.rangeEnd));
-		}
-		else {
-			xml2json.setAttribute(view, "EndDate", "2300-01-01T00:00:00-00:00");
-		}
-		xml2json.setAttribute(view, "MaxEntriesReturned", "1000");
-
-		view = null;
-
-		var parentFolder = makeParentFolderIds3("ParentFolderIds", this.argument);
-		xml2json.addTagObject(req,parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2json = true;
-
-		//exchWebService.commonFunctions.LOG("erFindCalendarItemsRequest.execute 2:"+String(this.parent.makeSoapMessage2(req))+"\n");
-
-                this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		/*
-		 * We want to include all Single items, all Exception items, but also
-		 * at least one Occurrence or Exception item for each master.
-		 * If we include too many Occurrences, we will query for the master
-		 * too often, but if we don't include any, we might not query for the
-		 * master at all.
-		 *
-		 * We first collect all non-Occurrences, and after that we fill in
-		 * Occurrence for those masters that did not yet see any Exception.
-		 */
-		if (this.subject) {
-		 exchWebService.commonFunctions.LOG("erFindCalendarItemsRequest.onSendOk:"+xml2json.toString(aResp)+"\n");
-		}
-
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var rootFolder = xml2json.getTag(rm[0], "m:RootFolder");
-			if (rootFolder) {
-					// Process results.
-					var calendarItems = xml2json.XPath(rootFolder, "/t:Items/t:CalendarItem");
-					this.newStartDate = null;
-					for (var index=0; index < calendarItems.length; index++) {
-						var calItem = calendarItems[index];
-
-						if (xml2json.getTagValue(calItem, "t:Start").substr(0,10) == xml2json.getTagValue(calItem, "t:End").substr(0,10)) {
-							var tmpDateStr = xml2json.getTagValue(calItem, "t:End");
-							var tmpDateObj = cal.fromRFC3339(tmpDateStr, exchWebService.commonFunctions.ecTZService().UTC).getInTimezone(exchWebService.commonFunctions.ecDefaultTimeZone());
-							var offset = cal.createDuration();
-							offset.seconds = 1;
-							tmpDateObj.addDuration(offset);
-							this.newStartDate = convDate(tmpDateObj);
-//		exchWebService.commonFunctions.LOG("  && this.newStartDate:"+this.newStartDate+"\n");
-						}
-
-						var uid = xml2json.getTagValue(calItem, "t:UID", "");
-
-/*exchWebService.commonFunctions.LOG("  ** title:"+xml2json.getTagValue(calItem, "t:Subject", "<NOP>")+"\n");
-exchWebService.commonFunctions.LOG("  ** Start:"+xml2json.getTagValue(calItem, "t:Start", "<NOP>")+"\n");
-exchWebService.commonFunctions.LOG("  ** End:"+xml2json.getTagValue(calItem, "t:End", "<NOP>")+"\n");
-exchWebService.commonFunctions.LOG("  ** CalendarItemType:"+xml2json.getTagValue(calItem, "t:CalendarItemType", "<NOP>")+"\n");*/
-
-						switch (xml2json.getTagValue(calItem, "t:CalendarItemType")) {
-							case "Occurrence" :
-							case "Exception" :
-								if ((this.uid) && (this.uid != uid)) { // Do not select items which do not fit the selected uid.
-									uid = "";
-								}
-								if (uid != "") {
-									this.occurrences[uid] = {Id: xml2json.getAttributeByTag(calItem, "t:ItemId","Id"),
-										  ChangeKey: xml2json.getAttributeByTag(calItem, "t:ItemId", "ChangeKey"),
-										  type: xml2json.getTagValue(calItem, "t:CalendarItemType"),
-										  uid: uid,
-										  start: xml2json.getTagValue(calItem, "t:Start"),
-										  end: xml2json.getTagValue(calItem, "t:End")};
-								}
-							case "RecurringMaster" :
-							case "Single" :
-								this.ids.push({Id: xml2json.getAttributeByTag(calItem, "t:ItemId","Id"),
-										  ChangeKey: xml2json.getAttributeByTag(calItem, "t:ItemId", "ChangeKey"),
-										  type: xml2json.getTagValue(calItem, "t:CalendarItemType"),
-										  uid: uid,
-										  start: xml2json.getTagValue(calItem, "t:Start"),
-										  end: xml2json.getTagValue(calItem, "t:End")});
-								break;
-							default:
-								exchWebService.commonFunctions.LOG("UNKNOWN CalendarItemType:"+xml2json.getTagValue(calItem, "t:CalendarItemType")+"\n");
-								break;
-						}
-					}
-				var itemsFound = calendarItems.length;
-
-				// Return the result to be processed.
-				if (this.mCbOk) {
-					this.mCbOk(this, this.ids, this.occurrences.slice());
-				}
-				// Clear data
-				this.recurringMasters = [];
-				this.occurrences = [];
-				this.occurrenceIds = [];
-				this.ids = [];
-				calendarItems = null;
-
-				// Should continue or not
-				if ((xml2json.getAttribute(rootFolder, "IncludesLastItemInRange") == "true")) {
-					// We are done.
-					exchWebService.commonFunctions.LOG("erFindCalendarItems: retrieved:"+itemsFound+" items. TotalItemsInView:"+xml2json.getAttribute(rootFolder, "TotalItemsInView")+" items. Includes last item in range.");
-					this.isRunning = false;
-				}
-				else {
-					exchWebService.commonFunctions.LOG("erFindCalendarItems: retrieved:"+itemsFound+" items. TotalItemsInView:"+xml2json.getAttribute(rootFolder, "TotalItemsInView")+" items. Last item not in range so going for another run.");
-					this.execute();
-					return;
-				}
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "No RootFolder found in FindItemResponse.";
-			}
-
-			// Ensure data can be cleared
-			rootFolder = null;
-		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_CONVERTID;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
-		
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-exchWebService.commonFunctions.LOG(" @@@ onSendError aCode:"+aCode+", aMsg:"+aMsg+" @@@\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erFindCalendarItemsRequest.execute\n");
+
+        var root = xml2json.newJSON();
+        var req = xml2json.addTag(root, "FindItem", "nsMessages", null);
+        xml2json.setAttribute(req, "xmlns:nsMessages", nsMessagesStr);
+        xml2json.setAttribute(req, "xmlns:nsTypes", nsTypesStr);
+        xml2json.setAttribute(req, "Traversal", "Shallow");
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        var baseShape = xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
+
+        var additionalProperties = xml2json.addTag(itemShape, "AdditionalProperties", "nsTypes", null);
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:UID'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:CalendarItemType'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Start'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:End'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ItemClass'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Subject'/>");
+
+        var view = xml2json.addTag(req, "CalendarView", "nsMessages", null);
+
+        if (this.newStartDate) {
+            xml2json.setAttribute(view, "StartDate", this.newStartDate);
+        }
+        else {
+            if (this.rangeStart) {
+                xml2json.setAttribute(view, "StartDate", convDate(this.rangeStart));
+            }
+            else {
+                xml2json.setAttribute(view, "StartDate", "1900-01-01T00:00:00-00:00");
+            }
+        }
+
+        if (this.rangeEnd) {
+            xml2json.setAttribute(view, "EndDate", convDate(this.rangeEnd));
+        }
+        else {
+            xml2json.setAttribute(view, "EndDate", "2300-01-01T00:00:00-00:00");
+        }
+        xml2json.setAttribute(view, "MaxEntriesReturned", "1000");
+
+        view = null;
+
+        var parentFolder = makeParentFolderIds3("ParentFolderIds", this.argument);
+        xml2json.addTagObject(req, parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2json = true;
+
+        //exchWebService.commonFunctions.LOG("erFindCalendarItemsRequest.execute 2:"+String(this.parent.makeSoapMessage2(req))+"\n");
+
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        /*
+         * We want to include all Single items, all Exception items, but also
+         * at least one Occurrence or Exception item for each master.
+         * If we include too many Occurrences, we will query for the master
+         * too often, but if we don't include any, we might not query for the
+         * master at all.
+         *
+         * We first collect all non-Occurrences, and after that we fill in
+         * Occurrence for those masters that did not yet see any Exception.
+         */
+        if (this.subject) {
+            exchWebService.commonFunctions.LOG("erFindCalendarItemsRequest.onSendOk:" + xml2json.toString(aResp) + "\n");
+        }
+
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            var rootFolder = xml2json.getTag(rm[0], "m:RootFolder");
+            if (rootFolder) {
+                // Process results.
+                var calendarItems = xml2json.XPath(rootFolder, "/t:Items/t:CalendarItem");
+                this.newStartDate = null;
+                for (var index = 0; index < calendarItems.length; index++) {
+                    var calItem = calendarItems[index];
+
+                    if (xml2json.getTagValue(calItem, "t:Start").substr(0, 10) == xml2json.getTagValue(calItem, "t:End").substr(0, 10)) {
+                        var tmpDateStr = xml2json.getTagValue(calItem, "t:End");
+                        var tmpDateObj = cal.fromRFC3339(tmpDateStr, exchWebService.commonFunctions.ecTZService().UTC).getInTimezone(exchWebService.commonFunctions.ecDefaultTimeZone());
+                        var offset = cal.createDuration();
+                        offset.seconds = 1;
+                        tmpDateObj.addDuration(offset);
+                        this.newStartDate = convDate(tmpDateObj);
+                        //		exchWebService.commonFunctions.LOG("  && this.newStartDate:"+this.newStartDate+"\n");
+                    }
+
+                    var uid = xml2json.getTagValue(calItem, "t:UID", "");
+
+                    /*exchWebService.commonFunctions.LOG("  ** title:"+xml2json.getTagValue(calItem, "t:Subject", "<NOP>")+"\n");
+                    exchWebService.commonFunctions.LOG("  ** Start:"+xml2json.getTagValue(calItem, "t:Start", "<NOP>")+"\n");
+                    exchWebService.commonFunctions.LOG("  ** End:"+xml2json.getTagValue(calItem, "t:End", "<NOP>")+"\n");
+                    exchWebService.commonFunctions.LOG("  ** CalendarItemType:"+xml2json.getTagValue(calItem, "t:CalendarItemType", "<NOP>")+"\n");*/
+
+                    switch (xml2json.getTagValue(calItem, "t:CalendarItemType")) {
+                    case "Occurrence":
+                    case "Exception":
+                        if ((this.uid) && (this.uid != uid)) { // Do not select items which do not fit the selected uid.
+                            uid = "";
+                        }
+                        if (uid != "") {
+                            this.occurrences[uid] = {
+                                Id: xml2json.getAttributeByTag(calItem, "t:ItemId", "Id"),
+                                ChangeKey: xml2json.getAttributeByTag(calItem, "t:ItemId", "ChangeKey"),
+                                type: xml2json.getTagValue(calItem, "t:CalendarItemType"),
+                                uid: uid,
+                                start: xml2json.getTagValue(calItem, "t:Start"),
+                                end: xml2json.getTagValue(calItem, "t:End")
+                            };
+                        }
+                    case "RecurringMaster":
+                    case "Single":
+                        this.ids.push({
+                            Id: xml2json.getAttributeByTag(calItem, "t:ItemId", "Id"),
+                            ChangeKey: xml2json.getAttributeByTag(calItem, "t:ItemId", "ChangeKey"),
+                            type: xml2json.getTagValue(calItem, "t:CalendarItemType"),
+                            uid: uid,
+                            start: xml2json.getTagValue(calItem, "t:Start"),
+                            end: xml2json.getTagValue(calItem, "t:End")
+                        });
+                        break;
+                    default:
+                        exchWebService.commonFunctions.LOG("UNKNOWN CalendarItemType:" + xml2json.getTagValue(calItem, "t:CalendarItemType") + "\n");
+                        break;
+                    }
+                }
+                var itemsFound = calendarItems.length;
+
+                // Return the result to be processed.
+                if (this.mCbOk) {
+                    this.mCbOk(this, this.ids, this.occurrences.slice());
+                }
+                // Clear data
+                this.recurringMasters = [];
+                this.occurrences = [];
+                this.occurrenceIds = [];
+                this.ids = [];
+                calendarItems = null;
+
+                // Should continue or not
+                if ((xml2json.getAttribute(rootFolder, "IncludesLastItemInRange") == "true")) {
+                    // We are done.
+                    exchWebService.commonFunctions.LOG("erFindCalendarItems: retrieved:" + itemsFound + " items. TotalItemsInView:" + xml2json.getAttribute(rootFolder, "TotalItemsInView") + " items. Includes last item in range.");
+                    this.isRunning = false;
+                }
+                else {
+                    exchWebService.commonFunctions.LOG("erFindCalendarItems: retrieved:" + itemsFound + " items. TotalItemsInView:" + xml2json.getAttribute(rootFolder, "TotalItemsInView") + " items. Last item not in range so going for another run.");
+                    this.execute();
+                    return;
+                }
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "No RootFolder found in FindItemResponse.";
+            }
+
+            // Ensure data can be cleared
+            rootFolder = null;
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_CONVERTID;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG(" @@@ onSendError aCode:" + aCode + ", aMsg:" + aMsg + " @@@\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erFindContacts.js b/components/erFindContacts.js
index 67a578c2..518b8049 100644
--- a/components/erFindContacts.js
+++ b/components/erFindContacts.js
@@ -31,153 +31,155 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindContactsRequest"];
 
-function erFindContactsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument,
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-	// Arrays containing results of the possible multiple requests
-	this.contacts = [];
-	this.distlists = [];
-
-	this.isRunning = true;
-
-	// First request is done with an offset of 0 (actually we don't know the number of contacts)
-	this.execute(0);
+function erFindContactsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    // Arrays containing results of the possible multiple requests
+    this.contacts = [];
+    this.distlists = [];
+
+    this.isRunning = true;
+
+    // First request is done with an offset of 0 (actually we don't know the number of contacts)
+    this.execute(0);
 }
 
 erFindContactsRequest.prototype = {
 
-	execute: function _execute(offset)
-	{
-		//exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("Traversal", "Shallow");
-
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
-		itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
-
-		// The IndexedPageItemView allows to request a certain range of contacts in the address book
-		var view = exchWebService.commonFunctions.xmlToJxon('<nsMessages:IndexedPageItemView />');
-		view.setAttribute("MaxEntriesReturned","300"); // Maximum number of entries to receive
-		view.setAttribute("Offset", offset); // Offset from the BasePoint (Beginning or End)
-		view.setAttribute("BasePoint", "Beginning");
-		req.addChildTagObject(view);
-		view = null;
-
-		var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
-
-		var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var or = restr.addChildTag("Or", "nsTypes", null);
-		var isEqualTo1 = or.addChildTag("IsEqualTo", "nsTypes", null);
-		isEqualTo1.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
-		isEqualTo1.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.Contact");
-
-		var isEqualTo2 = or.addChildTag("IsEqualTo", "nsTypes", null);
-		isEqualTo2.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
-		isEqualTo2.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.DistList");
-
-		req.addChildTagObject(restr);
-		restr = null;
-
-		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.onSendOk:"+String(aResp));
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
-
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
-			return;
-		}
-
-		var responseCode = rm[0].value;
-
-		if (responseCode == "NoError") {
-
-			var rootFolder = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:RootFolder");
-			if (rootFolder.length == 0) {
-				this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Did not find a rootfolder element.");
-				return;
-			}
-
-			for each (var contact in rootFolder[0].XPath("/t:Items/t:Contact")) {
-				exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.contacts: id:"+contact.getAttributeByTag("t:ItemId", "Id")+", changekey:"+contact.getAttributeByTag("t:ItemId", "ChangeKey"));
-				this.contacts.push({Id: contact.getAttributeByTag("t:ItemId", "Id"),
-					  ChangeKey: contact.getAttributeByTag("t:ItemId", "ChangeKey"),
-					  name: contact.getTagValue("t:Subject"),
-					  displayName: contact.getTagValue("t:DisplayName")});
-			}
-
-			for each (var distlist in rootFolder[0].XPath("/t:Items/t:DistributionList")) {
-				this.distlists.push({Id: distlist.getAttributeByTag("t:ItemId", "Id"),
-					  ChangeKey: distlist.getAttributeByTag("t:ItemId", "ChangeKey"),
-					  name: distlist.getTagValue("t:Subject"),
-					  displayName: distlist.getTagValue("t:DisplayName")});
-			}
-
-			// RootFolder attributes received after a FindItem request:
-			// https://msdn.microsoft.com/EN-US/library/office/aa493859%28v=exchg.150%29.aspx
-			var totalItemsInView = rootFolder[0].getAttribute("TotalItemsInView", 0);
-			var includesLastItemInRange = rootFolder[0].getAttribute("IncludesLastItemInRange", "true");
-			var offset = rootFolder[0].getAttribute("IndexedPagingOffset", 0);
-
-			exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.onSendOk Retrieved: "+(this.distlists.length + this.contacts.length)+" contacts and distlists on a total of "+totalItemsInView+" items available in the view.");
-
-			if (includesLastItemInRange == "true") {
-				if (this.mCbOk) {
-					this.mCbOk(this, this.contacts.slice(), this.distlists.slice());
-				}
-				this.isRunning = false;
-				this.contacts = [];
-				this.distlists = [];
-			}
-			else {
-				this.execute(offset);
-			}
-		}
-		else {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, responseCode);
-		}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute(offset) {
+        //exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Shallow");
+
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
+
+        // The IndexedPageItemView allows to request a certain range of contacts in the address book
+        var view = exchWebService.commonFunctions.xmlToJxon('<nsMessages:IndexedPageItemView />');
+        view.setAttribute("MaxEntriesReturned", "300"); // Maximum number of entries to receive
+        view.setAttribute("Offset", offset); // Offset from the BasePoint (Beginning or End)
+        view.setAttribute("BasePoint", "Beginning");
+        req.addChildTagObject(view);
+        view = null;
+
+        var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
+
+        var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var or = restr.addChildTag("Or", "nsTypes", null);
+        var isEqualTo1 = or.addChildTag("IsEqualTo", "nsTypes", null);
+        isEqualTo1.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
+        isEqualTo1.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.Contact");
+
+        var isEqualTo2 = or.addChildTag("IsEqualTo", "nsTypes", null);
+        isEqualTo2.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
+        isEqualTo2.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.DistList");
+
+        req.addChildTagObject(restr);
+        restr = null;
+
+        var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.onSendOk:" + String(aResp));
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
+
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
+            return;
+        }
+
+        var responseCode = rm[0].value;
+
+        if (responseCode == "NoError") {
+
+            var rootFolder = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:RootFolder");
+            if (rootFolder.length == 0) {
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Did not find a rootfolder element.");
+                return;
+            }
+
+            for each(var contact in rootFolder[0].XPath("/t:Items/t:Contact")) {
+                exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.contacts: id:" + contact.getAttributeByTag("t:ItemId", "Id") + ", changekey:" + contact.getAttributeByTag("t:ItemId", "ChangeKey"));
+                this.contacts.push({
+                    Id: contact.getAttributeByTag("t:ItemId", "Id"),
+                    ChangeKey: contact.getAttributeByTag("t:ItemId", "ChangeKey"),
+                    name: contact.getTagValue("t:Subject"),
+                    displayName: contact.getTagValue("t:DisplayName")
+                });
+            }
+
+            for each(var distlist in rootFolder[0].XPath("/t:Items/t:DistributionList")) {
+                this.distlists.push({
+                    Id: distlist.getAttributeByTag("t:ItemId", "Id"),
+                    ChangeKey: distlist.getAttributeByTag("t:ItemId", "ChangeKey"),
+                    name: distlist.getTagValue("t:Subject"),
+                    displayName: distlist.getTagValue("t:DisplayName")
+                });
+            }
+
+            // RootFolder attributes received after a FindItem request:
+            // https://msdn.microsoft.com/EN-US/library/office/aa493859%28v=exchg.150%29.aspx
+            var totalItemsInView = rootFolder[0].getAttribute("TotalItemsInView", 0);
+            var includesLastItemInRange = rootFolder[0].getAttribute("IncludesLastItemInRange", "true");
+            var offset = rootFolder[0].getAttribute("IndexedPagingOffset", 0);
+
+            exchWebService.commonAbFunctions.logInfo("erFindContactsRequest.onSendOk Retrieved: " + (this.distlists.length + this.contacts.length) + " contacts and distlists on a total of " + totalItemsInView + " items available in the view.");
+
+            if (includesLastItemInRange == "true") {
+                if (this.mCbOk) {
+                    this.mCbOk(this, this.contacts.slice(), this.distlists.slice());
+                }
+                this.isRunning = false;
+                this.contacts = [];
+                this.distlists = [];
+            }
+            else {
+                this.execute(offset);
+            }
+        }
+        else {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, responseCode);
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erFindFolder.js b/components/erFindFolder.js
index bb9e082d..5e86256e 100644
--- a/components/erFindFolder.js
+++ b/components/erFindFolder.js
@@ -46,162 +46,160 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindFolderRequest"];
 
-function erFindFolderRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-	while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
-		aArgument.folderPath = aArgument.folderPath.substr(1);
-	}
-
-	this.folderPath = aArgument.folderPath.split("/");
-
-	this.isRunning = true;
-	if (this.folderPath.length > 0) {
-		var counter = 0;
-		while (counter < this.folderPath.length) {
-			this.folderPath[counter] = exchWebService.commonFunctions.decodeFolderSpecialChars(this.folderPath[counter]);
-			counter++
-		}
-
-		this.folderCount = 0;
-		this.execute();
-	}
-	else {
-		this.onSendError(this, this.parent.ER_ERROR_EMPTY_FOLDERPATH, "No folderpath to search specified");
-	}
+function erFindFolderRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
+        aArgument.folderPath = aArgument.folderPath.substr(1);
+    }
+
+    this.folderPath = aArgument.folderPath.split("/");
+
+    this.isRunning = true;
+    if (this.folderPath.length > 0) {
+        var counter = 0;
+        while (counter < this.folderPath.length) {
+            this.folderPath[counter] = exchWebService.commonFunctions.decodeFolderSpecialChars(this.folderPath[counter]);
+            counter++
+        }
+
+        this.folderCount = 0;
+        this.execute();
+    }
+    else {
+        this.onSendError(this, this.parent.ER_ERROR_EMPTY_FOLDERPATH, "No folderpath to search specified");
+    }
 }
 
 erFindFolderRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erFindFolderRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindFolder xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("Traversal", "Shallow");
-
-		req.addChildTag("FolderShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "AllProperties"); 
-
-		var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var isEqualTo = restr.addChildTag("IsEqualTo", "nsTypes", null);
-		isEqualTo.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
-		isEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", this.folderPath[this.folderCount]);
-
-/*		var restr = 
-			<nsMessages:Restriction xmlns:nsMessages={nsMessages} xmlns:nsTypes={nsTypes}>
-				<nsTypes:IsEqualTo>
-					<nsTypes:FieldURI FieldURI="folder:DisplayName"/>
-					<nsTypes:FieldURIOrConstant>
-						<nsTypes:Constant Value={this.folderPath[this.folderCount]}/>
-					</nsTypes:FieldURIOrConstant>
-				</nsTypes:IsEqualTo>
-			</nsMessages:Restriction>;*/
-
-		req.addChildTagObject(restr);
-		restr = null;
-	
-		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erFindFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erFindFolderRequest.onSendOk:"+String(aResp));
-		// Get FolderID and ChangeKey
-		var aContinue = true;
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindFolderResponse/m:ResponseMessages/m:FindFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-
-			var totalItemsInView = rm[0].getAttributeByTag("m:RootFolder", "TotalItemsInView");
-
-			exchWebService.commonFunctions.LOG("totalItemsInView="+totalItemsInView+"\n");
-			if (totalItemsInView == 1) {
-				var folder = rm[0].XPath("/m:RootFolder/t:Folders/*");
-				try {
-					this.argument.folderID = folder[0].getAttributeByTag("t:FolderId", "Id");
-					this.argument.changeKey = folder[0].getAttributeByTag("t:FolderId", "ChangeKey");
-					var folderClass = folder[0].getTagValue("t:FolderClass");
-					this.folderCount++;
-					if (this.folderCount < this.folderPath.length) {
-						this.execute();
-						return;
-					}
-				}
-				catch(err) {
-				exchWebService.commonFunctions.LOG("bliepbliep 3");
-					aMsg = err;
-					aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-					aContinue = false;
-					aError = true;
-				}
-				folder = null;
-			}
-			else {
-				exchWebService.commonFunctions.LOG("totalItemsInView != 1 ("+totalItemsInView+")\n");
-				aError = true;
-				aCode = this.parent.ER_ERROR_FINDFOLDER_MULTIPLE_RESULTS;
-				aMsg = "Expected on findfolder result but have "+totalItemsInView+" results.";
-			}
-		}
-		else {
-			aMsg = err;
-			aCode = this.parent.ER_ERROR_FINDFOLDER_NO_TOTALITEMSVIEW;
-			aContinue = false;
-			aError = true;
-		}
-
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(this, this.argument.folderID, this.argument.changeKey, folderClass);
-			}
-			this.isRunning = false;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erFindFolderRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindFolder xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Shallow");
+
+        req.addChildTag("FolderShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "AllProperties");
+
+        var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var isEqualTo = restr.addChildTag("IsEqualTo", "nsTypes", null);
+        isEqualTo.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
+        isEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", this.folderPath[this.folderCount]);
+
+        /*		var restr = 
+        			<nsMessages:Restriction xmlns:nsMessages={nsMessages} xmlns:nsTypes={nsTypes}>
+        				<nsTypes:IsEqualTo>
+        					<nsTypes:FieldURI FieldURI="folder:DisplayName"/>
+        					<nsTypes:FieldURIOrConstant>
+        						<nsTypes:Constant Value={this.folderPath[this.folderCount]}/>
+        					</nsTypes:FieldURIOrConstant>
+        				</nsTypes:IsEqualTo>
+        			</nsMessages:Restriction>;*/
+
+        req.addChildTagObject(restr);
+        restr = null;
+
+        var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erFindFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erFindFolderRequest.onSendOk:"+String(aResp));
+        // Get FolderID and ChangeKey
+        var aContinue = true;
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindFolderResponse/m:ResponseMessages/m:FindFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+
+            var totalItemsInView = rm[0].getAttributeByTag("m:RootFolder", "TotalItemsInView");
+
+            exchWebService.commonFunctions.LOG("totalItemsInView=" + totalItemsInView + "\n");
+            if (totalItemsInView == 1) {
+                var folder = rm[0].XPath("/m:RootFolder/t:Folders/*");
+                try {
+                    this.argument.folderID = folder[0].getAttributeByTag("t:FolderId", "Id");
+                    this.argument.changeKey = folder[0].getAttributeByTag("t:FolderId", "ChangeKey");
+                    var folderClass = folder[0].getTagValue("t:FolderClass");
+                    this.folderCount++;
+                    if (this.folderCount < this.folderPath.length) {
+                        this.execute();
+                        return;
+                    }
+                }
+                catch (err) {
+                    exchWebService.commonFunctions.LOG("bliepbliep 3");
+                    aMsg = err;
+                    aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                    aContinue = false;
+                    aError = true;
+                }
+                folder = null;
+            }
+            else {
+                exchWebService.commonFunctions.LOG("totalItemsInView != 1 (" + totalItemsInView + ")\n");
+                aError = true;
+                aCode = this.parent.ER_ERROR_FINDFOLDER_MULTIPLE_RESULTS;
+                aMsg = "Expected on findfolder result but have " + totalItemsInView + " results.";
+            }
+        }
+        else {
+            aMsg = err;
+            aCode = this.parent.ER_ERROR_FINDFOLDER_NO_TOTALITEMSVIEW;
+            aContinue = false;
+            aError = true;
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(this, this.argument.folderID, this.argument.changeKey, folderClass);
+            }
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erFindFollowupItems.js b/components/erFindFollowupItems.js
index 9f177fcb..892b667f 100644
--- a/components/erFindFollowupItems.js
+++ b/components/erFindFollowupItems.js
@@ -50,95 +50,94 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindFollowupItemsRequest"];
 
-function erFindFollowupItemsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.itemFilter = aArgument.itemFilter;
-
-	this.isRunning = true;
-	this.execute();
+function erFindFollowupItemsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.itemFilter = aArgument.itemFilter;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erFindFollowupItemsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//	exchWebService.commonFunctions.LOG("erGetFollowupItemsRequest.execute\n");
-
-	var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-	req.setAttribute("Traversal", "Shallow");
- 	var itemShape = req.addChildTag("ItemShape", "nsMessages", null); 
-	itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
-	itemShape = null;
-	
-	var Restriction = req.addChildTag("Restriction", "nsMessages", null); 
-	var Or=Restriction.addChildTag("Or", "nsTypes", null); 
-	
-	for each(var i in ["1","2"] )
-	{
-		var IsEqualTo=Or.addChildTag("IsEqualTo", "nsTypes", null); 
-		var ExtendedFieldURI=IsEqualTo.addChildTag("ExtendedFieldURI", "nsTypes", null); 
-		ExtendedFieldURI.setAttribute("PropertyTag","0x1090");
-		ExtendedFieldURI.setAttribute("PropertyType","Integer");
-		var FieldURIOrConstant=IsEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null);
-		var Constant=FieldURIOrConstant.addChildTag("Constant", "nsTypes", null);
-		Constant.setAttribute("Value", i);
-	} 
-
-	var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-	req.addChildTagObject(parentFolder);
-	parentFolder = null;
-
-	this.parent.xml2jxon = true;
-
-	// exchWebService.commonFunctions.LOG("erFindFollowupItemsRequest.execute:"+String(req));
-     this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-	req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		// exchWebService.commonFunctions.LOG("erFindFollowupItemsRequest.onSendOk:"+String(aResp)+"\n");
-
-		var ids = [];
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:RootFolder/t:Items/t:Message");
-
-		for each (var e in rm) {
-			ids.push({Id: e.getAttributeByTag("t:ItemId","Id"),
-				  ChangeKey: e.getAttributeByTag("t:ItemId","ChangeKey")});
-		}
-		rm = null;
-	
-		if (this.mCbOk) {
-			this.mCbOk(this, ids);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //	exchWebService.commonFunctions.LOG("erGetFollowupItemsRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Shallow");
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
+        itemShape = null;
+
+        var Restriction = req.addChildTag("Restriction", "nsMessages", null);
+        var Or = Restriction.addChildTag("Or", "nsTypes", null);
+
+        for each(var i in ["1", "2"]) {
+            var IsEqualTo = Or.addChildTag("IsEqualTo", "nsTypes", null);
+            var ExtendedFieldURI = IsEqualTo.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            ExtendedFieldURI.setAttribute("PropertyTag", "0x1090");
+            ExtendedFieldURI.setAttribute("PropertyType", "Integer");
+            var FieldURIOrConstant = IsEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null);
+            var Constant = FieldURIOrConstant.addChildTag("Constant", "nsTypes", null);
+            Constant.setAttribute("Value", i);
+        }
+
+        var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2jxon = true;
+
+        // exchWebService.commonFunctions.LOG("erFindFollowupItemsRequest.execute:"+String(req));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        // exchWebService.commonFunctions.LOG("erFindFollowupItemsRequest.onSendOk:"+String(aResp)+"\n");
+
+        var ids = [];
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:RootFolder/t:Items/t:Message");
+
+        for each(var e in rm) {
+            ids.push({
+                Id: e.getAttributeByTag("t:ItemId", "Id"),
+                ChangeKey: e.getAttributeByTag("t:ItemId", "ChangeKey")
+            });
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, ids);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erFindInboxFolder.js b/components/erFindInboxFolder.js
index d711a91e..31656166 100644
--- a/components/erFindInboxFolder.js
+++ b/components/erFindInboxFolder.js
@@ -19,162 +19,161 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindInboxFolderRequest"];
 
-function erFindInboxFolderRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	
-	while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
-		aArgument.folderPath = aArgument.folderPath.substr(1);
-	}
-
-	this.folderPath = aArgument.folderPath.split("/");
-
-	this.isRunning = true;
-	if (this.folderPath.length > 0) {
-		var counter = 0;
-		while (counter < this.folderPath.length) {
-			this.folderPath[counter] = exchWebService.commonFunctions.decodeFolderSpecialChars(this.folderPath[counter]);
-			counter++
-		}
-
-		this.folderCount = 0;
-		this.execute();
-	}
-	else {
-		this.onSendError(this, this.parent.ER_ERROR_EMPTY_FOLDERPATH, "No folderpath to search specified");
-	}
+function erFindInboxFolderRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
+        aArgument.folderPath = aArgument.folderPath.substr(1);
+    }
+
+    this.folderPath = aArgument.folderPath.split("/");
+
+    this.isRunning = true;
+    if (this.folderPath.length > 0) {
+        var counter = 0;
+        while (counter < this.folderPath.length) {
+            this.folderPath[counter] = exchWebService.commonFunctions.decodeFolderSpecialChars(this.folderPath[counter]);
+            counter++
+        }
+
+        this.folderCount = 0;
+        this.execute();
+    }
+    else {
+        this.onSendError(this, this.parent.ER_ERROR_EMPTY_FOLDERPATH, "No folderpath to search specified");
+    }
 }
 
 erFindInboxFolderRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erFindInboxFolderRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindFolder xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("Traversal", "Deep");
-
-		var fs = req.addChildTag("FolderShape", "nsMessages", null);
-		fs.addChildTag("BaseShape", "nsTypes", "IdOnly");
-		var ap = fs.addChildTag("AdditionalProperties", "nsTypes", null);
-		ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI","folder:DisplayName");	
-		ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI","folder:ParentFolderId");	
-		ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI","folder:FolderClass");	
-		
-		var extProp = ap.addChildTag("ExtendedFieldURI", "nsTypes", null);
-		extProp.setAttribute("PropertyTag","4340");
-		extProp.setAttribute("PropertyType","Boolean");
-		
-		/*var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var isEqualTo = restr.addChildTag("IsEqualTo", "nsTypes", null);
-		isEqualTo.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
-		isEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", this.folderPath[this.folderCount]);
- 
-		req.addChildTagObject(restr);
-		restr = null;
-		 */ 
-	
-		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erFindInboxFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erFindInboxFolderRequest.onSendOk:"+String(aResp));
-		// Get FolderID and ChangeKey
-		var aContinue = true;
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindFolderResponse/m:ResponseMessages/m:FindFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		var fldrs = [];
-		if (rm.length > 0) {
-
-			var totalItemsInView = rm[0].getAttributeByTag("m:RootFolder", "TotalItemsInView");
-
-			exchWebService.commonFunctions.LOG("totalItemsInView="+totalItemsInView+"\n");
-			if ( totalItemsInView > 0) {
-				var folder = rm[0].XPath("/m:RootFolder/t:Folders/*");
-				try {
-					for(var i=0;i<folder.length;i++){
-						 fldrs[i] = { id : folder[i].getAttributeByTag("t:FolderId", "Id") ,
-						 changeKey : folder[i].getAttributeByTag("t:FolderId", "ChangeKey"),
-						 name : folder[i].getTagValue("t:DisplayName"),
-						 pId : folder[i].getAttributeByTag("t:ParentFolderId","Id"),
-						 folderClass: folder[i].getTagValue("t:FolderClass"),
-						};  
-					}
-				}
-				catch(err) {
-				exchWebService.commonFunctions.LOG("bliepbliep 4");
-					aMsg = err;
-					aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-					aContinue = false;
-					aError = true;
-				}
-				folder = null;
-			}
-			else {
-				exchWebService.commonFunctions.LOG("totalItemsInView != 1 ("+totalItemsInView+")\n");
-				aError = true;
-				aCode = this.parent.ER_ERROR_FINDFOLDER_MULTIPLE_RESULTS;
-				aMsg = "Expected on findfolder result but have "+totalItemsInView+" results.";
-			}
-		}
-		else {
-			aMsg = err;
-			aCode = this.parent.ER_ERROR_FINDFOLDER_NO_TOTALITEMSVIEW;
-			aContinue = false;
-			aError = true;
-		}
-
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(this, fldrs);
-			}
-			this.isRunning = false;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erFindInboxFolderRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindFolder xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Deep");
 
+        var fs = req.addChildTag("FolderShape", "nsMessages", null);
+        fs.addChildTag("BaseShape", "nsTypes", "IdOnly");
+        var ap = fs.addChildTag("AdditionalProperties", "nsTypes", null);
+        ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
+        ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:ParentFolderId");
+        ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:FolderClass");
 
+        var extProp = ap.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        extProp.setAttribute("PropertyTag", "4340");
+        extProp.setAttribute("PropertyType", "Boolean");
+
+        /*var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        var isEqualTo = restr.addChildTag("IsEqualTo", "nsTypes", null);
+        isEqualTo.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
+        isEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", this.folderPath[this.folderCount]);
+ 
+        req.addChildTagObject(restr);
+        restr = null;
+         */
+
+        var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erFindInboxFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erFindInboxFolderRequest.onSendOk:"+String(aResp));
+        // Get FolderID and ChangeKey
+        var aContinue = true;
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindFolderResponse/m:ResponseMessages/m:FindFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        var fldrs = [];
+        if (rm.length > 0) {
+
+            var totalItemsInView = rm[0].getAttributeByTag("m:RootFolder", "TotalItemsInView");
+
+            exchWebService.commonFunctions.LOG("totalItemsInView=" + totalItemsInView + "\n");
+            if (totalItemsInView > 0) {
+                var folder = rm[0].XPath("/m:RootFolder/t:Folders/*");
+                try {
+                    for (var i = 0; i < folder.length; i++) {
+                        fldrs[i] = {
+                            id: folder[i].getAttributeByTag("t:FolderId", "Id"),
+                            changeKey: folder[i].getAttributeByTag("t:FolderId", "ChangeKey"),
+                            name: folder[i].getTagValue("t:DisplayName"),
+                            pId: folder[i].getAttributeByTag("t:ParentFolderId", "Id"),
+                            folderClass: folder[i].getTagValue("t:FolderClass"),
+                        };
+                    }
+                }
+                catch (err) {
+                    exchWebService.commonFunctions.LOG("bliepbliep 4");
+                    aMsg = err;
+                    aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                    aContinue = false;
+                    aError = true;
+                }
+                folder = null;
+            }
+            else {
+                exchWebService.commonFunctions.LOG("totalItemsInView != 1 (" + totalItemsInView + ")\n");
+                aError = true;
+                aCode = this.parent.ER_ERROR_FINDFOLDER_MULTIPLE_RESULTS;
+                aMsg = "Expected on findfolder result but have " + totalItemsInView + " results.";
+            }
+        }
+        else {
+            aMsg = err;
+            aCode = this.parent.ER_ERROR_FINDFOLDER_NO_TOTALITEMSVIEW;
+            aContinue = false;
+            aError = true;
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(this, fldrs);
+            }
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erFindItems.js b/components/erFindItems.js
index 596e113d..926aa833 100644
--- a/components/erFindItems.js
+++ b/components/erFindItems.js
@@ -25,153 +25,153 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erFindItemsRequest"];
 
-function convDate(aDate)
-{
-	if (aDate) {
-		var d = aDate.clone();
+function convDate(aDate) {
+    if (aDate) {
+        var d = aDate.clone();
 
-		d.isDate = false;
-		return cal.toRFC3339(d);
-	}
+        d.isDate = false;
+        return cal.toRFC3339(d);
+    }
 
-	return null;
+    return null;
 }
 
-function erFindItemsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-  
- 	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
- 
-	this.messageId = aArgument.messageId;
-
-   	this.ids = [];
-
-	this.itemsFound = 0;
- 	this.isRunning = true;
-	this.execute();
+function erFindItemsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    this.messageId = aArgument.messageId;
+
+    this.ids = [];
+
+    this.itemsFound = 0;
+    this.isRunning = true;
+    this.execute();
 }
 
 erFindItemsRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//dump("erFindItemsRequest.execute\n");
-
-		var root = xml2json.newJSON();
-		var req = xml2json.addTag(root, "FindItem", "nsMessages", null);
-		xml2json.setAttribute(req, "xmlns:nsMessages", nsMessagesStr);
-		xml2json.setAttribute(req, "xmlns:nsTypes", nsTypesStr);
-		xml2json.setAttribute(req, "Traversal", "Shallow"); 
-		
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		var baseShape = xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly"); 
- 
-		var view = 	xml2json.addTag(req, "IndexedPageItemView", "nsMessages", null); 
-					xml2json.setAttribute(view, "MaxEntriesReturned", "100"); 
-					xml2json.setAttribute(view, "Offset", "0"); 
-					xml2json.setAttribute(view, "BasePoint", "Beginning");
-			  
-		var restrict = xml2json.addTag(req, "Restriction", "nsMessages", null); 
-				var isequal =   xml2json.addTag(restrict, "IsEqualTo", "nsTypes", null); 
-					var extField =   xml2json.addTag(isequal, "ExtendedFieldURI", "nsTypes", null); 
-										xml2json.setAttribute(extField, "PropertyTag", "0x1035"); 
-											xml2json.setAttribute(extField, "PropertyType", "String"); 
-					var fieldUri = xml2json.addTag(isequal, "FieldURIOrConstant", "nsTypes", null);
-					 					var  constant = xml2json.addTag(fieldUri, "Constant", "nsTypes", null);
-					 										xml2json.setAttribute(constant, "Value", this.messageId);
-					 										
-		view = null; 
-		var parentFolder = makeParentFolderIds3("ParentFolderIds", this.argument);
-		xml2json.addTagObject(req,parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2json = true; 
-		exchWebService.commonFunctions.LOG("erFindItemsRequest.execute 2:"+String(xml2json.toString(req))+"\n");
+    execute: function _execute() {
+        //dump("erFindItemsRequest.execute\n");
 
-        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erFindItemsRequest.execute 2: "+ String(xml2json.toString(aResp))+"\n"); 
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var rootFolder = xml2json.getTag(rm[0], "m:RootFolder");
-			if (rootFolder) { 
- 					// Process results.
-					var message = xml2json.XPath(rootFolder, "/t:Items/t:Message");
- 					for (var index=0; index < message.length; index++) {
-						var id =  xml2json.getAttributeByTag(message[index], "t:ItemId","Id");
-						var changeKey =  xml2json.getAttributeByTag(message[index], "t:ItemId","ChangeKey");
-						
-						this.ids.push({"Id": id ,"ChangeKey":changeKey,}); 
-					}
-					message = null;  
- 			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "No RootFolder found in FindItemResponse.";
-			}
-		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_CONVERTID;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
-		
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) { 
-				this.mCbOk(this, this.ids );
-			}
-			this.ids = null;
- 			this.isRunning = false;
-		}
-		
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-dump(" @@@ onSendError aCode:"+aCode+", aMsg:"+aMsg+" @@@\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+        var root = xml2json.newJSON();
+        var req = xml2json.addTag(root, "FindItem", "nsMessages", null);
+        xml2json.setAttribute(req, "xmlns:nsMessages", nsMessagesStr);
+        xml2json.setAttribute(req, "xmlns:nsTypes", nsTypesStr);
+        xml2json.setAttribute(req, "Traversal", "Shallow");
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        var baseShape = xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
+
+        var view = xml2json.addTag(req, "IndexedPageItemView", "nsMessages", null);
+        xml2json.setAttribute(view, "MaxEntriesReturned", "100");
+        xml2json.setAttribute(view, "Offset", "0");
+        xml2json.setAttribute(view, "BasePoint", "Beginning");
+
+        var restrict = xml2json.addTag(req, "Restriction", "nsMessages", null);
+        var isequal = xml2json.addTag(restrict, "IsEqualTo", "nsTypes", null);
+        var extField = xml2json.addTag(isequal, "ExtendedFieldURI", "nsTypes", null);
+        xml2json.setAttribute(extField, "PropertyTag", "0x1035");
+        xml2json.setAttribute(extField, "PropertyType", "String");
+        var fieldUri = xml2json.addTag(isequal, "FieldURIOrConstant", "nsTypes", null);
+        var constant = xml2json.addTag(fieldUri, "Constant", "nsTypes", null);
+        xml2json.setAttribute(constant, "Value", this.messageId);
 
+        view = null;
+        var parentFolder = makeParentFolderIds3("ParentFolderIds", this.argument);
+        xml2json.addTagObject(req, parentFolder);
+        parentFolder = null;
 
+        this.parent.xml2json = true;
+        exchWebService.commonFunctions.LOG("erFindItemsRequest.execute 2:" + String(xml2json.toString(req)) + "\n");
+
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erFindItemsRequest.execute 2: " + String(xml2json.toString(aResp)) + "\n");
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            var rootFolder = xml2json.getTag(rm[0], "m:RootFolder");
+            if (rootFolder) {
+                // Process results.
+                var message = xml2json.XPath(rootFolder, "/t:Items/t:Message");
+                for (var index = 0; index < message.length; index++) {
+                    var id = xml2json.getAttributeByTag(message[index], "t:ItemId", "Id");
+                    var changeKey = xml2json.getAttributeByTag(message[index], "t:ItemId", "ChangeKey");
+
+                    this.ids.push({
+                        "Id": id,
+                        "ChangeKey": changeKey,
+                    });
+                }
+                message = null;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "No RootFolder found in FindItemResponse.";
+            }
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_CONVERTID;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(this, this.ids);
+            }
+            this.ids = null;
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        dump(" @@@ onSendError aCode:" + aCode + ", aMsg:" + aMsg + " @@@\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erFindMasterOccurrences.js b/components/erFindMasterOccurrences.js
index d8e6b6e0..3c01d38d 100644
--- a/components/erFindMasterOccurrences.js
+++ b/components/erFindMasterOccurrences.js
@@ -67,275 +67,272 @@ const MAPI_PidLidReminderSignalTime = "34144";
 const MAPI_PidLidReminderSet = "34051";
 const MAPI_PidLidReminderDelta = "34049";
 
-function erFindMasterOccurrencesRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.occurrences = aArgument.occurrences;
-
-	this.folderClass = aArgument.folderClass;
-
-	this.isRunning = true;
-	this.execute();
+function erFindMasterOccurrencesRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.occurrences = aArgument.occurrences;
+
+    this.folderClass = aArgument.folderClass;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erFindMasterOccurrencesRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erFindMasterOccurrencesRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
-		itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
-		
-		itemShape.addChildTag("BodyType", "nsTypes", "Text");
-
-		var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemId");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ParentFolderId");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Attachments");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:DateTimeReceived");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Size");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Categories");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:HasAttachments");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Importance");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsDraft");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsFromMe");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsResend");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsSubmitted");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsUnmodified");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:DateTimeSent");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:DateTimeCreated");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Body");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ResponseObjects");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Sensitivity");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ReminderDueBy");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ReminderIsSet");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ReminderMinutesBeforeStart");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:EffectiveRights");
-
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-
-		if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1 )) {
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:UniqueBody");
-		}
-		else { // Exchange2007
-		}
-
-		var extFieldURI;
-		extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-		extFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
-		extFieldURI.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
-		extFieldURI.setAttribute("PropertyType", "SystemTime");
-		extFieldURI = null;
-
-		extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-		extFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
-		extFieldURI.setAttribute("PropertyId", MAPI_PidLidReminderSet);
-		extFieldURI.setAttribute("PropertyType", "Boolean");
-		extFieldURI = null;
-
-		extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-		extFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
-		extFieldURI.setAttribute("PropertyId", MAPI_PidLidReminderDelta);
-		extFieldURI.setAttribute("PropertyType", "Integer");
-		extFieldURI = null;
-
-		// Calendar fields
-		switch (this.folderClass) {
-		case "IPF.Appointment":
-				
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Start");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:End");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:OriginalStart");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsAllDayEvent");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:LegacyFreeBusyStatus");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Location");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:When");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsMeeting");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsCancelled");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsRecurring");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MeetingRequestWasSent");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsResponseRequested");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:CalendarItemType");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MyResponseType");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Organizer");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:RequiredAttendees");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:OptionalAttendees");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Resources");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Duration");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:TimeZone");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Recurrence");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:ConferenceType");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:AllowNewTimeProposal");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsOnlineMeeting");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MeetingWorkspaceUrl");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:UID");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:RecurrenceId");
-			
-			if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:StartTimeZone");
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:EndTimeZone");
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:ModifiedOccurrences");
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:DeletedOccurrences");
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:FirstOccurrence");
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:FirstOccurrence");
-			
-			}
-			else { // Exchange2007
-				additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MeetingTimeZone");
-			}
-			break;	
-
-		case "IPF.Task":
-			//Task fields
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:ActualWork");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:AssignedTime");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:BillingInformation");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:ChangeCount");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Companies");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:CompleteDate");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Contacts");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:DelegationState");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Delegator");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:DueDate");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsAssignmentEditable");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsComplete");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsRecurring");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsTeamTask");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Mileage");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Owner");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:PercentComplete");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Recurrence");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:StartDate");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Status");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:StatusDescription");
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:TotalWork");
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskAccepted);
-			extFieldURI.setAttribute("PropertyType", "Boolean");
-			extFieldURI = null;
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskLastUpdate);
-			extFieldURI.setAttribute("PropertyType", "SystemTime");
-			extFieldURI = null;
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskAcceptanceState);
-			extFieldURI.setAttribute("PropertyType", "Integer");
-			extFieldURI = null;
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskMode);
-			extFieldURI.setAttribute("PropertyType", "Integer");
-			extFieldURI = null;
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskGlobalId);
-			extFieldURI.setAttribute("PropertyType", "Binary");
-			extFieldURI = null;
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskHistory);
-			extFieldURI.setAttribute("PropertyType", "Integer");
-			extFieldURI = null;
-
-			extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
-			extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskOwnership);
-			extFieldURI.setAttribute("PropertyType", "Integer");
-			extFieldURI = null;
-
-		}
-/*
-			//meeting fields
-			req.nsMessages::ItemShape.nsTypes::AdditionalProperties.content += <>
-				<nsTypes:FieldURI FieldURI="meeting:AssociatedCalendarItemId" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:IsDelegated" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:IsOutOfDate" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:HasBeenProcessed" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:ResponseType" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meetingRequest:MeetingRequestType" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meetingRequest:IntendedFreeBusyStatus" xmlns:nsTypes={nsTypes}/>
-				</>;
-*/
-
-		itemids = req.addChildTag("ItemIds", "nsMessages", null);
-
-		for each (var master in this.occurrences) {
-			var reccMasterItemId = itemids.addChildTag("RecurringMasterItemId", "nsTypes", null);
-			reccMasterItemId.setAttribute("OccurrenceId", master.Id);
-			reccMasterItemId.setAttribute("ChangeKey", master.ChangeKey);
-			reccMasterItemId = null;
-		}
-		itemids = null;
-
-		this.parent.xml2jxon = true;
-		
-		//exchWebService.commonFunctions.LOG("erFindMasterOccurrencesRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-		additionalProperties = null;
-		itemShape = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erFindMasterOccurrencesRequest.onSendOk>"+String(aResp)+"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		var items = [];
-		
-		for each (var e in rm) {
-			var calendarItem = e.XPath("/m:Items/t:CalendarItem");
-			if (calendarItem.length > 0)
-			{
-				items.push(calendarItem[0]);
-			}
-			calendarItem = null;
-		}
-		rm = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, items);
-		}
-		items = null;
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erFindMasterOccurrencesRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
+
+        itemShape.addChildTag("BodyType", "nsTypes", "Text");
+
+        var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemId");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ParentFolderId");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Attachments");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:DateTimeReceived");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Size");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Categories");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:HasAttachments");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Importance");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsDraft");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsFromMe");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsResend");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsSubmitted");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:IsUnmodified");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:DateTimeSent");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:DateTimeCreated");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Body");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ResponseObjects");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Sensitivity");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ReminderDueBy");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ReminderIsSet");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ReminderMinutesBeforeStart");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:EffectiveRights");
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+        if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:UniqueBody");
+        }
+        else { // Exchange2007
+        }
+
+        var extFieldURI;
+        extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        extFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
+        extFieldURI.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
+        extFieldURI.setAttribute("PropertyType", "SystemTime");
+        extFieldURI = null;
+
+        extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        extFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
+        extFieldURI.setAttribute("PropertyId", MAPI_PidLidReminderSet);
+        extFieldURI.setAttribute("PropertyType", "Boolean");
+        extFieldURI = null;
+
+        extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        extFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
+        extFieldURI.setAttribute("PropertyId", MAPI_PidLidReminderDelta);
+        extFieldURI.setAttribute("PropertyType", "Integer");
+        extFieldURI = null;
+
+        // Calendar fields
+        switch (this.folderClass) {
+        case "IPF.Appointment":
+
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Start");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:End");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:OriginalStart");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsAllDayEvent");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:LegacyFreeBusyStatus");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Location");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:When");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsMeeting");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsCancelled");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsRecurring");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MeetingRequestWasSent");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsResponseRequested");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:CalendarItemType");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MyResponseType");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Organizer");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:RequiredAttendees");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:OptionalAttendees");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Resources");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Duration");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:TimeZone");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Recurrence");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:ConferenceType");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:AllowNewTimeProposal");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:IsOnlineMeeting");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MeetingWorkspaceUrl");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:UID");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:RecurrenceId");
+
+            if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:StartTimeZone");
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:EndTimeZone");
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:ModifiedOccurrences");
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:DeletedOccurrences");
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:FirstOccurrence");
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:FirstOccurrence");
+
+            }
+            else { // Exchange2007
+                additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:MeetingTimeZone");
+            }
+            break;
+
+        case "IPF.Task":
+            //Task fields
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:ActualWork");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:AssignedTime");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:BillingInformation");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:ChangeCount");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Companies");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:CompleteDate");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Contacts");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:DelegationState");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Delegator");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:DueDate");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsAssignmentEditable");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsComplete");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsRecurring");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:IsTeamTask");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Mileage");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Owner");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:PercentComplete");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Recurrence");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:StartDate");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:Status");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:StatusDescription");
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "task:TotalWork");
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskAccepted);
+            extFieldURI.setAttribute("PropertyType", "Boolean");
+            extFieldURI = null;
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskLastUpdate);
+            extFieldURI.setAttribute("PropertyType", "SystemTime");
+            extFieldURI = null;
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskAcceptanceState);
+            extFieldURI.setAttribute("PropertyType", "Integer");
+            extFieldURI = null;
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskMode);
+            extFieldURI.setAttribute("PropertyType", "Integer");
+            extFieldURI = null;
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskGlobalId);
+            extFieldURI.setAttribute("PropertyType", "Binary");
+            extFieldURI = null;
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskHistory);
+            extFieldURI.setAttribute("PropertyType", "Integer");
+            extFieldURI = null;
+
+            extFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extFieldURI.setAttribute("DistinguishedPropertySetId", "Task");
+            extFieldURI.setAttribute("PropertyId", MAPI_PidLidTaskOwnership);
+            extFieldURI.setAttribute("PropertyType", "Integer");
+            extFieldURI = null;
+
+        }
+        /*
+        			//meeting fields
+        			req.nsMessages::ItemShape.nsTypes::AdditionalProperties.content += <>
+        				<nsTypes:FieldURI FieldURI="meeting:AssociatedCalendarItemId" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:IsDelegated" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:IsOutOfDate" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:HasBeenProcessed" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:ResponseType" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meetingRequest:MeetingRequestType" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meetingRequest:IntendedFreeBusyStatus" xmlns:nsTypes={nsTypes}/>
+        				</>;
+        */
+
+        itemids = req.addChildTag("ItemIds", "nsMessages", null);
+
+        for each(var master in this.occurrences) {
+            var reccMasterItemId = itemids.addChildTag("RecurringMasterItemId", "nsTypes", null);
+            reccMasterItemId.setAttribute("OccurrenceId", master.Id);
+            reccMasterItemId.setAttribute("ChangeKey", master.ChangeKey);
+            reccMasterItemId = null;
+        }
+        itemids = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erFindMasterOccurrencesRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+        additionalProperties = null;
+        itemShape = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erFindMasterOccurrencesRequest.onSendOk>"+String(aResp)+"\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        var items = [];
+
+        for each(var e in rm) {
+            var calendarItem = e.XPath("/m:Items/t:CalendarItem");
+            if (calendarItem.length > 0) {
+                items.push(calendarItem[0]);
+            }
+            calendarItem = null;
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, items);
+        }
+        items = null;
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erFindOccurrences.js b/components/erFindOccurrences.js
index 28cf328b..916e7f6e 100644
--- a/components/erFindOccurrences.js
+++ b/components/erFindOccurrences.js
@@ -54,217 +54,223 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erFindOccurrencesRequest"];
 
-function erFindOccurrencesRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.masterID = aArgument.masterItem.Id;
-	this.masterChangeKey = aArgument.masterItem.ChangeKey;
-	this.startDate = aArgument.startDate;
-	this.endDate = aArgument.endDate;
-
-try{
-	if (!this.startDate) {
-		var monthBeforeDuration = cal.createDuration("-P4W");
-
-		this.startDate = cal.now();
-		this.startDate.addDuration(monthBeforeDuration);
-	}
-dump("  -------------->>> erFindOccurrences: this.startDate="+this.startDate+"\n");
-	if (!this.endDate) {
-		var monthAfterDuration = cal.createDuration("P4W");
-
-		this.endDate = cal.now();
-		this.endDate.addDuration(monthAfterDuration);
-	}
-dump("  -------------->>> erFindOccurrences: this.endDate="+this.endDate+"\n");
-}
-catch(err){dump(" ERROR: erFindOccurrences: err:"+err+"\n");}
-
-	this.currentSearchIndex = 1;
-	this.currentRealIndex = 0;
-	this.idGroupSize = 25; // We will request in pages of 50 occurrences of the list at once
-	this.items = [];
-
-	var self = this;
-
-	this.isRunning = true;
-
-	if (aArgument.masterItem.type == "RecurringMaster") {
-//exchWebService.commonFunctions.LOG("We have a master. Find occurences\n");
-		this.execute();
-	}
-	else {
-//exchWebService.commonFunctions.LOG("We have a child. First try to find master.\n");
-		var tmpObject = new erGetMasterOccurrenceIdRequest( 
-				{user: aArgument.user, 
-				 serverUrl: aArgument.serverUrl,
-				 item: aArgument.masterItem,
-				 folderID: aArgument.folderID,
-				 changeKey: aArgument.changeKey,
-				 getType: "exchange" }, 
-				function(erGetMasterOccurrenceIdRequest, aId, aChangeKey) { self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey);}, 
-				function(erGetMasterOccurrenceIdRequest, aCode, aMsg) { self.onSendError(erGetMasterOccurrenceIdRequest, aCode, aMsg);},
-				aListener);
-	}
-
-//	this.execute();
+function erFindOccurrencesRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.masterID = aArgument.masterItem.Id;
+    this.masterChangeKey = aArgument.masterItem.ChangeKey;
+    this.startDate = aArgument.startDate;
+    this.endDate = aArgument.endDate;
+
+    try {
+        if (!this.startDate) {
+            var monthBeforeDuration = cal.createDuration("-P4W");
+
+            this.startDate = cal.now();
+            this.startDate.addDuration(monthBeforeDuration);
+        }
+        dump("  -------------->>> erFindOccurrences: this.startDate=" + this.startDate + "\n");
+        if (!this.endDate) {
+            var monthAfterDuration = cal.createDuration("P4W");
+
+            this.endDate = cal.now();
+            this.endDate.addDuration(monthAfterDuration);
+        }
+        dump("  -------------->>> erFindOccurrences: this.endDate=" + this.endDate + "\n");
+    }
+    catch (err) {
+        dump(" ERROR: erFindOccurrences: err:" + err + "\n");
+    }
+
+    this.currentSearchIndex = 1;
+    this.currentRealIndex = 0;
+    this.idGroupSize = 25; // We will request in pages of 50 occurrences of the list at once
+    this.items = [];
+
+    var self = this;
+
+    this.isRunning = true;
+
+    if (aArgument.masterItem.type == "RecurringMaster") {
+        //exchWebService.commonFunctions.LOG("We have a master. Find occurences\n");
+        this.execute();
+    }
+    else {
+        //exchWebService.commonFunctions.LOG("We have a child. First try to find master.\n");
+        var tmpObject = new erGetMasterOccurrenceIdRequest({
+                user: aArgument.user,
+                serverUrl: aArgument.serverUrl,
+                item: aArgument.masterItem,
+                folderID: aArgument.folderID,
+                changeKey: aArgument.changeKey,
+                getType: "exchange"
+            },
+            function (erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
+                self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey);
+            },
+            function (erGetMasterOccurrenceIdRequest, aCode, aMsg) {
+                self.onSendError(erGetMasterOccurrenceIdRequest, aCode, aMsg);
+            },
+            aListener);
+    }
+
+    //	this.execute();
 }
 
 erFindOccurrencesRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-
-		//var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
-		//itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly"); 
-
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");		
-
-		var additionalProperties = xml2json.addTag(itemShape, "AdditionalProperties", "nsTypes", null);
-		let fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
-		xml2json.setAttribute(fieldURI, "FieldURI", "calendar:UID");
-		fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
-		fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "calendar:CalendarItemType");
-		fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
-		fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "calendar:Start");
-		fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
-		fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "calendar:End");
-		fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
-		fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "item:ItemClass");
-
-		var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var itemids = xml2json.addTag(req, "ItemIds", "nsMessages", null); 
-		for (var x = 0; x < this.idGroupSize; x++) {
-			var occurrenceItemID = xml2json.addTag(itemids, "OccurrenceItemId", "nsTypes", null);
-			xml2json.setAttribute(occurrenceItemID, "RecurringMasterId", this.masterID);
-			xml2json.setAttribute(occurrenceItemID, "ChangeKey", this.masterChangeKey);
-			xml2json.setAttribute(occurrenceItemID, "InstanceIndex", this.currentSearchIndex++);
-			occurrenceItemID = null;
-		}
-
-		itemids = null;
-
-		this.parent.xml2json = true;
-
-		//dump("erFindOccurrencesRequest.execute>"+String(this.parent.makeSoapMessage(req))+"\n");
-                this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//dump("erFindOccurrencesRequest.onSendOk>"+xml2json.toString(aResp)+"\n");
-		var finished = false;
-		var found = false;
-
-		//var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
-		for each (var e in rm) {
-			var responseCode = xml2json.getTagValue(e, "m:ResponseCode");
-			switch (responseCode) {
-				case "ErrorCalendarOccurrenceIsDeletedFromRecurrence" :
-					this.currentRealIndex++;
-					break;
-				case "NoError":
-					var tmpItems = xml2json.XPath(e, "/m:Items/*");
-					for each (var tmpItem in tmpItems) {
-						this.currentRealIndex++;
-						var startDate = cal.fromRFC3339(xml2json.getTagValue(tmpItem, "t:Start"), cal.UTC()).getInTimezone(cal.UTC()); 
-						var endDate = cal.fromRFC3339(xml2json.getTagValue(tmpItem, "t:End"), cal.UTC()).getInTimezone(cal.UTC()); 
-						if ((this.startDate.compare(endDate) < 1) &&
-						    (this.endDate.compare(startDate) > -1) ) {
-							// We found our occurrence
-							this.items.push({Id: xml2json.getAttributeByTag(tmpItem, "t:ItemId","Id"),
-						  ChangeKey: xml2json.getAttributeByTag(tmpItem, "t:ItemId", "ChangeKey"),
-						  type: xml2json.getTagValue(tmpItem, "t:CalendarItemType"),
-						  uid: xml2json.getTagValue(tmpItem, "t:UID"),
-						  start: xml2json.getTagValue(tmpItem, "t:Start"),
-						  end: xml2json.getTagValue(tmpItem, "t:End"),
-						  index: this.currentRealIndex});
-						}
-
-						// When we see occurrences past our endDate range stop.
-						if (startDate.compare(this.endDate) == 1) {	
-							finished = true;
-							break;
-						}
-					}
-					tmpItems = null;
-					break;
-				case "ErrorItemNotFound":
-				case "ErrorCalendarOccurrenceIndexIsOutOfRecurrenceRange" :
-					finished = true;
-					break;
-				case "ErrorInvalidIdMalformed" :
-					this.onSendError(aExchangeRequest, this.parent.ER_ERROR_FINDOCCURRENCES_INVALIDIDMALFORMED, responseCode);
-					return;
-				default:
-					this.onSendError(aExchangeRequest, this.parent.ER_ERROR_FINDOCCURRENCES_UNKNOWN, responseCode);
-					return;
-			}
-
-			if ((finished) || (found)) {
-				break;	// break the loop
-			}
-		}
-		rm = null;
-
-		// This is so we do not get in an infinite loop
-		if (this.currentSearchIndex > 20000) {
-			finished = true;
-		}
-
-		if (finished) {
-			// We found our occurrence.
-			if (this.mCbOk) {
-				this.mCbOk(this, this.items);
-			}
-			this.isRunning = false;
-		}
-		else {
-			// We did not find the occurrence but we did not yet hit the end of the
-			// occurrence list. Request the next page.
-			if (this.mCbOk) {
-				this.mCbOk(this, this.items);
-			}
-			this.items = [];
-			this.execute();
-		}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-
-	getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey)
-	{
-		this.masterID = aId;
-		this.masterChangeKey = aChangeKey;
-
-		this.execute();
-	},
+    execute: function _execute() {
+        //var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:GetItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+
+        //var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        //itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly"); 
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
+
+        var additionalProperties = xml2json.addTag(itemShape, "AdditionalProperties", "nsTypes", null);
+        let fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
+        xml2json.setAttribute(fieldURI, "FieldURI", "calendar:UID");
+        fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
+        fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "calendar:CalendarItemType");
+        fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
+        fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "calendar:Start");
+        fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
+        fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "calendar:End");
+        fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
+        fieldURI = xml2json.setAttribute(fieldURI, "FieldURI", "item:ItemClass");
+
+        var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var itemids = xml2json.addTag(req, "ItemIds", "nsMessages", null);
+        for (var x = 0; x < this.idGroupSize; x++) {
+            var occurrenceItemID = xml2json.addTag(itemids, "OccurrenceItemId", "nsTypes", null);
+            xml2json.setAttribute(occurrenceItemID, "RecurringMasterId", this.masterID);
+            xml2json.setAttribute(occurrenceItemID, "ChangeKey", this.masterChangeKey);
+            xml2json.setAttribute(occurrenceItemID, "InstanceIndex", this.currentSearchIndex++);
+            occurrenceItemID = null;
+        }
+
+        itemids = null;
+
+        this.parent.xml2json = true;
+
+        //dump("erFindOccurrencesRequest.execute>"+String(this.parent.makeSoapMessage(req))+"\n");
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //dump("erFindOccurrencesRequest.onSendOk>"+xml2json.toString(aResp)+"\n");
+        var finished = false;
+        var found = false;
+
+        //var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
+        for each(var e in rm) {
+            var responseCode = xml2json.getTagValue(e, "m:ResponseCode");
+            switch (responseCode) {
+            case "ErrorCalendarOccurrenceIsDeletedFromRecurrence":
+                this.currentRealIndex++;
+                break;
+            case "NoError":
+                var tmpItems = xml2json.XPath(e, "/m:Items/*");
+                for each(var tmpItem in tmpItems) {
+                    this.currentRealIndex++;
+                    var startDate = cal.fromRFC3339(xml2json.getTagValue(tmpItem, "t:Start"), cal.UTC()).getInTimezone(cal.UTC());
+                    var endDate = cal.fromRFC3339(xml2json.getTagValue(tmpItem, "t:End"), cal.UTC()).getInTimezone(cal.UTC());
+                    if ((this.startDate.compare(endDate) < 1)
+                        && (this.endDate.compare(startDate) > -1)) {
+                        // We found our occurrence
+                        this.items.push({
+                            Id: xml2json.getAttributeByTag(tmpItem, "t:ItemId", "Id"),
+                            ChangeKey: xml2json.getAttributeByTag(tmpItem, "t:ItemId", "ChangeKey"),
+                            type: xml2json.getTagValue(tmpItem, "t:CalendarItemType"),
+                            uid: xml2json.getTagValue(tmpItem, "t:UID"),
+                            start: xml2json.getTagValue(tmpItem, "t:Start"),
+                            end: xml2json.getTagValue(tmpItem, "t:End"),
+                            index: this.currentRealIndex
+                        });
+                    }
+
+                    // When we see occurrences past our endDate range stop.
+                    if (startDate.compare(this.endDate) == 1) {
+                        finished = true;
+                        break;
+                    }
+                }
+                tmpItems = null;
+                break;
+            case "ErrorItemNotFound":
+            case "ErrorCalendarOccurrenceIndexIsOutOfRecurrenceRange":
+                finished = true;
+                break;
+            case "ErrorInvalidIdMalformed":
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_FINDOCCURRENCES_INVALIDIDMALFORMED, responseCode);
+                return;
+            default:
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_FINDOCCURRENCES_UNKNOWN, responseCode);
+                return;
+            }
+
+            if ((finished) || (found)) {
+                break; // break the loop
+            }
+        }
+        rm = null;
+
+        // This is so we do not get in an infinite loop
+        if (this.currentSearchIndex > 20000) {
+            finished = true;
+        }
+
+        if (finished) {
+            // We found our occurrence.
+            if (this.mCbOk) {
+                this.mCbOk(this, this.items);
+            }
+            this.isRunning = false;
+        }
+        else {
+            // We did not find the occurrence but we did not yet hit the end of the
+            // occurrence list. Request the next page.
+            if (this.mCbOk) {
+                this.mCbOk(this, this.items);
+            }
+            this.items = [];
+            this.execute();
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+
+    getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
+        this.masterID = aId;
+        this.masterChangeKey = aChangeKey;
+
+        this.execute();
+    },
 
 };
-
-
diff --git a/components/erFindTaskItems.js b/components/erFindTaskItems.js
index 1dd3bf2e..587e7c61 100644
--- a/components/erFindTaskItems.js
+++ b/components/erFindTaskItems.js
@@ -50,82 +50,82 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindTaskItemsRequest"];
 
-function erFindTaskItemsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.itemFilter = aArgument.itemFilter;
-
-	this.isRunning = true;
-	this.execute();
+function erFindTaskItemsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.itemFilter = aArgument.itemFilter;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erFindTaskItemsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetTaskItemsRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("Traversal", "Shallow");
-
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null); 
-		itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
-		itemShape = null;
-
-		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erFindTaskItemsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erFindTaskItemsRequest.onSendOk:"+String(aResp)+"\n");
-
-		var ids = [];
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:RootFolder/t:Items/t:Task");
-
-		for each (var e in rm) {
-			ids.push({Id: e.getAttributeByTag("t:ItemId","Id"),
-				  ChangeKey: e.getAttributeByTag("t:ItemId","ChangeKey")});
-		}
-		rm = null;
-	
-		if (this.mCbOk) {
-			this.mCbOk(this, ids);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetTaskItemsRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Shallow");
+
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
+        itemShape = null;
+
+        var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erFindTaskItemsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
 
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erFindTaskItemsRequest.onSendOk:"+String(aResp)+"\n");
 
+        var ids = [];
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:RootFolder/t:Items/t:Task");
+
+        for each(var e in rm) {
+            ids.push({
+                Id: e.getAttributeByTag("t:ItemId", "Id"),
+                ChangeKey: e.getAttributeByTag("t:ItemId", "ChangeKey")
+            });
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, ids);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erForewardItem.js b/components/erForewardItem.js
index 44e45826..5ce25fd1 100644
--- a/components/erForewardItem.js
+++ b/components/erForewardItem.js
@@ -51,111 +51,108 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erForewardItemRequest"];
 
-function erForewardItemRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-
-	this.isRunning = true;
-	this.execute();
+function erForewardItemRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erForewardItemRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erForewardItemRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("MessageDisposition", "SendAndSaveCopy");
-
-		var forwardItem = req.addChildTag("Items", "nsMessages", null).addChildTag("ForwardItem", "nsTypes", null);
-		var toRecipients = forwardItem.addChildTag("ToRecipients", "nsTypes", null);
-
-		for each (let emailId in this.argument.attendees) 
-                { 
-                        var email = new String(emailId); 
-                        var start = email.indexOf('<'); 
-			if(start<0){
-				toRecipients.addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", email);
-			}
-			else{
-				email = email.substr(start+1);
-	                        var end = email.indexOf('>'); 
-				toRecipients.addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", email.substr(0,end));
-			}
-                }
-		
-		var referenceItemId = forwardItem.addChildTag("ReferenceItemId", "nsTypes", null);
-		referenceItemId.setAttribute("Id", this.argument.item.id);
-		referenceItemId.setAttribute("ChangeKey", this.argument.item.changeKey);
-
-		forwardItem.addChildTag("NewBodyContent", "nsTypes", this.argument.item.body).setAttribute("BodyType", "HTML");
-
-		this.parent.xml2jxon = true;
-		
-		//dump("erForewardItemRequest.execute>"+String(this.parent.makeSoapMessage(req))+"\n");
- 
-               this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-		
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erForewardItemRequest.onSendOk: "+String(aResp)+"\n");
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage/m:ResponseCode");
-
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
-			return;
-		}
-
-		var responseCode = rm[0].value;
-		rm = null;
-
-		var response;
-		if (responseCode != "NoError") {
-			var messageText = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage/m:MessageText");
-			if (messageText.length == 0) {
-				messageText = "(unknown)";
-			}
-			else {
-				messageText = messageText[0].value;
-			}
-			response="Event forwarding not successful!:"+messageText+"("+responseCode+")";
-			//this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Event forewarding not successful!:"+messageText+"("+responseCode+")" );
-			messageText = null;
-		}
-		else{
-			response = "Event forwarding successful!";
-		}
-	
-		if (this.mCbOk) {
-			this.mCbOk(this, response);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erForewardItemRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("MessageDisposition", "SendAndSaveCopy");
+
+        var forwardItem = req.addChildTag("Items", "nsMessages", null).addChildTag("ForwardItem", "nsTypes", null);
+        var toRecipients = forwardItem.addChildTag("ToRecipients", "nsTypes", null);
+
+        for each(let emailId in this.argument.attendees) {
+            var email = new String(emailId);
+            var start = email.indexOf('<');
+            if (start < 0) {
+                toRecipients.addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", email);
+            }
+            else {
+                email = email.substr(start + 1);
+                var end = email.indexOf('>');
+                toRecipients.addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", email.substr(0, end));
+            }
+        }
+
+        var referenceItemId = forwardItem.addChildTag("ReferenceItemId", "nsTypes", null);
+        referenceItemId.setAttribute("Id", this.argument.item.id);
+        referenceItemId.setAttribute("ChangeKey", this.argument.item.changeKey);
+
+        forwardItem.addChildTag("NewBodyContent", "nsTypes", this.argument.item.body).setAttribute("BodyType", "HTML");
+
+        this.parent.xml2jxon = true;
+
+        //dump("erForewardItemRequest.execute>"+String(this.parent.makeSoapMessage(req))+"\n");
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erForewardItemRequest.onSendOk: "+String(aResp)+"\n");
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage/m:ResponseCode");
+
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
+            return;
+        }
+
+        var responseCode = rm[0].value;
+        rm = null;
+
+        var response;
+        if (responseCode != "NoError") {
+            var messageText = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage/m:MessageText");
+            if (messageText.length == 0) {
+                messageText = "(unknown)";
+            }
+            else {
+                messageText = messageText[0].value;
+            }
+            response = "Event forwarding not successful!:" + messageText + "(" + responseCode + ")";
+            //this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Event forewarding not successful!:"+messageText+"("+responseCode+")" );
+            messageText = null;
+        }
+        else {
+            response = "Event forwarding successful!";
+        }
+
+        if (this.mCbOk) {
+            this.mCbOk(this, response);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetAttachments.js b/components/erGetAttachments.js
index 54437bfc..609cab58 100644
--- a/components/erGetAttachments.js
+++ b/components/erGetAttachments.js
@@ -44,100 +44,99 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetAttachmentsRequest"];
 
-function erGetAttachmentsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-exchWebService.commonFunctions.LOG(" == serverUrl:"+aArgument.serverUrl);
-	this.attachmentIds = aArgument.attachmentIds;
-
-	this.isRunning = true;
-	this.execute();
+function erGetAttachmentsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    exchWebService.commonFunctions.LOG(" == serverUrl:" + aArgument.serverUrl);
+    this.attachmentIds = aArgument.attachmentIds;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetAttachmentsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetAttachmentsRequest.execute");
-
-		//var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetAttachment xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:GetAttachment xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-
-		var attachmentShape = xml2json.addTag(req, "AttachmentShape", "nsMessages", null);
-		xml2json.addTag(attachmentShape, "IncludeMimeContent", "nsTypes", "true");
-		//var additionalProperties = xml2json.addTag(attachmentShape, "AdditionalProperties", "nsTypes", null);
-		//var fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
-		//xml2json.setAttribute(fieldURI, "FieldURI" , "attachment:contentId");
-
-		//var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:AttachmentIds xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var itemids = xml2json.addTag(req, "AttachmentIds", "nsMessages", null);
-		for (var index in this.attachmentIds) {
-			let attachmentId = xml2json.addTag(itemids, "AttachmentId", "nsTypes", null);
-			xml2json.setAttribute(attachmentId, "Id", this.attachmentIds[index]);
-		}
-
-		//req.addChildTagObject(itemids);
-		itemids = null;
-
-		this.parent.xml2json = true;
-
-		//dump("erGetAttachmentsRequest.execute:"+this.parent.makeSoapMessage2(req)+"\n\n");
-                this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//dump("erGetAttachmentsRequest.onSendOk: "+xml2json.toString(aResp)+"\n\n");
-
-		//var rm = aResp.XPath("/s:Envelope/s:Body/m:GetAttachmentResponse/m:ResponseMessages/m:GetAttachmentResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Attachments/*");
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetAttachmentResponse/m:ResponseMessages/m:GetAttachmentResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Attachments/*");
-
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting Attachment.");
-			rm = null;
-			return;
-		}
-
-		var attachments = [];
-		for each (var e in rm) {
-			attachments.push( { id: xml2json.getAttributeByTag(e, "t:AttachmentId","Id"),
-				      name: xml2json.getTagValue(e, "t:Name"),
-				      content: xml2json.getTagValue(e, "t:Content"),
-					contentId: xml2json.getTagValue(e, "t:ContentId"),
-					contentType: xml2json.getTagValue(e, "t:ContentType"),
-					attachment: e}
-				);
-		} 
-		rm = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, attachments);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		dump("erGetAttachmentsRequest.onSendError: aCode:"+aCode+", aMsg:"+aMsg+"\n\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetAttachmentsRequest.execute");
+
+        //var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetAttachment xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:GetAttachment xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+
+        var attachmentShape = xml2json.addTag(req, "AttachmentShape", "nsMessages", null);
+        xml2json.addTag(attachmentShape, "IncludeMimeContent", "nsTypes", "true");
+        //var additionalProperties = xml2json.addTag(attachmentShape, "AdditionalProperties", "nsTypes", null);
+        //var fieldURI = xml2json.addTag(additionalProperties, "FieldURI", "nsTypes", null);
+        //xml2json.setAttribute(fieldURI, "FieldURI" , "attachment:contentId");
+
+        //var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:AttachmentIds xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        var itemids = xml2json.addTag(req, "AttachmentIds", "nsMessages", null);
+        for (var index in this.attachmentIds) {
+            let attachmentId = xml2json.addTag(itemids, "AttachmentId", "nsTypes", null);
+            xml2json.setAttribute(attachmentId, "Id", this.attachmentIds[index]);
+        }
+
+        //req.addChildTagObject(itemids);
+        itemids = null;
+
+        this.parent.xml2json = true;
+
+        //dump("erGetAttachmentsRequest.execute:"+this.parent.makeSoapMessage2(req)+"\n\n");
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //dump("erGetAttachmentsRequest.onSendOk: "+xml2json.toString(aResp)+"\n\n");
+
+        //var rm = aResp.XPath("/s:Envelope/s:Body/m:GetAttachmentResponse/m:ResponseMessages/m:GetAttachmentResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Attachments/*");
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetAttachmentResponse/m:ResponseMessages/m:GetAttachmentResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Attachments/*");
+
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting Attachment.");
+            rm = null;
+            return;
+        }
+
+        var attachments = [];
+        for each(var e in rm) {
+            attachments.push({
+                id: xml2json.getAttributeByTag(e, "t:AttachmentId", "Id"),
+                name: xml2json.getTagValue(e, "t:Name"),
+                content: xml2json.getTagValue(e, "t:Content"),
+                contentId: xml2json.getTagValue(e, "t:ContentId"),
+                contentType: xml2json.getTagValue(e, "t:ContentType"),
+                attachment: e
+            });
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, attachments);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        dump("erGetAttachmentsRequest.onSendError: aCode:" + aCode + ", aMsg:" + aMsg + "\n\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetContacts.js b/components/erGetContacts.js
index 6aa35a6e..a63271f3 100644
--- a/components/erGetContacts.js
+++ b/components/erGetContacts.js
@@ -37,115 +37,113 @@ var EXPORTED_SYMBOLS = ["erGetContactsRequest"];
 
 const MAPI_PidTagBody = "4096";
 
-function erGetContactsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.ids = aArgument.ids;
-
-	this.isRunning = true;
-	this.execute();
+function erGetContactsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.ids = aArgument.ids;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetContactsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetContactsRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
-		itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");		
-		itemShape.addChildTag("BodyType", "nsTypes", "Text");
-
-		var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
-
-
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2007") == -1) {
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "contacts:HasPicture");
-		}
-
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:HasAttachments");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Attachments");
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:EffectiveRights");
-
-		if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") == -1) &&
-		    (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010_SP1") == -1)){
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "contacts:Photo");
-		}
-
-		var extendedFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-		extendedFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
-		extendedFieldURI.setAttribute("PropertyId", MAPI_PidTagBody);
-		extendedFieldURI.setAttribute("PropertyType", "String");
-		itemids = null;
-		itemids = null;
-
-		var itemids = req.addChildTag("ItemIds", "nsMessages", null);
-		for each (var item in this.ids) {
-			var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
-			itemId.setAttribute("Id", item.Id);
-			if (item.ChangeKey) {
-				itemId.setAttribute("ChangeKey", item.ChangeKey);
-			}
-			itemId = null;
-		}
-		itemids = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erGetContactsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-		itemShape = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetContactsRequest.onSendOk:"+aResp.toString());
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
-
-		var contacts = [];
-		var tmpList = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage/m:Items/*");
-		for (var index in tmpList) {
-			contacts.push(tmpList[index]);
-		}
-		tmpList = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, contacts);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		exchWebService.commonFunctions.LOG("erGetContactsRequest.onSendError.aMsg:"+aMsg);
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetContactsRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
+        itemShape.addChildTag("BodyType", "nsTypes", "Text");
+
+        var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
+
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+        if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2007") == -1) {
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "contacts:HasPicture");
+        }
+
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:HasAttachments");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Attachments");
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:EffectiveRights");
+
+        if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") == -1)
+            && (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010_SP1") == -1)) {
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "contacts:Photo");
+        }
+
+        var extendedFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        extendedFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
+        extendedFieldURI.setAttribute("PropertyId", MAPI_PidTagBody);
+        extendedFieldURI.setAttribute("PropertyType", "String");
+        itemids = null;
+        itemids = null;
+
+        var itemids = req.addChildTag("ItemIds", "nsMessages", null);
+        for each(var item in this.ids) {
+            var itemId = itemids.addChildTag("ItemId", "nsTypes", null);
+            itemId.setAttribute("Id", item.Id);
+            if (item.ChangeKey) {
+                itemId.setAttribute("ChangeKey", item.ChangeKey);
+            }
+            itemId = null;
+        }
+        itemids = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erGetContactsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+        itemShape = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetContactsRequest.onSendOk:"+aResp.toString());
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
+
+        var contacts = [];
+        var tmpList = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage/m:Items/*");
+        for (var index in tmpList) {
+            contacts.push(tmpList[index]);
+        }
+        tmpList = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, contacts);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("erGetContactsRequest.onSendError.aMsg:" + aMsg);
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetDelegateRequest.js b/components/erGetDelegateRequest.js
index b60686e3..a262f177 100644
--- a/components/erGetDelegateRequest.js
+++ b/components/erGetDelegateRequest.js
@@ -19,127 +19,126 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js"); 
+Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetDelegateRequest"];
-function erGetDelegateRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-	this.delegatingItem = aArgument.delegatingItem;
-
-    this.permission = ""; 
-	switch( this.delegatingItem ){
-		case "calendar":
-			 this.permission = "CalendarFolderPermissionLevel";
-			break;
-		case  "tasks":
-			 this.permission = "TasksFolderPermissionLevel";
-			break;
-		case  "inbox":
-			 this.permission = "InboxFolderPermissionLevel";
-			break;
-		case "contacts":
-			 this.permission = "ContactsFolderPermissionLevel";  
-			break;
-		case "notes":
-			 this.permission = "NotesFolderPermissionLevel";
-			break;
-		case "journal":
-			 this.permission = "JournalFolderPermissionLevel";
-			break;
-		default:
- 	}
-	
-	this.isRunning = true;
-	this.execute();
+
+function erGetDelegateRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+    this.delegatingItem = aArgument.delegatingItem;
+
+    this.permission = "";
+    switch (this.delegatingItem) {
+    case "calendar":
+        this.permission = "CalendarFolderPermissionLevel";
+        break;
+    case "tasks":
+        this.permission = "TasksFolderPermissionLevel";
+        break;
+    case "inbox":
+        this.permission = "InboxFolderPermissionLevel";
+        break;
+    case "contacts":
+        this.permission = "ContactsFolderPermissionLevel";
+        break;
+    case "notes":
+        this.permission = "NotesFolderPermissionLevel";
+        break;
+    case "journal":
+        this.permission = "JournalFolderPermissionLevel";
+        break;
+    default:
+    }
+
+    this.isRunning = true;
+    this.execute();
 }
 
-erGetDelegateRequest.prototype = { 
+erGetDelegateRequest.prototype = {
 
-	execute: function _execute()
-	{
- 		exchWebService.commonFunctions.LOG("erGetDelegateRequest.execute\n");
+    execute: function _execute() {
+        exchWebService.commonFunctions.LOG("erGetDelegateRequest.execute\n");
 
- 		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetDelegate xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("IncludePermissions","true"); 
- 		var mailBox = req.addChildTag("Mailbox", "nsMessages", null);  
-		mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox );    
-		this.parent.xml2jxon = true;
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetDelegate xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("IncludePermissions", "true");
+        var mailBox = req.addChildTag("Mailbox", "nsMessages", null);
+        mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox);
+        this.parent.xml2jxon = true;
         this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendOk: "  +"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:"+responseCode);
-			return;
-		}  
-			var dmr = aResp.XPath("/s:Envelope/s:Body/m:GetDelegateResponse");
-		    var  DeliverMeetingRequests=dmr[0].getTagValue("m:DeliverMeetingRequests");
-		//	exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendOk: DeliverMeetingRequests  " + DeliverMeetingRequests);
-		    
-		var delegates=[];
-		if ( rm.length > 0) 
-		{  
- 			for( index=0;index<rm.length;index++)
-			{ 
-			    //exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendOk:  " + index + " : " +  rm[index] + " \n");  
-
-			    var delegateUser = rm[index].getTag("m:DelegateUser");  
-			    if ( delegateUser )  {
-					 delegates[index]={ 
-						 	SID: delegateUser.getTag("t:UserId").getTagValue("t:SID"),
-						 	PrimarySmtpAddress: delegateUser.getTag("t:UserId").getTagValue("t:PrimarySmtpAddress"),
-						  	DisplayName: delegateUser.getTag("t:UserId").getTagValue("t:DisplayName"), 
-						    DelegatePermissions: delegateUser.getTag("t:DelegatePermissions").getTagValue("t:"+this.permission),
-						 	ReceiveCopiesOfMeetingMessages:delegateUser.getTagValue("t:ReceiveCopiesOfMeetingMessages"),
-						 	ViewPrivateItems: delegateUser.getTagValue("t:ViewPrivateItems"),
-						 	DeliverMeetingRequests: DeliverMeetingRequests ,
-				 	}; 
-			    }
-			}  
-		} 
-		
-		rm = null; 
-		if (this.mCbOk) {
-			this.mCbOk(this,delegates); 
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		 exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendError: "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			 exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendError: Callback Active  \n"); 
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendOk: " + "\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:" + responseCode);
+            return;
+        }
+        var dmr = aResp.XPath("/s:Envelope/s:Body/m:GetDelegateResponse");
+        var DeliverMeetingRequests = dmr[0].getTagValue("m:DeliverMeetingRequests");
+        //	exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendOk: DeliverMeetingRequests  " + DeliverMeetingRequests);
+
+        var delegates = [];
+        if (rm.length > 0) {
+            for (index = 0; index < rm.length; index++) {
+                //exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendOk:  " + index + " : " +  rm[index] + " \n");  
+
+                var delegateUser = rm[index].getTag("m:DelegateUser");
+                if (delegateUser) {
+                    delegates[index] = {
+                        SID: delegateUser.getTag("t:UserId").getTagValue("t:SID"),
+                        PrimarySmtpAddress: delegateUser.getTag("t:UserId").getTagValue("t:PrimarySmtpAddress"),
+                        DisplayName: delegateUser.getTag("t:UserId").getTagValue("t:DisplayName"),
+                        DelegatePermissions: delegateUser.getTag("t:DelegatePermissions").getTagValue("t:" + this.permission),
+                        ReceiveCopiesOfMeetingMessages: delegateUser.getTagValue("t:ReceiveCopiesOfMeetingMessages"),
+                        ViewPrivateItems: delegateUser.getTagValue("t:ViewPrivateItems"),
+                        DeliverMeetingRequests: DeliverMeetingRequests,
+                    };
+                }
+            }
+        }
+
+        rm = null;
+        if (this.mCbOk) {
+            this.mCbOk(this, delegates);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendError: " + aMsg + "\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            exchWebService.commonFunctions.LOG("erGetDelegateRequest.onSendError: Callback Active  \n");
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
 
 /*
@@ -164,38 +163,37 @@ erGetDelegateRequest.prototype = {
 *
 **/
 
-	/*
-	 * <?xml version="1.0" encoding="utf-8"?>
-	 * <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"><s:Header><h:ServerVersionInfo MajorVersion="14" MinorVersion="3" MajorBuildNumber="174" MinorBuildNumber="1" Version="Exchange2010_SP2" xmlns:h="http://schemas.microsoft.com/exchange/services/2006/types" xmlns="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/></s:Header><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	 * <m:GetDelegateResponse ResponseClass="Success" xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"><m:ResponseCode>NoError</m:ResponseCode>
-	 * <m:ResponseMessages> 
-	 * <m:DelegateUserResponseMessageType ResponseClass="Success"><m:ResponseCode>NoError</m:ResponseCode> 			 * 
-	 * <m:DelegateUser>
-	 * 	<t:UserId>
-	 * 	<t:SID>S-1-5-21-1538607324-3213881460-940295383-542321</t:SID>
-	 * 	<t:PrimarySmtpAddress>p.raveendra.babu@ericsson.com</t:PrimarySmtpAddress>
-	 * 	<t:DisplayName>P Raveendra Babu</t:DisplayName>
-	 * 	</t:UserId>
-	 * <t:DelegatePermissions><t:CalendarFolderPermissionLevel>Author</t:CalendarFolderPermissionLevel></t:DelegatePermissions>
-	 * <t:ReceiveCopiesOfMeetingMessages>false</t:ReceiveCopiesOfMeetingMessages>
-	 * <t:ViewPrivateItems>false</t:ViewPrivateItems>
-	 * </m:DelegateUser>
-	 * </m:DelegateUserResponseMessageType>
-	 * 
-	 * <m:DelegateUserResponseMessageType ResponseClass="Success"><m:ResponseCode>NoError</m:ResponseCode>
-	 * <m:DelegateUser>
-	 * 	<t:UserId>
-	 * 	<t:SID>S-1-5-21-1538607324-3213881460-940295383-21415</t:SID>
-	 * 	<t:PrimarySmtpAddress>anant.kumar.a.singh@ericsson.com</t:PrimarySmtpAddress>
-	 * 	<t:DisplayName>Anant Kumar Singh A</t:DisplayName>
-	 * 	</t:UserId>
-	 * <t:DelegatePermissions><t:CalendarFolderPermissionLevel>Author</t:CalendarFolderPermissionLevel>
-	 * </t:DelegatePermissions><t:ReceiveCopiesOfMeetingMessages>false</t:ReceiveCopiesOfMeetingMessages>
-	 * <t:ViewPrivateItems>false</t:ViewPrivateItems>
-	 * </m:DelegateUser>
-	 * 
-	 * </m:DelegateUserResponseMessageType>
-	 * </m:ResponseMessages>
-	 * <m:DeliverMeetingRequests>DelegatesAndMe</m:DeliverMeetingRequests></m:GetDelegateResponse></s:Body></s:Envelope>
-	 * */
-	  
\ No newline at end of file
+/*
+ * <?xml version="1.0" encoding="utf-8"?>
+ * <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"><s:Header><h:ServerVersionInfo MajorVersion="14" MinorVersion="3" MajorBuildNumber="174" MinorBuildNumber="1" Version="Exchange2010_SP2" xmlns:h="http://schemas.microsoft.com/exchange/services/2006/types" xmlns="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/></s:Header><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ * <m:GetDelegateResponse ResponseClass="Success" xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"><m:ResponseCode>NoError</m:ResponseCode>
+ * <m:ResponseMessages> 
+ * <m:DelegateUserResponseMessageType ResponseClass="Success"><m:ResponseCode>NoError</m:ResponseCode> 			 * 
+ * <m:DelegateUser>
+ * 	<t:UserId>
+ * 	<t:SID>S-1-5-21-1538607324-3213881460-940295383-542321</t:SID>
+ * 	<t:PrimarySmtpAddress>p.raveendra.babu@ericsson.com</t:PrimarySmtpAddress>
+ * 	<t:DisplayName>P Raveendra Babu</t:DisplayName>
+ * 	</t:UserId>
+ * <t:DelegatePermissions><t:CalendarFolderPermissionLevel>Author</t:CalendarFolderPermissionLevel></t:DelegatePermissions>
+ * <t:ReceiveCopiesOfMeetingMessages>false</t:ReceiveCopiesOfMeetingMessages>
+ * <t:ViewPrivateItems>false</t:ViewPrivateItems>
+ * </m:DelegateUser>
+ * </m:DelegateUserResponseMessageType>
+ * 
+ * <m:DelegateUserResponseMessageType ResponseClass="Success"><m:ResponseCode>NoError</m:ResponseCode>
+ * <m:DelegateUser>
+ * 	<t:UserId>
+ * 	<t:SID>S-1-5-21-1538607324-3213881460-940295383-21415</t:SID>
+ * 	<t:PrimarySmtpAddress>anant.kumar.a.singh@ericsson.com</t:PrimarySmtpAddress>
+ * 	<t:DisplayName>Anant Kumar Singh A</t:DisplayName>
+ * 	</t:UserId>
+ * <t:DelegatePermissions><t:CalendarFolderPermissionLevel>Author</t:CalendarFolderPermissionLevel>
+ * </t:DelegatePermissions><t:ReceiveCopiesOfMeetingMessages>false</t:ReceiveCopiesOfMeetingMessages>
+ * <t:ViewPrivateItems>false</t:ViewPrivateItems>
+ * </m:DelegateUser>
+ * 
+ * </m:DelegateUserResponseMessageType>
+ * </m:ResponseMessages>
+ * <m:DeliverMeetingRequests>DelegatesAndMe</m:DeliverMeetingRequests></m:GetDelegateResponse></s:Body></s:Envelope>
+ * */
diff --git a/components/erGetEvents.js b/components/erGetEvents.js
index 78c14456..e9448f8f 100644
--- a/components/erGetEvents.js
+++ b/components/erGetEvents.js
@@ -14,99 +14,97 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js"); 
+Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetEventsRequest"];
 
-function erGetEventsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
- 	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.subscriptionId = aArgument.subscriptionId;
-	this.watermark = aArgument.watermark;
- 	this.listener = aListener;
-  
-	this.isRunning = true;
-	this.execute();
+function erGetEventsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.subscriptionId = aArgument.subscriptionId;
+    this.watermark = aArgument.watermark;
+    this.listener = aListener;
+
+    this.isRunning = true;
+    this.execute();
 }
-  
+
 erGetEventsRequest.prototype = {
 
-	execute: function _execute()
-	{
-		 //exchWebService.commonFunctions.LOG("erGetEventsRequest.execute 1"); 
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetEvents xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		  req.addChildTag("SubscriptionId", "nsMessages", this.subscriptionId);  
-		  req.addChildTag("Watermark", "nsMessages",this.watermark);   
-		 
-		//exchWebService.commonFunctions.LOG("erGetEventsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null; 
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		// exchWebService.commonFunctions.LOG("erGetEventsRequest.onSendOk:"+String(aResp));
- 		// Get FolderID and ChangeKey
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = [];
-		 
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetEventsResponse/m:ResponseMessages/m:GetEventsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		if (rm.length > 0) {   
-			for (var index = 0 ; index < rm.length ; index++) {
-				aResult.push(rm[index]); 
-			}
- 		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
- 
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.properties = aResp;
-				this.mCbOk(this, aResult);
-			}
-			this.isRunning = false;
-		}
-		rm = null; 
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erGetEventsRequest.execute 1"); 
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetEvents xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.addChildTag("SubscriptionId", "nsMessages", this.subscriptionId);
+        req.addChildTag("Watermark", "nsMessages", this.watermark);
+
+        //exchWebService.commonFunctions.LOG("erGetEventsRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        // exchWebService.commonFunctions.LOG("erGetEventsRequest.onSendOk:"+String(aResp));
+        // Get FolderID and ChangeKey
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = [];
 
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetEventsResponse/m:ResponseMessages/m:GetEventsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        if (rm.length > 0) {
+            for (var index = 0; index < rm.length; index++) {
+                aResult.push(rm[index]);
+            }
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
 
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.properties = aResp;
+                this.mCbOk(this, aResult);
+            }
+            this.isRunning = false;
+        }
+        rm = null;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erGetFolder.js b/components/erGetFolder.js
index 0e35242e..784b71c5 100644
--- a/components/erGetFolder.js
+++ b/components/erGetFolder.js
@@ -51,121 +51,119 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetFolderRequest"];
 
-function erGetFolderRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
- 	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-/*	while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
-		aArgument.folderPath = aArgument.folderPath.substr(1);
-	}*/
-
-	this.isRunning = true;
-	this.execute();
+function erGetFolderRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    /*	while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
+    		aArgument.folderPath = aArgument.folderPath.substr(1);
+    	}*/
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetFolderRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erGetFolderRequest.execute 1");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetFolder xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		req.addChildTag("FolderShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "AllProperties");
-
-		var parentFolder = makeParentFolderIds2("FolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		//exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
-
-		//exchWebService.commonFunctions.LOG("erGetFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetFolderRequest.onSendOk:"+String(aResp));
-		// Get FolderID and ChangeKey
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var calendarFolder = rm[0].XPath("/m:Folders/t:CalendarFolder");
-			if (calendarFolder.length == 0) {
-				var calendarFolder = rm[0].XPath("/m:Folders/t:TasksFolder");
-			}
-			if (calendarFolder.length > 0) {
-				var folderID = calendarFolder[0].getAttributeByTag("t:FolderId", "Id");
-				var changeKey = calendarFolder[0].getAttributeByTag("t:FolderId", "ChangeKey");
-				var folderClass = calendarFolder[0].getTagValue("t:FolderClass");
-				this.displayName = calendarFolder[0].getTagValue("t:DisplayName");
-			}
-			else {
-				aMsg = "Did not find any CalendarFolder parts.";
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			calendarFolder = null;
-		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
-
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.properties = aResp;
-				this.mCbOk(this, folderID, changeKey, folderClass);
-			}
-			this.isRunning = false;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erGetFolderRequest.execute 1");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetFolder xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        req.addChildTag("FolderShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "AllProperties");
+
+        var parentFolder = makeParentFolderIds2("FolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        //exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
+
+        //exchWebService.commonFunctions.LOG("erGetFolderRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetFolderRequest.onSendOk:"+String(aResp));
+        // Get FolderID and ChangeKey
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            var calendarFolder = rm[0].XPath("/m:Folders/t:CalendarFolder");
+            if (calendarFolder.length == 0) {
+                var calendarFolder = rm[0].XPath("/m:Folders/t:TasksFolder");
+            }
+            if (calendarFolder.length > 0) {
+                var folderID = calendarFolder[0].getAttributeByTag("t:FolderId", "Id");
+                var changeKey = calendarFolder[0].getAttributeByTag("t:FolderId", "ChangeKey");
+                var folderClass = calendarFolder[0].getTagValue("t:FolderClass");
+                this.displayName = calendarFolder[0].getTagValue("t:DisplayName");
+            }
+            else {
+                aMsg = "Did not find any CalendarFolder parts.";
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+            calendarFolder = null;
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.properties = aResp;
+                this.mCbOk(this, folderID, changeKey, folderClass);
+            }
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetFolderPermission.js b/components/erGetFolderPermission.js
index aa5f727a..ceca9051 100644
--- a/components/erGetFolderPermission.js
+++ b/components/erGetFolderPermission.js
@@ -51,190 +51,191 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetFolderPermissionRequest"];
 
-function erGetFolderPermissionRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.parent.debug = false;
-	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-/*	while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
-		aArgument.folderPath = aArgument.folderPath.substr(1);
-	}*/
-
-	this.isRunning = true;
-	this.execute();
+function erGetFolderPermissionRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.parent.debug = false;
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    /*	while ((aArgument.folderPath.length > 0) && (aArgument.folderPath.indexOf("/") == 0)) {
+    		aArgument.folderPath = aArgument.folderPath.substr(1);
+    	}*/
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetFolderPermissionRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erGetFolderPermissionRequest.execute 1");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetFolder xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var fs = req.addChildTag("FolderShape", "nsMessages", null);
-		fs.addChildTag("BaseShape", "nsTypes", "IdOnly");
-		var ap = fs.addChildTag("AdditionalProperties", "nsTypes", null);
-		ap.addChildTag("FieldURI", "nsTypes",  null).setAttribute("FieldURI","folder:PermissionSet");
-		ap.addChildTag("FieldURI", "nsTypes",  null).setAttribute("FieldURI","folder:DisplayName"); 
-	 
-		var parentFolder = makeParentFolderIds2("FolderIds", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-
-		//exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
-
-		//exchWebService.commonFunctions.LOG("erGetFolderPermissionRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		 exchWebService.commonFunctions.LOG("erGetFolderPermissionRequest.onSendOk:"+String(aResp));
-		// Get FolderID and ChangeKey
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-	 
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		var delegatees = [] ;
-		var permissions = [];
-		var folderID;
-		var changeKey;
-		var folderName;
-			
-		if (rm.length > 0) {
-			var Folder = rm[0].XPath("/m:Folders/t:Folder");
-		 
-			if (Folder.length > 0) {
-				
-				 folderID = Folder[0].getAttributeByTag("t:FolderId", "Id");
-				 changeKey = Folder[0].getAttributeByTag("t:FolderId", "ChangeKey");
-				 folderName = Folder[0].getTagValue("t:DisplayName");
- 		
- 				//Get Permissions
- 				var permission = Folder[0].XPath("/t:PermissionSet/t:Permissions/t:Permission"); 
- 				
- 				for ( var i = 0; i < permission.length; i++ ){
-	 				var userId = permission[i].XPath("/t:UserId"); 				
-	 				var email = userId[0].getTagValue("t:PrimarySmtpAddress");
-	 				var sid = userId[0].getTagValue("t:SID");
-	 				var displayName = userId[0].getTagValue("t:DisplayName");
-	 				
-	 				if ( email === undefined ){
-	 					displayName = userId[0].getTagValue("t:DistinguishedUser");
-	 					email = displayName; 
-	 					sid = null;
-	 				} 
-	 				
-	 				var canCreateItems = permission[i].getTagValue("t:CanCreateItems");
-	 				var canCreateSubFolders = permission[i].getTagValue("t:CanCreateSubFolders");
-	 				var isFolderOwner = permission[i].getTagValue("t:IsFolderOwner");
-	 				var isFolderVisible = permission[i].getTagValue("t:IsFolderVisible");
-	 				var isFolderContact = permission[i].getTagValue("t:IsFolderContact");
-	 				var editItems = permission[i].getTagValue("t:EditItems");
-	 				var deleteItems = permission[i].getTagValue("t:DeleteItems");
-	 				var readItems = permission[i].getTagValue("t:ReadItems");
-	 				var permissionLevel = permission[i].getTagValue("t:PermissionLevel");
-	 				
-	 				 
-	 				var perm = {  			   
-	 	 					  canCreateItems : canCreateItems,
-	 	 	 				  canCreateSubFolders : canCreateSubFolders,
-	 	 	 				  isFolderOwner : isFolderOwner,
-	 	 	 				  isFolderVisible : isFolderVisible,
-	 	 	 				  isFolderContact : isFolderContact,
-	 	 	 				  editItems : editItems,
-	 	 	 				  deleteItems : deleteItems,
-	 	 	 				  readItems : readItems,
-	 	 	 				  permissionLevel : permissionLevel, };
-	 				
-	 				var  user = {
-		 					 name : displayName ,
-		 					 emailId : email ,
-		 					 sid : sid, 
-	 	 	 				 permissionLevel : permissionLevel, 
-		 					 permissions : {  			   
-		 	 					  canCreateItems : canCreateItems,
-		 	 	 				  canCreateSubFolders : canCreateSubFolders,
-		 	 	 				  isFolderOwner : isFolderOwner,
-		 	 	 				  isFolderVisible : isFolderVisible,
-		 	 	 				  isFolderContact : isFolderContact,
-		 	 	 				  editItems : editItems,
-		 	 	 				  deleteItems : deleteItems,
-		 	 	 				  readItems : readItems,} , };
-	 				
-	 				delegatees.push(user);
-	 				permissions.push(perm);
-	 				user=null;
-	 				perm=null;
- 				} 
- 				
- 				
- 				
- 			}
-			else {
-				aMsg = "Did not find any Folder parts.";
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			
-			Folder = null;
-		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
- 
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
- 				this.mCbOk(this,folderID,changeKey,folderName,delegatees,permissions);  
-			}
-			this.isRunning = false;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erGetFolderPermissionRequest.execute 1");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetFolder xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var fs = req.addChildTag("FolderShape", "nsMessages", null);
+        fs.addChildTag("BaseShape", "nsTypes", "IdOnly");
+        var ap = fs.addChildTag("AdditionalProperties", "nsTypes", null);
+        ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:PermissionSet");
+        ap.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName");
+
+        var parentFolder = makeParentFolderIds2("FolderIds", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        //exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
+
+        //exchWebService.commonFunctions.LOG("erGetFolderPermissionRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erGetFolderPermissionRequest.onSendOk:" + String(aResp));
+        // Get FolderID and ChangeKey
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        var delegatees = [];
+        var permissions = [];
+        var folderID;
+        var changeKey;
+        var folderName;
+
+        if (rm.length > 0) {
+            var Folder = rm[0].XPath("/m:Folders/t:Folder");
+
+            if (Folder.length > 0) {
+
+                folderID = Folder[0].getAttributeByTag("t:FolderId", "Id");
+                changeKey = Folder[0].getAttributeByTag("t:FolderId", "ChangeKey");
+                folderName = Folder[0].getTagValue("t:DisplayName");
+
+                //Get Permissions
+                var permission = Folder[0].XPath("/t:PermissionSet/t:Permissions/t:Permission");
+
+                for (var i = 0; i < permission.length; i++) {
+                    var userId = permission[i].XPath("/t:UserId");
+                    var email = userId[0].getTagValue("t:PrimarySmtpAddress");
+                    var sid = userId[0].getTagValue("t:SID");
+                    var displayName = userId[0].getTagValue("t:DisplayName");
+
+                    if (email === undefined) {
+                        displayName = userId[0].getTagValue("t:DistinguishedUser");
+                        email = displayName;
+                        sid = null;
+                    }
+
+                    var canCreateItems = permission[i].getTagValue("t:CanCreateItems");
+                    var canCreateSubFolders = permission[i].getTagValue("t:CanCreateSubFolders");
+                    var isFolderOwner = permission[i].getTagValue("t:IsFolderOwner");
+                    var isFolderVisible = permission[i].getTagValue("t:IsFolderVisible");
+                    var isFolderContact = permission[i].getTagValue("t:IsFolderContact");
+                    var editItems = permission[i].getTagValue("t:EditItems");
+                    var deleteItems = permission[i].getTagValue("t:DeleteItems");
+                    var readItems = permission[i].getTagValue("t:ReadItems");
+                    var permissionLevel = permission[i].getTagValue("t:PermissionLevel");
+
+
+                    var perm = {
+                        canCreateItems: canCreateItems,
+                        canCreateSubFolders: canCreateSubFolders,
+                        isFolderOwner: isFolderOwner,
+                        isFolderVisible: isFolderVisible,
+                        isFolderContact: isFolderContact,
+                        editItems: editItems,
+                        deleteItems: deleteItems,
+                        readItems: readItems,
+                        permissionLevel: permissionLevel,
+                    };
+
+                    var user = {
+                        name: displayName,
+                        emailId: email,
+                        sid: sid,
+                        permissionLevel: permissionLevel,
+                        permissions: {
+                            canCreateItems: canCreateItems,
+                            canCreateSubFolders: canCreateSubFolders,
+                            isFolderOwner: isFolderOwner,
+                            isFolderVisible: isFolderVisible,
+                            isFolderContact: isFolderContact,
+                            editItems: editItems,
+                            deleteItems: deleteItems,
+                            readItems: readItems,
+                        },
+                    };
+
+                    delegatees.push(user);
+                    permissions.push(perm);
+                    user = null;
+                    perm = null;
+                }
+
+
+
+            }
+            else {
+                aMsg = "Did not find any Folder parts.";
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+
+            Folder = null;
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(this, folderID, changeKey, folderName, delegatees, permissions);
+            }
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetItems.js b/components/erGetItems.js
index b8c57ef5..6395a2dc 100644
--- a/components/erGetItems.js
+++ b/components/erGetItems.js
@@ -63,404 +63,402 @@ const MAPI_PidLidReminderDelta = "34049";
 
 const MAPI_PidLidTaskStartDate = "33028";
 const MAPI_PidLidTaskDueDate = "33029";
-const MAPI_PidLidTaskStatus = "33025"; 
+const MAPI_PidLidTaskStatus = "33025";
 const MAPI_PidLidPercentComplete = "33026";
-const MAPI_PidLidTaskComplete = "33052";  
+const MAPI_PidLidTaskComplete = "33052";
 const MAPI_PidLidTaskDateCompleted = "33039";
 
 const MAPI_PidTagFlagStatus = "0x1090";
-const MAPI_PidTagFollowupIcon  = "0x1095";
+const MAPI_PidTagFollowupIcon = "0x1095";
 const MAPI_PidTagToDoItemFlags = "0x0E2B";
 
 const MAPI_PidLidCommonEnd = "34071";
 const MAPI_PidLidCommonStart = "34070";
 const MAPI_MessageId = "0x1035";
 
-function erGetItemsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.argument.occurrenceIndexes = {};
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.ids = aArgument.ids;
-	this.counter = 0;
-
-	this.folderClass = aArgument.folderClass;
-
-	this.isRunning = true;
-	this.requestedItemId = [];
-	this.execute();
+function erGetItemsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.argument.occurrenceIndexes = {};
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.ids = aArgument.ids;
+    this.counter = 0;
+
+    this.folderClass = aArgument.folderClass;
+
+    this.isRunning = true;
+    this.requestedItemId = [];
+    this.execute();
 }
 
 erGetItemsRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erGetTaskItemsRequest.execute\n");
-
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");		
-//		xml2json.addTag(itemShape, "BodyType", "nsTypes", "Text");
-		xml2json.addTag(itemShape, "BodyType", "nsTypes", "Best");
-
-		var additionalProperties = xml2json.addTag(itemShape, "AdditionalProperties", "nsTypes", null);
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ItemId'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ParentFolderId'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ItemClass'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Attachments'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Subject'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:DateTimeReceived'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Size'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Categories'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:HasAttachments'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Importance'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:IsDraft'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:IsFromMe'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:IsResend'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:IsSubmitted'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:IsUnmodified'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:DateTimeSent'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:DateTimeCreated'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Body'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ResponseObjects'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:Sensitivity'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ReminderDueBy'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ReminderIsSet'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:ReminderMinutesBeforeStart'/>");
-		xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:EffectiveRights'/>");
-		//xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:MimeContent'/>");
-
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-
-		if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1 )) {
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:UniqueBody'/>");
-		}
-		else { // Exchange2007
-		}
-
-		var extFieldURI;
-		extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-		xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
-		xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidReminderSignalTime);
-		xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-
-		extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-		xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
-		xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidReminderSet);
-		xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
-		
-		extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-		xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
-		xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidReminderDelta);
-		xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-		extFieldURI= xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-		xml2json.setAttribute(extFieldURI,"PropertyTag", MAPI_MessageId);
-		xml2json.setAttribute(extFieldURI,"PropertyType","String");
-		
-			// Calendar fields
-		switch (this.folderClass) {
-		case "IPF.Appointment":
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Start'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:End'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:OriginalStart'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:IsAllDayEvent'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:LegacyFreeBusyStatus'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Location'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:When'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:IsMeeting'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:IsCancelled'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:IsRecurring'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:MeetingRequestWasSent'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:IsResponseRequested'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:CalendarItemType'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:MyResponseType'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Organizer'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:RequiredAttendees'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:OptionalAttendees'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Resources'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Duration'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:TimeZone'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:Recurrence'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:ConferenceType'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:AllowNewTimeProposal'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:IsOnlineMeeting'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:MeetingWorkspaceUrl'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:UID'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:RecurrenceId'/>");
-
-			if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1 )) {
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:StartTimeZone'/>");
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:EndTimeZone'/>");
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:ModifiedOccurrences'/>");
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:DeletedOccurrences'/>");
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:FirstOccurrence'/>");
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:LastOccurrence'/>");
-			}
-			else { // Exchange2007
-				xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='calendar:MeetingTimeZone'/>");
-			}
-			break;	
-
-		case "IPF.Task":
-			//Task fields
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:ActualWork'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:AssignedTime'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:BillingInformation'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:ChangeCount'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Companies'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:CompleteDate'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Contacts'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:DelegationState'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Delegator'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:DueDate'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:IsAssignmentEditable'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:IsComplete'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:IsRecurring'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:IsTeamTask'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Mileage'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Owner'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:PercentComplete'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Recurrence'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:StartDate'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Status'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:StatusDescription'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:TotalWork'/>");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAccepted);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskLastUpdate);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAcceptanceState);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskMode);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskGlobalId);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Binary");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskHistory);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskOwnership);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-			
-		case "IPF.Note":	
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:ActualWork'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:AssignedTime'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:BillingInformation'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:ChangeCount'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Companies'/>");
- 			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Contacts'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:DelegationState'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Delegator'/>");
- 			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:IsAssignmentEditable'/>");
- 			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:IsTeamTask'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Mileage'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Owner'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:PercentComplete'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:Recurrence'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:StatusDescription'/>");
-			xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='task:TotalWork'/>");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAccepted);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskLastUpdate);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAcceptanceState);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskMode);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskGlobalId);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Binary");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskHistory);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskOwnership);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer"); 
-			
-			/* Task Followup MAPI Properties */
-			
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskStartDate);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-			
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskDueDate);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-	 
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskStatus);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
-			
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidPercentComplete);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Double");
-						
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskComplete);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
-			 
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidCommonEnd);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-			
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidCommonStart);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-			
-			extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
-			xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskDateCompleted);
-			xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
-			
-			extFieldURI= xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI,"PropertyTag", MAPI_PidTagFlagStatus);
-			xml2json.setAttribute(extFieldURI,"PropertyType","Integer");
-			
-			extFieldURI= xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI,"PropertyTag", MAPI_PidTagFollowupIcon);
-			xml2json.setAttribute(extFieldURI,"PropertyType","Integer"); 
-
-			extFieldURI= xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
-			xml2json.setAttribute(extFieldURI,"PropertyTag", MAPI_PidTagToDoItemFlags);
-			xml2json.setAttribute(extFieldURI,"PropertyType","Integer");
-		
-			
-		}
-/*
-			//meeting fields
-			req.nsMessages::ItemShape.nsTypes::AdditionalProperties.content += <>
-				<nsTypes:FieldURI FieldURI="meeting:AssociatedCalendarItemId" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:IsDelegated" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:IsOutOfDate" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:HasBeenProcessed" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meeting:ResponseType" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meetingRequest:MeetingRequestType" xmlns:nsTypes={nsTypes}/>
-				<nsTypes:FieldURI FieldURI="meetingRequest:IntendedFreeBusyStatus" xmlns:nsTypes={nsTypes}/>
-				</>;
-*/
-
-		var itemids = xml2json.addTag(req, "ItemIds", "nsMessages", null);
-		for each (var item in this.ids) {
-			var itemId = xml2json.addTag(itemids, "ItemId", "nsTypes", null);
-			xml2json.setAttribute(itemId, "Id", item.Id);
-			this.requestedItemId.push(item.Id);
-			if (item.ChangeKey) {
-				xml2json.setAttribute(itemId, "ChangeKey", item.ChangeKey);
-			}
-			if (item.index) {
-				//exchWebService.commonFunctions.LOG("erGetTaskItemsRequest.execute. We have an index.");
-				this.argument.occurrenceIndexes[item.Id] = item.index;
-			}
-			itemId = null;
-		}
-		itemids = null;
-
-		this.parent.xml2json = true;
-		
-	//	exchWebService.commonFunctions.LOG("erGetItemsRequest.execute: "+   xml2json.toString(req) +"\n");
-
-		this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-
-		itemShape = null;
-		additionalProperties = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-	//	exchWebService.commonFunctions.LOG("erGetItemsRequest.onSendOk: "+ String(aResp)+"\n");
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Items/*");
-
-		var rmErrorSearch = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
-		var rmErrors = [];
-		if (rmErrorSearch.length > 0) {
-			var i = 0;
-			while (i < rmErrorSearch.length) {
-				if (xml2json.getAttribute(rmErrorSearch[i], "ResponseClass", "") == "Error") {
-					//dump("Found an get item with error answer. id:"+this.requestedItemId[i]+"\n");
-					rmErrors.push(this.requestedItemId[i]);
-				}
-				i++;
-			}
-		}
-
-		if (this.mCbOk) {
-			this.mCbOk(this, rm, rmErrors);
-		}
-
-		this.isRunning = false;
-		this.parent = null;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		//dump("erGetItemsRequest.onSendError: "+String(aMsg)+"\n");
-		this.isRunning = false;
-		this.parent = null;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erGetTaskItemsRequest.execute\n");
+
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:GetItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
+        //		xml2json.addTag(itemShape, "BodyType", "nsTypes", "Text");
+        xml2json.addTag(itemShape, "BodyType", "nsTypes", "Best");
+
+        var additionalProperties = xml2json.addTag(itemShape, "AdditionalProperties", "nsTypes", null);
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ItemId'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ParentFolderId'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ItemClass'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Attachments'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Subject'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:DateTimeReceived'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Size'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Categories'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:HasAttachments'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Importance'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:IsDraft'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:IsFromMe'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:IsResend'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:IsSubmitted'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:IsUnmodified'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:DateTimeSent'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:DateTimeCreated'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Body'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ResponseObjects'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:Sensitivity'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ReminderDueBy'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ReminderIsSet'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:ReminderMinutesBeforeStart'/>");
+        xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:EffectiveRights'/>");
+        //xml2json.parseXML(additionalProperties,"<nsTypes:FieldURI FieldURI='item:MimeContent'/>");
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+        if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='item:UniqueBody'/>");
+        }
+        else { // Exchange2007
+        }
+
+        var extFieldURI;
+        extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+        xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
+        xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidReminderSignalTime);
+        xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+        extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+        xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
+        xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidReminderSet);
+        xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
+
+        extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+        xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
+        xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidReminderDelta);
+        xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+        extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+        xml2json.setAttribute(extFieldURI, "PropertyTag", MAPI_MessageId);
+        xml2json.setAttribute(extFieldURI, "PropertyType", "String");
+
+        // Calendar fields
+        switch (this.folderClass) {
+        case "IPF.Appointment":
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Start'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:End'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:OriginalStart'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:IsAllDayEvent'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:LegacyFreeBusyStatus'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Location'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:When'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:IsMeeting'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:IsCancelled'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:IsRecurring'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:MeetingRequestWasSent'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:IsResponseRequested'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:CalendarItemType'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:MyResponseType'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Organizer'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:RequiredAttendees'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:OptionalAttendees'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Resources'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Duration'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:TimeZone'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:Recurrence'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:ConferenceType'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:AllowNewTimeProposal'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:IsOnlineMeeting'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:MeetingWorkspaceUrl'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:UID'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:RecurrenceId'/>");
+
+            if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2010") > -1) || (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1)) {
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:StartTimeZone'/>");
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:EndTimeZone'/>");
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:ModifiedOccurrences'/>");
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:DeletedOccurrences'/>");
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:FirstOccurrence'/>");
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:LastOccurrence'/>");
+            }
+            else { // Exchange2007
+                xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='calendar:MeetingTimeZone'/>");
+            }
+            break;
+
+        case "IPF.Task":
+            //Task fields
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:ActualWork'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:AssignedTime'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:BillingInformation'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:ChangeCount'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Companies'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:CompleteDate'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Contacts'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:DelegationState'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Delegator'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:DueDate'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:IsAssignmentEditable'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:IsComplete'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:IsRecurring'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:IsTeamTask'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Mileage'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Owner'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:PercentComplete'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Recurrence'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:StartDate'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Status'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:StatusDescription'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:TotalWork'/>");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAccepted);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskLastUpdate);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAcceptanceState);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskMode);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskGlobalId);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Binary");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskHistory);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskOwnership);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+        case "IPF.Note":
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:ActualWork'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:AssignedTime'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:BillingInformation'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:ChangeCount'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Companies'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Contacts'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:DelegationState'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Delegator'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:IsAssignmentEditable'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:IsTeamTask'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Mileage'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Owner'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:PercentComplete'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:Recurrence'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:StatusDescription'/>");
+            xml2json.parseXML(additionalProperties, "<nsTypes:FieldURI FieldURI='task:TotalWork'/>");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAccepted);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskLastUpdate);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskAcceptanceState);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskMode);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskGlobalId);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Binary");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskHistory);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskOwnership);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            /* Task Followup MAPI Properties */
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskStartDate);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskDueDate);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskStatus);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidPercentComplete);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Double");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskComplete);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Boolean");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidCommonEnd);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Common");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidCommonStart);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "DistinguishedPropertySetId", "Task");
+            xml2json.setAttribute(extFieldURI, "PropertyId", MAPI_PidLidTaskDateCompleted);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "SystemTime");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "PropertyTag", MAPI_PidTagFlagStatus);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "PropertyTag", MAPI_PidTagFollowupIcon);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+            extFieldURI = xml2json.addTag(additionalProperties, "ExtendedFieldURI", "nsTypes", null);
+            xml2json.setAttribute(extFieldURI, "PropertyTag", MAPI_PidTagToDoItemFlags);
+            xml2json.setAttribute(extFieldURI, "PropertyType", "Integer");
+
+
+        }
+        /*
+        			//meeting fields
+        			req.nsMessages::ItemShape.nsTypes::AdditionalProperties.content += <>
+        				<nsTypes:FieldURI FieldURI="meeting:AssociatedCalendarItemId" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:IsDelegated" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:IsOutOfDate" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:HasBeenProcessed" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meeting:ResponseType" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meetingRequest:MeetingRequestType" xmlns:nsTypes={nsTypes}/>
+        				<nsTypes:FieldURI FieldURI="meetingRequest:IntendedFreeBusyStatus" xmlns:nsTypes={nsTypes}/>
+        				</>;
+        */
+
+        var itemids = xml2json.addTag(req, "ItemIds", "nsMessages", null);
+        for each(var item in this.ids) {
+            var itemId = xml2json.addTag(itemids, "ItemId", "nsTypes", null);
+            xml2json.setAttribute(itemId, "Id", item.Id);
+            this.requestedItemId.push(item.Id);
+            if (item.ChangeKey) {
+                xml2json.setAttribute(itemId, "ChangeKey", item.ChangeKey);
+            }
+            if (item.index) {
+                //exchWebService.commonFunctions.LOG("erGetTaskItemsRequest.execute. We have an index.");
+                this.argument.occurrenceIndexes[item.Id] = item.index;
+            }
+            itemId = null;
+        }
+        itemids = null;
+
+        this.parent.xml2json = true;
+
+        //	exchWebService.commonFunctions.LOG("erGetItemsRequest.execute: "+   xml2json.toString(req) +"\n");
+
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+
+        itemShape = null;
+        additionalProperties = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //	exchWebService.commonFunctions.LOG("erGetItemsRequest.onSendOk: "+ String(aResp)+"\n");
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Items/*");
+
+        var rmErrorSearch = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
+        var rmErrors = [];
+        if (rmErrorSearch.length > 0) {
+            var i = 0;
+            while (i < rmErrorSearch.length) {
+                if (xml2json.getAttribute(rmErrorSearch[i], "ResponseClass", "") == "Error") {
+                    //dump("Found an get item with error answer. id:"+this.requestedItemId[i]+"\n");
+                    rmErrors.push(this.requestedItemId[i]);
+                }
+                i++;
+            }
+        }
+
+        if (this.mCbOk) {
+            this.mCbOk(this, rm, rmErrors);
+        }
+
+        this.isRunning = false;
+        this.parent = null;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //dump("erGetItemsRequest.onSendError: "+String(aMsg)+"\n");
+        this.isRunning = false;
+        this.parent = null;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetMasterOccurrenceId.js b/components/erGetMasterOccurrenceId.js
index e29b8a43..2296d220 100644
--- a/components/erGetMasterOccurrenceId.js
+++ b/components/erGetMasterOccurrenceId.js
@@ -50,93 +50,91 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetMasterOccurrenceIdRequest"];
 
-function erGetMasterOccurrenceIdRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-
-	switch (aArgument.getType) {
-		case "lightning" :
-			this.id = aArgument.item.id;
-			this.changeKey = aArgument.item.changeKey;
-			break;
-		case "exchange" :
-			this.id = aArgument.item.Id;
-			this.changeKey = aArgument.item.ChangeKey;
-			break;
-	}
-
-	this.isRunning = true;
-	this.execute();
+function erGetMasterOccurrenceIdRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+
+    switch (aArgument.getType) {
+    case "lightning":
+        this.id = aArgument.item.id;
+        this.changeKey = aArgument.item.changeKey;
+        break;
+    case "exchange":
+        this.id = aArgument.item.Id;
+        this.changeKey = aArgument.item.ChangeKey;
+        break;
+    }
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetMasterOccurrenceIdRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.execute\n");
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.execute\n");
 
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
 
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null); 
-		itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
 
-		var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var recurringMasterItemId = itemids.addChildTag("RecurringMasterItemId", "nsTypes", null);
-		recurringMasterItemId.setAttribute("OccurrenceId", this.id);
-		recurringMasterItemId.setAttribute("ChangeKey", this.changeKey);
+        var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var recurringMasterItemId = itemids.addChildTag("RecurringMasterItemId", "nsTypes", null);
+        recurringMasterItemId.setAttribute("OccurrenceId", this.id);
+        recurringMasterItemId.setAttribute("ChangeKey", this.changeKey);
 
-		req.addChildTagObject(itemids);
-		itemids = null;
+        req.addChildTagObject(itemids);
+        itemids = null;
 
-		this.parent.xml2jxon = true;
+        this.parent.xml2jxon = true;
 
-		//exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
+        //exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
 
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.onSendOk>"+String(aResp));
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetMasterOccurrenceIdRequest.onSendOk>"+String(aResp));
 
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Items/*");
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']/m:Items/*");
 
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting OccurrenceMasterId.");
-			rm = null;
-			return;
-		}
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting OccurrenceMasterId.");
+            rm = null;
+            return;
+        }
 
-		var aId = rm[0].getAttributeByTag("t:ItemId","Id");
-		var aChangeKey = rm[0].getAttributeByTag("t:ItemId","ChangeKey");
-		
-		rm = null;
+        var aId = rm[0].getAttributeByTag("t:ItemId", "Id");
+        var aChangeKey = rm[0].getAttributeByTag("t:ItemId", "ChangeKey");
 
-		if (this.mCbOk) {
-			this.mCbOk(this, aId, aChangeKey);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+        rm = null;
 
+        if (this.mCbOk) {
+            this.mCbOk(this, aId, aChangeKey);
+        }
+        this.isRunning = false;
+    },
 
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erGetMeetingRequestByUID.js b/components/erGetMeetingRequestByUID.js
index 52b27fff..2c46c5dd 100644
--- a/components/erGetMeetingRequestByUID.js
+++ b/components/erGetMeetingRequestByUID.js
@@ -59,145 +59,143 @@ const MAPI_PidLidReminderDelta = "34049";
 
 var EXPORTED_SYMBOLS = ["erGetMeetingRequestByUIDRequest"];
 
-function erGetMeetingRequestByUIDRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderBase = aArgument.folderBase;
-	this.listener = aListener;
-
-	this.isRunning = true;
-	this.execute();
+function erGetMeetingRequestByUIDRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderBase = aArgument.folderBase;
+    this.listener = aListener;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetMeetingRequestByUIDRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetMeetingRequestByUIDRequest.execute\n");
-
-		//var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		//req.setAttribute("Traversal", "Shallow");
-
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-		xml2json.setAttribute(req, "Traversal", "Shallow");
-
-		//var itemShape = req.addChildTag("ItemShape", "nsMessages", null); 
-		//itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
-		//itemShape.addChildTag("BodyType", "nsTypes", "Text");
-
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		xml2json.addTag(itemShape, "BaseShape", "nsTypes", "AllProperties");		
-		xml2json.addTag(itemShape, "BodyType", "nsTypes", "Best");
-
-		//var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		//var isEqualTo = restr.addChildTag("IsEqualTo", "nsTypes", null);
-		//isEqualTo.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
-		//isEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.Schedule.Meeting.Request");
-
-		var restriction = xml2json.addTag(req, "Restriction", "nsMessages", null); 
-		var isEqualTo = xml2json.addTag(restriction, "IsEqualTo", "nsTypes", null);
-		var fieldUri = xml2json.addTag(isEqualTo, "FieldURI", "nsTypes", null);
-		xml2json.setAttribute(fieldUri, "FieldURI", "item:ItemClass");
-		var fieldURIOrConstant = xml2json.addTag(isEqualTo, "FieldURIOrConstant", "nsTypes", null);
-		var constant = xml2json.addTag(fieldURIOrConstant, "Constant", "nsTypes", null);
-		xml2json.setAttribute(constant, "Value", "IPM.Schedule.Meeting.Request");
-
-		/*var and = restr.addChildTag("And", "nsTypes", null);
-		var isEqualTo1 = and.addChildTag("IsEqualTo", "nsTypes", null);
-		isEqualTo1.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
-		isEqualTo1.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.Schedule.Meeting.Request");
-
-		var isEqualTo2 = and.addChildTag("IsEqualTo", "nsTypes", null);
-		isEqualTo2.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:UID");
-		isEqualTo2.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", this.argument.uid);*/
-
-		//req.addChildTagObject(restr);
-		//restr = null;
-
-		//var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-		//req.addChildTagObject(parentFolder);
-		//parentFolder = null;
-
-		var parentFolder = makeParentFolderIds3("ParentFolderIds", this.argument);
-		xml2json.addTagObject(req,parentFolder);
-		parentFolder = null;
-
-		this.parent.xml2json = true;
-
-		//exchWebService.commonFunctions.LOG("erGetMeetingRequestByUIDRequest.execute:"+String(this.parent.makeSoapMessage2(req)));
-                //this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-                this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetMeetingRequestByUIDRequest.onSendOk:"+String(aResp));
-
-		//var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
-
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field responsecode");
-			return;
-		}
-
-		//var responseCode = rm[0].value;
-		var responseCode = xml2json.getValue(rm[0]);
-		rm = null;
-
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting erGetMeetingRequestByUIDRequest:"+responseCode);
-			return;
-		}
-
-		//var rootFolder = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:RootFolder");
-		var rootFolder = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:RootFolder");
-		if (rootFolder.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field rootfolder");
-			return;
-		}
-
-		//var totalItemsInView = rootFolder[0].getAttribute("TotalItemsInView", 0);
-		var totalItemsInView = xml2json.getAttribute(rootFolder[0], "TotalItemsInView", 0);
-		//var includesLastItemInRange = rootFolder[0].getAttribute("IncludesLastItemInRange", "true");
-		var includesLastItemInRange = xml2json.getAttribute(rootFolder[0], "IncludesLastItemInRange", "true");
-
-		var aMeetingRequests = [];
-		for each(var tmpItem in xml2json.XPath(rootFolder[0],"/t:Items/*")) {
-			if (xml2json.getTagValue(tmpItem, "t:UID") == this.argument.uid) {
-				aMeetingRequests.push(tmpItem);
-			}
-		}
-		rootFolder = null;
-		
-		if (this.mCbOk) {
-			this.mCbOk(this, aMeetingRequests);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetMeetingRequestByUIDRequest.execute\n");
+
+        //var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        //req.setAttribute("Traversal", "Shallow");
+
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:FindItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+        xml2json.setAttribute(req, "Traversal", "Shallow");
+
+        //var itemShape = req.addChildTag("ItemShape", "nsMessages", null); 
+        //itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
+        //itemShape.addChildTag("BodyType", "nsTypes", "Text");
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        xml2json.addTag(itemShape, "BaseShape", "nsTypes", "AllProperties");
+        xml2json.addTag(itemShape, "BodyType", "nsTypes", "Best");
+
+        //var restr = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Restriction xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+        //var isEqualTo = restr.addChildTag("IsEqualTo", "nsTypes", null);
+        //isEqualTo.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
+        //isEqualTo.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.Schedule.Meeting.Request");
+
+        var restriction = xml2json.addTag(req, "Restriction", "nsMessages", null);
+        var isEqualTo = xml2json.addTag(restriction, "IsEqualTo", "nsTypes", null);
+        var fieldUri = xml2json.addTag(isEqualTo, "FieldURI", "nsTypes", null);
+        xml2json.setAttribute(fieldUri, "FieldURI", "item:ItemClass");
+        var fieldURIOrConstant = xml2json.addTag(isEqualTo, "FieldURIOrConstant", "nsTypes", null);
+        var constant = xml2json.addTag(fieldURIOrConstant, "Constant", "nsTypes", null);
+        xml2json.setAttribute(constant, "Value", "IPM.Schedule.Meeting.Request");
+
+        /*var and = restr.addChildTag("And", "nsTypes", null);
+        var isEqualTo1 = and.addChildTag("IsEqualTo", "nsTypes", null);
+        isEqualTo1.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:ItemClass");
+        isEqualTo1.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", "IPM.Schedule.Meeting.Request");
+
+        var isEqualTo2 = and.addChildTag("IsEqualTo", "nsTypes", null);
+        isEqualTo2.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:UID");
+        isEqualTo2.addChildTag("FieldURIOrConstant", "nsTypes", null).addChildTag("Constant", "nsTypes", null).setAttribute("Value", this.argument.uid);*/
+
+        //req.addChildTagObject(restr);
+        //restr = null;
+
+        //var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        //req.addChildTagObject(parentFolder);
+        //parentFolder = null;
+
+        var parentFolder = makeParentFolderIds3("ParentFolderIds", this.argument);
+        xml2json.addTagObject(req, parentFolder);
+        parentFolder = null;
+
+        this.parent.xml2json = true;
+
+        //exchWebService.commonFunctions.LOG("erGetMeetingRequestByUIDRequest.execute:"+String(this.parent.makeSoapMessage2(req)));
+        //this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetMeetingRequestByUIDRequest.onSendOk:"+String(aResp));
+
+        //var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:ResponseCode");
+
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field responsecode");
+            return;
+        }
+
+        //var responseCode = rm[0].value;
+        var responseCode = xml2json.getValue(rm[0]);
+        rm = null;
+
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting erGetMeetingRequestByUIDRequest:" + responseCode);
+            return;
+        }
+
+        //var rootFolder = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:RootFolder");
+        var rootFolder = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage/m:RootFolder");
+        if (rootFolder.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field rootfolder");
+            return;
+        }
+
+        //var totalItemsInView = rootFolder[0].getAttribute("TotalItemsInView", 0);
+        var totalItemsInView = xml2json.getAttribute(rootFolder[0], "TotalItemsInView", 0);
+        //var includesLastItemInRange = rootFolder[0].getAttribute("IncludesLastItemInRange", "true");
+        var includesLastItemInRange = xml2json.getAttribute(rootFolder[0], "IncludesLastItemInRange", "true");
+
+        var aMeetingRequests = [];
+        for each(var tmpItem in xml2json.XPath(rootFolder[0], "/t:Items/*")) {
+            if (xml2json.getTagValue(tmpItem, "t:UID") == this.argument.uid) {
+                aMeetingRequests.push(tmpItem);
+            }
+        }
+        rootFolder = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, aMeetingRequests);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetOccurrenceIndex.js b/components/erGetOccurrenceIndex.js
index 9a8c4b72..99e92360 100644
--- a/components/erGetOccurrenceIndex.js
+++ b/components/erGetOccurrenceIndex.js
@@ -52,154 +52,156 @@ Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
 
 var EXPORTED_SYMBOLS = ["erGetOccurrenceIndexRequest"];
 
-function erGetOccurrenceIndexRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.masterID = aArgument.masterItem.id;
-	this.masterChangeKey = aArgument.masterItem.changeKey;
-//	this.startDate = aArgument.masterItem.getProperty("X-Start");
-
-	this.currentSearchIndex = 1;
-	this.currentRealIndex = 0;
-	this.idGroupSize = 15; // We will request in pages of 15 occurrences of the list at once
-
-	var self = this;
-
-	this.isRunning = true;
-	var tmpObject = new erGetMasterOccurrenceIdRequest( 
-			{user: aArgument.user, 
-			 serverUrl: aArgument.serverUrl,
-			 item: aArgument.item,
-			 folderID: aArgument.folderID,
-			 changeKey: aArgument.changeKey,
-			 getType: "lightning" }, 
-			function(erGetMasterOccurrenceIdRequest, aId, aChangeKey) { self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey);}, 
-			function(erGetMasterOccurrenceIdRequest, aCode, aMsg) { self.onSendError(erGetMasterOccurrenceIdRequest, aCode, aMsg);},
-			aListener);
-
-//	this.execute();
+function erGetOccurrenceIndexRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.masterID = aArgument.masterItem.id;
+    this.masterChangeKey = aArgument.masterItem.changeKey;
+    //	this.startDate = aArgument.masterItem.getProperty("X-Start");
+
+    this.currentSearchIndex = 1;
+    this.currentRealIndex = 0;
+    this.idGroupSize = 15; // We will request in pages of 15 occurrences of the list at once
+
+    var self = this;
+
+    this.isRunning = true;
+    var tmpObject = new erGetMasterOccurrenceIdRequest({
+            user: aArgument.user,
+            serverUrl: aArgument.serverUrl,
+            item: aArgument.item,
+            folderID: aArgument.folderID,
+            changeKey: aArgument.changeKey,
+            getType: "lightning"
+        },
+        function (erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
+            self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey);
+        },
+        function (erGetMasterOccurrenceIdRequest, aCode, aMsg) {
+            self.onSendError(erGetMasterOccurrenceIdRequest, aCode, aMsg);
+        },
+        aListener);
+
+    //	this.execute();
 }
 
 erGetOccurrenceIndexRequest.prototype = {
 
-	execute: function _execute()
-	{
-		exchWebService.commonFunctions.LOG("erGetOccurrenceIndexRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null); 
-		itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
-
-		itemShape.addChildTag("AdditionalProperties", "nsTypes", null).addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI","calendar:Start");		
-
-		var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		for (var x = 0; x < this.idGroupSize; x++) {
-			var occurrenceItemId = itemids.addChildTag("OccurrenceItemId", "nsTypes", null);
-			occurrenceItemId.setAttribute("RecurringMasterId", this.masterID);
-			occurrenceItemId.setAttribute("ChangeKey", this.masterChangeKey);
-			occurrenceItemId.setAttribute("InstanceIndex", this.currentSearchIndex++);
-		}
-
-		req.addChildTagObject(itemids);
-		itemids = null;
-
-		this.parent.xml2jxon = true;
-
-//		exchWebService.commonFunctions.LOG("erGetOccurrenceIndexRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-//		exchWebService.commonFunctions.LOG("erGetOccurrenceIndexRequest.onSendOk>"+String(aResp));
-		var finished = false;
-		var found = false;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
-
-		for each (var e in rm) {
-
-			var responseCode = e.getTagValue("m:ResponseCode");
-			switch (responseCode) {
-				case "ErrorCalendarOccurrenceIsDeletedFromRecurrence" :
-					this.currentRealIndex++;
-					break;
-				case "NoError":
-					var items = e.XPath("/m:Items/*");
-					for each(var item in items) {
-						this.currentRealIndex++;
-						if (this.argument.item.id == item.getAttributeByTag("t:ItemId","Id")) {
-							// We found our occurrence
-							finished = true;
-							found = true;
-							break;
-						}
-					}
-					items = null;
-					break;
-				case "ErrorCalendarOccurrenceIndexIsOutOfRecurrenceRange" :
-					finished = true;
-			}
-
-			if ((finished) || (found)) {
-				break;	// break the loop
-			}
-		}
-		rm = null;
-
-		if (found) {
-			// We found our occurrence.
-			if (this.mCbOk) {
-				this.mCbOk(this, this.currentRealIndex, this.masterID, this.masterChangeKey);
-			}
-			this.isRunning = false;
-		}
-		else {
-			if (finished) {
-				// We hit the end of the occurrence list and did not find our occurrence.
-				// Error....
-				this.onSendError(aExchangeRequest, this.parent.ER_ERROR_GETOCCURRENCEINDEX_NOTFOUND, "Index could not be found for occurrence.");
-				return;
-			}
-			else {
-				// We did not find the occurrence but we did not yet hit the end of the
-				// occurrence list. Request the next page.
-				this.execute();
-			}
-		}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-
-	getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey)
-	{
-		this.masterID = aId;
-		this.masterChangeKey = aChangeKey;
-
-		this.execute();
-	},
+    execute: function _execute() {
+        exchWebService.commonFunctions.LOG("erGetOccurrenceIndexRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "IdOnly");
+
+        itemShape.addChildTag("AdditionalProperties", "nsTypes", null).addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "calendar:Start");
+
+        var itemids = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemIds xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        for (var x = 0; x < this.idGroupSize; x++) {
+            var occurrenceItemId = itemids.addChildTag("OccurrenceItemId", "nsTypes", null);
+            occurrenceItemId.setAttribute("RecurringMasterId", this.masterID);
+            occurrenceItemId.setAttribute("ChangeKey", this.masterChangeKey);
+            occurrenceItemId.setAttribute("InstanceIndex", this.currentSearchIndex++);
+        }
+
+        req.addChildTagObject(itemids);
+        itemids = null;
+
+        this.parent.xml2jxon = true;
+
+        //		exchWebService.commonFunctions.LOG("erGetOccurrenceIndexRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //		exchWebService.commonFunctions.LOG("erGetOccurrenceIndexRequest.onSendOk>"+String(aResp));
+        var finished = false;
+        var found = false;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:GetItemResponse/m:ResponseMessages/m:GetItemResponseMessage");
+
+        for each(var e in rm) {
+
+            var responseCode = e.getTagValue("m:ResponseCode");
+            switch (responseCode) {
+            case "ErrorCalendarOccurrenceIsDeletedFromRecurrence":
+                this.currentRealIndex++;
+                break;
+            case "NoError":
+                var items = e.XPath("/m:Items/*");
+                for each(var item in items) {
+                    this.currentRealIndex++;
+                    if (this.argument.item.id == item.getAttributeByTag("t:ItemId", "Id")) {
+                        // We found our occurrence
+                        finished = true;
+                        found = true;
+                        break;
+                    }
+                }
+                items = null;
+                break;
+            case "ErrorCalendarOccurrenceIndexIsOutOfRecurrenceRange":
+                finished = true;
+            }
+
+            if ((finished) || (found)) {
+                break; // break the loop
+            }
+        }
+        rm = null;
+
+        if (found) {
+            // We found our occurrence.
+            if (this.mCbOk) {
+                this.mCbOk(this, this.currentRealIndex, this.masterID, this.masterChangeKey);
+            }
+            this.isRunning = false;
+        }
+        else {
+            if (finished) {
+                // We hit the end of the occurrence list and did not find our occurrence.
+                // Error....
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_GETOCCURRENCEINDEX_NOTFOUND, "Index could not be found for occurrence.");
+                return;
+            }
+            else {
+                // We did not find the occurrence but we did not yet hit the end of the
+                // occurrence list. Request the next page.
+                this.execute();
+            }
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+
+    getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
+        this.masterID = aId;
+        this.masterChangeKey = aChangeKey;
+
+        this.execute();
+    },
 
 };
-
-
diff --git a/components/erGetTimeZones.js b/components/erGetTimeZones.js
index a52870f5..a545f363 100644
--- a/components/erGetTimeZones.js
+++ b/components/erGetTimeZones.js
@@ -55,84 +55,82 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetTimeZonesRequest"];
 
-function erGetTimeZonesRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	// Check if we have at least Exchange server version 2010.
-	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-			.getService(Ci.mivExchangeStatistics);
-
-/*	if (this.exchangeStatistics.getServerVersion(aArgument.serverUrl).indexOf("2010") == -1) {
-		return;
-	}
-*/
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-	this.isRunning = true;
-	this.execute();
+function erGetTimeZonesRequest(aArgument, aCbOk, aCbError, aListener) {
+    // Check if we have at least Exchange server version 2010.
+    this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+        .getService(Ci.mivExchangeStatistics);
+
+    /*	if (this.exchangeStatistics.getServerVersion(aArgument.serverUrl).indexOf("2010") == -1) {
+    		return;
+    	}
+    */
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetTimeZonesRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetTimeZonesRequest\n");
-
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:GetServerTimeZones xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-		xml2json.setAttribute(req, "ReturnFullTimeZoneData", "true");
-
-		this.parent.xml2json = true;
-		//dump("erGetTimeZonesRequest.execute:"+req.toString()+"\n");
-                this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetTimeZonesRequest.onSendOk:"+String(aResp));
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetServerTimeZonesResponse/m:ResponseMessages/m:GetServerTimeZonesResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-
-			if (this.mCbOk) {
-				this.mCbOk(this, aResp);
-			}
-			this.isRunning = false;
-		}
-		else {
-			exchWebService.commonFunctions.LOG("erGetTimeZonesRequest.onSendOk: DID NOT FIND valid response.");
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during SyncFolderItems:");//+ResponseCode);
-			rm = null;
-			return;
-		}
-		rm = null;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		//exchWebService.commonFunctions.LOG("erGetTimeZonesRequest.onSendError:"+aMsg);
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetTimeZonesRequest\n");
+
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:GetServerTimeZones xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+        xml2json.setAttribute(req, "ReturnFullTimeZoneData", "true");
+
+        this.parent.xml2json = true;
+        //dump("erGetTimeZonesRequest.execute:"+req.toString()+"\n");
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetTimeZonesRequest.onSendOk:"+String(aResp));
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:GetServerTimeZonesResponse/m:ResponseMessages/m:GetServerTimeZonesResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+
+            if (this.mCbOk) {
+                this.mCbOk(this, aResp);
+            }
+            this.isRunning = false;
+        }
+        else {
+            exchWebService.commonFunctions.LOG("erGetTimeZonesRequest.onSendOk: DID NOT FIND valid response.");
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during SyncFolderItems:"); //+ResponseCode);
+            rm = null;
+            return;
+        }
+        rm = null;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //exchWebService.commonFunctions.LOG("erGetTimeZonesRequest.onSendError:"+aMsg);
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetUserAvailability.js b/components/erGetUserAvailability.js
index d30cc2b6..00c08bad 100644
--- a/components/erGetUserAvailability.js
+++ b/components/erGetUserAvailability.js
@@ -52,136 +52,134 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetUserAvailabilityRequest"];
 
-function erGetUserAvailabilityRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.email = aArgument.email;
-	this.attendeeType = aArgument.attendeeType;
-	this.start = aArgument.start;
-	this.end = aArgument.end;
-
-	this.isRunning = true;
-	this.execute();
+function erGetUserAvailabilityRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.email = aArgument.email;
+    this.attendeeType = aArgument.attendeeType;
+    this.start = aArgument.start;
+    this.end = aArgument.end;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetUserAvailabilityRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.execute\n");
-
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:GetUserAvailabilityRequest xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-
-		/* WTF really?  Just give me UTC. */
-		var timeZone = xml2json.addTag(req, "TimeZone", "nsTypes", null);
-		xml2json.addTag(timeZone, "Bias", "nsTypes", "0");
-		var standardTime = xml2json.addTag(timeZone, "StandardTime", "nsTypes", null);
-		xml2json.addTag(standardTime, "Bias", "nsTypes", "0");
-		xml2json.addTag(standardTime, "Time", "nsTypes", "00:00:00");
-		xml2json.addTag(standardTime, "DayOrder", "nsTypes", "1");
-		xml2json.addTag(standardTime, "Month", "nsTypes", "0");
-		xml2json.addTag(standardTime, "DayOfWeek", "nsTypes", "Sunday");
-
-		var daylightTime = xml2json.addTag(timeZone, "DaylightTime", "nsTypes", null);
-		xml2json.addTag(daylightTime, "Bias", "nsTypes", "0");
-		xml2json.addTag(daylightTime, "Time", "nsTypes", "00:00:00");
-		xml2json.addTag(daylightTime, "DayOrder", "nsTypes", "1");
-		xml2json.addTag(daylightTime, "Month", "nsTypes", "0");
-		xml2json.addTag(daylightTime, "DayOfWeek", "nsTypes", "Sunday");
-
-		var mailboxDataArray = xml2json.addTag(req, "MailboxDataArray", "nsMessages", null);
-		var mailboxData = xml2json.addTag(mailboxDataArray, "MailboxData", "nsTypes", null);
-		var email = xml2json.addTag(mailboxData, "Email", "nsTypes", null);
-		xml2json.addTag(email, "Address", "nsTypes", this.email);
-		xml2json.addTag(mailboxData, "AttendeeType", "nsTypes", this.attendeeType);
-	
-		var freeBusyViewOptions = xml2json.addTag(req, "FreeBusyViewOptions", "nsTypes", null);
-		var timeWindow = xml2json.addTag(freeBusyViewOptions, "TimeWindow", "nsTypes", null);
-		xml2json.addTag(timeWindow, "StartTime", "nsTypes", this.start);
-		xml2json.addTag(timeWindow, "EndTime", "nsTypes", this.end);
-
-		xml2json.addTag(freeBusyViewOptions, "MergedFreeBusyIntervalInMinutes", "nsTypes", "15");
-
-		xml2json.addTag(freeBusyViewOptions, "RequestedView", "nsTypes", "DetailedMerged");
-
-		this.parent.xml2json = true;
-
-		//exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.execute: "+String(this.parent.makeSoapMessage(req))+"\n");
-                this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: "+String(aResp)+"\n");
-
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse/FreeBusyResponseArray/FreeBusyResponse/ResponseMessage[@ResponseClass='Success' and ResponseCode='NoError']");
-
-		if (rm.length == 0) {
-			rm = null;
-			var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse/FreeBusyResponseArray/FreeBusyResponse/ResponseMessage[@ResponseClass='Error']");
-			if (rm.length == 0) {
-				//Check if we only have a /s:Envelope/s:Body/GetUserAvailabilityResponse
-				var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse");
-				if (rm.length == 0) {
-					exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: Respons does not contain expected field");
-					this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
-					rm = null;
-					this.isRunning = false;
-					return;
-				}
-			}
-			else {
-				var responseCode = xml2json.getTagValue(rm[0], "m:ResponseCode", "");
-				var messageText = xml2json.getTagValue(rm[0], "m:MessageText", "");
-				if (responseCode.indexOf("ErrorMailRecipientNotFound") > -1) {
-					exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: "+messageText);
-				}
-				else {
-					exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: "+messageText);
-					this.onSendError(aExchangeRequest, this.parent.ER_ERROR_NOACCESSTOFREEBUSY, messageText);
-					rm = null;
-					this.isRunning = false;
-					return;
-				}
-			}
-		}
-		rm = null;
-
-		var items = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse/FreeBusyResponseArray/FreeBusyResponse/FreeBusyView/CalendarEventArray/CalendarEvent");
-
-		// We also need to get the working hour period. But lightning cannot handle this.
-		//dump("erGetUserAvailabilityRequest.onSendOk 2: We have '"+items.length+"' items.\n");
-	
-		if (this.mCbOk) {
-			this.mCbOk(this, items);
-		}
-		this.isRunning = false;
-		items = null;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		//exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendError: "+aCode+", "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.execute\n");
+
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:GetUserAvailabilityRequest xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+
+        /* WTF really?  Just give me UTC. */
+        var timeZone = xml2json.addTag(req, "TimeZone", "nsTypes", null);
+        xml2json.addTag(timeZone, "Bias", "nsTypes", "0");
+        var standardTime = xml2json.addTag(timeZone, "StandardTime", "nsTypes", null);
+        xml2json.addTag(standardTime, "Bias", "nsTypes", "0");
+        xml2json.addTag(standardTime, "Time", "nsTypes", "00:00:00");
+        xml2json.addTag(standardTime, "DayOrder", "nsTypes", "1");
+        xml2json.addTag(standardTime, "Month", "nsTypes", "0");
+        xml2json.addTag(standardTime, "DayOfWeek", "nsTypes", "Sunday");
+
+        var daylightTime = xml2json.addTag(timeZone, "DaylightTime", "nsTypes", null);
+        xml2json.addTag(daylightTime, "Bias", "nsTypes", "0");
+        xml2json.addTag(daylightTime, "Time", "nsTypes", "00:00:00");
+        xml2json.addTag(daylightTime, "DayOrder", "nsTypes", "1");
+        xml2json.addTag(daylightTime, "Month", "nsTypes", "0");
+        xml2json.addTag(daylightTime, "DayOfWeek", "nsTypes", "Sunday");
+
+        var mailboxDataArray = xml2json.addTag(req, "MailboxDataArray", "nsMessages", null);
+        var mailboxData = xml2json.addTag(mailboxDataArray, "MailboxData", "nsTypes", null);
+        var email = xml2json.addTag(mailboxData, "Email", "nsTypes", null);
+        xml2json.addTag(email, "Address", "nsTypes", this.email);
+        xml2json.addTag(mailboxData, "AttendeeType", "nsTypes", this.attendeeType);
+
+        var freeBusyViewOptions = xml2json.addTag(req, "FreeBusyViewOptions", "nsTypes", null);
+        var timeWindow = xml2json.addTag(freeBusyViewOptions, "TimeWindow", "nsTypes", null);
+        xml2json.addTag(timeWindow, "StartTime", "nsTypes", this.start);
+        xml2json.addTag(timeWindow, "EndTime", "nsTypes", this.end);
+
+        xml2json.addTag(freeBusyViewOptions, "MergedFreeBusyIntervalInMinutes", "nsTypes", "15");
+
+        xml2json.addTag(freeBusyViewOptions, "RequestedView", "nsTypes", "DetailedMerged");
+
+        this.parent.xml2json = true;
+
+        //exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.execute: "+String(this.parent.makeSoapMessage(req))+"\n");
+        this.parent.sendRequest(this.parent.makeSoapMessage2(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: "+String(aResp)+"\n");
+
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse/FreeBusyResponseArray/FreeBusyResponse/ResponseMessage[@ResponseClass='Success' and ResponseCode='NoError']");
+
+        if (rm.length == 0) {
+            rm = null;
+            var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse/FreeBusyResponseArray/FreeBusyResponse/ResponseMessage[@ResponseClass='Error']");
+            if (rm.length == 0) {
+                //Check if we only have a /s:Envelope/s:Body/GetUserAvailabilityResponse
+                var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse");
+                if (rm.length == 0) {
+                    exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: Respons does not contain expected field");
+                    this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
+                    rm = null;
+                    this.isRunning = false;
+                    return;
+                }
+            }
+            else {
+                var responseCode = xml2json.getTagValue(rm[0], "m:ResponseCode", "");
+                var messageText = xml2json.getTagValue(rm[0], "m:MessageText", "");
+                if (responseCode.indexOf("ErrorMailRecipientNotFound") > -1) {
+                    exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: " + messageText);
+                }
+                else {
+                    exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendOk: " + messageText);
+                    this.onSendError(aExchangeRequest, this.parent.ER_ERROR_NOACCESSTOFREEBUSY, messageText);
+                    rm = null;
+                    this.isRunning = false;
+                    return;
+                }
+            }
+        }
+        rm = null;
+
+        var items = xml2json.XPath(aResp, "/s:Envelope/s:Body/GetUserAvailabilityResponse/FreeBusyResponseArray/FreeBusyResponse/FreeBusyView/CalendarEventArray/CalendarEvent");
+
+        // We also need to get the working hour period. But lightning cannot handle this.
+        //dump("erGetUserAvailabilityRequest.onSendOk 2: We have '"+items.length+"' items.\n");
+
+        if (this.mCbOk) {
+            this.mCbOk(this, items);
+        }
+        this.isRunning = false;
+        items = null;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //exchWebService.commonFunctions.LOG("erGetUserAvailabilityRequest.onSendError: "+aCode+", "+aMsg+"\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erGetUserOofSettings.js b/components/erGetUserOofSettings.js
index 0a6b154c..a6dc0eba 100644
--- a/components/erGetUserOofSettings.js
+++ b/components/erGetUserOofSettings.js
@@ -50,109 +50,109 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetUserOofSettingsRequest"];
 
-function erGetUserOofSettingsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-
-	this.isRunning = true;
-	this.execute();
+function erGetUserOofSettingsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erGetUserOofSettingsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erGetUserOofSettingsRequest.execute\n");
-
-		//var req = <nsMessages:GetUserOofSettingsRequest xmlns:nsMessages={nsMessages}/>;
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetUserOofSettingsRequest xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		//req.nsTypes::Mailbox.nsTypes::Address = this.mailbox;
-		req.addChildTag("Mailbox", "nsTypes", null).addChildTag("Address", "nsTypes", this.mailbox);
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erGetUserOofSettingsRequest.execute: "+String(this.parent.makeSoapMessage(req))+"\n");
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erGetUserOofSettingsRequest.onSendOk: "+String(aResp)+"\n");
-
-		var oofSettingsResponse = aResp.XPath("/s:Envelope/s:Body/m:GetUserOofSettingsResponse");
-		var rm = oofSettingsResponse[0].XPath("/m:ResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		if (rm.length == 0) {
-			rm = null;
-			var rm = oofSettingsResponse[0].XPath("/m:ResponseMessage[@ResponseClass='Error']");
-			if (rm.length > 0) {
-				var responseCode = rm[0].getTagValue("m:ResponseCode");
-			}
-			else {
-				var responseCode = "unknown";
-			}
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting user Oof Settings:"+responseCode);
-			oofSettingsResponse = null;
-			rm = null;
-			return;
-		}
-		rm = null;
-
-		var oofSettingsXML = oofSettingsResponse[0].getTag("t:OofSettings");
-
-		var oofSettings = { oofState: "Disabled",
-				    startTime: null,
-				    endTime: null,
-				    externalAudience: "All",
-				    internalReply: "",
-				    externalReply: "",
-				    allowExternalOof: "All"};
-
-
-		oofSettings.oofState = oofSettingsXML.getTagValue("t:OofState", "Disabled");
-		oofSettings.externalAudience = oofSettingsXML.getTagValue("t:ExternalAudience", "All");
-
-		var duration = oofSettingsXML.getTag("t:Duration");
-
-		if (duration) {
-			oofSettings.startTime = cal.fromRFC3339(duration.getTagValue("t:StartTime"), exchWebService.commonFunctions.ecTZService().UTC).getInTimezone(exchWebService.commonFunctions.ecDefaultTimeZone());
-			oofSettings.endTime = cal.fromRFC3339(duration.getTagValue("t:EndTime"), exchWebService.commonFunctions.ecTZService().UTC).getInTimezone(exchWebService.commonFunctions.ecDefaultTimeZone());
-		}
-
-		oofSettings.internalReply = oofSettingsXML.getTag("t:InternalReply").getTagValue("t:Message", null);
-
-		oofSettings.externalReply = oofSettingsXML.getTag("t:ExternalReply").getTagValue("t:Message", null);
-
-		oofSettings.allowExternalOof = oofSettingsResponse[0].getTagValue("t:AllowExternalOof", "All");
-
-		oofSettingsResponse = null;
-		if (this.mCbOk) {
-			this.mCbOk(this, oofSettings);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erGetUserOofSettingsRequest.execute\n");
+
+        //var req = <nsMessages:GetUserOofSettingsRequest xmlns:nsMessages={nsMessages}/>;
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:GetUserOofSettingsRequest xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        //req.nsTypes::Mailbox.nsTypes::Address = this.mailbox;
+        req.addChildTag("Mailbox", "nsTypes", null).addChildTag("Address", "nsTypes", this.mailbox);
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erGetUserOofSettingsRequest.execute: "+String(this.parent.makeSoapMessage(req))+"\n");
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erGetUserOofSettingsRequest.onSendOk: "+String(aResp)+"\n");
+
+        var oofSettingsResponse = aResp.XPath("/s:Envelope/s:Body/m:GetUserOofSettingsResponse");
+        var rm = oofSettingsResponse[0].XPath("/m:ResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        if (rm.length == 0) {
+            rm = null;
+            var rm = oofSettingsResponse[0].XPath("/m:ResponseMessage[@ResponseClass='Error']");
+            if (rm.length > 0) {
+                var responseCode = rm[0].getTagValue("m:ResponseCode");
+            }
+            else {
+                var responseCode = "unknown";
+            }
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on getting user Oof Settings:" + responseCode);
+            oofSettingsResponse = null;
+            rm = null;
+            return;
+        }
+        rm = null;
+
+        var oofSettingsXML = oofSettingsResponse[0].getTag("t:OofSettings");
+
+        var oofSettings = {
+            oofState: "Disabled",
+            startTime: null,
+            endTime: null,
+            externalAudience: "All",
+            internalReply: "",
+            externalReply: "",
+            allowExternalOof: "All"
+        };
+
+
+        oofSettings.oofState = oofSettingsXML.getTagValue("t:OofState", "Disabled");
+        oofSettings.externalAudience = oofSettingsXML.getTagValue("t:ExternalAudience", "All");
+
+        var duration = oofSettingsXML.getTag("t:Duration");
+
+        if (duration) {
+            oofSettings.startTime = cal.fromRFC3339(duration.getTagValue("t:StartTime"), exchWebService.commonFunctions.ecTZService().UTC).getInTimezone(exchWebService.commonFunctions.ecDefaultTimeZone());
+            oofSettings.endTime = cal.fromRFC3339(duration.getTagValue("t:EndTime"), exchWebService.commonFunctions.ecTZService().UTC).getInTimezone(exchWebService.commonFunctions.ecDefaultTimeZone());
+        }
+
+        oofSettings.internalReply = oofSettingsXML.getTag("t:InternalReply").getTagValue("t:Message", null);
+
+        oofSettings.externalReply = oofSettingsXML.getTag("t:ExternalReply").getTagValue("t:Message", null);
+
+        oofSettings.allowExternalOof = oofSettingsResponse[0].getTagValue("t:AllowExternalOof", "All");
+
+        oofSettingsResponse = null;
+        if (this.mCbOk) {
+            this.mCbOk(this, oofSettings);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erPrimarySMTPCheck.js b/components/erPrimarySMTPCheck.js
index bf90d953..b195807b 100644
--- a/components/erPrimarySMTPCheck.js
+++ b/components/erPrimarySMTPCheck.js
@@ -46,111 +46,109 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erPrimarySMTPCheckRequest"];
 
-function erPrimarySMTPCheckRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-
-	this.isRunning = true;
-	this.execute();
+function erPrimarySMTPCheckRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erPrimarySMTPCheckRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("sendPrimarySmtpCheck\n");
-		// We are going to do a dummy FindItem. It will return the real primarySMTP
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("Traversal", "Shallow");
-
-		req.addChildTag("ItemShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "IdOnly");
-
-		var view = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CalendarView xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		// Dummy date range to limit result
-		view.setAttribute("StartDate", "2011-01-30T11:34:00Z");
-		view.setAttribute("EndDate", "2011-01-30T11:35:00Z");
-		view.setAttribute("MaxEntriesReturned", "1");
-		req.addChildTagObject(view);
-		view = null;
-
-		var parentFolderIds = makeParentFolderIds2("ParentFolderIds", this.argument);
-		req.addChildTagObject(parentFolderIds);
-		parentFolderIds = null;
-
-		//exchWebService.commonFunctions.LOG("erPrimarySMTPCheckRequest.execute: "+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erPrimarySMTPCheckRequest.onSendOk: "+String(aResp));
-
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = this.mailbox;
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Error']");
-
-		if (rm.length > 0) {
-			aMsg = rm[0].getTagValue("m:MessageText")+"("+rm[0].getTagValue("m:ResponseCode")+")";
-			switch (rm[0].getTagValue("m:ResponseCode")) {
-			case "ErrorNonPrimarySmtpAddress": 
-				aResult = rm[0].XPath("/m:MessageXml/t:Value[@Name='Primary']");
-				if (aResult.length > 0) {
-					aResult = aResult[0].value;
-					aError = false;
-				}
-				else {
-					aCode = this.parent.ER_ERROR_PRIMARY_SMTP_NOTFOUND;
-					aError = true;
-				}
-				aResult = null;
-				break;
-			case "ErrorNonExistentMailbox": 
-				aCode = this.parent.ER_ERROR_SPECIFIED_SMTP_NOTFOUND; 
-				aError = true;
-				break;
-			default: 
-				aCode = this.parent.ER_ERROR_PRIMARY_SMTP_UNKNOWN; 
-				aError = true;
-				break;
-			}
-		}
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.mCbOk(aResult);
-			}
-			this.isRunning = false;
-		}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("sendPrimarySmtpCheck\n");
+        // We are going to do a dummy FindItem. It will return the real primarySMTP
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:FindItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("Traversal", "Shallow");
+
+        req.addChildTag("ItemShape", "nsMessages", null).addChildTag("BaseShape", "nsTypes", "IdOnly");
+
+        var view = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CalendarView xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        // Dummy date range to limit result
+        view.setAttribute("StartDate", "2011-01-30T11:34:00Z");
+        view.setAttribute("EndDate", "2011-01-30T11:35:00Z");
+        view.setAttribute("MaxEntriesReturned", "1");
+        req.addChildTagObject(view);
+        view = null;
+
+        var parentFolderIds = makeParentFolderIds2("ParentFolderIds", this.argument);
+        req.addChildTagObject(parentFolderIds);
+        parentFolderIds = null;
+
+        //exchWebService.commonFunctions.LOG("erPrimarySMTPCheckRequest.execute: "+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erPrimarySMTPCheckRequest.onSendOk: "+String(aResp));
+
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = this.mailbox;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:FindItemResponse/m:ResponseMessages/m:FindItemResponseMessage[@ResponseClass='Error']");
+
+        if (rm.length > 0) {
+            aMsg = rm[0].getTagValue("m:MessageText") + "(" + rm[0].getTagValue("m:ResponseCode") + ")";
+            switch (rm[0].getTagValue("m:ResponseCode")) {
+            case "ErrorNonPrimarySmtpAddress":
+                aResult = rm[0].XPath("/m:MessageXml/t:Value[@Name='Primary']");
+                if (aResult.length > 0) {
+                    aResult = aResult[0].value;
+                    aError = false;
+                }
+                else {
+                    aCode = this.parent.ER_ERROR_PRIMARY_SMTP_NOTFOUND;
+                    aError = true;
+                }
+                aResult = null;
+                break;
+            case "ErrorNonExistentMailbox":
+                aCode = this.parent.ER_ERROR_SPECIFIED_SMTP_NOTFOUND;
+                aError = true;
+                break;
+            default:
+                aCode = this.parent.ER_ERROR_PRIMARY_SMTP_UNKNOWN;
+                aError = true;
+                break;
+            }
+        }
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.mCbOk(aResult);
+            }
+            this.isRunning = false;
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erRemoveDelegateRequest.js b/components/erRemoveDelegateRequest.js
index 28701e18..7c1e2466 100644
--- a/components/erRemoveDelegateRequest.js
+++ b/components/erRemoveDelegateRequest.js
@@ -19,111 +19,114 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js"); 
- 
+Cu.import("resource://exchangecalendar/soapFunctions.js");
+
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erRemoveDelegateRequest"];
-function erRemoveDelegateRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-	this.DelegateEmail=aArgument.DelegateEmail;
-	this.delegatingItem = aArgument.delegatingItem;
-
-    this.permission = ""; 
-	switch( this.delegatingItem ){
-		case "calendar":
-			 this.permission = "CalendarFolderPermissionLevel";
-			break;
-		case  "tasks":
-			 this.permission = "TasksFolderPermissionLevel";
-			break;
-		case  "inbox":
-			 this.permission = "InboxFolderPermissionLevel";
-			break;
-		case "contacts":
-			 this.permission = "ContactsFolderPermissionLevel";  
-			break;
-		case "notes":
-			 this.permission = "NotesFolderPermissionLevel";
-			break;
-		case "journal":
-			 this.permission = "JournalFolderPermissionLevel";
-			break;
-		default:
- 	}
-	
-	this.isRunning = true;
-	this.execute();
+
+function erRemoveDelegateRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+    this.DelegateEmail = aArgument.DelegateEmail;
+    this.delegatingItem = aArgument.delegatingItem;
+
+    this.permission = "";
+    switch (this.delegatingItem) {
+    case "calendar":
+        this.permission = "CalendarFolderPermissionLevel";
+        break;
+    case "tasks":
+        this.permission = "TasksFolderPermissionLevel";
+        break;
+    case "inbox":
+        this.permission = "InboxFolderPermissionLevel";
+        break;
+    case "contacts":
+        this.permission = "ContactsFolderPermissionLevel";
+        break;
+    case "notes":
+        this.permission = "NotesFolderPermissionLevel";
+        break;
+    case "journal":
+        this.permission = "JournalFolderPermissionLevel";
+        break;
+    default:
+    }
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erRemoveDelegateRequest.prototype = {
 
-	execute: function _execute()
-	{
- 		exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.execute\n");
-
- 		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:RemoveDelegate xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
- 		var mailBox = req.addChildTag("Mailbox", "nsMessages", null);  
-		mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox );  
- 		   
-		var userids=req.addChildTag("UserIds","nsMessages", null);  
-		var userid=userids.addChildTag("UserId","nsTypes", null);  
-		userid.addChildTag("PrimarySmtpAddress","nsTypes",this.DelegateEmail);   
-	
-		exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.execute2 " + req + "\n" );
-		
-		this.parent.xml2jxon = true;
+    execute: function _execute() {
+        exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:RemoveDelegate xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var mailBox = req.addChildTag("Mailbox", "nsMessages", null);
+        mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox);
+
+        var userids = req.addChildTag("UserIds", "nsMessages", null);
+        var userid = userids.addChildTag("UserId", "nsTypes", null);
+        userid.addChildTag("PrimarySmtpAddress", "nsTypes", this.DelegateEmail);
+
+        exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.execute2 " + req + "\n");
+
+        this.parent.xml2jxon = true;
         this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.onSendOk: " + aResp +"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:RemoveDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:"+responseCode);
-			return;
-		}
-		
-		rm = null;
-		var  delegate=[];
-		delegate[0]={PrimarySmtpAddress:this.DelegateEmail};
-		if (this.mCbOk) {
-			this.mCbOk(this,delegate); 
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		 exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.onSendError: "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.onSendOk: " + aResp + "\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:RemoveDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:" + responseCode);
+            return;
+        }
+
+        rm = null;
+        var delegate = [];
+        delegate[0] = {
+            PrimarySmtpAddress: this.DelegateEmail
+        };
+        if (this.mCbOk) {
+            this.mCbOk(this, delegate);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("erRemoveDelegateRequest.onSendError: " + aMsg + "\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
 
 /*
diff --git a/components/erResolveNames.js b/components/erResolveNames.js
index 1b433a07..b4cd93da 100644
--- a/components/erResolveNames.js
+++ b/components/erResolveNames.js
@@ -35,126 +35,124 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erResolveNames"];
 
-function erResolveNames(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-
-	this.ids = aArgument.ids;
-	this.searchScope = aArgument.searchScope;
-	this.GALQuery = aArgument.GALQuery;
-
-	this.isRunning = true;
-	this.execute();
+function erResolveNames(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+
+    this.ids = aArgument.ids;
+    this.searchScope = aArgument.searchScope;
+    this.GALQuery = aArgument.GALQuery;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erResolveNames.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erResolveNames.execute\n");
-
-		// http://msdn.microsoft.com/en-us/library/exchange/aa565329%28v=exchg.140%29.aspx
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ResolveNames xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		req.setAttribute("ReturnFullContactData", "true");
-		if (this.searchScope) {
-			req.setAttribute("SearchScope", this.searchScope);
-		}
-		else {
-			req.setAttribute("SearchScope", "ContactsActiveDirectory");
-		}
-
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-
-		if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") == -1) &&
-		    (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010_SP1") == -1)){
-			req.setAttribute("ContactDataShape", "AllProperties");
-		}
-
-//		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
-//		req.addChildTagObject(parentFolder);
-
-		if ((this.ids.routingType) && (this.ids.routingType == "SMTP")) {
-			req.addChildTag("UnresolvedEntry", "nsMessages", this.ids.emailAddress); 
-		}
-		else {
-			req.addChildTag("UnresolvedEntry", "nsMessages", this.ids.name); 
-		}
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erResolveNames.execute:"+String(this.parent.makeSoapMessage(req)));
-
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erResolveNames.onSendOk:"+String(aResp));
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:ResolveNamesResponse/m:ResponseMessages/m:ResolveNamesResponseMessage[@ResponseClass='Success' or @ResponseClass='Warning']");
-
-		var allResolutions = new Array();
-		if (rm.length == 0) {
-
-			rm = aResp.XPath("/s:Envelope/s:Body/m:ResolveNamesResponse/m:ResponseMessages/m:ResolveNamesResponseMessage[@ResponseClass='Error' and m:ResponseCode = 'ErrorNameResolutionNoResults']");
-			if (rm.length > 0) {
-				this.onSendError(aExchangeRequest, 0, "ErrorNameResolutionNoResults");
-			}
-			else {
-				this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
-			}
-			return;
-		}
-		else {
-			var resolutionsSets = rm[0].getTags("m:ResolutionSet");
-
-			for each(var resolutionsSet in resolutionsSets) {
-
-				var totalItemsInView = resolutionsSet.getAttribute("TotalItemsInView", 0);
-				var includesLastItem = resolutionsSet.getAttribute("IncludesLastItemInRange", "false");
-
-				var resList = resolutionsSet.XPath("/t:Resolution");
-				for each(var resolution in resList) {
-					allResolutions.push(resolution);
-				}
-		
-			}
-			resolutionsSets = null;
-		}
-		rm = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, allResolutions);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		//exchWebService.commonFunctions.LOG("erResolveNames.onSendError: aCode"+aCode+", aMsg:"+aMsg);
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erResolveNames.execute\n");
+
+        // http://msdn.microsoft.com/en-us/library/exchange/aa565329%28v=exchg.140%29.aspx
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ResolveNames xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.setAttribute("ReturnFullContactData", "true");
+        if (this.searchScope) {
+            req.setAttribute("SearchScope", this.searchScope);
+        }
+        else {
+            req.setAttribute("SearchScope", "ContactsActiveDirectory");
+        }
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+        if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") == -1)
+            && (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010_SP1") == -1)) {
+            req.setAttribute("ContactDataShape", "AllProperties");
+        }
+
+        //		var parentFolder = makeParentFolderIds2("ParentFolderIds", this.argument);
+        //		req.addChildTagObject(parentFolder);
+
+        if ((this.ids.routingType) && (this.ids.routingType == "SMTP")) {
+            req.addChildTag("UnresolvedEntry", "nsMessages", this.ids.emailAddress);
+        }
+        else {
+            req.addChildTag("UnresolvedEntry", "nsMessages", this.ids.name);
+        }
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erResolveNames.execute:"+String(this.parent.makeSoapMessage(req)));
+
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erResolveNames.onSendOk:"+String(aResp));
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:ResolveNamesResponse/m:ResponseMessages/m:ResolveNamesResponseMessage[@ResponseClass='Success' or @ResponseClass='Warning']");
+
+        var allResolutions = new Array();
+        if (rm.length == 0) {
+
+            rm = aResp.XPath("/s:Envelope/s:Body/m:ResolveNamesResponse/m:ResponseMessages/m:ResolveNamesResponseMessage[@ResponseClass='Error' and m:ResponseCode = 'ErrorNameResolutionNoResults']");
+            if (rm.length > 0) {
+                this.onSendError(aExchangeRequest, 0, "ErrorNameResolutionNoResults");
+            }
+            else {
+                this.onSendError(aExchangeRequest, this.parent.ER_ERROR_RESPONS_NOT_VALID, "Respons does not contain expected field");
+            }
+            return;
+        }
+        else {
+            var resolutionsSets = rm[0].getTags("m:ResolutionSet");
+
+            for each(var resolutionsSet in resolutionsSets) {
+
+                var totalItemsInView = resolutionsSet.getAttribute("TotalItemsInView", 0);
+                var includesLastItem = resolutionsSet.getAttribute("IncludesLastItemInRange", "false");
+
+                var resList = resolutionsSet.XPath("/t:Resolution");
+                for each(var resolution in resList) {
+                    allResolutions.push(resolution);
+                }
+
+            }
+            resolutionsSets = null;
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, allResolutions);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //exchWebService.commonFunctions.LOG("erResolveNames.onSendError: aCode"+aCode+", aMsg:"+aMsg);
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erSendMeetingRespons.js b/components/erSendMeetingRespons.js
index 8a211b0e..d8122d7f 100644
--- a/components/erSendMeetingRespons.js
+++ b/components/erSendMeetingRespons.js
@@ -52,131 +52,129 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSendMeetingResponsRequest"];
 
-function erSendMeetingResponsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.bodyText = aArgument.bodyText;
-	this.senderMailbox = aArgument.senderMailbox;
-	this.response = aArgument.response;
-	this.item = aArgument.item;
-	this.messageDisposition = aArgument.messageDisposition;
-	this.pstart = aArgument.proposeStart;
-	this.pend = aArgument.proposeEnd;
-	this.proposeNewTime = aArgument.proposeNewTime;
-	this.isRunning = true;
-	this.execute();
+function erSendMeetingResponsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.bodyText = aArgument.bodyText;
+    this.senderMailbox = aArgument.senderMailbox;
+    this.response = aArgument.response;
+    this.item = aArgument.item;
+    this.messageDisposition = aArgument.messageDisposition;
+    this.pstart = aArgument.proposeStart;
+    this.pend = aArgument.proposeEnd;
+    this.proposeNewTime = aArgument.proposeNewTime;
+    this.isRunning = true;
+    this.execute();
 }
 
 erSendMeetingResponsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var SendMeetingInvitations = "SendToAllAndSaveCopy";
-
-		if ((cal.isEvent(this.argument.item)) && (!this.messageDisposition)) {
-			req.setAttribute('SendMeetingInvitations', SendMeetingInvitations);
-		}	
-
-		if (this.messageDisposition) {
-			req.setAttribute('MessageDisposition', this.messageDisposition);
-		}
-		else {
-			req.setAttribute('MessageDisposition', "SendAndSaveCopy");
-		}
-
-		const responseMap = {
-			"NEEDS-ACTION"	: exchWebService.commonFunctions.xmlToJxon('<nsTypes:TentativelyAcceptItem xmlns:nsTypes="'+nsTypesStr+'"/>'),
-			"TENTATIVE"	: exchWebService.commonFunctions.xmlToJxon('<nsTypes:TentativelyAcceptItem xmlns:nsTypes="'+nsTypesStr+'"/>'),
-			"ACCEPTED"	: exchWebService.commonFunctions.xmlToJxon('<nsTypes:AcceptItem xmlns:nsTypes="'+nsTypesStr+'"/>'),
-			"DECLINED"	: exchWebService.commonFunctions.xmlToJxon('<nsTypes:DeclineItem xmlns:nsTypes="'+nsTypesStr+'"/>')
-		}; 
-
-		var r = responseMap[this.response];
-
-		if (!r) {
-			this.onSendError(this, this.parent.ER_ERROR_UNKNOWN_MEETING_REPSONSE, "No valid response entered"+this.response);
-		}
-
-		if (this.bodyText) {
-			r.addChildTag("Body", "nsTypes", this.bodyText).setAttribute("BodyType", "Text");
-		}
-
-		if (this.senderMailbox) {
-			r.addChildTag("Sender", "nsTypes", null).addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", this.senderMailbox);
-		} 
-		
-		var referenceItemId = r.addChildTag("ReferenceItemId", "nsTypes", null);
-		referenceItemId.setAttribute("Id", this.item.id);
-		referenceItemId.setAttribute("ChangeKey", this.item.changeKey);
-		
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-				
-
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1) {  
-				if( this.proposeNewTime == true ){
-					r.addChildTag("ProposedStart", "nsTypes", this.pstart);   
-					r.addChildTag("ProposedEnd", "nsTypes", this.pend);
-				}
-		}
-		
-		req.addChildTag("Items", "nsMessages", null).addChildTagObject(r);
-		r = null;
-
-		this.parent.xml2jxon = true;
-
-	//	exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.execute>"+String(req));
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-	//	exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.onSendOkxxxxxxxxxx : "+String(aResp)+"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:"+responseCode);
-			return;
-		}
-		rm = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this); //, itemId, changeKey);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		//exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.onSendError: "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:CreateItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var SendMeetingInvitations = "SendToAllAndSaveCopy";
+
+        if ((cal.isEvent(this.argument.item)) && (!this.messageDisposition)) {
+            req.setAttribute('SendMeetingInvitations', SendMeetingInvitations);
+        }
+
+        if (this.messageDisposition) {
+            req.setAttribute('MessageDisposition', this.messageDisposition);
+        }
+        else {
+            req.setAttribute('MessageDisposition', "SendAndSaveCopy");
+        }
+
+        const responseMap = {
+            "NEEDS-ACTION": exchWebService.commonFunctions.xmlToJxon('<nsTypes:TentativelyAcceptItem xmlns:nsTypes="' + nsTypesStr + '"/>'),
+            "TENTATIVE": exchWebService.commonFunctions.xmlToJxon('<nsTypes:TentativelyAcceptItem xmlns:nsTypes="' + nsTypesStr + '"/>'),
+            "ACCEPTED": exchWebService.commonFunctions.xmlToJxon('<nsTypes:AcceptItem xmlns:nsTypes="' + nsTypesStr + '"/>'),
+            "DECLINED": exchWebService.commonFunctions.xmlToJxon('<nsTypes:DeclineItem xmlns:nsTypes="' + nsTypesStr + '"/>')
+        };
+
+        var r = responseMap[this.response];
+
+        if (!r) {
+            this.onSendError(this, this.parent.ER_ERROR_UNKNOWN_MEETING_REPSONSE, "No valid response entered" + this.response);
+        }
+
+        if (this.bodyText) {
+            r.addChildTag("Body", "nsTypes", this.bodyText).setAttribute("BodyType", "Text");
+        }
+
+        if (this.senderMailbox) {
+            r.addChildTag("Sender", "nsTypes", null).addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", this.senderMailbox);
+        }
+
+        var referenceItemId = r.addChildTag("ReferenceItemId", "nsTypes", null);
+        referenceItemId.setAttribute("Id", this.item.id);
+        referenceItemId.setAttribute("ChangeKey", this.item.changeKey);
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+
+        if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("Exchange2013") > -1) {
+            if (this.proposeNewTime == true) {
+                r.addChildTag("ProposedStart", "nsTypes", this.pstart);
+                r.addChildTag("ProposedEnd", "nsTypes", this.pend);
+            }
+        }
+
+        req.addChildTag("Items", "nsMessages", null).addChildTagObject(r);
+        r = null;
+
+        this.parent.xml2jxon = true;
+
+        //	exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.execute>"+String(req));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //	exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.onSendOkxxxxxxxxxx : "+String(aResp)+"\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:CreateItemResponse/m:ResponseMessages/m:CreateItemResponseMessage[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:" + responseCode);
+            return;
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this); //, itemId, changeKey);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //exchWebService.commonFunctions.LOG("erSendMeetingResponsRequest.onSendError: "+aMsg+"\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erSetUserOofSettings.js b/components/erSetUserOofSettings.js
index a0d22d84..b704f871 100644
--- a/components/erSetUserOofSettings.js
+++ b/components/erSetUserOofSettings.js
@@ -50,93 +50,91 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSetUserOofSettingsRequest"];
 
-function erSetUserOofSettingsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-
-	this.oofState = aArgument.oofState;
-	this.externalAudience = aArgument.externalAudience;
-	this.startTime = aArgument.startTime;
-	this.endTime = aArgument.endTime;
-	this.internalReply = aArgument.internalReply;
-	this.externalReply = aArgument.externalReply;
-
-	this.isRunning = true;
-	this.execute();
+function erSetUserOofSettingsRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+
+    this.oofState = aArgument.oofState;
+    this.externalAudience = aArgument.externalAudience;
+    this.startTime = aArgument.startTime;
+    this.endTime = aArgument.endTime;
+    this.internalReply = aArgument.internalReply;
+    this.externalReply = aArgument.externalReply;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erSetUserOofSettingsRequest.prototype = {
 
-	execute: function _execute()
-	{
-//		exchWebService.commonFunctions.LOG("erSetUserOofSettingsRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:SetUserOofSettingsRequest xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		req.addChildTag("Mailbox", "nsTypes", null).addChildTag("Address", "nsTypes", this.mailbox)
-
-		var userOofSettings = req.addChildTag("UserOofSettings", "nsTypes", null);
-		userOofSettings.addChildTag("OofState", "nsTypes", this.oofState);
-		userOofSettings.addChildTag("ExternalAudience", "nsTypes", this.externalAudience);
-
-		var duration = userOofSettings.addChildTag("Duration", "nsTypes", null);
-		duration.addChildTag("StartTime", "nsTypes", cal.toRFC3339(this.startTime));
-		duration.addChildTag("EndTime", "nsTypes", cal.toRFC3339(this.endTime));
-
-		userOofSettings.addChildTag("InternalReply", "nsTypes", null).addChildTag("Message", "nsTypes", this.internalReply);
-		userOofSettings.addChildTag("ExternalReply", "nsTypes", null).addChildTag("Message", "nsTypes", this.externalReply);
-
-		this.parent.xml2jxon = true;
-
-		exchWebService.commonFunctions.LOG("erSetUserOofSettingsRequest.execute: "+String(this.parent.makeSoapMessage(req))+"\n");
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erSetUserOofSettingsRequest.onSendOk: "+String(aResp)+"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:SetUserOofSettingsResponse/m:ResponseMessage[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending user Oof Settings.");
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on setting user Oof Settings:"+responseCode);
-			rm = null;
-			return;
-		}
-		rm = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute() {
+        //		exchWebService.commonFunctions.LOG("erSetUserOofSettingsRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:SetUserOofSettingsRequest xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        req.addChildTag("Mailbox", "nsTypes", null).addChildTag("Address", "nsTypes", this.mailbox)
+
+        var userOofSettings = req.addChildTag("UserOofSettings", "nsTypes", null);
+        userOofSettings.addChildTag("OofState", "nsTypes", this.oofState);
+        userOofSettings.addChildTag("ExternalAudience", "nsTypes", this.externalAudience);
+
+        var duration = userOofSettings.addChildTag("Duration", "nsTypes", null);
+        duration.addChildTag("StartTime", "nsTypes", cal.toRFC3339(this.startTime));
+        duration.addChildTag("EndTime", "nsTypes", cal.toRFC3339(this.endTime));
+
+        userOofSettings.addChildTag("InternalReply", "nsTypes", null).addChildTag("Message", "nsTypes", this.internalReply);
+        userOofSettings.addChildTag("ExternalReply", "nsTypes", null).addChildTag("Message", "nsTypes", this.externalReply);
 
+        this.parent.xml2jxon = true;
 
+        exchWebService.commonFunctions.LOG("erSetUserOofSettingsRequest.execute: " + String(this.parent.makeSoapMessage(req)) + "\n");
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erSetUserOofSettingsRequest.onSendOk: " + String(aResp) + "\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:SetUserOofSettingsResponse/m:ResponseMessage[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending user Oof Settings.");
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on setting user Oof Settings:" + responseCode);
+            rm = null;
+            return;
+        }
+        rm = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erSubscribe.js b/components/erSubscribe.js
index 6666bf23..0d8f0603 100644
--- a/components/erSubscribe.js
+++ b/components/erSubscribe.js
@@ -13,135 +13,133 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js"); 
+Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSubscribeRequest"];
 
-function erSubscribeRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.parent.debug = false;
-	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.folderIds = aArgument.folderIds;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.eventTypes = aArgument.eventTypes;
-	this.timeout = aArgument.timeout;
-	this.listener = aListener;
-  
-	this.isRunning = true;
-	this.execute();
+function erSubscribeRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.parent.debug = false;
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.folderIds = aArgument.folderIds;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.eventTypes = aArgument.eventTypes;
+    this.timeout = aArgument.timeout;
+    this.listener = aListener;
+
+    this.isRunning = true;
+    this.execute();
 }
-  
+
 erSubscribeRequest.prototype = {
 
-	execute: function _execute()
-	{
-		//exchWebService.commonFunctions.LOG("erSubscribeRequest.execute 1");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Subscribe xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var pr = req.addChildTag("PullSubscriptionRequest", "nsMessages", null);  
-		
-		if( this.folderBase ){
-			var parentFolder = makeParentFolderIds2("FolderIds", this.argument);
-			pr.addChildTagObject(parentFolder);
-			parentFolder = null;  
-		}
-		else{  
-			var parentFolder = pr.addChildTag("FolderIds", "nsTypes", null);  
-			for( var i = 0 ; i < this.folderIds.length; i++ ){
-				parentFolder.addChildTag("FolderId", "nsTypes", null).setAttribute("Id", this.folderIds[i].id );
-			}
- 			parentFolder = null; 
-		}
- 
-		var eventTypes = pr.addChildTag("EventTypes", "nsTypes", null); 
-		for( var i = 0 ; i < 	this.eventTypes.length; i++ ){
-			eventTypes.addChildTag("EventType", "nsTypes", this.eventTypes[i] );
-		}
- 		 
-		if(this.timeout){
-			pr.addChildTag("Timeout", "nsTypes",this.timeout);
-		}
-		else{
-			pr.addChildTag("Timeout", "nsTypes","1440");
-		}
-		
-	 //   exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
-
-	//	exchWebService.commonFunctions.LOG("erSubscribeRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-	//	exchWebService.commonFunctions.LOG("erSubscribeRequest.onSendOk:"+String(aResp));
- 		// Get FolderID and ChangeKey
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = undefined;
-		var subscriptionId =  undefined;
-		var watermark =  undefined;
-		
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:SubscribeResponse/m:ResponseMessages/m:SubscribeResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			 subscriptionId = rm[0].getTagValue("m:SubscriptionId");
-			 watermark = rm[0].getTagValue("m:Watermark");  
- 		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
-
-		rm = null;
-
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.properties = aResp;
-				this.mCbOk(this, subscriptionId, watermark);
-			}
-			this.isRunning = false;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erSubscribeRequest.execute 1");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Subscribe xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var pr = req.addChildTag("PullSubscriptionRequest", "nsMessages", null);
+
+        if (this.folderBase) {
+            var parentFolder = makeParentFolderIds2("FolderIds", this.argument);
+            pr.addChildTagObject(parentFolder);
+            parentFolder = null;
+        }
+        else {
+            var parentFolder = pr.addChildTag("FolderIds", "nsTypes", null);
+            for (var i = 0; i < this.folderIds.length; i++) {
+                parentFolder.addChildTag("FolderId", "nsTypes", null).setAttribute("Id", this.folderIds[i].id);
+            }
+            parentFolder = null;
+        }
+
+        var eventTypes = pr.addChildTag("EventTypes", "nsTypes", null);
+        for (var i = 0; i < this.eventTypes.length; i++) {
+            eventTypes.addChildTag("EventType", "nsTypes", this.eventTypes[i]);
+        }
+
+        if (this.timeout) {
+            pr.addChildTag("Timeout", "nsTypes", this.timeout);
+        }
+        else {
+            pr.addChildTag("Timeout", "nsTypes", "1440");
+        }
+
+        //   exchWebService.commonFunctions.LOG(" ++ xml2jxon ++:"+this.parent.makeSoapMessage(req));
+
+        //	exchWebService.commonFunctions.LOG("erSubscribeRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //	exchWebService.commonFunctions.LOG("erSubscribeRequest.onSendOk:"+String(aResp));
+        // Get FolderID and ChangeKey
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = undefined;
+        var subscriptionId = undefined;
+        var watermark = undefined;
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:SubscribeResponse/m:ResponseMessages/m:SubscribeResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            subscriptionId = rm[0].getTagValue("m:SubscriptionId");
+            watermark = rm[0].getTagValue("m:Watermark");
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
+
+        rm = null;
+
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.properties = aResp;
+                this.mCbOk(this, subscriptionId, watermark);
+            }
+            this.isRunning = false;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erSyncContactsFolder.js b/components/erSyncContactsFolder.js
index 7a6f3a71..9ddd8042 100644
--- a/components/erSyncContactsFolder.js
+++ b/components/erSyncContactsFolder.js
@@ -37,168 +37,183 @@ var EXPORTED_SYMBOLS = ["erSyncContactsFolderRequest"];
 
 const MAPI_PidTagBody = "4096";
 
-function erSyncContactsFolderRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.syncState = aArgument.syncState;
-
-	if (!aArgument.syncState) {
-		this.getSyncState = true;
-	}
-	else {
-		this.getSyncState = false;
-	}
-
-	this.creations = {contacts: [], distlists:[]};
-	this.updates = {contacts: [], distlists:[]};
-	this.deletions = {contacts: [], distlists:[]};
-
-	this.isRunning = true;
-	this.execute(aArgument.syncState);
+function erSyncContactsFolderRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.syncState = aArgument.syncState;
+
+    if (!aArgument.syncState) {
+        this.getSyncState = true;
+    }
+    else {
+        this.getSyncState = false;
+    }
+
+    this.creations = {
+        contacts: [],
+        distlists: []
+    };
+    this.updates = {
+        contacts: [],
+        distlists: []
+    };
+    this.deletions = {
+        contacts: [],
+        distlists: []
+    };
+
+    this.isRunning = true;
+    this.execute(aArgument.syncState);
 }
 
 erSyncContactsFolderRequest.prototype = {
 
-	execute: function _execute(aSyncState)
-	{
-//		exchWebService.commonFunctions.LOG("erSyncContactsFolderRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:SyncFolderItems xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
-		itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
-		itemShape.addChildTag("BodyType", "nsTypes", "Text");
-
-		var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
-		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
-//		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName"); // Not allowed for this request
-
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
-
-		if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") == -1) &&
-		    (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010_SP1") == -1)){
-			additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "contacts:Photo");
-		}
-
-		var extendedFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
-		extendedFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
-		extendedFieldURI.setAttribute("PropertyId", MAPI_PidTagBody);
-		extendedFieldURI.setAttribute("PropertyType", "String");
-
-		var parentFolder = makeParentFolderIds2("SyncFolderId", this.argument);
-		req.addChildTagObject(parentFolder);
-		parentFolder = null;
-	
-		if (aSyncState) {
-			req.addChildTag("SyncState", "nsMessages", aSyncState);
-		}
-
-		req.addChildTag("MaxChangesReturned", "nsMessages", "512");
-		
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erSyncContactsFolderRequest.execute:"+String(this.parent.makeSoapMessage(req))+"\n");
-		var soapStr = this.parent.makeSoapMessage(req);
- 		req = null;
-                this.parent.sendRequest(soapStr, this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erSyncContactsFolderRequest.onSendOk:"+String(aResp)+"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var syncState = rm[0].getTagValue("m:SyncState");
-
-			var lastItemInRange = rm[0].getTagValue("m:IncludesLastItemInRange");
-
-			for each (var creation in rm[0].XPath("/m:Changes/t:Create")) {
-				for each (var contact in creation.XPath("/t:Contact")) {
-					//this.creations.contacts.push(contact);
-					this.creations.contacts.push({Id: contact.getAttributeByTag("t:ItemId", "Id"),
-						  ChangeKey: contact.getAttributeByTag("t:ItemId", "ChangeKey"),
-					  	  name: contact.getTagValue("t:Subject"),
-					  	  displayName: contact.getTagValue("t:DisplayName")});
-				}
-				for each (var distlist in creation.XPath("/t:DistributionList")) {
-					//this.creations.distlists.push(distlist);
-					this.creations.distlists.push({Id: distlist.getAttributeByTag("t:ItemId", "Id"),
-						  ChangeKey: distlist.getAttributeByTag("t:ItemId", "ChangeKey"),
-					  	  name: distlist.getTagValue("t:Subject"),
-					  	  displayName: distlist.getTagValue("t:DisplayName")});
-				}
-			}
-
-			for each (var update in rm[0].XPath("/m:Changes/t:Update")) {
-				for each (var contact in update.XPath("/t:Contact")) {
-					//this.updates.contacts.push(contact);
-					this.updates.contacts.push({Id: contact.getAttributeByTag("t:ItemId", "Id"),
-						  ChangeKey: contact.getAttributeByTag("t:ItemId", "ChangeKey"),
-					  	  name: contact.getTagValue("t:Subject"),
-					  	  displayName: contact.getTagValue("t:DisplayName")});
-				}
-				for each (var distlist in update.XPath("/t:DistributionList")) {
-					//this.updates.distlists.push(distlist);
-					this.updates.distlists.push({Id: distlist.getAttributeByTag("t:ItemId", "Id"),
-						  ChangeKey: distlist.getAttributeByTag("t:ItemId", "ChangeKey"),
-					  	  name: distlist.getTagValue("t:Subject"),
-					  	  displayName: distlist.getTagValue("t:DisplayName")});
-				}
-			}
-
-			for each (var deleted in rm[0].XPath("/m:Changes/t:Delete")) {
-				this.deletions.contacts.push(deleted);
-			}
-
-			rm = null;
-
-			if (lastItemInRange == "false") {
-				this.execute(syncState);
-				return;
-			}
-			else {
-				if (this.mCbOk) {
-					this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
-				}
-				this.isRunning = false;
-			}
-		}
-		else {
-			rm = null;
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during erSyncContactsFolderRequest");
-			return;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-//exchWebService.commonFunctions.LOG("onSendError aMsg:"+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute(aSyncState) {
+        //		exchWebService.commonFunctions.LOG("erSyncContactsFolderRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:SyncFolderItems xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
+        itemShape.addChildTag("BodyType", "nsTypes", "Text");
+
+        var additionalProperties = itemShape.addChildTag("AdditionalProperties", "nsTypes", null);
+        additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
+        //		additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:DisplayName"); // Not allowed for this request
+
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
+
+        if ((this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") == -1)
+            && (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010_SP1") == -1)) {
+            additionalProperties.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "contacts:Photo");
+        }
+
+        var extendedFieldURI = additionalProperties.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        extendedFieldURI.setAttribute("DistinguishedPropertySetId", "Common");
+        extendedFieldURI.setAttribute("PropertyId", MAPI_PidTagBody);
+        extendedFieldURI.setAttribute("PropertyType", "String");
+
+        var parentFolder = makeParentFolderIds2("SyncFolderId", this.argument);
+        req.addChildTagObject(parentFolder);
+        parentFolder = null;
+
+        if (aSyncState) {
+            req.addChildTag("SyncState", "nsMessages", aSyncState);
+        }
+
+        req.addChildTag("MaxChangesReturned", "nsMessages", "512");
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erSyncContactsFolderRequest.execute:"+String(this.parent.makeSoapMessage(req))+"\n");
+        var soapStr = this.parent.makeSoapMessage(req);
+        req = null;
+        this.parent.sendRequest(soapStr, this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erSyncContactsFolderRequest.onSendOk:"+String(aResp)+"\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            var syncState = rm[0].getTagValue("m:SyncState");
+
+            var lastItemInRange = rm[0].getTagValue("m:IncludesLastItemInRange");
+
+            for each(var creation in rm[0].XPath("/m:Changes/t:Create")) {
+                for each(var contact in creation.XPath("/t:Contact")) {
+                    //this.creations.contacts.push(contact);
+                    this.creations.contacts.push({
+                        Id: contact.getAttributeByTag("t:ItemId", "Id"),
+                        ChangeKey: contact.getAttributeByTag("t:ItemId", "ChangeKey"),
+                        name: contact.getTagValue("t:Subject"),
+                        displayName: contact.getTagValue("t:DisplayName")
+                    });
+                }
+                for each(var distlist in creation.XPath("/t:DistributionList")) {
+                    //this.creations.distlists.push(distlist);
+                    this.creations.distlists.push({
+                        Id: distlist.getAttributeByTag("t:ItemId", "Id"),
+                        ChangeKey: distlist.getAttributeByTag("t:ItemId", "ChangeKey"),
+                        name: distlist.getTagValue("t:Subject"),
+                        displayName: distlist.getTagValue("t:DisplayName")
+                    });
+                }
+            }
+
+            for each(var update in rm[0].XPath("/m:Changes/t:Update")) {
+                for each(var contact in update.XPath("/t:Contact")) {
+                    //this.updates.contacts.push(contact);
+                    this.updates.contacts.push({
+                        Id: contact.getAttributeByTag("t:ItemId", "Id"),
+                        ChangeKey: contact.getAttributeByTag("t:ItemId", "ChangeKey"),
+                        name: contact.getTagValue("t:Subject"),
+                        displayName: contact.getTagValue("t:DisplayName")
+                    });
+                }
+                for each(var distlist in update.XPath("/t:DistributionList")) {
+                    //this.updates.distlists.push(distlist);
+                    this.updates.distlists.push({
+                        Id: distlist.getAttributeByTag("t:ItemId", "Id"),
+                        ChangeKey: distlist.getAttributeByTag("t:ItemId", "ChangeKey"),
+                        name: distlist.getTagValue("t:Subject"),
+                        displayName: distlist.getTagValue("t:DisplayName")
+                    });
+                }
+            }
+
+            for each(var deleted in rm[0].XPath("/m:Changes/t:Delete")) {
+                this.deletions.contacts.push(deleted);
+            }
+
+            rm = null;
+
+            if (lastItemInRange == "false") {
+                this.execute(syncState);
+                return;
+            }
+            else {
+                if (this.mCbOk) {
+                    this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
+                }
+                this.isRunning = false;
+            }
+        }
+        else {
+            rm = null;
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during erSyncContactsFolderRequest");
+            return;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //exchWebService.commonFunctions.LOG("onSendError aMsg:"+aMsg+"\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erSyncFolderItems.js b/components/erSyncFolderItems.js
index 1234666f..0c61ad5d 100644
--- a/components/erSyncFolderItems.js
+++ b/components/erSyncFolderItems.js
@@ -54,218 +54,226 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erSyncFolderItemsRequest"];
 
-function erSyncFolderItemsRequest(aArgument, aCbOk, aCbError, aListener)
-{
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.syncState = aArgument.syncState;
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError; 
-	if (!aArgument.syncState) {
-		this.getSyncState = true;
-	}
-	else {
-		this.getSyncState = false;
-	}
-
-	this.creations = [];
-	this.updates = [];
-	this.deletions = [];
-
-	this.attempts = 0;
-	this.runs = 0;
-	this.isRunning = true;
-
-	var self = this; 
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-
-	this.execute(aArgument.syncState);
+function erSyncFolderItemsRequest(aArgument, aCbOk, aCbError, aListener) {
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.syncState = aArgument.syncState;
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+    if (!aArgument.syncState) {
+        this.getSyncState = true;
+    }
+    else {
+        this.getSyncState = false;
+    }
+
+    this.creations = [];
+    this.updates = [];
+    this.deletions = [];
+
+    this.attempts = 0;
+    this.runs = 0;
+    this.isRunning = true;
+
+    var self = this;
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+
+    this.execute(aArgument.syncState);
 }
 
 erSyncFolderItemsRequest.prototype = {
 
-	execute: function _execute(aSyncState)
-	{
-		//exchWebService.commonFunctions.LOG("erSyncFolderItemsRequest.execute\n");
-		this.runs++;
-
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, '<nsMessages:SyncFolderItems xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		var req = root[telements][0];
-
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
-		itemShape = null;
-
-		var parentFolder = makeParentFolderIds3("SyncFolderId", this.argument);
-		xml2json.addTagObject(req,parentFolder);
-		parentFolder = null;
-	
-		if ((aSyncState) && (aSyncState != "")) {
-			xml2json.addTag(req, "SyncState", "nsMessages", aSyncState);
-		}
-
-		if (this.getSyncState) {
-			xml2json.addTag(req, "MaxChangesReturned", "nsMessages", "512");
-		}
-		else {
-			xml2json.addTag(req, "MaxChangesReturned", "nsMessages", "25");
-		}
-		
-		this.parent.xml2json = true;
-		
-		//exchWebService.commonFunctions.LOG(String(this.parent.makeSoapMessage(req)));		
-		this.attempts++;
-
-		var soapStr = this.parent.makeSoapMessage2(req);
- 		req = null;
-		this.parent.sendRequest(soapStr, this.serverUrl);
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		 //dump("\nerSyncFolderItemsRequest.onSendOk:"+xml2json.toString(aResp));
-try{
-		var rm = xml2json.XPath(aResp,"/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var syncState = xml2json.getTagValue(rm[0], "m:SyncState");
-
-			var lastItemInRange = xml2json.getTagValue(rm[0], "m:IncludesLastItemInRange");
-
-			if (this.getSyncState === false) {
-				var createItems = xml2json.XPath(rm[0], "/m:Changes/t:Create");
-				for each (var creation in createItems) {
-					var calendarItems = xml2json.XPath(creation, "/t:CalendarItem/t:ItemId");
-					for each (var calendarItem in calendarItems) {
-						this.creations.push({Id: xml2json.getAttribute(calendarItem, "Id").toString(),
-							  ChangeKey: xml2json.getAttribute(calendarItem, "ChangeKey").toString()});
-					}
-					calendarItems = null;
-					
-					var tasks; 
-					switch(this.folderBase){
-					case "tasks":
-						tasks = xml2json.XPath(creation, "/t:Task/t:ItemId");
-						break;
-					case "inbox":
-						tasks = xml2json.XPath(creation, "/t:Message/t:ItemId");
-						break;
-					default:
-					}
-					
-					for each (var task in tasks) {
-						this.creations.push({Id: xml2json.getAttribute(task, "Id").toString(),
-							  ChangeKey: xml2json.getAttribute(task, "ChangeKey").toString()});
-					}
-					tasks = null;
-				}
-				createItems = null;
-
-				var updateItems = xml2json.XPath(rm[0], "/m:Changes/t:Update");
-				for each (var update in updateItems) {
-					var calendarItems = xml2json.XPath(update, "/t:CalendarItem/t:ItemId");
-					for each (var calendarItem in calendarItems) {
-						this.updates.push({Id: xml2json.getAttribute(calendarItem, "Id").toString(),
-					  ChangeKey: xml2json.getAttribute(calendarItem, "ChangeKey").toString()});
-					}
-					calendarItems = null;
-					
-					var tasks; 
-					switch(this.folderBase){
-					case "tasks":
-						tasks = xml2json.XPath(update, "/t:Task/t:ItemId");
-						break;
-					case "inbox":
-						tasks = xml2json.XPath(update, "/t:Message/t:ItemId");
-						break;
-					default:
-					} 					
-					for each (var task in tasks) {
-						this.updates.push({Id: xml2json.getAttribute(task, "Id").toString(),
-					  ChangeKey: xml2json.getAttribute(task, "ChangeKey").toString()});
-					}
-					tasks = null;
-				}
-				updateItems = null;
-
-				var deleteItems = xml2json.XPath(rm[0], "/m:Changes/t:Delete/t:ItemId");
-				for each (var deleted in deleteItems) {
-					this.deletions.push({Id: xml2json.getAttribute(deleted, "Id").toString(),
-					  ChangeKey: xml2json.getAttribute(deleted, "ChangeKey").toString()});
-				}
-				deleteItems = null;
-
-				rm = null;
-				aResp = null;
-			}
-
-			if (lastItemInRange == "false") {
-				if ((this.mCbOk) && (this.getSyncState === false)) {
-					this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
-				}
-				this.creations = [];
-				this.updates = [];
-				this.deletions = [];
-				this.execute(syncState);
-				return;
-			}
-			else {
-				if (this.mCbOk) {
-					this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
-				}
-				this.creations = [];
-				this.updates = [];
-				this.deletions = [];
-				this.isRunning = false;
-			}
-		}
-		else {
-			if (this.attempts == 1) {
-				// We retry without a known syncstate.
-				this.getSyncState = true;
-				this.execute(null);
-				return;
-			}
-			else {
-				var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage");
-				if (rm.length > 0) {
-					var ResponseCode = xml2json.getTagValue(rm[0], "m:ResponseCode");
-				}
-				else {
-					var ResponseCode = "Unknown error from Exchange server.";
-				}
-				rm = null;
-				this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during SyncFolderItems:"+ResponseCode);
-				return;
-			}
-		}
-		this.parent = null;
-}
-catch(tmpErr) {
-	dump("\nerSyncFolderItemsRequest.onSendOk: try error '"+tmpErr+"'.\n");
-}
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-dump("erSyncFolderItemsRequest.onSendError aMsg:"+aMsg+"\n");
-		this.isRunning = false;
-		this.parent = null;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute(aSyncState) {
+        //exchWebService.commonFunctions.LOG("erSyncFolderItemsRequest.execute\n");
+        this.runs++;
+
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, '<nsMessages:SyncFolderItems xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var req = root[telements][0];
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        xml2json.addTag(itemShape, "BaseShape", "nsTypes", "IdOnly");
+        itemShape = null;
+
+        var parentFolder = makeParentFolderIds3("SyncFolderId", this.argument);
+        xml2json.addTagObject(req, parentFolder);
+        parentFolder = null;
+
+        if ((aSyncState) && (aSyncState != "")) {
+            xml2json.addTag(req, "SyncState", "nsMessages", aSyncState);
+        }
+
+        if (this.getSyncState) {
+            xml2json.addTag(req, "MaxChangesReturned", "nsMessages", "512");
+        }
+        else {
+            xml2json.addTag(req, "MaxChangesReturned", "nsMessages", "25");
+        }
 
+        this.parent.xml2json = true;
 
+        //exchWebService.commonFunctions.LOG(String(this.parent.makeSoapMessage(req)));		
+        this.attempts++;
+
+        var soapStr = this.parent.makeSoapMessage2(req);
+        req = null;
+        this.parent.sendRequest(soapStr, this.serverUrl);
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //dump("\nerSyncFolderItemsRequest.onSendOk:"+xml2json.toString(aResp));
+        try {
+            var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+            if (rm.length > 0) {
+                var syncState = xml2json.getTagValue(rm[0], "m:SyncState");
+
+                var lastItemInRange = xml2json.getTagValue(rm[0], "m:IncludesLastItemInRange");
+
+                if (this.getSyncState === false) {
+                    var createItems = xml2json.XPath(rm[0], "/m:Changes/t:Create");
+                    for each(var creation in createItems) {
+                        var calendarItems = xml2json.XPath(creation, "/t:CalendarItem/t:ItemId");
+                        for each(var calendarItem in calendarItems) {
+                            this.creations.push({
+                                Id: xml2json.getAttribute(calendarItem, "Id").toString(),
+                                ChangeKey: xml2json.getAttribute(calendarItem, "ChangeKey").toString()
+                            });
+                        }
+                        calendarItems = null;
+
+                        var tasks;
+                        switch (this.folderBase) {
+                        case "tasks":
+                            tasks = xml2json.XPath(creation, "/t:Task/t:ItemId");
+                            break;
+                        case "inbox":
+                            tasks = xml2json.XPath(creation, "/t:Message/t:ItemId");
+                            break;
+                        default:
+                        }
+
+                        for each(var task in tasks) {
+                            this.creations.push({
+                                Id: xml2json.getAttribute(task, "Id").toString(),
+                                ChangeKey: xml2json.getAttribute(task, "ChangeKey").toString()
+                            });
+                        }
+                        tasks = null;
+                    }
+                    createItems = null;
+
+                    var updateItems = xml2json.XPath(rm[0], "/m:Changes/t:Update");
+                    for each(var update in updateItems) {
+                        var calendarItems = xml2json.XPath(update, "/t:CalendarItem/t:ItemId");
+                        for each(var calendarItem in calendarItems) {
+                            this.updates.push({
+                                Id: xml2json.getAttribute(calendarItem, "Id").toString(),
+                                ChangeKey: xml2json.getAttribute(calendarItem, "ChangeKey").toString()
+                            });
+                        }
+                        calendarItems = null;
+
+                        var tasks;
+                        switch (this.folderBase) {
+                        case "tasks":
+                            tasks = xml2json.XPath(update, "/t:Task/t:ItemId");
+                            break;
+                        case "inbox":
+                            tasks = xml2json.XPath(update, "/t:Message/t:ItemId");
+                            break;
+                        default:
+                        }
+                        for each(var task in tasks) {
+                            this.updates.push({
+                                Id: xml2json.getAttribute(task, "Id").toString(),
+                                ChangeKey: xml2json.getAttribute(task, "ChangeKey").toString()
+                            });
+                        }
+                        tasks = null;
+                    }
+                    updateItems = null;
+
+                    var deleteItems = xml2json.XPath(rm[0], "/m:Changes/t:Delete/t:ItemId");
+                    for each(var deleted in deleteItems) {
+                        this.deletions.push({
+                            Id: xml2json.getAttribute(deleted, "Id").toString(),
+                            ChangeKey: xml2json.getAttribute(deleted, "ChangeKey").toString()
+                        });
+                    }
+                    deleteItems = null;
+
+                    rm = null;
+                    aResp = null;
+                }
+
+                if (lastItemInRange == "false") {
+                    if ((this.mCbOk) && (this.getSyncState === false)) {
+                        this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
+                    }
+                    this.creations = [];
+                    this.updates = [];
+                    this.deletions = [];
+                    this.execute(syncState);
+                    return;
+                }
+                else {
+                    if (this.mCbOk) {
+                        this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
+                    }
+                    this.creations = [];
+                    this.updates = [];
+                    this.deletions = [];
+                    this.isRunning = false;
+                }
+            }
+            else {
+                if (this.attempts == 1) {
+                    // We retry without a known syncstate.
+                    this.getSyncState = true;
+                    this.execute(null);
+                    return;
+                }
+                else {
+                    var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage");
+                    if (rm.length > 0) {
+                        var ResponseCode = xml2json.getTagValue(rm[0], "m:ResponseCode");
+                    }
+                    else {
+                        var ResponseCode = "Unknown error from Exchange server.";
+                    }
+                    rm = null;
+                    this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during SyncFolderItems:" + ResponseCode);
+                    return;
+                }
+            }
+            this.parent = null;
+        }
+        catch (tmpErr) {
+            dump("\nerSyncFolderItemsRequest.onSendOk: try error '" + tmpErr + "'.\n");
+        }
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        dump("erSyncFolderItemsRequest.onSendError aMsg:" + aMsg + "\n");
+        this.isRunning = false;
+        this.parent = null;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erSyncInbox.js b/components/erSyncInbox.js
index b04beabc..28edd097 100644
--- a/components/erSyncInbox.js
+++ b/components/erSyncInbox.js
@@ -52,176 +52,186 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erSyncInboxRequest"];
 
-function erSyncInboxRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.mailbox = aArgument.mailbox;
-	this.serverUrl = aArgument.serverUrl;
-	this.folderID = aArgument.folderID;
-	this.folderBase = aArgument.folderBase;
-	this.changeKey = aArgument.changeKey;
-	this.listener = aListener;
-	this.syncState = aArgument.syncState;
-
-	if (!aArgument.syncState) {
-		this.getSyncState = true;
-	}
-	else {
-		this.getSyncState = false;
-	}
-
-	this.creations = {meetingrequests: [], meetingCancellations:[], meetingResponses:[]};
-	this.updates = {meetingrequests: [], meetingCancellations:[], meetingResponses:[]};
-	this.deletions = {meetingrequests: [], meetingCancellations:[], meetingResponses:[]};
-
-	this.isRunning = true;
-	this.execute(aArgument.syncState);
+function erSyncInboxRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.mailbox = aArgument.mailbox;
+    this.serverUrl = aArgument.serverUrl;
+    this.folderID = aArgument.folderID;
+    this.folderBase = aArgument.folderBase;
+    this.changeKey = aArgument.changeKey;
+    this.listener = aListener;
+    this.syncState = aArgument.syncState;
+
+    if (!aArgument.syncState) {
+        this.getSyncState = true;
+    }
+    else {
+        this.getSyncState = false;
+    }
+
+    this.creations = {
+        meetingrequests: [],
+        meetingCancellations: [],
+        meetingResponses: []
+    };
+    this.updates = {
+        meetingrequests: [],
+        meetingCancellations: [],
+        meetingResponses: []
+    };
+    this.deletions = {
+        meetingrequests: [],
+        meetingCancellations: [],
+        meetingResponses: []
+    };
+
+    this.isRunning = true;
+    this.execute(aArgument.syncState);
 }
 
 erSyncInboxRequest.prototype = {
 
-	execute: function _execute(aSyncState)
-	{
-		exchWebService.commonFunctions.LOG("erSyncInboxRequest.execute\n");
-
-		//var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:SyncFolderItems xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		//var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
-		//itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
-		//itemShape = null;
-
-		var root = xml2json.newJSON();
-		var req = xml2json.addTag(root, "SyncFolderItems", "nsMessages", null);
-		xml2json.setAttribute(req, "xmlns:nsMessages", nsMessagesStr);
-		xml2json.setAttribute(req, "xmlns:nsTypes", nsTypesStr);
-
-		var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
-		var baseShape = xml2json.addTag(itemShape, "BaseShape", "nsTypes", "AllProperties");
-
-		//var parentFolder = makeParentFolderIds2("SyncFolderId", this.argument);
-		//req.addChildTagObject(parentFolder);
-
-		var parentFolder = makeParentFolderIds3("SyncFolderId", this.argument);
-		xml2json.addTagObject(req,parentFolder);
-		parentFolder = null;
-	
-		if ((aSyncState) && (aSyncState != "")) {
-			xml2json.addTag(req, "SyncState", "nsMessages", aSyncState);
-		}
-
-//		if (this.getSyncState) {
-			xml2json.addTag(req, "MaxChangesReturned", "nsMessages", "512");
-//		}
-//		else {
-//			req.addChildTag("MaxChangesReturned", "nsMessages", "15");  // We will ask 15 items at a time.
-//		}
-		
-		this.parent.xml2json = true;
-
-		//exchWebService.commonFunctions.LOG("erSyncInboxRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		var soapStr = this.parent.makeSoapMessage2(req);
- 		req = null;
-                this.parent.sendRequest(soapStr, this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erSyncInboxRequest.onSendOk:"+String(aResp));
-
-		//var rm = aResp.XPath("/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-
-		if (rm.length > 0) {
-			var syncState = xml2json.getTagValue(rm[0], "m:SyncState");
-
-			var lastItemInRange = xml2json.getTagValue(rm[0], "m:IncludesLastItemInRange");
-		
-		//	if (!this.getSyncState) {
-				for each (var creation in xml2json.XPath(rm[0], "/m:Changes/t:Create")) {
-					for each (var meetingrequest in xml2json.getTags(creation, "t:MeetingRequest")) {
-						this.creations.meetingrequests.push(meetingrequest);
-					}
-					for each (var meetingCancellation in xml2json.getTags(creation, "t:MeetingCancellation")) {
-						this.creations.meetingCancellations.push(meetingCancellation);
-					}
-					for each (var meetingResponse in xml2json.getTags(creation, "t:MeetingResponse")) {
-						this.creations.meetingResponses.push(meetingResponse);
-					}
-				}
-	
-				for each (var update in xml2json.XPath(rm[0], "/m:Changes/t:Update")) {
-					for each (var meetingrequest in xml2json.getTags(update, "t:MeetingRequest")) {
-						this.updates.meetingrequests.push(meetingrequest);
-					}
-					for each (var meetingCancellation in xml2json.getTags(update, "t:MeetingCancellation")) {
-						this.updates.meetingCancellations.push(meetingCancellation);
-					}
-					for each (var meetingResponse in xml2json.getTags(update, "t:MeetingResponse")) {
-						this.updates.meetingResponses.push(meetingResponse);
-					}
-				}
-
-				for each (var deleted in xml2json.XPath(rm[0], "/m:Changes/t:Delete")) {
-					for each (var meetingrequest in xml2json.getTags(deleted, "t:MeetingRequest")) {
-						this.deletions.meetingrequests.push(meetingrequest);
-					}
-					for each (var meetingCancellation in xml2json.getTags(deleted, "t:MeetingCancellation")) {
-						this.deletions.meetingCancellations.push(meetingCancellation);
-					}
-					for each (var meetingResponse in xml2json.getTags(deleted, "t:MeetingResponse")) {
-						this.deletions.meetingResponses.push(meetingResponse);
-					}
-				}
-		//	}
-
-			rm = null;
-			if (lastItemInRange == "false") {
-				this.execute(syncState);
-				return;
-			}
-			else {
-				if (this.mCbOk) {
-					this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
-				}
-				this.isRunning = false;
-			}
-		}
-		else {
-			rm = null;
-			//var rm = aResp.XPath("/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage");
-			var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage");
-			if (rm.length > 0) {
-				var ResponseCode = xml2json.getTagValue(rm[0], "m:ResponseCode");
-			}
-			else {
-				var ResponseCode = "Unknown error from Exchange server.";
-			}
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during SyncFolderItems:"+ResponseCode);
-			rm = null;
-			return;
-		}
-
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-//exchWebService.commonFunctions.LOG("onSendError aMsg:"+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute(aSyncState) {
+        exchWebService.commonFunctions.LOG("erSyncInboxRequest.execute\n");
+
+        //var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:SyncFolderItems xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+
+        //var itemShape = req.addChildTag("ItemShape", "nsMessages", null);
+        //itemShape.addChildTag("BaseShape", "nsTypes", "AllProperties");
+        //itemShape = null;
+
+        var root = xml2json.newJSON();
+        var req = xml2json.addTag(root, "SyncFolderItems", "nsMessages", null);
+        xml2json.setAttribute(req, "xmlns:nsMessages", nsMessagesStr);
+        xml2json.setAttribute(req, "xmlns:nsTypes", nsTypesStr);
+
+        var itemShape = xml2json.addTag(req, "ItemShape", "nsMessages", null);
+        var baseShape = xml2json.addTag(itemShape, "BaseShape", "nsTypes", "AllProperties");
+
+        //var parentFolder = makeParentFolderIds2("SyncFolderId", this.argument);
+        //req.addChildTagObject(parentFolder);
+
+        var parentFolder = makeParentFolderIds3("SyncFolderId", this.argument);
+        xml2json.addTagObject(req, parentFolder);
+        parentFolder = null;
+
+        if ((aSyncState) && (aSyncState != "")) {
+            xml2json.addTag(req, "SyncState", "nsMessages", aSyncState);
+        }
+
+        //		if (this.getSyncState) {
+        xml2json.addTag(req, "MaxChangesReturned", "nsMessages", "512");
+        //		}
+        //		else {
+        //			req.addChildTag("MaxChangesReturned", "nsMessages", "15");  // We will ask 15 items at a time.
+        //		}
+
+        this.parent.xml2json = true;
+
+        //exchWebService.commonFunctions.LOG("erSyncInboxRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        var soapStr = this.parent.makeSoapMessage2(req);
+        req = null;
+        this.parent.sendRequest(soapStr, this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erSyncInboxRequest.onSendOk:"+String(aResp));
+
+        //var rm = aResp.XPath("/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+
+        if (rm.length > 0) {
+            var syncState = xml2json.getTagValue(rm[0], "m:SyncState");
+
+            var lastItemInRange = xml2json.getTagValue(rm[0], "m:IncludesLastItemInRange");
+
+            //	if (!this.getSyncState) {
+            for each(var creation in xml2json.XPath(rm[0], "/m:Changes/t:Create")) {
+                for each(var meetingrequest in xml2json.getTags(creation, "t:MeetingRequest")) {
+                    this.creations.meetingrequests.push(meetingrequest);
+                }
+                for each(var meetingCancellation in xml2json.getTags(creation, "t:MeetingCancellation")) {
+                    this.creations.meetingCancellations.push(meetingCancellation);
+                }
+                for each(var meetingResponse in xml2json.getTags(creation, "t:MeetingResponse")) {
+                    this.creations.meetingResponses.push(meetingResponse);
+                }
+            }
+
+            for each(var update in xml2json.XPath(rm[0], "/m:Changes/t:Update")) {
+                for each(var meetingrequest in xml2json.getTags(update, "t:MeetingRequest")) {
+                    this.updates.meetingrequests.push(meetingrequest);
+                }
+                for each(var meetingCancellation in xml2json.getTags(update, "t:MeetingCancellation")) {
+                    this.updates.meetingCancellations.push(meetingCancellation);
+                }
+                for each(var meetingResponse in xml2json.getTags(update, "t:MeetingResponse")) {
+                    this.updates.meetingResponses.push(meetingResponse);
+                }
+            }
+
+            for each(var deleted in xml2json.XPath(rm[0], "/m:Changes/t:Delete")) {
+                    for each(var meetingrequest in xml2json.getTags(deleted, "t:MeetingRequest")) {
+                        this.deletions.meetingrequests.push(meetingrequest);
+                    }
+                    for each(var meetingCancellation in xml2json.getTags(deleted, "t:MeetingCancellation")) {
+                        this.deletions.meetingCancellations.push(meetingCancellation);
+                    }
+                    for each(var meetingResponse in xml2json.getTags(deleted, "t:MeetingResponse")) {
+                        this.deletions.meetingResponses.push(meetingResponse);
+                    }
+                }
+                //	}
+
+            rm = null;
+            if (lastItemInRange == "false") {
+                this.execute(syncState);
+                return;
+            }
+            else {
+                if (this.mCbOk) {
+                    this.mCbOk(this, this.creations, this.updates, this.deletions, syncState);
+                }
+                this.isRunning = false;
+            }
+        }
+        else {
+            rm = null;
+            //var rm = aResp.XPath("/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage");
+            var rm = xml2json.XPath(aResp, "/s:Envelope/s:Body/m:SyncFolderItemsResponse/m:ResponseMessages/m:SyncFolderItemsResponseMessage");
+            if (rm.length > 0) {
+                var ResponseCode = xml2json.getTagValue(rm[0], "m:ResponseCode");
+            }
+            else {
+                var ResponseCode = "Unknown error from Exchange server.";
+            }
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SYNCFOLDERITEMS_UNKNOWN, "Error during SyncFolderItems:" + ResponseCode);
+            rm = null;
+            return;
+        }
+
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        //exchWebService.commonFunctions.LOG("onSendError aMsg:"+aMsg+"\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/erUnsubscribe.js b/components/erUnsubscribe.js
index 95d27457..028eb1f0 100644
--- a/components/erUnsubscribe.js
+++ b/components/erUnsubscribe.js
@@ -14,95 +14,93 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js"); 
+Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erUnsubscribeRequest"];
 
-function erUnsubscribeRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
- 	this.argument = aArgument;
-	
-	this.serverUrl = aArgument.serverUrl;
-	this.subscriptionId = aArgument.subscriptionId;
-  	this.listener = aListener;
-  
-	this.isRunning = true;
-	this.execute();
+function erUnsubscribeRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+
+    this.serverUrl = aArgument.serverUrl;
+    this.subscriptionId = aArgument.subscriptionId;
+    this.listener = aListener;
+
+    this.isRunning = true;
+    this.execute();
 }
-  
+
 erUnsubscribeRequest.prototype = {
 
-	execute: function _execute()
-	{
-		 //exchWebService.commonFunctions.LOG("erUnsubscribeRequest.execute 1"); 
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Unsubscribe xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-		  req.addChildTag("SubscriptionId", "nsMessages", this.subscriptionId);  
- 		 
-		//exchWebService.commonFunctions.LOG("erUnsubscribeRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-		this.parent.xml2jxon = true;
-		this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null; 
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		// exchWebService.commonFunctions.LOG("erUnsubscribeRequest.onSendOk:"+String(aResp));
- 		// Get FolderID and ChangeKey
-		var aError = false;
-		var aCode = 0;
-		var aMsg = "";
-		var aResult = [];
-		 
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:UnsubscribeResponse/m:ResponseMessages/m:UnsubscribeResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
-		if (rm.length > 0) {   
-			aResult = rm;
- 		}
-		else {
-			aMsg = this.parent.getSoapErrorMsg(aResp);
-			if (aMsg) {
-				aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
-				aError = true;
-			}
-			else {
-				aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
-				aError = true;
-				aMsg = "Wrong response received.";
-			}
-		}
- 
-		if (aError) {
-			this.onSendError(aExchangeRequest, aCode, aMsg);
-		}
-		else {
-			if (this.mCbOk) {
-				this.properties = aResp;
-				this.mCbOk(this, aResult);
-			}
-			this.isRunning = false;
-		}
-		rm = null; 
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-};
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erUnsubscribeRequest.execute 1"); 
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:Unsubscribe xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        req.addChildTag("SubscriptionId", "nsMessages", this.subscriptionId);
+
+        //exchWebService.commonFunctions.LOG("erUnsubscribeRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.xml2jxon = true;
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        // exchWebService.commonFunctions.LOG("erUnsubscribeRequest.onSendOk:"+String(aResp));
+        // Get FolderID and ChangeKey
+        var aError = false;
+        var aCode = 0;
+        var aMsg = "";
+        var aResult = [];
 
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:UnsubscribeResponse/m:ResponseMessages/m:UnsubscribeResponseMessage[@ResponseClass='Success' and m:ResponseCode='NoError']");
+        if (rm.length > 0) {
+            aResult = rm;
+        }
+        else {
+            aMsg = this.parent.getSoapErrorMsg(aResp);
+            if (aMsg) {
+                aCode = this.parent.ER_ERROR_FINDFOLDER_FOLDERID_DETAILS;
+                aError = true;
+            }
+            else {
+                aCode = this.parent.ER_ERROR_SOAP_RESPONSECODE_NOTFOUND;
+                aError = true;
+                aMsg = "Wrong response received.";
+            }
+        }
 
+        if (aError) {
+            this.onSendError(aExchangeRequest, aCode, aMsg);
+        }
+        else {
+            if (this.mCbOk) {
+                this.properties = aResp;
+                this.mCbOk(this, aResult);
+            }
+            this.isRunning = false;
+        }
+        rm = null;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erUpdateDelegateRequest.js b/components/erUpdateDelegateRequest.js
index aa3f9323..b64b5ca9 100644
--- a/components/erUpdateDelegateRequest.js
+++ b/components/erUpdateDelegateRequest.js
@@ -19,144 +19,143 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js"); 
+Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erUpdateDelegateRequest"];
-function erUpdateDelegateRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-	this.delegateemail=aArgument.delegateemail;
-	this.delegateproperties=aArgument.delegateproperties;
-	this.delegatingItem = aArgument.delegatingItem;
-	
-    this.permission = ""; 
-	switch( this.delegatingItem ){
-		case "calendar":
-			 this.permission = "CalendarFolderPermissionLevel";
-			break;
-		case  "tasks":
-			 this.permission = "TasksFolderPermissionLevel";
-			break;
-		case  "inbox":
-			 this.permission = "InboxFolderPermissionLevel";
-			break;
-		case "contacts":
-			 this.permission = "ContactsFolderPermissionLevel";  
-			break;
-		case "notes":
-			 this.permission = "NotesFolderPermissionLevel";
-			break;
-		case "journal":
-			 this.permission = "JournalFolderPermissionLevel";
-			break;
-		default:
- 	}
-	
-	this.isRunning = true;
-	this.execute();
+
+function erUpdateDelegateRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+    this.delegateemail = aArgument.delegateemail;
+    this.delegateproperties = aArgument.delegateproperties;
+    this.delegatingItem = aArgument.delegatingItem;
+
+    this.permission = "";
+    switch (this.delegatingItem) {
+    case "calendar":
+        this.permission = "CalendarFolderPermissionLevel";
+        break;
+    case "tasks":
+        this.permission = "TasksFolderPermissionLevel";
+        break;
+    case "inbox":
+        this.permission = "InboxFolderPermissionLevel";
+        break;
+    case "contacts":
+        this.permission = "ContactsFolderPermissionLevel";
+        break;
+    case "notes":
+        this.permission = "NotesFolderPermissionLevel";
+        break;
+    case "journal":
+        this.permission = "JournalFolderPermissionLevel";
+        break;
+    default:
+    }
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erUpdateDelegateRequest.prototype = {
 
-	execute: function _execute()
-	{
- 		exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.execute\n");
-
- 		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:UpdateDelegate xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
- 		var mailBox = req.addChildTag("Mailbox", "nsMessages", null);  
-		mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox );  
-		
- 		var delegateusers = req.addChildTag("DelegateUsers","nsMessages", null);  
-		var delegateuser=delegateusers.addChildTag("DelegateUser","nsTypes", null);  
-		var userid=delegateuser.addChildTag("UserId","nsTypes", null);  
-		userid.addChildTag("PrimarySmtpAddress","nsTypes",this.delegateemail); 
-		
-		var delegatepermissions = delegateuser.addChildTag("DelegatePermissions","nsTypes", null); 
-		delegatepermissions.addChildTag(this.permission,"nsTypes", this.delegateproperties.DelegatePermissions );
-		delegateuser.addChildTag("ReceiveCopiesOfMeetingMessages","nsTypes", this.delegateproperties.ReceiveCopiesOfMeetingMessages); 
-		delegateuser.addChildTag("ViewPrivateItems","nsTypes", this.delegateproperties.ViewPrivateItems );
-		req.addChildTag("DeliverMeetingRequests", "nsMessages",this.delegateproperties.DeliverMeetingRequests );      
-		
-		exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.execute2 " + req + "\n" ); 
-	      
-		this.parent.xml2jxon = true;
+    execute: function _execute() {
+        exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:UpdateDelegate xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var mailBox = req.addChildTag("Mailbox", "nsMessages", null);
+        mailBox.addChildTag("EmailAddress", "nsTypes", this.mailbox);
+
+        var delegateusers = req.addChildTag("DelegateUsers", "nsMessages", null);
+        var delegateuser = delegateusers.addChildTag("DelegateUser", "nsTypes", null);
+        var userid = delegateuser.addChildTag("UserId", "nsTypes", null);
+        userid.addChildTag("PrimarySmtpAddress", "nsTypes", this.delegateemail);
+
+        var delegatepermissions = delegateuser.addChildTag("DelegatePermissions", "nsTypes", null);
+        delegatepermissions.addChildTag(this.permission, "nsTypes", this.delegateproperties.DelegatePermissions);
+        delegateuser.addChildTag("ReceiveCopiesOfMeetingMessages", "nsTypes", this.delegateproperties.ReceiveCopiesOfMeetingMessages);
+        delegateuser.addChildTag("ViewPrivateItems", "nsTypes", this.delegateproperties.ViewPrivateItems);
+        req.addChildTag("DeliverMeetingRequests", "nsMessages", this.delegateproperties.DeliverMeetingRequests);
+
+        exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.execute2 " + req + "\n");
+
+        this.parent.xml2jxon = true;
         this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendOk: " + aResp +"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:UpdateDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:"+responseCode);
-			return;
-		}
-		
-		var dmr = aResp.XPath("/s:Envelope/s:Body/m:UpdateDelegateResponse");
-	    var  DeliverMeetingRequests=dmr[0].getTagValue("m:DeliverMeetingRequests");
-	//	exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendOk: DeliverMeetingRequests  " + DeliverMeetingRequests);
-	    
-		
- 		var delegates=[];
-		if ( rm.length > 0) 
-		{  
- 			for( index=0;index<rm.length;index++)
-			{ 
-			  //exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendOk:  " + index + " : " +  rm[index] + " \n");  
-			    var delegateUser = rm[index].getTag("m:DelegateUser");   
-			    if ( delegateUser )  {
-					 delegates[index]={ 
-						  SID: delegateUser.getTag("t:UserId").getTagValue("t:SID") ,
-						  PrimarySmtpAddress: delegateUser.getTag("t:UserId").getTagValue("t:PrimarySmtpAddress"),
-						  DisplayName: delegateUser.getTag("t:UserId").getTagValue("t:DisplayName"), 
-						  /*adding local permission so we receive no response for that */ 
-						  DelegatePermissions: this.delegateproperties.DelegatePermissions  ,
-						  ReceiveCopiesOfMeetingMessages:delegateUser.getTagValue("t:ReceiveCopiesOfMeetingMessages"),
-						  ViewPrivateItems: delegateUser.getTagValue("t:ViewPrivateItems"),
-						  DeliverMeetingRequests: DeliverMeetingRequests ,
-				 	}; 
-			    }
-			}  
-		} 
-		
-		rm = null; 
-		if (this.mCbOk) {
-			this.mCbOk(this,delegates); 
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		 exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendError: "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendOk: " + aResp + "\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:UpdateDelegateResponse/m:ResponseMessages/m:DelegateUserResponseMessageType[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons.");
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending meeting respons:" + responseCode);
+            return;
+        }
+
+        var dmr = aResp.XPath("/s:Envelope/s:Body/m:UpdateDelegateResponse");
+        var DeliverMeetingRequests = dmr[0].getTagValue("m:DeliverMeetingRequests");
+        //	exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendOk: DeliverMeetingRequests  " + DeliverMeetingRequests);
+
+
+        var delegates = [];
+        if (rm.length > 0) {
+            for (index = 0; index < rm.length; index++) {
+                //exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendOk:  " + index + " : " +  rm[index] + " \n");  
+                var delegateUser = rm[index].getTag("m:DelegateUser");
+                if (delegateUser) {
+                    delegates[index] = {
+                        SID: delegateUser.getTag("t:UserId").getTagValue("t:SID"),
+                        PrimarySmtpAddress: delegateUser.getTag("t:UserId").getTagValue("t:PrimarySmtpAddress"),
+                        DisplayName: delegateUser.getTag("t:UserId").getTagValue("t:DisplayName"),
+                        /*adding local permission so we receive no response for that */
+                        DelegatePermissions: this.delegateproperties.DelegatePermissions,
+                        ReceiveCopiesOfMeetingMessages: delegateUser.getTagValue("t:ReceiveCopiesOfMeetingMessages"),
+                        ViewPrivateItems: delegateUser.getTagValue("t:ViewPrivateItems"),
+                        DeliverMeetingRequests: DeliverMeetingRequests,
+                    };
+                }
+            }
+        }
+
+        rm = null;
+        if (this.mCbOk) {
+            this.mCbOk(this, delegates);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("erUpdateDelegateRequest.onSendError: " + aMsg + "\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
 
 /*
diff --git a/components/erUpdateFolderPermission.js b/components/erUpdateFolderPermission.js
index d1831aab..238a18ed 100644
--- a/components/erUpdateFolderPermission.js
+++ b/components/erUpdateFolderPermission.js
@@ -19,127 +19,126 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js"); 
+Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erUpdateFolderPermissionRequest"];
-function erUpdateFolderPermissionRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.mailbox = aArgument.mailbox;
-	this.permissionSet = [];
-	this.permissionSet = aArgument.permissionSet ; 
- 
-	this.isRunning = true;
-	this.execute();
+
+function erUpdateFolderPermissionRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.mailbox = aArgument.mailbox;
+    this.permissionSet = [];
+    this.permissionSet = aArgument.permissionSet;
+
+    this.isRunning = true;
+    this.execute();
 }
 
 erUpdateFolderPermissionRequest.prototype = {
 
-	execute: function _execute()
-	{
- 		//exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.execute\n");
-
- 		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:UpdateFolder xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
- 		var folderChange = req.addChildTag("FolderChanges", "nsMessages", null).addChildTag("FolderChange", "nsTypes", null );  
-		
- 		var fid = folderChange.addChildTag("FolderId", "nsTypes", null)
- 		fid.setAttribute("Id",this.argument.folderId);
- 		fid.setAttribute("ChangeKey",this.argument.changeKey); 
- 		 
- 		var updates=folderChange.addChildTag("Updates", "nsTypes", null);
- 		var sff = updates.addChildTag("SetFolderField", "nsTypes", null);
- 		sff.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI","folder:PermissionSet");
- 		
- 		var perms = sff.addChildTag("Folder", "nsTypes", null).addChildTag("PermissionSet", "nsTypes", null)
- 						.addChildTag("Permissions", "nsTypes", null);
- 		for( var i = 0 ; i < this.permissionSet.length ;  i++ ){
-	 		var perm = perms.addChildTag("Permission", "nsTypes", null);
-	 		if( this.permissionSet[i].sid == null )//if distinguished user
-	 		{
-	 			perm.addChildTag("UserId", "nsTypes", null).addChildTag("DistinguishedUser", "nsTypes",this.permissionSet[i].emailId); 
-	 		}
-	 		else
-	 		{
-	 			perm.addChildTag("UserId", "nsTypes", null).addChildTag("PrimarySmtpAddress", "nsTypes",this.permissionSet[i].emailId);
-	 		}
-	 		
-	 		if( this.permissionSet[i].permissionLevel == "Custom" ){
-		 		perm.addChildTag("CanCreateItems", "nsTypes", this.permissionSet[i].permissions.canCreateItems );
-		 		perm.addChildTag("CanCreateSubFolders", "nsTypes",  this.permissionSet[i].permissions.canCreateSubFolders );
-		 		perm.addChildTag("IsFolderOwner", "nsTypes", this.permissionSet[i].permissions.isFolderOwner );
-		 		perm.addChildTag("IsFolderVisible", "nsTypes", this.permissionSet[i].permissions.isFolderVisible  );
-		 		perm.addChildTag("IsFolderContact", "nsTypes", this.permissionSet[i].permissions.isFolderContact );
-		 		perm.addChildTag("EditItems", "nsTypes",  this.permissionSet[i].permissions.editItems );
-		 		perm.addChildTag("DeleteItems", "nsTypes", this.permissionSet[i].permissions.deleteItems );
-		 		perm.addChildTag("ReadItems", "nsTypes",  this.permissionSet[i].permissions.readItems ); 
-	 		}	 		
-	 		perm.addChildTag("PermissionLevel", "nsTypes", this.permissionSet[i].permissionLevel);
- 		}
-		//exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.execute2 " + req + "\n" ); 
-	      
-		this.parent.xml2jxon = true;
+    execute: function _execute() {
+        //exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:UpdateFolder xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var folderChange = req.addChildTag("FolderChanges", "nsMessages", null).addChildTag("FolderChange", "nsTypes", null);
+
+        var fid = folderChange.addChildTag("FolderId", "nsTypes", null)
+        fid.setAttribute("Id", this.argument.folderId);
+        fid.setAttribute("ChangeKey", this.argument.changeKey);
+
+        var updates = folderChange.addChildTag("Updates", "nsTypes", null);
+        var sff = updates.addChildTag("SetFolderField", "nsTypes", null);
+        sff.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "folder:PermissionSet");
+
+        var perms = sff.addChildTag("Folder", "nsTypes", null).addChildTag("PermissionSet", "nsTypes", null)
+            .addChildTag("Permissions", "nsTypes", null);
+        for (var i = 0; i < this.permissionSet.length; i++) {
+            var perm = perms.addChildTag("Permission", "nsTypes", null);
+            if (this.permissionSet[i].sid == null) //if distinguished user
+            {
+                perm.addChildTag("UserId", "nsTypes", null).addChildTag("DistinguishedUser", "nsTypes", this.permissionSet[i].emailId);
+            }
+            else {
+                perm.addChildTag("UserId", "nsTypes", null).addChildTag("PrimarySmtpAddress", "nsTypes", this.permissionSet[i].emailId);
+            }
+
+            if (this.permissionSet[i].permissionLevel == "Custom") {
+                perm.addChildTag("CanCreateItems", "nsTypes", this.permissionSet[i].permissions.canCreateItems);
+                perm.addChildTag("CanCreateSubFolders", "nsTypes", this.permissionSet[i].permissions.canCreateSubFolders);
+                perm.addChildTag("IsFolderOwner", "nsTypes", this.permissionSet[i].permissions.isFolderOwner);
+                perm.addChildTag("IsFolderVisible", "nsTypes", this.permissionSet[i].permissions.isFolderVisible);
+                perm.addChildTag("IsFolderContact", "nsTypes", this.permissionSet[i].permissions.isFolderContact);
+                perm.addChildTag("EditItems", "nsTypes", this.permissionSet[i].permissions.editItems);
+                perm.addChildTag("DeleteItems", "nsTypes", this.permissionSet[i].permissions.deleteItems);
+                perm.addChildTag("ReadItems", "nsTypes", this.permissionSet[i].permissions.readItems);
+            }
+            perm.addChildTag("PermissionLevel", "nsTypes", this.permissionSet[i].permissionLevel);
+        }
+        //exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.execute2 " + req + "\n" ); 
+
+        this.parent.xml2jxon = true;
         this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.onSendOk: " + aResp +"\n");  
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:UpdateFolderResponse/m:ResponseMessages/m:UpdateFolderResponseMessage[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			var tmp = aResp.XPath("/s:Envelope/s:Body/m:UpdateFolderResponse/m:ResponseMessages/m:UpdateFolderResponseMessage[@ResponseClass='Error']");
-			var responseCode = tmp[0].getTagValue("m:ResponseCode");
-			var messageText = tmp[0].getTagValue("m:MessageText");  
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, messageText);
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		var messageText = rm[0].getTagValue("m:MessageText");  
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, messageText+": "+responseCode);
-			return;
-		} 
-		
-		var folderID = null;
-		var changeKey = null;
-		
-		if ( rm.length > 0) 
-		{  
-			var Folder = rm[0].XPath("/m:Folders/t:Folder"); 
-			if (Folder.length > 0) { 
-				 folderID = Folder[0].getAttributeByTag("t:FolderId", "Id");
-				 changeKey = Folder[0].getAttributeByTag("t:FolderId", "ChangeKey");
-			}  
-		} 
-		
-		rm = null; 
-		if (this.mCbOk) {
-			this.mCbOk(this, folderID, changeKey); 
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		 exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.onSendError: "+aMsg+"\n");
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
-}; 
\ No newline at end of file
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.onSendOk: " + aResp +"\n");  
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:UpdateFolderResponse/m:ResponseMessages/m:UpdateFolderResponseMessage[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            var tmp = aResp.XPath("/s:Envelope/s:Body/m:UpdateFolderResponse/m:ResponseMessages/m:UpdateFolderResponseMessage[@ResponseClass='Error']");
+            var responseCode = tmp[0].getTagValue("m:ResponseCode");
+            var messageText = tmp[0].getTagValue("m:MessageText");
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, messageText);
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        var messageText = rm[0].getTagValue("m:MessageText");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, messageText + ": " + responseCode);
+            return;
+        }
+
+        var folderID = null;
+        var changeKey = null;
+
+        if (rm.length > 0) {
+            var Folder = rm[0].XPath("/m:Folders/t:Folder");
+            if (Folder.length > 0) {
+                folderID = Folder[0].getAttributeByTag("t:FolderId", "Id");
+                changeKey = Folder[0].getAttributeByTag("t:FolderId", "ChangeKey");
+            }
+        }
+
+        rm = null;
+        if (this.mCbOk) {
+            this.mCbOk(this, folderID, changeKey);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        exchWebService.commonFunctions.LOG("erUpdateFolderPermissionRequest.onSendError: " + aMsg + "\n");
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
+};
diff --git a/components/erUpdateItem.js b/components/erUpdateItem.js
index 2b610adc..a0d442af 100644
--- a/components/erUpdateItem.js
+++ b/components/erUpdateItem.js
@@ -50,141 +50,138 @@ Cu.import("resource://exchangecalendar/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erUpdateItemRequest"];
 
-function erUpdateItemRequest(aArgument, aCbOk, aCbError, aListener)
-{
-	this.mCbOk = aCbOk;
-	this.mCbError = aCbError;
-
-	var self = this;
-
-	this.parent = new ExchangeRequest(aArgument, 
-		function(aExchangeRequest, aResp) { self.onSendOk(aExchangeRequest, aResp);},
-		function(aExchangeRequest, aCode, aMsg) { self.onSendError(aExchangeRequest, aCode, aMsg);},
-		aListener);
-
-	this.argument = aArgument;
-	this.serverUrl = aArgument.serverUrl;
-	this.listener = aListener;
-	this.updateReq = aArgument.updateReq;
-	this.onlySnoozeChanges=aArgument.onlySnoozeChanges;
-	
-	this.sendto = "sendtoall";
-	if (aArgument.sendto) {
-		this.sendto = aArgument.sendto;
-	}
-
-	this.isRunning = true;
-	if(this.onlySnoozeChanges){
-		this.execute("AlwaysOverwrite"); 
-	}
-	else
-	{
-		this.execute("AutoResolve");
-	}
+function erUpdateItemRequest(aArgument, aCbOk, aCbError, aListener) {
+    this.mCbOk = aCbOk;
+    this.mCbError = aCbError;
+
+    var self = this;
+
+    this.parent = new ExchangeRequest(aArgument,
+        function (aExchangeRequest, aResp) {
+            self.onSendOk(aExchangeRequest, aResp);
+        },
+        function (aExchangeRequest, aCode, aMsg) {
+            self.onSendError(aExchangeRequest, aCode, aMsg);
+        },
+        aListener);
+
+    this.argument = aArgument;
+    this.serverUrl = aArgument.serverUrl;
+    this.listener = aListener;
+    this.updateReq = aArgument.updateReq;
+    this.onlySnoozeChanges = aArgument.onlySnoozeChanges;
+
+    this.sendto = "sendtoall";
+    if (aArgument.sendto) {
+        this.sendto = aArgument.sendto;
+    }
+
+    this.isRunning = true;
+    if (this.onlySnoozeChanges) {
+        this.execute("AlwaysOverwrite");
+    }
+    else {
+        this.execute("AutoResolve");
+    }
 }
 
 erUpdateItemRequest.prototype = {
 
-	execute: function _execute(aConflictResolution)
-	{
-//		exchWebService.commonFunctions.LOG("erUpdateItemRequest.execute\n");
-
-		var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:UpdateItem xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
-
-		req.setAttribute("MessageDisposition", "SaveOnly");
-		req.setAttribute("ConflictResolution", aConflictResolution);
-
-		var weHaveAttachmentUpdates = false;
-		if (this.argument.attachmentsUpdates) {
-			weHaveAttachmentUpdates = ((this.argument.attachmentsUpdates.create.length > 0) || (this.argument.attachmentsUpdates.delete.length > 0));
-			if (weHaveAttachmentUpdates) {
-				exchWebService.commonFunctions.LOG("erUpdateItemRequest.execute: I see we have attachement changes I'm not going send an update to others if required. It will be send at the end when we processed the attachments.");
-			}
-		}
-
-		if ((publicFoldersMap[this.argument.folderBase]) || (weHaveAttachmentUpdates)) {
-			var sendMeetingCancellations = "SendToNone";
-		}
-		else {
-			switch (this.sendto) {
-				case "sendtonone":
-					req.setAttribute("MessageDisposition", "SendAndSaveCopy");
-					var sendMeetingCancellations = "SendToNone";//"SendToChangedAndSaveCopy";
-					break;
-				case "sendtoall":
-					req.setAttribute("MessageDisposition", "SendAndSaveCopy");
-					var sendMeetingCancellations = "SendToAllAndSaveCopy";//"SendToChangedAndSaveCopy";
-					break;
-				case "sendtochanged":
-					req.setAttribute("MessageDisposition", "SendAndSaveCopy");
-					var sendMeetingCancellations = "SendToChangedAndSaveCopy";//"SendToChangedAndSaveCopy";
-					break;
-			}
-		}
-
-		if (cal.isEvent(this.argument.item)) {
-			req.setAttribute("SendMeetingInvitationsOrCancellations", sendMeetingCancellations);
-		}
-		else {
-			req.setAttribute("MessageDisposition", "SaveOnly");
-		}	
-
-		var itemChanges = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemChanges xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'">'+String(this.updateReq)+'</nsMessages:ItemChanges>');
-		req.addChildTagObject(itemChanges);
-		itemChanges = null;
-
-		this.parent.xml2jxon = true;
-
-		//exchWebService.commonFunctions.LOG("erUpdateItemRequest.execute:"+String(this.parent.makeSoapMessage(req)));
-                this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
-		req = null;
-	},
-
-	onSendOk: function _onSendOk(aExchangeRequest, aResp)
-	{
-		//exchWebService.commonFunctions.LOG("erUpdateItemRequest.onSendOk: "+String(aResp)+"\n");
-
-		var rm = aResp.XPath("/s:Envelope/s:Body/m:UpdateItemResponse/m:ResponseMessages/m:UpdateItemResponseMessage[@ResponseClass='Success']");
-		if (rm.length == 0) {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending update respons.");
-			rm = null;
-			return;
-		}
-
-		var responseCode = rm[0].getTagValue("m:ResponseCode");
-		if (responseCode != "NoError") {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending update respons:"+responseCode);
-			rm = null;
-			return;
-		}
-
-		var aItem = rm[0].XPath("/m:Items/*");
-		if (aItem.length > 0) {
-			var itemId = aItem[0].getAttributeByTag("t:ItemId","Id");
-			var changeKey = aItem[0].getAttributeByTag("t:ItemId","ChangeKey");
-		}
-		else {
-			this.onSendError(aExchangeRequest, this.parent.ER_ERROR_ITEM_UPDATE_UNKNOWN, "Update request was ok but we did not receive any updated item details:"+String(aResp));
-			rm = null;
-			aItem = null;
-			return;
-		}
-		rm = null;
-		aItem = null;
-
-		if (this.mCbOk) {
-			this.mCbOk(this, itemId, changeKey);
-		}
-		this.isRunning = false;
-	},
-
-	onSendError: function _onSendError(aExchangeRequest, aCode, aMsg)
-	{
-		this.isRunning = false;
-		if (this.mCbError) {
-			this.mCbError(this, aCode, aMsg);
-		}
-	},
+    execute: function _execute(aConflictResolution) {
+        //		exchWebService.commonFunctions.LOG("erUpdateItemRequest.execute\n");
+
+        var req = exchWebService.commonFunctions.xmlToJxon('<nsMessages:UpdateItem xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        req.setAttribute("MessageDisposition", "SaveOnly");
+        req.setAttribute("ConflictResolution", aConflictResolution);
+
+        var weHaveAttachmentUpdates = false;
+        if (this.argument.attachmentsUpdates) {
+            weHaveAttachmentUpdates = ((this.argument.attachmentsUpdates.create.length > 0) || (this.argument.attachmentsUpdates.delete.length > 0));
+            if (weHaveAttachmentUpdates) {
+                exchWebService.commonFunctions.LOG("erUpdateItemRequest.execute: I see we have attachement changes I'm not going send an update to others if required. It will be send at the end when we processed the attachments.");
+            }
+        }
+
+        if ((publicFoldersMap[this.argument.folderBase]) || (weHaveAttachmentUpdates)) {
+            var sendMeetingCancellations = "SendToNone";
+        }
+        else {
+            switch (this.sendto) {
+            case "sendtonone":
+                req.setAttribute("MessageDisposition", "SendAndSaveCopy");
+                var sendMeetingCancellations = "SendToNone"; //"SendToChangedAndSaveCopy";
+                break;
+            case "sendtoall":
+                req.setAttribute("MessageDisposition", "SendAndSaveCopy");
+                var sendMeetingCancellations = "SendToAllAndSaveCopy"; //"SendToChangedAndSaveCopy";
+                break;
+            case "sendtochanged":
+                req.setAttribute("MessageDisposition", "SendAndSaveCopy");
+                var sendMeetingCancellations = "SendToChangedAndSaveCopy"; //"SendToChangedAndSaveCopy";
+                break;
+            }
+        }
+
+        if (cal.isEvent(this.argument.item)) {
+            req.setAttribute("SendMeetingInvitationsOrCancellations", sendMeetingCancellations);
+        }
+        else {
+            req.setAttribute("MessageDisposition", "SaveOnly");
+        }
+
+        var itemChanges = exchWebService.commonFunctions.xmlToJxon('<nsMessages:ItemChanges xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '">' + String(this.updateReq) + '</nsMessages:ItemChanges>');
+        req.addChildTagObject(itemChanges);
+        itemChanges = null;
+
+        this.parent.xml2jxon = true;
+
+        //exchWebService.commonFunctions.LOG("erUpdateItemRequest.execute:"+String(this.parent.makeSoapMessage(req)));
+        this.parent.sendRequest(this.parent.makeSoapMessage(req), this.serverUrl);
+        req = null;
+    },
+
+    onSendOk: function _onSendOk(aExchangeRequest, aResp) {
+        //exchWebService.commonFunctions.LOG("erUpdateItemRequest.onSendOk: "+String(aResp)+"\n");
+
+        var rm = aResp.XPath("/s:Envelope/s:Body/m:UpdateItemResponse/m:ResponseMessages/m:UpdateItemResponseMessage[@ResponseClass='Success']");
+        if (rm.length == 0) {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending update respons.");
+            rm = null;
+            return;
+        }
+
+        var responseCode = rm[0].getTagValue("m:ResponseCode");
+        if (responseCode != "NoError") {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_SOAP_ERROR, "Error on sending update respons:" + responseCode);
+            rm = null;
+            return;
+        }
+
+        var aItem = rm[0].XPath("/m:Items/*");
+        if (aItem.length > 0) {
+            var itemId = aItem[0].getAttributeByTag("t:ItemId", "Id");
+            var changeKey = aItem[0].getAttributeByTag("t:ItemId", "ChangeKey");
+        }
+        else {
+            this.onSendError(aExchangeRequest, this.parent.ER_ERROR_ITEM_UPDATE_UNKNOWN, "Update request was ok but we did not receive any updated item details:" + String(aResp));
+            rm = null;
+            aItem = null;
+            return;
+        }
+        rm = null;
+        aItem = null;
+
+        if (this.mCbOk) {
+            this.mCbOk(this, itemId, changeKey);
+        }
+        this.isRunning = false;
+    },
+
+    onSendError: function _onSendError(aExchangeRequest, aCode, aMsg) {
+        this.isRunning = false;
+        if (this.mCbError) {
+            this.mCbError(this, aCode, aMsg);
+        }
+    },
 };
-
-
diff --git a/components/exchangeAbFunctions.js b/components/exchangeAbFunctions.js
index f759c33b..b7ce831f 100644
--- a/components/exchangeAbFunctions.js
+++ b/components/exchangeAbFunctions.js
@@ -34,269 +34,260 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = [];
 
-if (! exchWebService) var exchWebService = {};
+if (!exchWebService) var exchWebService = {};
 
 exchWebService.commonAbFunctions = {
 
-	exchangePrefs : Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefService)
-		    .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl."),
-
-	/*
-	 * getAccounts
-	 * returns: a list with uuid values which represent user defined Exchange accounts
-	 */
-	getAccounts: function _getAccounts()
-	{
-		try {
-			var accounts = exchWebService.commonAbFunctions.exchangePrefs.getCharPref("accounts");
-		}
-		catch(err) {
-			this.logInfo("no Exchange accounts found.");
-			return [];
-		}
-
-		return accounts.split(",");
-	},
-
-	addAccount: function _addAccount(aAccountObject)
-	{
-		exchWebService.commonFunctions.ASSERT(aAccountObject);
-		
-		var newUUID = exchWebService.commonFunctions.getUUID();
-
-		try {
-			var accounts = exchWebService.commonAbFunctions.exchangePrefs.getCharPref("accounts");
-			if (accounts != "") {
-				accounts = accounts + "," + newUUID;
-			}
-			else {
-				accounts = newUUID;
-			}
-		}
-		catch(err) {
-			var accounts = newUUID;
-		}
-
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("accounts", accounts);
-
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".description", aAccountObject.description);
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".mailbox", aAccountObject.mailbox);
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".user", aAccountObject.user);
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".domain", aAccountObject.domain);
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".server", aAccountObject.serverUrl);
-
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".folderbase", aAccountObject.folderBase);
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".folderpath", aAccountObject.folderPath);
-
-		if (aAccountObject.folderID) {
-			exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".folderid", aAccountObject.folderID);
-		}
-		if (aAccountObject.changeKey) {
-			exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+newUUID+".changekey", aAccountObject.changeKey);
-		}
-		
-		return newUUID;
-	},
-
-	deleteAccount: function _deleteAccount(aUUID)
-	{
-		this.logInfo("deleteAccount:"+aUUID);
-		var currentAccounts = this.getAccounts();
-		var newAccounts = [];
-		for each(var account in currentAccounts) {
-			this.logInfo("  Account:"+account);
-			if (account != aUUID) {
-				newAccounts.push(account);
-			}
-		}
-		this.logInfo("  accounts:"+newAccounts.join(","));
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("accounts", newAccounts.join(","));
-		exchWebService.commonAbFunctions.exchangePrefs.deleteBranch("account."+aUUID);
-	},
-
-	getDescription: function _getDescription(aUUID)
-	{
-		try {
-			return exchWebService.commonAbFunctions.exchangePrefs.getCharPref("account."+aUUID+".description");
-		}
-		catch(err) {
-			return "";
-		}
-	},
-
-	setDescription: function _setDescription(aUUID, aValue)
-	{
-		exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account."+aUUID+".description", aValue);
-	},
-
-	getRootUUID: function _getRootUUID()
-	{
-		try {
-			return exchWebService.commonAbFunctions.exchangePrefs.getCharPref("rootUUID");
-		}
-		catch(err) {
-			var newRootUUID = exchWebService.commonFunctions.getUUID();
-			exchWebService.commonAbFunctions.exchangePrefs.setCharPref("rootUUID", newRootUUID);
-			return newRootUUID;
-		}
-	},
-
-	// aQuery should be enclosed by round brackets.
-	cardMatchesQuery: function _cardMatchesQuery(aQuery, aCard)
-	{
-this.logInfo("cardMatchesQuery: aQuery="+aQuery);
-
-		if (!aCard) {
-			return false;
-		}
-
-		// Trim leadin and trailing spaces
-		var cleanQuery = exchWebService.commonFunctions.trim(aQuery);
-
-		// Check for round brackets.
-		if ((cleanQuery.substr(0,1) != "(") || (cleanQuery.substr(cleanQuery.length-1,1) != ")")) {
-			throw "Invalid query. Missing leading or trailing round bracket";
-		}
-
-		// Remove brackets;
-		cleanQuery = cleanQuery.substr(1,cleanQuery.length-2);
-
-		var operator = cleanQuery.substr(0, cleanQuery.indexOf("("));
-		if ((operator == "or") || (operator == "and")) {
-			// We have a valid operator so get the list of subquery.
-			cleanQuery = cleanQuery.substr(cleanQuery.indexOf("("));
-			var totalResult = false;
-			while (cleanQuery.indexOf("(") > -1) {
-				this.logInfo("cardMatchesQuery. cleanQuery:"+cleanQuery);
-				var openBrackets = 1;
-				var subQuery = "(";
-				var charPos = 1;
-				var tmpChar;
-				while ((openBrackets > 0) && (charPos < cleanQuery.length)) {
-					tmpChar = cleanQuery.substr(charPos,1);
-					if (tmpChar == "(") openBrackets++;
-					if (tmpChar == ")") openBrackets--;
-					subQuery = subQuery + tmpChar;
-					charPos++;
-				}
-				
-				this.logInfo("cardMatchesQuery. subQuery:"+subQuery);
-				var subMatches = exchWebService.commonAbFunctions.cardMatchesQuery(subQuery, aCard);
-				if (subMatches) {
-					this.logInfo("cardMatchesQuery. Match on subQuery:"+subQuery);
-				}
-				else {
-					this.logInfo("cardMatchesQuery. NO Match on subQuery:"+subQuery);
-				}
-				switch (operator) {
-					case "or":
-						if (subMatches) return true;
-						break;
-					case "and":
-						if (! subMatches) return false;
-						totalResult = true;
-						break;
-				}
-				cleanQuery = cleanQuery.substr(subQuery.length);
-			}
-			return totalResult;
-			
-		}
-		else {
-			// We only have a query.
-			var queryFields = cleanQuery.split(",");
-			if (queryFields.length != 3) {
-				throw "Invalid query. Not enough fields in '"+cleanQuery+"'";
-			}
-			queryFields[2] = decodeURI(queryFields[2]);
-			this.logInfo("   - Field="+queryFields[0]);
-			this.logInfo("   - match="+queryFields[1]);
-			this.logInfo("   - value="+queryFields[2]);
-			switch (queryFields[1]) {
-				case "c":
-					if (aCard.getProperty(queryFields[0], "").toLowerCase().indexOf(queryFields[2].toLowerCase()) > -1) {
-						this.logInfo("   -- Matches card."+queryFields[0]+"="+aCard.getProperty(queryFields[0], "")+", value="+queryFields[2]);
-						return true;
-					}
-					else {
-						this.logInfo("   -- NO Match with card."+queryFields[0]+"="+aCard.getProperty(queryFields[0], "")+", value="+queryFields[2]);
-						return false;
-					}
-					break;
-				case "bw":
-					this.logInfo("   -'"+queryFields[0]+"'='"+aCard.getProperty(queryFields[0], "")+"' bw:'"+queryFields[2]+"'");
-					if (aCard.getProperty(queryFields[0], "").toLowerCase().indexOf(queryFields[2].toLowerCase()) == 0) {
-						this.logInfo("   -- Matches card."+queryFields[0]+"="+aCard.getProperty(queryFields[0], "")+", value="+queryFields[2]);
-						return true;
-					}
-					else {
-						this.logInfo("   -- NO Match with card."+queryFields[0]+"="+aCard.getProperty(queryFields[0], "")+", value="+queryFields[2]);
-						return false;
-					}
-					break;
-				case "=":
-					var value = false;
-					if (queryFields[2] == "TRUE") value = true;
-					if (aCard.getProperty(queryFields[0], !value) == value) {
-						this.logInfo("   -- Matches card."+queryFields[0]+"="+aCard.getProperty(queryFields[0], "")+", value="+queryFields[2]);
-						return true;
-					}
-					else {
-						this.logInfo("   -- NO Match with card."+queryFields[0]+"="+aCard.getProperty(queryFields[0], "")+", value="+queryFields[2]);
-						return false;
-					}
-					break;
-			}
-		}
-
-	},
-
-	filterCardsOnQuery: function _filterCarsOnQuery(aQuery, aCards, aDirectory)
-	{
-		var result = {};
-		for (var card in fixIterator(aCards, Ci.mivExchangeAbCard)) {
-			if (exchWebService.commonAbFunctions.cardMatchesQuery(aQuery, card)) {
-				result[card.localId] = card;
-			}
-		}
-		return result;
-	},
-
-	paramsToArray: function _paramsToArray(aParams, aSplitcharacter)
-	{
-		var tmpList = aParams.split(aSplitcharacter);
-		var result = {};
-		for (var index in tmpList) {
-			var tmpParam = tmpList[index].substr(0, tmpList[index].indexOf("="));
-			var tmpValue = tmpList[index].substr(tmpList[index].indexOf("=")+1);
-			result[tmpParam] = tmpValue;
-		}
-		return result;
-	},
-
-	logInfo: function _logInfo(message, aDebugLevel) {
-
-		if (!aDebugLevel) {
-			var debugLevel = 1;
-		}
-		else {
-			var debugLevel = aDebugLevel;
-		}
-
-		var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-
-		var doDebug = exchWebService.commonFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.contacts.debug", false, true);
-		if (!doDebug) {
-			return;
-		}
-
-		var storedDebugLevel = exchWebService.commonFunctions.safeGetIntPref(prefB, "extensions.1st-setup.contacts.debuglevel", 0, true);
-
-		if (debugLevel <= storedDebugLevel) {
-			exchWebService.commonFunctions.LOG("[contacts] "+message + " ("+exchWebService.commonFunctions.STACKshort()+")");
-		}
-	},
+    exchangePrefs: Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService)
+        .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl."),
+
+    /*
+     * getAccounts
+     * returns: a list with uuid values which represent user defined Exchange accounts
+     */
+    getAccounts: function _getAccounts() {
+        try {
+            var accounts = exchWebService.commonAbFunctions.exchangePrefs.getCharPref("accounts");
+        }
+        catch (err) {
+            this.logInfo("no Exchange accounts found.");
+            return [];
+        }
+
+        return accounts.split(",");
+    },
+
+    addAccount: function _addAccount(aAccountObject) {
+        exchWebService.commonFunctions.ASSERT(aAccountObject);
+
+        var newUUID = exchWebService.commonFunctions.getUUID();
+
+        try {
+            var accounts = exchWebService.commonAbFunctions.exchangePrefs.getCharPref("accounts");
+            if (accounts != "") {
+                accounts = accounts + "," + newUUID;
+            }
+            else {
+                accounts = newUUID;
+            }
+        }
+        catch (err) {
+            var accounts = newUUID;
+        }
+
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("accounts", accounts);
+
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".description", aAccountObject.description);
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".mailbox", aAccountObject.mailbox);
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".user", aAccountObject.user);
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".domain", aAccountObject.domain);
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".server", aAccountObject.serverUrl);
+
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".folderbase", aAccountObject.folderBase);
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".folderpath", aAccountObject.folderPath);
+
+        if (aAccountObject.folderID) {
+            exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".folderid", aAccountObject.folderID);
+        }
+        if (aAccountObject.changeKey) {
+            exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + newUUID + ".changekey", aAccountObject.changeKey);
+        }
+
+        return newUUID;
+    },
+
+    deleteAccount: function _deleteAccount(aUUID) {
+        this.logInfo("deleteAccount:" + aUUID);
+        var currentAccounts = this.getAccounts();
+        var newAccounts = [];
+        for each(var account in currentAccounts) {
+            this.logInfo("  Account:" + account);
+            if (account != aUUID) {
+                newAccounts.push(account);
+            }
+        }
+        this.logInfo("  accounts:" + newAccounts.join(","));
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("accounts", newAccounts.join(","));
+        exchWebService.commonAbFunctions.exchangePrefs.deleteBranch("account." + aUUID);
+    },
+
+    getDescription: function _getDescription(aUUID) {
+        try {
+            return exchWebService.commonAbFunctions.exchangePrefs.getCharPref("account." + aUUID + ".description");
+        }
+        catch (err) {
+            return "";
+        }
+    },
+
+    setDescription: function _setDescription(aUUID, aValue) {
+        exchWebService.commonAbFunctions.exchangePrefs.setCharPref("account." + aUUID + ".description", aValue);
+    },
+
+    getRootUUID: function _getRootUUID() {
+        try {
+            return exchWebService.commonAbFunctions.exchangePrefs.getCharPref("rootUUID");
+        }
+        catch (err) {
+            var newRootUUID = exchWebService.commonFunctions.getUUID();
+            exchWebService.commonAbFunctions.exchangePrefs.setCharPref("rootUUID", newRootUUID);
+            return newRootUUID;
+        }
+    },
+
+    // aQuery should be enclosed by round brackets.
+    cardMatchesQuery: function _cardMatchesQuery(aQuery, aCard) {
+        this.logInfo("cardMatchesQuery: aQuery=" + aQuery);
+
+        if (!aCard) {
+            return false;
+        }
+
+        // Trim leadin and trailing spaces
+        var cleanQuery = exchWebService.commonFunctions.trim(aQuery);
+
+        // Check for round brackets.
+        if ((cleanQuery.substr(0, 1) != "(") || (cleanQuery.substr(cleanQuery.length - 1, 1) != ")")) {
+            throw "Invalid query. Missing leading or trailing round bracket";
+        }
+
+        // Remove brackets;
+        cleanQuery = cleanQuery.substr(1, cleanQuery.length - 2);
+
+        var operator = cleanQuery.substr(0, cleanQuery.indexOf("("));
+        if ((operator == "or") || (operator == "and")) {
+            // We have a valid operator so get the list of subquery.
+            cleanQuery = cleanQuery.substr(cleanQuery.indexOf("("));
+            var totalResult = false;
+            while (cleanQuery.indexOf("(") > -1) {
+                this.logInfo("cardMatchesQuery. cleanQuery:" + cleanQuery);
+                var openBrackets = 1;
+                var subQuery = "(";
+                var charPos = 1;
+                var tmpChar;
+                while ((openBrackets > 0) && (charPos < cleanQuery.length)) {
+                    tmpChar = cleanQuery.substr(charPos, 1);
+                    if (tmpChar == "(") openBrackets++;
+                    if (tmpChar == ")") openBrackets--;
+                    subQuery = subQuery + tmpChar;
+                    charPos++;
+                }
+
+                this.logInfo("cardMatchesQuery. subQuery:" + subQuery);
+                var subMatches = exchWebService.commonAbFunctions.cardMatchesQuery(subQuery, aCard);
+                if (subMatches) {
+                    this.logInfo("cardMatchesQuery. Match on subQuery:" + subQuery);
+                }
+                else {
+                    this.logInfo("cardMatchesQuery. NO Match on subQuery:" + subQuery);
+                }
+                switch (operator) {
+                case "or":
+                    if (subMatches) return true;
+                    break;
+                case "and":
+                    if (!subMatches) return false;
+                    totalResult = true;
+                    break;
+                }
+                cleanQuery = cleanQuery.substr(subQuery.length);
+            }
+            return totalResult;
+
+        }
+        else {
+            // We only have a query.
+            var queryFields = cleanQuery.split(",");
+            if (queryFields.length != 3) {
+                throw "Invalid query. Not enough fields in '" + cleanQuery + "'";
+            }
+            queryFields[2] = decodeURI(queryFields[2]);
+            this.logInfo("   - Field=" + queryFields[0]);
+            this.logInfo("   - match=" + queryFields[1]);
+            this.logInfo("   - value=" + queryFields[2]);
+            switch (queryFields[1]) {
+            case "c":
+                if (aCard.getProperty(queryFields[0], "").toLowerCase().indexOf(queryFields[2].toLowerCase()) > -1) {
+                    this.logInfo("   -- Matches card." + queryFields[0] + "=" + aCard.getProperty(queryFields[0], "") + ", value=" + queryFields[2]);
+                    return true;
+                }
+                else {
+                    this.logInfo("   -- NO Match with card." + queryFields[0] + "=" + aCard.getProperty(queryFields[0], "") + ", value=" + queryFields[2]);
+                    return false;
+                }
+                break;
+            case "bw":
+                this.logInfo("   -'" + queryFields[0] + "'='" + aCard.getProperty(queryFields[0], "") + "' bw:'" + queryFields[2] + "'");
+                if (aCard.getProperty(queryFields[0], "").toLowerCase().indexOf(queryFields[2].toLowerCase()) == 0) {
+                    this.logInfo("   -- Matches card." + queryFields[0] + "=" + aCard.getProperty(queryFields[0], "") + ", value=" + queryFields[2]);
+                    return true;
+                }
+                else {
+                    this.logInfo("   -- NO Match with card." + queryFields[0] + "=" + aCard.getProperty(queryFields[0], "") + ", value=" + queryFields[2]);
+                    return false;
+                }
+                break;
+            case "=":
+                var value = false;
+                if (queryFields[2] == "TRUE") value = true;
+                if (aCard.getProperty(queryFields[0], !value) == value) {
+                    this.logInfo("   -- Matches card." + queryFields[0] + "=" + aCard.getProperty(queryFields[0], "") + ", value=" + queryFields[2]);
+                    return true;
+                }
+                else {
+                    this.logInfo("   -- NO Match with card." + queryFields[0] + "=" + aCard.getProperty(queryFields[0], "") + ", value=" + queryFields[2]);
+                    return false;
+                }
+                break;
+            }
+        }
+
+    },
+
+    filterCardsOnQuery: function _filterCarsOnQuery(aQuery, aCards, aDirectory) {
+        var result = {};
+        for (var card in fixIterator(aCards, Ci.mivExchangeAbCard)) {
+            if (exchWebService.commonAbFunctions.cardMatchesQuery(aQuery, card)) {
+                result[card.localId] = card;
+            }
+        }
+        return result;
+    },
+
+    paramsToArray: function _paramsToArray(aParams, aSplitcharacter) {
+        var tmpList = aParams.split(aSplitcharacter);
+        var result = {};
+        for (var index in tmpList) {
+            var tmpParam = tmpList[index].substr(0, tmpList[index].indexOf("="));
+            var tmpValue = tmpList[index].substr(tmpList[index].indexOf("=") + 1);
+            result[tmpParam] = tmpValue;
+        }
+        return result;
+    },
+
+    logInfo: function _logInfo(message, aDebugLevel) {
+
+        if (!aDebugLevel) {
+            var debugLevel = 1;
+        }
+        else {
+            var debugLevel = aDebugLevel;
+        }
+
+        var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+        var doDebug = exchWebService.commonFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.contacts.debug", false, true);
+        if (!doDebug) {
+            return;
+        }
+
+        var storedDebugLevel = exchWebService.commonFunctions.safeGetIntPref(prefB, "extensions.1st-setup.contacts.debuglevel", 0, true);
+
+        if (debugLevel <= storedDebugLevel) {
+            exchWebService.commonFunctions.LOG("[contacts] " + message + " (" + exchWebService.commonFunctions.STACKshort() + ")");
+        }
+    },
 
 }
 
diff --git a/components/soapFunctions.js b/components/soapFunctions.js
index 3a0961a0..9dac0c47 100644
--- a/components/soapFunctions.js
+++ b/components/soapFunctions.js
@@ -46,76 +46,75 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["makeParentFolderIds2", "makeParentFolderIds3", "publicFoldersMap"];
 
-const publicFoldersMap = { "publicfoldersroot" : true };
+const publicFoldersMap = {
+    "publicfoldersroot": true
+};
 
 // This is the xml2jxon version.
-function makeParentFolderIds2(aParentItem, aArgument)
-{
-	var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-			.getService(Ci.mivFunctions);
+function makeParentFolderIds2(aParentItem, aArgument) {
+    var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	var ParentFolderIds = globalFunctions.xmlToJxon('<nsMessages:'+aParentItem+' xmlns:nsMessages="'+nsMessagesStr+'" xmlns:nsTypes="'+nsTypesStr+'"/>');
+    var ParentFolderIds = globalFunctions.xmlToJxon('<nsMessages:' + aParentItem + ' xmlns:nsMessages="' + nsMessagesStr + '" xmlns:nsTypes="' + nsTypesStr + '"/>');
 
-	if (! aArgument.folderID) {
-		var DistinguishedFolderId = globalFunctions.xmlToJxon('<nsTypes:DistinguishedFolderId xmlns:nsTypes="'+nsTypesStr+'"/>');
-		DistinguishedFolderId.setAttribute("Id", aArgument.folderBase);
+    if (!aArgument.folderID) {
+        var DistinguishedFolderId = globalFunctions.xmlToJxon('<nsTypes:DistinguishedFolderId xmlns:nsTypes="' + nsTypesStr + '"/>');
+        DistinguishedFolderId.setAttribute("Id", aArgument.folderBase);
 
-		// If the folderBase is a public folder then do not provide mailbox if
-		// available.
-		if (! publicFoldersMap[aArgument.folderBase]) {
-			if (aArgument.mailbox) {
-				DistinguishedFolderId.addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", aArgument.mailbox);
-			}
-		}
-		ParentFolderIds.addChildTagObject(DistinguishedFolderId);
-		DistinguishedFolderId = null;
-	}
-	else {
-		var FolderId = globalFunctions.xmlToJxon('<nsTypes:FolderId xmlns:nsTypes="'+nsTypesStr+'"/>');
-		FolderId.setAttribute("Id", aArgument.folderID);
-		if ((aArgument.changeKey) && (aArgument.changeKey != "")) {
-			FolderId.setAttribute("ChangeKey", aArgument.changeKey);
-		}
-		
-		ParentFolderIds.addChildTagObject(FolderId);
-		FolderId = null;
-	}
+        // If the folderBase is a public folder then do not provide mailbox if
+        // available.
+        if (!publicFoldersMap[aArgument.folderBase]) {
+            if (aArgument.mailbox) {
+                DistinguishedFolderId.addChildTag("Mailbox", "nsTypes", null).addChildTag("EmailAddress", "nsTypes", aArgument.mailbox);
+            }
+        }
+        ParentFolderIds.addChildTagObject(DistinguishedFolderId);
+        DistinguishedFolderId = null;
+    }
+    else {
+        var FolderId = globalFunctions.xmlToJxon('<nsTypes:FolderId xmlns:nsTypes="' + nsTypesStr + '"/>');
+        FolderId.setAttribute("Id", aArgument.folderID);
+        if ((aArgument.changeKey) && (aArgument.changeKey != "")) {
+            FolderId.setAttribute("ChangeKey", aArgument.changeKey);
+        }
 
-	return ParentFolderIds;
+        ParentFolderIds.addChildTagObject(FolderId);
+        FolderId = null;
+    }
+
+    return ParentFolderIds;
 }
 
 // This is the xml2json version.
-function makeParentFolderIds3(aParentItem, aArgument)
-{
-	var root = xml2json.newJSON();
-	var ParentFolderIds = xml2json.addTag(root, aParentItem, "nsMessages");
-	xml2json.setAttribute(ParentFolderIds, "xmlns:nsMessages", nsMessagesStr);
-	xml2json.setAttribute(ParentFolderIds, "xmlns:nsTypes", nsTypesStr);
+function makeParentFolderIds3(aParentItem, aArgument) {
+    var root = xml2json.newJSON();
+    var ParentFolderIds = xml2json.addTag(root, aParentItem, "nsMessages");
+    xml2json.setAttribute(ParentFolderIds, "xmlns:nsMessages", nsMessagesStr);
+    xml2json.setAttribute(ParentFolderIds, "xmlns:nsTypes", nsTypesStr);
 
-	if (! aArgument.folderID) {
-		let DistinguishedFolderId = xml2json.addTag(ParentFolderIds, "DistinguishedFolderId", "nsTypes", null);
-		xml2json.setAttribute(DistinguishedFolderId, "Id", aArgument.folderBase);
+    if (!aArgument.folderID) {
+        let DistinguishedFolderId = xml2json.addTag(ParentFolderIds, "DistinguishedFolderId", "nsTypes", null);
+        xml2json.setAttribute(DistinguishedFolderId, "Id", aArgument.folderBase);
 
-		// If the folderBase is a public folder then do not provide mailbox if
-		// available.
-		if (! publicFoldersMap[aArgument.folderBase]) {
-			if (aArgument.mailbox) {
-				let mailbox = xml2json.addTag(DistinguishedFolderId, "Mailbox", "nsTypes", null);
-				xml2json.addTag(mailbox, "EmailAddress", "nsTypes", aArgument.mailbox);
-				mailbox = null;
-			}
-		}
-		DistinguishedFolderId = null;
-	}
-	else {
-		let FolderId = xml2json.addTag(ParentFolderIds, "FolderId", "nsTypes", null);
-		xml2json.setAttribute(FolderId, "Id", aArgument.folderID);
-		if ((aArgument.changeKey) && (aArgument.changeKey != "")) {
-			xml2json.setAttribute(FolderId, "ChangeKey", aArgument.changeKey);
-		}
-		FolderId = null;
-	}
+        // If the folderBase is a public folder then do not provide mailbox if
+        // available.
+        if (!publicFoldersMap[aArgument.folderBase]) {
+            if (aArgument.mailbox) {
+                let mailbox = xml2json.addTag(DistinguishedFolderId, "Mailbox", "nsTypes", null);
+                xml2json.addTag(mailbox, "EmailAddress", "nsTypes", aArgument.mailbox);
+                mailbox = null;
+            }
+        }
+        DistinguishedFolderId = null;
+    }
+    else {
+        let FolderId = xml2json.addTag(ParentFolderIds, "FolderId", "nsTypes", null);
+        xml2json.setAttribute(FolderId, "Id", aArgument.folderID);
+        if ((aArgument.changeKey) && (aArgument.changeKey != "")) {
+            xml2json.setAttribute(FolderId, "ChangeKey", aArgument.changeKey);
+        }
+        FolderId = null;
+    }
 
-	return ParentFolderIds;
+    return ParentFolderIds;
 }
-
diff --git a/defaults/preferences/debug.js b/defaults/preferences/debug.js
index 4ffde8e8..9017b4f5 100644
--- a/defaults/preferences/debug.js
+++ b/defaults/preferences/debug.js
@@ -12,7 +12,7 @@ pref("extensions.extras.LowIcon", "chrome://exchangecalendar-common/skin/images/
 pref("extensions.extras.LowestColor", "#99FF99");
 pref("extensions.extras.LowestIcon", "chrome://exchangecalendar-common/skin/images/lowest.gif");
 pref("extensions.extras.ShadeHigh", true);
-pref("extensions.extras.ShadeLow", false); 
-pref("calendar.timezone.local.auto", true ); 
-pref("extensions.1st-setup.others.warnAboutPrereleaseVersion", true); 
-user_pref("mailnews.database.global.indexer.enabled", true); 
+pref("extensions.extras.ShadeLow", false);
+pref("calendar.timezone.local.auto", true);
+pref("extensions.1st-setup.others.warnAboutPrereleaseVersion", true);
+user_pref("mailnews.database.global.indexer.enabled", true);
diff --git a/defaults/preferences/rtews.prefs.js b/defaults/preferences/rtews.prefs.js
index fc5d39ce..4531f6ca 100644
--- a/defaults/preferences/rtews.prefs.js
+++ b/defaults/preferences/rtews.prefs.js
@@ -1,2 +1,2 @@
 pref("extensions.rtews.pollinterval", 5000);
-pref("extensions.rtews.users", "[]");
\ No newline at end of file
+pref("extensions.rtews.users", "[]");
diff --git a/defaults/preferences/update.js b/defaults/preferences/update.js
index b5ec2650..1fc5400b 100644
--- a/defaults/preferences/update.js
+++ b/defaults/preferences/update.js
@@ -1 +1 @@
-user_pref("extensions.1st-setup.others.updateRequired", true); 
+user_pref("extensions.1st-setup.others.updateRequired", true);
diff --git a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js b/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js
index 34c3b5c1..8f392d44 100644
--- a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js
+++ b/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeMsgAccountManagerExtension() {
 
-	//this.logInfo("mivExchangeMsgAccountManagerExtension: init");
+    //this.logInfo("mivExchangeMsgAccountManagerExtension: init");
 
 }
 
@@ -37,66 +37,64 @@ var mivExchangeMsgAccountManagerExtensionGUID = "9b353ed2-b8c9-42aa-8aad-e2ee853
 
 mivExchangeMsgAccountManagerExtension.prototype = {
 
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeMsgAccountManagerExtension,
-				Ci.nsIMsgAccountManagerExtension,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
-
-	_className : "mivExchangeMsgAccountManagerExtension",
-
-	classDescription : "Exchange EWS Msg Account Manager Extension",
-
-	classID : components.ID("{"+mivExchangeMsgAccountManagerExtensionGUID+"}"),
-	contractID : "@mozilla.org/accountmanager/extension;1?name=exchangeWebServiceMail",
-	flags : Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeMsgAccountManagerExtension,
-				Ci.nsIMsgAccountManagerExtension,
-				Ci.nsIClassInfo,
-				Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-//  readonly attribute ACString name;   // examples:  mdn
-	get name()
-	{
-dump("mivExchangeMsgAccountManagerExtension.name:\n");
-		return "exchangeWebServiceMail";
-	},
-
-//  boolean showPanel(in nsIMsgIncomingServer server);
-	showPanel: function _showPanel(aServer)
-	{
-dump("mivExchangeMsgAccountManagerExtension.showPanel: aServer.type:"+aServer.type+"\n");
-	},
-
-//  readonly attribute ACString chromePackageName;  // example:  messenger, chrome://messenger/content/am-mdn.xul and chrome://messenger/locale/am-mdn.properties
-	get chromePackageName()
-	{
-dump("mivExchangeMsgAccountManagerExtension.chromePackageName:\n");
-		return "exchangemail"
-	},
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeMsgAccountManagerExtension,
+        Ci.nsIMsgAccountManagerExtension,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    _className: "mivExchangeMsgAccountManagerExtension",
+
+    classDescription: "Exchange EWS Msg Account Manager Extension",
+
+    classID: components.ID("{" + mivExchangeMsgAccountManagerExtensionGUID + "}"),
+    contractID: "@mozilla.org/accountmanager/extension;1?name=exchangeWebServiceMail",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeMsgAccountManagerExtension,
+            Ci.nsIMsgAccountManagerExtension,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    //  readonly attribute ACString name;   // examples:  mdn
+    get name() {
+        dump("mivExchangeMsgAccountManagerExtension.name:\n");
+        return "exchangeWebServiceMail";
+    },
+
+    //  boolean showPanel(in nsIMsgIncomingServer server);
+    showPanel: function _showPanel(aServer) {
+        dump("mivExchangeMsgAccountManagerExtension.showPanel: aServer.type:" + aServer.type + "\n");
+    },
+
+    //  readonly attribute ACString chromePackageName;  // example:  messenger, chrome://messenger/content/am-mdn.xul and chrome://messenger/locale/am-mdn.properties
+    get chromePackageName() {
+        dump("mivExchangeMsgAccountManagerExtension.chromePackageName:\n");
+        return "exchangemail"
+    },
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeMsgAccountManagerExtension) {
-			NSGetFactory.mivExchangeMsgAccountManagerExtension = XPCOMUtils.generateNSGetFactory([mivExchangeMsgAccountManagerExtension]);
+    try {
+        if (!NSGetFactory.mivExchangeMsgAccountManagerExtension) {
+            NSGetFactory.mivExchangeMsgAccountManagerExtension = XPCOMUtils.generateNSGetFactory([mivExchangeMsgAccountManagerExtension]);
 
-	}
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeMsgAccountManagerExtension(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeMsgAccountManagerExtension(cid);
+}
diff --git a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js b/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js
index acd89ef4..dcb17617 100644
--- a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js
+++ b/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeMsgIncomingServer() {
 
-	//this.logInfo("mivExchangeMsgIncomingServer: init");
+    //this.logInfo("mivExchangeMsgIncomingServer: init");
 
 }
 
@@ -37,1093 +37,964 @@ var mivExchangeMsgIncomingServerGUID = "79d87edc-020e-48d4-8c04-b894edab4bd2";
 
 mivExchangeMsgIncomingServer.prototype = {
 
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeMsgIncomingServer,
-				Ci.nsIMsgIncomingServer,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
-
-	_className : "mivExchangeMsgIncomingServer",
-
-	classDescription : "Exchange EWS Msg Incoming server",
-
-	classID : components.ID("{"+mivExchangeMsgIncomingServerGUID+"}"),
-	contractID : "@mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail",
-	flags : Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeMsgIncomingServer,
-				Ci.nsIMsgIncomingServer,
-				Ci.nsIClassInfo,
-				Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-  /**
-   * internal pref key - guaranteed to be unique across all servers
-   */
-//  attribute ACString key;
-	get key()
-	{
-		dump("get key\n");
-	},
-
-	set key(aValue)
-	{
-		dump("set key aValue:"+aValue+"\n");
-	},
-
-  /**
-   * pretty name - should be "userid on hostname"
-   * if the pref is not set
-   */
-//  attribute AString prettyName;
-	get prettyName()
-	{
-		dump("get prettyName\n");
-	},
-
-	set prettyName(aValue)
-	{
-		dump("set prettyName aValue:"+aValue+"\n");
-	},
-
-  /**
-  * helper function to construct the pretty name in a server type
-  * specific way - e.g., mail for foo@test.com, news on news.mozilla.org
-  */
-//  readonly attribute AString constructedPrettyName;
-	get constructedPrettyName()
-	{
-		dump("get constructedPrettyName\n");
-	},
-
-  /**
-   * hostname of the server
-   */
-//  attribute ACString hostName;
-	get hostName()
-	{
-		dump("get hostName\n");
-	},
-
-	set hostName(aValue)
-	{
-		dump("set hostName aValue:"+aValue+"\n");
-	},
-  
-  /**
-   * real hostname of the server (if server name is changed it's stored here)
-   */
-//  attribute ACString realHostName;
-	get realHostName()
-	{
-		dump("get realHostName\n");
-	},
-
-	set realHostName(aValue)
-	{
-		dump("set realHostName aValue:"+aValue+"\n");
-	},
-  
-  /* port of the server */
-//  attribute long port;
-	get port()
-	{
-		dump("get port\n");
-	},
-
-	set port(aValue)
-	{
-		dump("set port aValue:"+aValue+"\n");
-	},
-
-  /**
-   * userid to log into the server
-   */
-//  attribute ACString username;
-	get username()
-	{
-		dump("get username\n");
-	},
-
-	set username(aValue)
-	{
-		dump("set username aValue:"+aValue+"\n");
-	},
-
-  /**
-   * real username of the server (if username is changed it's stored here)
-   */
-//  attribute ACString realUsername;
-	get realUsername()
-	{
-		dump("get realUsername\n");
-	},
-
-	set realUsername(aValue)
-	{
-		dump("set realUsername aValue:"+aValue+"\n");
-	},
-
-  /**
-   * protocol type, i.e. "pop3", "imap", "nntp", "none", etc
-   * used to construct URLs
-   */
-//  attribute ACString type;
-	get type()
-	{
-		dump("get type\n");
-	},
-
-	set type(aValue)
-	{
-		dump("set type aValue:"+aValue+"\n");
-	},
-
-//  readonly attribute AString accountManagerChrome;
-	get accountManagerChrome()
-	{
-		dump("get accountManagerChrome\n");
-	},
-
-  /**
-   * the schema for the local mail store, such
-   * as "mailbox", "imap", or "news"
-   * used to construct URIs
-   */
-//  readonly attribute ACString localStoreType;
-	get localStoreType()
-	{
-		dump("get localStoreType\n");
-	},
-
-  // Perform specific tasks (reset flags, remove files, etc) for account user/server name changes.
-//  void onUserOrHostNameChanged(in ACString oldName, in ACString newName,
-//                               in bool hostnameChanged);
-	onUserOrHostNameChanged: function _onUserOrHostNameChanged(oldName, newName, hostnameChanged)
-	{
-		dump("function onUserOrHostNameChanged\n");
-	},
-
-  /* cleartext version of the password */
-//  attribute ACString password;
-	get password()
-	{
-		dump("get password\n");
-	},
-
-	set password(aValue)
-	{
-		dump("set password aValue:"+aValue+"\n");
-	},
-
-  /**
-   * Attempts to get the password first from the password manager, if that
-   * fails it will attempt to get it from the user if aMsgWindow is supplied.
-   *
-   * @param aPromptString  The text of the prompt if the user is prompted for
-   *                       password.
-   * @param aPromptTitle   The title of the prompt if the user is prompted.
-   * @param aMsgWindow     A message window to associate the prompt with.
-   * @return               The obtained password. Could be an empty password.
-   *
-   * @exception NS_ERROR_FAILURE  The password could not be obtained.
-   *
-   * @note NS_MSG_PASSWORD_PROMPT_CANCELLED is a success code that is returned
-   *       if the prompt was presented to the user but the user cancelled the
-   *       prompt.
-   */
-//  ACString getPasswordWithUI(in AString aPromptString, in AString aPromptTitle,
-//                             in nsIMsgWindow aMsgWindow);
-	getPasswordWithUI: function _getPasswordWithUI(aPromptString, aPromptTitle, aMsgWindow)
-	{
-		dump("function getPasswordWithUI\n");
-	},
-
-  /* forget the password in memory and in single signon database */
-//  void forgetPassword();
-	forgetPassword: function _forgetPassword()
-	{
-		dump("function forgetPassword\n");
-	},
-
-  /* forget the password in memory which is cached for the session */
-//  void forgetSessionPassword();
-	forgetSessionPassword: function _forgetSessionPassword()
-	{
-		dump("function forgetSessionPassword\n");
-	},
-
-  /* should we download whole messages when biff goes off? */
-//  attribute boolean downloadOnBiff;
-	get downloadOnBiff()
-	{
-		dump("get downloadOnBiff\n");
-	},
-
-	set downloadOnBiff(aValue)
-	{
-		dump("set downloadOnBiff aValue:"+aValue+"\n");
-	},
-
-  /* should we biff the server? */
-//  attribute boolean doBiff;
-	get doBiff()
-	{
-		dump("get doBiff\n");
-	},
-
-	set doBiff(aValue)
-	{
-		dump("set doBiff aValue:"+aValue+"\n");
-	},
-
-  /* how often to biff */
-//  attribute long biffMinutes;
-	get biffMinutes()
-	{
-		dump("get biffMinutes\n");
-	},
-
-	set biffMinutes(aValue)
-	{
-		dump("set biffMinutes aValue:"+aValue+"\n");
-	},
-
-  /* current biff state */
-//  attribute unsigned long biffState;
-	get biffState()
-	{
-		dump("get biffState\n");
-	},
-
-	set biffState(aValue)
-	{
-		dump("set biffState aValue:"+aValue+"\n");
-	},
-
-  /* are we running a url as a result of biff going off? (different from user clicking get msg) */
-//  attribute boolean performingBiff; 
-	get performingBiff()
-	{
-		dump("get performingBiff\n");
-	},
-
-	set performingBiff(aValue)
-	{
-		dump("set performingBiff aValue:"+aValue+"\n");
-	},
-
-  /* the on-disk path to message storage for this server */
-//  attribute nsIFile localPath;
-	get localPath()
-	{
-		dump("get localPath\n");
-	},
-
-	set localPath(aValue)
-	{
-		dump("set localPath aValue:"+aValue+"\n");
-	},
-
-  /// message store to use for the folders under this server.
-//  readonly attribute nsIMsgPluggableStore msgStore;
-	get msgStore()
-	{
-		dump("get msgStore\n");
-	},
-
-  /* the RDF URI for the root mail folder */
-//  readonly attribute ACString serverURI;
-	get serverURI()
-	{
-		dump("get serverURI\n");
-	},
-
-  /* the root folder for this server, even if server is deferred */
-//  attribute nsIMsgFolder rootFolder;
-	get rootFolder()
-	{
-		dump("get rootFolder\n");
-	},
-
-	set rootFolder(aValue)
-	{
-		dump("set rootFolder aValue:"+aValue+"\n");
-	},
-
-  /* root folder for this account 
-     - if account is deferred, root folder of deferred-to account */
-//  readonly attribute nsIMsgFolder rootMsgFolder;
-	get rootMsgFolder()
-	{
-		dump("get rootMsgFolder\n");
-	},
-
-  /* are we already getting new Messages on the current server..
-     This is used to help us prevent multiple get new msg commands from
-     going off at the same time. */
-//  attribute boolean serverBusy;
-	get serverBusy()
-	{
-		dump("get serverBusy\n");
-	},
-
-	set serverBusy(aValue)
-	{
-		dump("set serverBusy aValue:"+aValue+"\n");
-	},
-
-  /**
-   * Is the server using a secure channel (SSL or STARTTLS).
-   */
-//  readonly attribute boolean isSecure;
-	get isSecure()
-	{
-		dump("get isSecure\n");
-	},
-
-  /**
-   * Authentication mechanism.
-   *
-   * @see nsMsgAuthMethod (in MailNewsTypes2.idl)
-   * Same as "mail.server...authMethod" pref
-   */
-//  attribute nsMsgAuthMethodValue authMethod;
-	get authMethod()
-	{
-		dump("get authMethod\n");
-	},
-
-	set authMethod(aValue)
-	{
-		dump("set authMethod aValue:"+aValue+"\n");
-	},
-
-  /**
-   * Whether to SSL or STARTTLS or not
-   *
-   * @see nsMsgSocketType (in MailNewsTypes2.idl)
-   * Same as "mail.server...socketType" pref
-   */
-//  attribute nsMsgSocketTypeValue socketType;
-	get socketType()
-	{
-		dump("get socketType\n");
-	},
-
-	set socketType(aValue)
-	{
-		dump("set socketType aValue:"+aValue+"\n");
-	},
-
-  /* empty trash on exit */
-//  attribute boolean emptyTrashOnExit;
-	get emptyTrashOnExit()
-	{
-		dump("get emptyTrashOnExit\n");
-	},
-
-	set emptyTrashOnExit(aValue)
-	{
-		dump("set emptyTrashOnExit aValue:"+aValue+"\n");
-	},
-
-  /**
-   * Get the server's list of filters.
-   *
-   * This SHOULD be the same filter list as the root folder's, if the server
-   * supports per-folder filters. Furthermore, this list SHOULD be used for all
-   * incoming messages.
-   *
-   * Since the returned nsIMsgFilterList is mutable, it is not necessary to call
-   * setFilterList after the filters have been changed.
-   *
-   * @param aMsgWindow  @ref msgwindow "The standard message window"
-   * @return            The list of filters.
-   */
-//  nsIMsgFilterList getFilterList(in nsIMsgWindow aMsgWindow);
-	getFilterList: function _getFilterList(aMsgWindow)
-	{
-		dump("function getFilterList\n");
-	},
-
-  /**
-   * Set the server's list of filters.
-   *
-   * Note that this does not persist the filter list. To change the contents
-   * of the existing filters, use getFilterList and mutate the values as
-   * appopriate.
-   *
-   * @param aFilterList The new list of filters.
-   */
-//  void setFilterList(in nsIMsgFilterList aFilterList);
-	setFilterList: function _setFilterList(aFilterList)
-	{
-		dump("function setFilterList\n");
-	},
-
-  /**
-   * Get user editable filter list. This does not have to be the same as
-   * the filterlist above, typically depending on the users preferences.
-   * The filters in this list are not processed, but only to be edited by
-   * the user.
-   * @see getFilterList
-   *
-   * @param aMsgWindow  @ref msgwindow "The standard message window"
-   * @return            The list of filters.
-   */
-//  nsIMsgFilterList getEditableFilterList(in nsIMsgWindow aMsgWindow);
-	getEditableFilterList: function _getEditableFilterList(aMsgWindow)
-	{
-		dump("function getEditableFilterList\n");
-	},
-
-  /**
-   * Set user editable filter list.
-   * This does not persist the filterlist, @see setFilterList
-   * @see getEditableFilterList
-   * @see setFilterList
-   *
-   * @param aFilterList The new list of filters.
-   */
-//  void setEditableFilterList(in nsIMsgFilterList aFilterList);
-	setEditableFilterList: function _setEditableFilterList(aFilterList)
-	{
-		dump("function setEditableFilterList\n");
-	},
-
-  /* we use this to set the default local path.  we use this when migrating prefs */
-//  void setDefaultLocalPath(in nsIFile aDefaultLocalPath);
-	setDefaultLocalPath: function _setDefaultLocalPath(aDefaultLocalPath)
-	{
-		dump("function setDefaultLocalPath\n");
-	},
-
-  /**
-   * Verify that we can logon
-   * 
-   * @param  aUrlListener - gets called back with success or failure.
-   * @param aMsgWindow         nsIMsgWindow to use for notification callbacks.
-   * @return - the url that we run.
-   */
-//  nsIURI verifyLogon(in nsIUrlListener aUrlListener, in nsIMsgWindow aMsgWindow);
-	verifyLogon: function _verifyLogon(aUrlListener, aMsgWindow)
-	{
-		dump("function verifyLogon\n");
-	},
-
-  /* do a biff */
-//  void performBiff(in nsIMsgWindow aMsgWindow);
-	performBiff: function _performBiff(aMsgWindow)
-	{
-		dump("function performBiff\n");
-	},
-  
-  /* get new messages */
-//  void getNewMessages(in nsIMsgFolder aFolder, in nsIMsgWindow aMsgWindow, 
-//                      in nsIUrlListener aUrlListener);
-	getNewMessages: function _getNewMessages(aFolder, aMsgWindow, aUrlListener)
-	{
-		dump("function getNewMessages\n");
-	},
-
-  /* this checks if a server needs a password to do biff */
-//  readonly attribute boolean serverRequiresPasswordForBiff;
-	get serverRequiresPasswordForBiff()
-	{
-		dump("get serverRequiresPasswordForBiff\n");
-	},
-
-  /* this gets called when the server is expanded in the folder pane */
-//  void performExpand(in nsIMsgWindow aMsgWindow);
-	performExpand: function _performExpand(aMsgWindow)
-	{
-		dump("function performExpand\n");
-	},
-
-  /* Write out all known folder data to panacea.dat */
-//  void writeToFolderCache(in nsIMsgFolderCache folderCache);
-	writeToFolderCache: function _writeToFolderCache(folderCache)
-	{
-		dump("function writeToFolderCache\n");
-	},
-
-  /* close any server connections */
-//  void closeCachedConnections();
-	closeCachedConnections: function _closeCachedConnections()
-	{
-		dump("function closeCachedConnections\n");
-	},
- 
-  /* ... */
-//  void shutdown();
-	shutdown: function _shutdown()
-	{
-		dump("function shutdown\n");
-	},
-
-  /**
-   * Get or set the value as determined by the preference tree.
-   *
-   * These methods MUST NOT fail if the preference is not set, and therefore
-   * they MUST have a default value. This default value is provided in practice
-   * by use of a default preference tree. The standard format for the pref
-   * branches are <tt>mail.server.<i>key</i>.</tt> for per-server preferences,
-   * such that the preference is <tt>mail.server.<i>key</i>.<i>attr</i></tt>.
-   *
-   * The attributes are passed in as strings for ease of access by the C++
-   * consumers of this method.
-   *
-   * @param attr  The value for which the preference should be accessed.
-   * @param value The value of the preference to set.
-   * @return      The value of the preference.
-   * @{
-   */
-//  boolean getBoolValue(in string attr);
-	getBoolValue: function _getBoolValue(attr)
-	{
-		dump("function getBoolValue\n");
-	},
-
-//  void setBoolValue(in string attr, in boolean value);
-	setBoolValue: function _setBoolValue(attr, value)
-	{
-		dump("function setBoolValue\n");
-	},
-
-//  ACString getCharValue(in string attr);
-	getCharValue: function _getCharValue(attr)
-	{
-		dump("function getCharValue\n");
-	},
-
-//  void setCharValue(in string attr, in ACString value);
-	setCharValue: function _setCharValue(attr, value)
-	{
-		dump("function setCharValue\n");
-	},
-
-//  AString getUnicharValue(in string attr);
-	getUnicharValue: function _getUnicharValue(attr)
-	{
-		dump("function getUnicharValue\n");
-	},
-
-//  void setUnicharValue(in string attr, in AString value);
-	setUnicharValue: function _setUnicharValue(attr, value)
-	{
-		dump("function setUnicharValue\n");
-	},
-  
-//  long getIntValue(in string attr);
-	getIntValue: function _getIntValue(attr)
-	{
-		dump("function getIntValue\n");
-	},
-
-//  void setIntValue(in string attr, in long value);
-	setIntValue: function _setIntValue(attr, value)
-	{
-		dump("function setIntValue\n");
-	},
-
-  /** @} */
-
-  /**
-   * Get or set the value as determined by the preference tree.
-   *
-   * These methods MUST NOT fail if the preference is not set, and therefore
-   * they MUST have a default value. This default value is provided in practice
-   * by use of a default preference tree. The standard format for the pref
-   * branches are <tt>mail.server.<i>key</i>.</tt> for per-server preferences,
-   * such that the preference is <tt>mail.server.<i>key</i>.<i>attr</i></tt>.
-   *
-   * The attributes are passed in as strings for ease of access by the C++
-   * consumers of this method.
-   *
-   * There are two preference names on here for legacy reasons, where the first
-   * is the name which will be using a (preferred) relative preference and the
-   * second a deprecated absolute preference. Implementations that do not have
-   * to worry about supporting legacy preferences can safely ignore this second
-   * parameter. Callers must still provide a valid value, though.
-   *
-   * @param relpref The name of the relative file preference.
-   * @param absref  The name of the absolute file preference.
-   * @param aValue  The value of the preference to set.
-   * @return        The value of the preference.
-   * @{
-   */
-//  nsIFile getFileValue(in string relpref, in string abspref);
-	getFileValue: function _getFileValue(relpref, abspref)
-	{
-		dump("function getFileValue\n");
-	},
-
-//  void setFileValue(in string relpref, in string abspref, in nsIFile aValue);
-	setFileValue: function _setFileValue(relpref, abspref, aValue)
-	{
-		dump("function setFileValue\n");
-	},
-
-  /** @} */
-
-  /**
-   * this is really dangerous. this destroys all pref values
-   * do not call this unless you know what you're doing!
-   */
-//  void clearAllValues();
-	clearAllValues: function _clearAllValues()
-	{
-		dump("function clearAllValues\n");
-	},
-
-  /** 
-   * this is also very dangerous.  this will remove the files
-   * associated with this server on disk.
-   */
-//  void removeFiles();
-	removeFiles: function _removeFiles()
-	{
-		dump("function removeFiles\n");
-	},
-  
-//  attribute boolean valid;
-	get valid()
-	{
-		dump("get valid\n");
-	},
-
-	set valid(aValue)
-	{
-		dump("set valid aValue:"+aValue+"\n");
-	},
-  
-//  AString toString();
-	toString: function _toString()
-	{
-		dump("function toString\n");
-	},
-
-//  void displayOfflineMsg(in nsIMsgWindow aWindow);
-	displayOfflineMsg: function _displayOfflineMsg(aWindow)
-	{
-		dump("function displayOfflineMsg\n");
-	},
-
-  /* used for comparing nsIMsgIncomingServers */
-//  boolean equals(in nsIMsgIncomingServer server);
-	equals: function _equals(server)
-	{
-		dump("function equals\n");
-	},
-
-  /* Get Messages at startup */
-//  readonly attribute boolean downloadMessagesAtStartup; 
-	get downloadMessagesAtStartup()
-	{
-		dump("get downloadMessagesAtStartup\n");
-	},
-
-  /* check to this if the server supports filters */
-//  attribute boolean canHaveFilters;
-	get canHaveFilters()
-	{
-		dump("get canHaveFilters\n");
-	},
-
-	set canHaveFilters(aValue)
-	{
-		dump("set canHaveFilters aValue:"+aValue+"\n");
-	},
-
-  /**
-   * can this server be removed from the account manager?  for
-   * instance, local mail is not removable, but an imported folder is 
-   */
-//  attribute boolean canDelete;
-	get canDelete()
-	{
-		dump("get canDelete\n");
-	},
-
-	set canDelete(aValue)
-	{
-		dump("set canDelete aValue:"+aValue+"\n");
-	},
-
-//  attribute boolean loginAtStartUp;
-	get loginAtStartUp()
-	{
-		dump("get loginAtStartUp\n");
-	},
-
-	set loginAtStartUp(aValue)
-	{
-		dump("set loginAtStartUp aValue:"+aValue+"\n");
-	},
-
-//  attribute boolean limitOfflineMessageSize;
-	get limitOfflineMessageSize()
-	{
-		dump("get limitOfflineMessageSize\n");
-	},
-
-	set limitOfflineMessageSize(aValue)
-	{
-		dump("set limitOfflineMessageSize aValue:"+aValue+"\n");
-	},
-//  attribute long maxMessageSize;
-	get maxMessageSize()
-	{
-		dump("get maxMessageSize\n");
-	},
-
-	set maxMessageSize(aValue)
-	{
-		dump("set maxMessageSize aValue:"+aValue+"\n");
-	},
-
-//  attribute nsIMsgRetentionSettings retentionSettings;
-	get retentionSettings()
-	{
-		dump("get retentionSettings\n");
-	},
-
-	set retentionSettings(aValue)
-	{
-		dump("set retentionSettings aValue:"+aValue+"\n");
-	},
-
-  /* check if this server can be a default server */
-//  readonly attribute boolean canBeDefaultServer;
-	get canBeDefaultServer()
-	{
-		dump("get canBeDefaultServer\n");
-	},
-
-  /* check if this server allows search operations */
-//  readonly attribute boolean canSearchMessages;
-	get canSearchMessages()
-	{
-		dump("get canSearchMessages\n");
-	},
-
-  /* check if this server allows canEmptyTrashOnExit operations */
-//  readonly attribute boolean canEmptyTrashOnExit;
-	get canEmptyTrashOnExit()
-	{
-		dump("get canEmptyTrashOnExit\n");
-	},
-
-  /* display startup page once per account per session */
-//  attribute boolean displayStartupPage;
-	get displayStartupPage()
-	{
-		dump("get displayStartupPage\n");
-	},
-
-	set displayStartupPage(aValue)
-	{
-		dump("set displayStartupPage aValue:"+aValue+"\n");
-	},
-//  attribute nsIMsgDownloadSettings downloadSettings;
-	get downloadSettings()
-	{
-		dump("get downloadSettings\n");
-	},
-
-	set downloadSettings(aValue)
-	{
-		dump("set downloadSettings aValue:"+aValue+"\n");
-	},
-
-  /*
-   * Offline support level. Support level can vary based on abilities 
-   * and features each server can offer wrt to offline service.
-   * Here is the legend to determine the each support level details
-   *
-   * supportLevel == 0  --> no offline support (default) 
-   * supportLevel == 10 --> regular offline feature support
-   * supportLevel == 20 --> extended offline feature support 
-   *
-   * Each server can initialize itself to the support level if needed
-   * to override the default choice i.e., no offline support.
-   *
-   * POP3, None and Movemail will default to 0. 
-   * IMAP level 10 and NEWS with level 20. 
-   * 
-   */
-//  attribute long offlineSupportLevel;
-	get offlineSupportLevel()
-	{
-		dump("get offlineSupportLevel\n");
-	},
-
-	set offlineSupportLevel(aValue)
-	{
-		dump("set offlineSupportLevel aValue:"+aValue+"\n");
-	},
-
-  /* create pretty name for migrated accounts */
-//  AString generatePrettyNameForMigration(); 
-	generatePrettyNameForMigration: function _generatePrettyNameForMigration()
-	{
-		dump("function generatePrettyNameForMigration\n");
-	},
-
-  /* does this server have disk space settings? */
-//  readonly attribute boolean supportsDiskSpace;
-	get supportsDiskSpace()
-	{
-		dump("get supportsDiskSpace\n");
-	},
-
-  /**
-   * Hide this server/account from the UI - used for smart mailboxes.
-   * The server can be retrieved from the account manager by name using the
-   * various Find methods, but nsIMsgAccountManager's GetAccounts and 
-   * GetAllServers methods won't return the server/account.
-   */
-//  attribute boolean hidden;
-	get hidden()
-	{
-		dump("get hidden\n");
-	},
-
-	set hidden(aValue)
-	{
-		dump("set hidden aValue:"+aValue+"\n");
-	},
-
-  /**
-   * If the server supports Fcc/Sent/etc, default prefs can point to 
-   * the server. Otherwise, copies and folders prefs should point to
-   * Local Folders.
-   *
-   * By default this value is set to true via global pref 'allows_specialfolders_usage'
-   * (mailnews.js). For Nntp, the value is overridden to be false.
-   * If ISPs want to modify this value, they should do that in their rdf file
-   * by using this attribute. Please look at mozilla/mailnews/base/ispdata/aol.rdf for
-   * usage example.
-   */
-//  attribute boolean defaultCopiesAndFoldersPrefsToServer;
-	get defaultCopiesAndFoldersPrefsToServer()
-	{
-		dump("get defaultCopiesAndFoldersPrefsToServer\n");
-	},
-
-	set defaultCopiesAndFoldersPrefsToServer(aValue)
-	{
-		dump("set defaultCopiesAndFoldersPrefsToServer aValue:"+aValue+"\n");
-	},
-
-  /* can this server allows sub folder creation */
-//  attribute boolean canCreateFoldersOnServer;
-	get canCreateFoldersOnServer()
-	{
-		dump("get canCreateFoldersOnServer\n");
-	},
-
-	set canCreateFoldersOnServer(aValue)
-	{
-		dump("set canCreateFoldersOnServer aValue:"+aValue+"\n");
-	},
-
-  /* can this server allows message filing ? */
-//  attribute boolean canFileMessagesOnServer;
-	get canFileMessagesOnServer()
-	{
-		dump("get canFileMessagesOnServer\n");
-	},
-
-	set canFileMessagesOnServer(aValue)
-	{
-		dump("set canFileMessagesOnServer aValue:"+aValue+"\n");
-	},
-
-  /* can this server allow compacting folders ? */
-//  readonly attribute boolean canCompactFoldersOnServer;
-	get canCompactFoldersOnServer()
-	{
-		dump("get canCompactFoldersOnServer\n");
-	},
-
-  /* can this server allow undo delete ? */
-//  readonly attribute boolean canUndoDeleteOnServer;
-	get canUndoDeleteOnServer()
-	{
-		dump("get canUndoDeleteOnServer\n");
-	},
-
-  /* used for setting up the filter UI */
-//  readonly attribute nsMsgSearchScopeValue filterScope;
-	get filterScope()
-	{
-		dump("get filterScope\n");
-	},
-
-  /* used for setting up the search UI */
-//  readonly attribute nsMsgSearchScopeValue searchScope;
-	get searchScope()
-	{
-		dump("get searchScope\n");
-	},
-
-  /** 
-   * If the password for the server is available either via authentication 
-   * in the current session or from password manager stored entries, return
-   * false. Otherwise, return true. If password is obtained from password 
-   * manager, set the password member variable.
-   */ 
-//  readonly attribute boolean passwordPromptRequired;
-	get passwordPromptRequired()
-	{
-		dump("get passwordPromptRequired\n");
-	},
-
-  /**
-   * for mail, this configures both the MDN filter, and the server-side
-   * spam filter filters, if needed.
-   *
-   * If we have set up to filter return receipts into
-   * our Sent folder, this utility method creates
-   * a filter to do that, and adds it to our filterList
-   * if it doesn't exist.  If it does, it will enable it.
-   *
-   * this is not used by news filters (yet).
-   */
-//  void configureTemporaryFilters(in nsIMsgFilterList filterList);
-	configureTemporaryFilters: function _configureTemporaryFilters(filterList)
-	{
-		dump("function configureTemporaryFilters\n");
-	},
-
-  /**
-   * If Sent folder pref is changed we need to clear the temporary 
-   * return receipt filter so that the new return receipt filter can
-   * be recreated (by ConfigureTemporaryReturnReceiptsFilter()).
-   */
-//  void clearTemporaryReturnReceiptsFilter();
-	clearTemporaryReturnReceiptsFilter: function _clearTemporaryReturnReceiptsFilter()
-	{
-		dump("function clearTemporaryReturnReceiptsFilter\n");
-	},
-
-  /**
-   * spam settings
-   */
-//  readonly attribute nsISpamSettings spamSettings;
-	get spamSettings()
-	{
-		dump("get spamSettings\n");
-	},
-
-//  readonly attribute nsIMsgFilterPlugin spamFilterPlugin;
-	get spamFilterPlugin()
-	{
-		dump("get spamFilterPlugin\n");
-	},
-
-//  nsIMsgFolder getMsgFolderFromURI(in nsIMsgFolder aFolderResource, in ACString aURI);
-	getMsgFolderFromURI: function _getMsgFolderFromURI(aFolderResource, aURI)
-	{
-		dump("function getMsgFolderFromURI\n");
-	},
-
-//  readonly attribute boolean isDeferredTo;
-	get isDeferredTo()
-	{
-		dump("get isDeferredTo\n");
-	},
-
-//  const long keepDups = 0;
-//  const long deleteDups = 1;
-//  const long moveDupsToTrash = 2;
-//  const long markDupsRead = 3;
-
-//  attribute long incomingDuplicateAction;
-	get incomingDuplicateAction()
-	{
-		dump("get incomingDuplicateAction\n");
-	},
-
-	set incomingDuplicateAction(aValue)
-	{
-		dump("set incomingDuplicateAction aValue:"+aValue+"\n");
-	},
-
-  // check if new hdr is a duplicate of a recently arrived header
-//  boolean isNewHdrDuplicate(in nsIMsgDBHdr aNewHdr);
-	isNewHdrDuplicate: function _isNewHdrDuplicate(aNewHdr)
-	{
-		dump("function isNewHdrDuplicate\n");
-	},
-
-  /**
-   * Set a boolean to force an inherited propertyName to return empty instead
-   * of inheriting from a parent folder, server, or the global
-   *
-   * @param propertyName         The name of the property
-   * @param aForcePropertyEmpty  true if an empty inherited property should be returned
-   */
-//  void setForcePropertyEmpty(in string propertyName, in boolean aForcePropertyEmpty);
-	setForcePropertyEmpty: function _setForcePropertyEmpty(propertyName, aForcePropertyEmpty)
-	{
-		dump("function setForcePropertyEmpty\n");
-	},
-
-  /**
-   * Get a boolean to force an inherited propertyName to return empty instead
-   * of inheriting from a parent folder, server, or the global
-   *
-   * @param propertyName      The name of the property
-   *
-   * @return                  true if an empty inherited property should be returned
-   */
-//  boolean getForcePropertyEmpty(in string propertyName);
-	getForcePropertyEmpty: function _getForcePropertyEmpty(propertyName)
-	{
-		dump("function getForcePropertyEmpty\n");
-	},
-
-  /**
-   * Return the order in which this server type should appear in the folder pane.
-   * This sort order is a number between 100000000 and 900000000 so that RDF can
-   * use it as a string.
-   * The current return values are these:
-   * 0 = default account,       100000000 = mail accounts (POP3/IMAP4),
-   * 200000000 = Local Folders, 300000000 = IM accounts,
-   * 400000000 = RSS,           500000000 = News
-   * If a new server type is created a TB UI reviewer must decide its sort order.
-   */
-//  readonly attribute long sortOrder;
-	get sortOrder()
-	{
-		dump("get sortOrder\n");
-		return 100000000;
-	},
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeMsgIncomingServer,
+        Ci.nsIMsgIncomingServer,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    _className: "mivExchangeMsgIncomingServer",
+
+    classDescription: "Exchange EWS Msg Incoming server",
+
+    classID: components.ID("{" + mivExchangeMsgIncomingServerGUID + "}"),
+    contractID: "@mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeMsgIncomingServer,
+            Ci.nsIMsgIncomingServer,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    /**
+     * internal pref key - guaranteed to be unique across all servers
+     */
+    //  attribute ACString key;
+    get key() {
+        dump("get key\n");
+    },
+
+    set key(aValue) {
+        dump("set key aValue:" + aValue + "\n");
+    },
+
+    /**
+     * pretty name - should be "userid on hostname"
+     * if the pref is not set
+     */
+    //  attribute AString prettyName;
+    get prettyName() {
+        dump("get prettyName\n");
+    },
+
+    set prettyName(aValue) {
+        dump("set prettyName aValue:" + aValue + "\n");
+    },
+
+    /**
+     * helper function to construct the pretty name in a server type
+     * specific way - e.g., mail for foo@test.com, news on news.mozilla.org
+     */
+    //  readonly attribute AString constructedPrettyName;
+    get constructedPrettyName() {
+        dump("get constructedPrettyName\n");
+    },
+
+    /**
+     * hostname of the server
+     */
+    //  attribute ACString hostName;
+    get hostName() {
+        dump("get hostName\n");
+    },
+
+    set hostName(aValue) {
+        dump("set hostName aValue:" + aValue + "\n");
+    },
+
+    /**
+     * real hostname of the server (if server name is changed it's stored here)
+     */
+    //  attribute ACString realHostName;
+    get realHostName() {
+        dump("get realHostName\n");
+    },
+
+    set realHostName(aValue) {
+        dump("set realHostName aValue:" + aValue + "\n");
+    },
+
+    /* port of the server */
+    //  attribute long port;
+    get port() {
+        dump("get port\n");
+    },
+
+    set port(aValue) {
+        dump("set port aValue:" + aValue + "\n");
+    },
+
+    /**
+     * userid to log into the server
+     */
+    //  attribute ACString username;
+    get username() {
+        dump("get username\n");
+    },
+
+    set username(aValue) {
+        dump("set username aValue:" + aValue + "\n");
+    },
+
+    /**
+     * real username of the server (if username is changed it's stored here)
+     */
+    //  attribute ACString realUsername;
+    get realUsername() {
+        dump("get realUsername\n");
+    },
+
+    set realUsername(aValue) {
+        dump("set realUsername aValue:" + aValue + "\n");
+    },
+
+    /**
+     * protocol type, i.e. "pop3", "imap", "nntp", "none", etc
+     * used to construct URLs
+     */
+    //  attribute ACString type;
+    get type() {
+        dump("get type\n");
+    },
+
+    set type(aValue) {
+        dump("set type aValue:" + aValue + "\n");
+    },
+
+    //  readonly attribute AString accountManagerChrome;
+    get accountManagerChrome() {
+        dump("get accountManagerChrome\n");
+    },
+
+    /**
+     * the schema for the local mail store, such
+     * as "mailbox", "imap", or "news"
+     * used to construct URIs
+     */
+    //  readonly attribute ACString localStoreType;
+    get localStoreType() {
+        dump("get localStoreType\n");
+    },
+
+    // Perform specific tasks (reset flags, remove files, etc) for account user/server name changes.
+    //  void onUserOrHostNameChanged(in ACString oldName, in ACString newName,
+    //                               in bool hostnameChanged);
+    onUserOrHostNameChanged: function _onUserOrHostNameChanged(oldName, newName, hostnameChanged) {
+        dump("function onUserOrHostNameChanged\n");
+    },
+
+    /* cleartext version of the password */
+    //  attribute ACString password;
+    get password() {
+        dump("get password\n");
+    },
+
+    set password(aValue) {
+        dump("set password aValue:" + aValue + "\n");
+    },
+
+    /**
+     * Attempts to get the password first from the password manager, if that
+     * fails it will attempt to get it from the user if aMsgWindow is supplied.
+     *
+     * @param aPromptString  The text of the prompt if the user is prompted for
+     *                       password.
+     * @param aPromptTitle   The title of the prompt if the user is prompted.
+     * @param aMsgWindow     A message window to associate the prompt with.
+     * @return               The obtained password. Could be an empty password.
+     *
+     * @exception NS_ERROR_FAILURE  The password could not be obtained.
+     *
+     * @note NS_MSG_PASSWORD_PROMPT_CANCELLED is a success code that is returned
+     *       if the prompt was presented to the user but the user cancelled the
+     *       prompt.
+     */
+    //  ACString getPasswordWithUI(in AString aPromptString, in AString aPromptTitle,
+    //                             in nsIMsgWindow aMsgWindow);
+    getPasswordWithUI: function _getPasswordWithUI(aPromptString, aPromptTitle, aMsgWindow) {
+        dump("function getPasswordWithUI\n");
+    },
+
+    /* forget the password in memory and in single signon database */
+    //  void forgetPassword();
+    forgetPassword: function _forgetPassword() {
+        dump("function forgetPassword\n");
+    },
+
+    /* forget the password in memory which is cached for the session */
+    //  void forgetSessionPassword();
+    forgetSessionPassword: function _forgetSessionPassword() {
+        dump("function forgetSessionPassword\n");
+    },
+
+    /* should we download whole messages when biff goes off? */
+    //  attribute boolean downloadOnBiff;
+    get downloadOnBiff() {
+        dump("get downloadOnBiff\n");
+    },
+
+    set downloadOnBiff(aValue) {
+        dump("set downloadOnBiff aValue:" + aValue + "\n");
+    },
+
+    /* should we biff the server? */
+    //  attribute boolean doBiff;
+    get doBiff() {
+        dump("get doBiff\n");
+    },
+
+    set doBiff(aValue) {
+        dump("set doBiff aValue:" + aValue + "\n");
+    },
+
+    /* how often to biff */
+    //  attribute long biffMinutes;
+    get biffMinutes() {
+        dump("get biffMinutes\n");
+    },
+
+    set biffMinutes(aValue) {
+        dump("set biffMinutes aValue:" + aValue + "\n");
+    },
+
+    /* current biff state */
+    //  attribute unsigned long biffState;
+    get biffState() {
+        dump("get biffState\n");
+    },
+
+    set biffState(aValue) {
+        dump("set biffState aValue:" + aValue + "\n");
+    },
+
+    /* are we running a url as a result of biff going off? (different from user clicking get msg) */
+    //  attribute boolean performingBiff; 
+    get performingBiff() {
+        dump("get performingBiff\n");
+    },
+
+    set performingBiff(aValue) {
+        dump("set performingBiff aValue:" + aValue + "\n");
+    },
+
+    /* the on-disk path to message storage for this server */
+    //  attribute nsIFile localPath;
+    get localPath() {
+        dump("get localPath\n");
+    },
+
+    set localPath(aValue) {
+        dump("set localPath aValue:" + aValue + "\n");
+    },
+
+    /// message store to use for the folders under this server.
+    //  readonly attribute nsIMsgPluggableStore msgStore;
+    get msgStore() {
+        dump("get msgStore\n");
+    },
+
+    /* the RDF URI for the root mail folder */
+    //  readonly attribute ACString serverURI;
+    get serverURI() {
+        dump("get serverURI\n");
+    },
+
+    /* the root folder for this server, even if server is deferred */
+    //  attribute nsIMsgFolder rootFolder;
+    get rootFolder() {
+        dump("get rootFolder\n");
+    },
+
+    set rootFolder(aValue) {
+        dump("set rootFolder aValue:" + aValue + "\n");
+    },
+
+    /* root folder for this account 
+       - if account is deferred, root folder of deferred-to account */
+    //  readonly attribute nsIMsgFolder rootMsgFolder;
+    get rootMsgFolder() {
+        dump("get rootMsgFolder\n");
+    },
+
+    /* are we already getting new Messages on the current server..
+       This is used to help us prevent multiple get new msg commands from
+       going off at the same time. */
+    //  attribute boolean serverBusy;
+    get serverBusy() {
+        dump("get serverBusy\n");
+    },
+
+    set serverBusy(aValue) {
+        dump("set serverBusy aValue:" + aValue + "\n");
+    },
+
+    /**
+     * Is the server using a secure channel (SSL or STARTTLS).
+     */
+    //  readonly attribute boolean isSecure;
+    get isSecure() {
+        dump("get isSecure\n");
+    },
+
+    /**
+     * Authentication mechanism.
+     *
+     * @see nsMsgAuthMethod (in MailNewsTypes2.idl)
+     * Same as "mail.server...authMethod" pref
+     */
+    //  attribute nsMsgAuthMethodValue authMethod;
+    get authMethod() {
+        dump("get authMethod\n");
+    },
+
+    set authMethod(aValue) {
+        dump("set authMethod aValue:" + aValue + "\n");
+    },
+
+    /**
+     * Whether to SSL or STARTTLS or not
+     *
+     * @see nsMsgSocketType (in MailNewsTypes2.idl)
+     * Same as "mail.server...socketType" pref
+     */
+    //  attribute nsMsgSocketTypeValue socketType;
+    get socketType() {
+        dump("get socketType\n");
+    },
+
+    set socketType(aValue) {
+        dump("set socketType aValue:" + aValue + "\n");
+    },
+
+    /* empty trash on exit */
+    //  attribute boolean emptyTrashOnExit;
+    get emptyTrashOnExit() {
+        dump("get emptyTrashOnExit\n");
+    },
+
+    set emptyTrashOnExit(aValue) {
+        dump("set emptyTrashOnExit aValue:" + aValue + "\n");
+    },
+
+    /**
+     * Get the server's list of filters.
+     *
+     * This SHOULD be the same filter list as the root folder's, if the server
+     * supports per-folder filters. Furthermore, this list SHOULD be used for all
+     * incoming messages.
+     *
+     * Since the returned nsIMsgFilterList is mutable, it is not necessary to call
+     * setFilterList after the filters have been changed.
+     *
+     * @param aMsgWindow  @ref msgwindow "The standard message window"
+     * @return            The list of filters.
+     */
+    //  nsIMsgFilterList getFilterList(in nsIMsgWindow aMsgWindow);
+    getFilterList: function _getFilterList(aMsgWindow) {
+        dump("function getFilterList\n");
+    },
+
+    /**
+     * Set the server's list of filters.
+     *
+     * Note that this does not persist the filter list. To change the contents
+     * of the existing filters, use getFilterList and mutate the values as
+     * appopriate.
+     *
+     * @param aFilterList The new list of filters.
+     */
+    //  void setFilterList(in nsIMsgFilterList aFilterList);
+    setFilterList: function _setFilterList(aFilterList) {
+        dump("function setFilterList\n");
+    },
+
+    /**
+     * Get user editable filter list. This does not have to be the same as
+     * the filterlist above, typically depending on the users preferences.
+     * The filters in this list are not processed, but only to be edited by
+     * the user.
+     * @see getFilterList
+     *
+     * @param aMsgWindow  @ref msgwindow "The standard message window"
+     * @return            The list of filters.
+     */
+    //  nsIMsgFilterList getEditableFilterList(in nsIMsgWindow aMsgWindow);
+    getEditableFilterList: function _getEditableFilterList(aMsgWindow) {
+        dump("function getEditableFilterList\n");
+    },
+
+    /**
+     * Set user editable filter list.
+     * This does not persist the filterlist, @see setFilterList
+     * @see getEditableFilterList
+     * @see setFilterList
+     *
+     * @param aFilterList The new list of filters.
+     */
+    //  void setEditableFilterList(in nsIMsgFilterList aFilterList);
+    setEditableFilterList: function _setEditableFilterList(aFilterList) {
+        dump("function setEditableFilterList\n");
+    },
+
+    /* we use this to set the default local path.  we use this when migrating prefs */
+    //  void setDefaultLocalPath(in nsIFile aDefaultLocalPath);
+    setDefaultLocalPath: function _setDefaultLocalPath(aDefaultLocalPath) {
+        dump("function setDefaultLocalPath\n");
+    },
+
+    /**
+     * Verify that we can logon
+     * 
+     * @param  aUrlListener - gets called back with success or failure.
+     * @param aMsgWindow         nsIMsgWindow to use for notification callbacks.
+     * @return - the url that we run.
+     */
+    //  nsIURI verifyLogon(in nsIUrlListener aUrlListener, in nsIMsgWindow aMsgWindow);
+    verifyLogon: function _verifyLogon(aUrlListener, aMsgWindow) {
+        dump("function verifyLogon\n");
+    },
+
+    /* do a biff */
+    //  void performBiff(in nsIMsgWindow aMsgWindow);
+    performBiff: function _performBiff(aMsgWindow) {
+        dump("function performBiff\n");
+    },
+
+    /* get new messages */
+    //  void getNewMessages(in nsIMsgFolder aFolder, in nsIMsgWindow aMsgWindow, 
+    //                      in nsIUrlListener aUrlListener);
+    getNewMessages: function _getNewMessages(aFolder, aMsgWindow, aUrlListener) {
+        dump("function getNewMessages\n");
+    },
+
+    /* this checks if a server needs a password to do biff */
+    //  readonly attribute boolean serverRequiresPasswordForBiff;
+    get serverRequiresPasswordForBiff() {
+        dump("get serverRequiresPasswordForBiff\n");
+    },
+
+    /* this gets called when the server is expanded in the folder pane */
+    //  void performExpand(in nsIMsgWindow aMsgWindow);
+    performExpand: function _performExpand(aMsgWindow) {
+        dump("function performExpand\n");
+    },
+
+    /* Write out all known folder data to panacea.dat */
+    //  void writeToFolderCache(in nsIMsgFolderCache folderCache);
+    writeToFolderCache: function _writeToFolderCache(folderCache) {
+        dump("function writeToFolderCache\n");
+    },
+
+    /* close any server connections */
+    //  void closeCachedConnections();
+    closeCachedConnections: function _closeCachedConnections() {
+        dump("function closeCachedConnections\n");
+    },
+
+    /* ... */
+    //  void shutdown();
+    shutdown: function _shutdown() {
+        dump("function shutdown\n");
+    },
+
+    /**
+     * Get or set the value as determined by the preference tree.
+     *
+     * These methods MUST NOT fail if the preference is not set, and therefore
+     * they MUST have a default value. This default value is provided in practice
+     * by use of a default preference tree. The standard format for the pref
+     * branches are <tt>mail.server.<i>key</i>.</tt> for per-server preferences,
+     * such that the preference is <tt>mail.server.<i>key</i>.<i>attr</i></tt>.
+     *
+     * The attributes are passed in as strings for ease of access by the C++
+     * consumers of this method.
+     *
+     * @param attr  The value for which the preference should be accessed.
+     * @param value The value of the preference to set.
+     * @return      The value of the preference.
+     * @{
+     */
+    //  boolean getBoolValue(in string attr);
+    getBoolValue: function _getBoolValue(attr) {
+        dump("function getBoolValue\n");
+    },
+
+    //  void setBoolValue(in string attr, in boolean value);
+    setBoolValue: function _setBoolValue(attr, value) {
+        dump("function setBoolValue\n");
+    },
+
+    //  ACString getCharValue(in string attr);
+    getCharValue: function _getCharValue(attr) {
+        dump("function getCharValue\n");
+    },
+
+    //  void setCharValue(in string attr, in ACString value);
+    setCharValue: function _setCharValue(attr, value) {
+        dump("function setCharValue\n");
+    },
+
+    //  AString getUnicharValue(in string attr);
+    getUnicharValue: function _getUnicharValue(attr) {
+        dump("function getUnicharValue\n");
+    },
+
+    //  void setUnicharValue(in string attr, in AString value);
+    setUnicharValue: function _setUnicharValue(attr, value) {
+        dump("function setUnicharValue\n");
+    },
+
+    //  long getIntValue(in string attr);
+    getIntValue: function _getIntValue(attr) {
+        dump("function getIntValue\n");
+    },
+
+    //  void setIntValue(in string attr, in long value);
+    setIntValue: function _setIntValue(attr, value) {
+        dump("function setIntValue\n");
+    },
+
+    /** @} */
+
+    /**
+     * Get or set the value as determined by the preference tree.
+     *
+     * These methods MUST NOT fail if the preference is not set, and therefore
+     * they MUST have a default value. This default value is provided in practice
+     * by use of a default preference tree. The standard format for the pref
+     * branches are <tt>mail.server.<i>key</i>.</tt> for per-server preferences,
+     * such that the preference is <tt>mail.server.<i>key</i>.<i>attr</i></tt>.
+     *
+     * The attributes are passed in as strings for ease of access by the C++
+     * consumers of this method.
+     *
+     * There are two preference names on here for legacy reasons, where the first
+     * is the name which will be using a (preferred) relative preference and the
+     * second a deprecated absolute preference. Implementations that do not have
+     * to worry about supporting legacy preferences can safely ignore this second
+     * parameter. Callers must still provide a valid value, though.
+     *
+     * @param relpref The name of the relative file preference.
+     * @param absref  The name of the absolute file preference.
+     * @param aValue  The value of the preference to set.
+     * @return        The value of the preference.
+     * @{
+     */
+    //  nsIFile getFileValue(in string relpref, in string abspref);
+    getFileValue: function _getFileValue(relpref, abspref) {
+        dump("function getFileValue\n");
+    },
+
+    //  void setFileValue(in string relpref, in string abspref, in nsIFile aValue);
+    setFileValue: function _setFileValue(relpref, abspref, aValue) {
+        dump("function setFileValue\n");
+    },
+
+    /** @} */
+
+    /**
+     * this is really dangerous. this destroys all pref values
+     * do not call this unless you know what you're doing!
+     */
+    //  void clearAllValues();
+    clearAllValues: function _clearAllValues() {
+        dump("function clearAllValues\n");
+    },
+
+    /** 
+     * this is also very dangerous.  this will remove the files
+     * associated with this server on disk.
+     */
+    //  void removeFiles();
+    removeFiles: function _removeFiles() {
+        dump("function removeFiles\n");
+    },
+
+    //  attribute boolean valid;
+    get valid() {
+        dump("get valid\n");
+    },
+
+    set valid(aValue) {
+        dump("set valid aValue:" + aValue + "\n");
+    },
+
+    //  AString toString();
+    toString: function _toString() {
+        dump("function toString\n");
+    },
+
+    //  void displayOfflineMsg(in nsIMsgWindow aWindow);
+    displayOfflineMsg: function _displayOfflineMsg(aWindow) {
+        dump("function displayOfflineMsg\n");
+    },
+
+    /* used for comparing nsIMsgIncomingServers */
+    //  boolean equals(in nsIMsgIncomingServer server);
+    equals: function _equals(server) {
+        dump("function equals\n");
+    },
+
+    /* Get Messages at startup */
+    //  readonly attribute boolean downloadMessagesAtStartup; 
+    get downloadMessagesAtStartup() {
+        dump("get downloadMessagesAtStartup\n");
+    },
+
+    /* check to this if the server supports filters */
+    //  attribute boolean canHaveFilters;
+    get canHaveFilters() {
+        dump("get canHaveFilters\n");
+    },
+
+    set canHaveFilters(aValue) {
+        dump("set canHaveFilters aValue:" + aValue + "\n");
+    },
+
+    /**
+     * can this server be removed from the account manager?  for
+     * instance, local mail is not removable, but an imported folder is 
+     */
+    //  attribute boolean canDelete;
+    get canDelete() {
+        dump("get canDelete\n");
+    },
+
+    set canDelete(aValue) {
+        dump("set canDelete aValue:" + aValue + "\n");
+    },
+
+    //  attribute boolean loginAtStartUp;
+    get loginAtStartUp() {
+        dump("get loginAtStartUp\n");
+    },
+
+    set loginAtStartUp(aValue) {
+        dump("set loginAtStartUp aValue:" + aValue + "\n");
+    },
+
+    //  attribute boolean limitOfflineMessageSize;
+    get limitOfflineMessageSize() {
+        dump("get limitOfflineMessageSize\n");
+    },
+
+    set limitOfflineMessageSize(aValue) {
+        dump("set limitOfflineMessageSize aValue:" + aValue + "\n");
+    },
+    //  attribute long maxMessageSize;
+    get maxMessageSize() {
+        dump("get maxMessageSize\n");
+    },
+
+    set maxMessageSize(aValue) {
+        dump("set maxMessageSize aValue:" + aValue + "\n");
+    },
+
+    //  attribute nsIMsgRetentionSettings retentionSettings;
+    get retentionSettings() {
+        dump("get retentionSettings\n");
+    },
+
+    set retentionSettings(aValue) {
+        dump("set retentionSettings aValue:" + aValue + "\n");
+    },
+
+    /* check if this server can be a default server */
+    //  readonly attribute boolean canBeDefaultServer;
+    get canBeDefaultServer() {
+        dump("get canBeDefaultServer\n");
+    },
+
+    /* check if this server allows search operations */
+    //  readonly attribute boolean canSearchMessages;
+    get canSearchMessages() {
+        dump("get canSearchMessages\n");
+    },
+
+    /* check if this server allows canEmptyTrashOnExit operations */
+    //  readonly attribute boolean canEmptyTrashOnExit;
+    get canEmptyTrashOnExit() {
+        dump("get canEmptyTrashOnExit\n");
+    },
+
+    /* display startup page once per account per session */
+    //  attribute boolean displayStartupPage;
+    get displayStartupPage() {
+        dump("get displayStartupPage\n");
+    },
+
+    set displayStartupPage(aValue) {
+        dump("set displayStartupPage aValue:" + aValue + "\n");
+    },
+    //  attribute nsIMsgDownloadSettings downloadSettings;
+    get downloadSettings() {
+        dump("get downloadSettings\n");
+    },
+
+    set downloadSettings(aValue) {
+        dump("set downloadSettings aValue:" + aValue + "\n");
+    },
+
+    /*
+     * Offline support level. Support level can vary based on abilities 
+     * and features each server can offer wrt to offline service.
+     * Here is the legend to determine the each support level details
+     *
+     * supportLevel == 0  --> no offline support (default) 
+     * supportLevel == 10 --> regular offline feature support
+     * supportLevel == 20 --> extended offline feature support 
+     *
+     * Each server can initialize itself to the support level if needed
+     * to override the default choice i.e., no offline support.
+     *
+     * POP3, None and Movemail will default to 0. 
+     * IMAP level 10 and NEWS with level 20. 
+     * 
+     */
+    //  attribute long offlineSupportLevel;
+    get offlineSupportLevel() {
+        dump("get offlineSupportLevel\n");
+    },
+
+    set offlineSupportLevel(aValue) {
+        dump("set offlineSupportLevel aValue:" + aValue + "\n");
+    },
+
+    /* create pretty name for migrated accounts */
+    //  AString generatePrettyNameForMigration(); 
+    generatePrettyNameForMigration: function _generatePrettyNameForMigration() {
+        dump("function generatePrettyNameForMigration\n");
+    },
+
+    /* does this server have disk space settings? */
+    //  readonly attribute boolean supportsDiskSpace;
+    get supportsDiskSpace() {
+        dump("get supportsDiskSpace\n");
+    },
+
+    /**
+     * Hide this server/account from the UI - used for smart mailboxes.
+     * The server can be retrieved from the account manager by name using the
+     * various Find methods, but nsIMsgAccountManager's GetAccounts and 
+     * GetAllServers methods won't return the server/account.
+     */
+    //  attribute boolean hidden;
+    get hidden() {
+        dump("get hidden\n");
+    },
+
+    set hidden(aValue) {
+        dump("set hidden aValue:" + aValue + "\n");
+    },
+
+    /**
+     * If the server supports Fcc/Sent/etc, default prefs can point to 
+     * the server. Otherwise, copies and folders prefs should point to
+     * Local Folders.
+     *
+     * By default this value is set to true via global pref 'allows_specialfolders_usage'
+     * (mailnews.js). For Nntp, the value is overridden to be false.
+     * If ISPs want to modify this value, they should do that in their rdf file
+     * by using this attribute. Please look at mozilla/mailnews/base/ispdata/aol.rdf for
+     * usage example.
+     */
+    //  attribute boolean defaultCopiesAndFoldersPrefsToServer;
+    get defaultCopiesAndFoldersPrefsToServer() {
+        dump("get defaultCopiesAndFoldersPrefsToServer\n");
+    },
+
+    set defaultCopiesAndFoldersPrefsToServer(aValue) {
+        dump("set defaultCopiesAndFoldersPrefsToServer aValue:" + aValue + "\n");
+    },
+
+    /* can this server allows sub folder creation */
+    //  attribute boolean canCreateFoldersOnServer;
+    get canCreateFoldersOnServer() {
+        dump("get canCreateFoldersOnServer\n");
+    },
+
+    set canCreateFoldersOnServer(aValue) {
+        dump("set canCreateFoldersOnServer aValue:" + aValue + "\n");
+    },
+
+    /* can this server allows message filing ? */
+    //  attribute boolean canFileMessagesOnServer;
+    get canFileMessagesOnServer() {
+        dump("get canFileMessagesOnServer\n");
+    },
+
+    set canFileMessagesOnServer(aValue) {
+        dump("set canFileMessagesOnServer aValue:" + aValue + "\n");
+    },
+
+    /* can this server allow compacting folders ? */
+    //  readonly attribute boolean canCompactFoldersOnServer;
+    get canCompactFoldersOnServer() {
+        dump("get canCompactFoldersOnServer\n");
+    },
+
+    /* can this server allow undo delete ? */
+    //  readonly attribute boolean canUndoDeleteOnServer;
+    get canUndoDeleteOnServer() {
+        dump("get canUndoDeleteOnServer\n");
+    },
+
+    /* used for setting up the filter UI */
+    //  readonly attribute nsMsgSearchScopeValue filterScope;
+    get filterScope() {
+        dump("get filterScope\n");
+    },
+
+    /* used for setting up the search UI */
+    //  readonly attribute nsMsgSearchScopeValue searchScope;
+    get searchScope() {
+        dump("get searchScope\n");
+    },
+
+    /** 
+     * If the password for the server is available either via authentication 
+     * in the current session or from password manager stored entries, return
+     * false. Otherwise, return true. If password is obtained from password 
+     * manager, set the password member variable.
+     */
+    //  readonly attribute boolean passwordPromptRequired;
+    get passwordPromptRequired() {
+        dump("get passwordPromptRequired\n");
+    },
+
+    /**
+     * for mail, this configures both the MDN filter, and the server-side
+     * spam filter filters, if needed.
+     *
+     * If we have set up to filter return receipts into
+     * our Sent folder, this utility method creates
+     * a filter to do that, and adds it to our filterList
+     * if it doesn't exist.  If it does, it will enable it.
+     *
+     * this is not used by news filters (yet).
+     */
+    //  void configureTemporaryFilters(in nsIMsgFilterList filterList);
+    configureTemporaryFilters: function _configureTemporaryFilters(filterList) {
+        dump("function configureTemporaryFilters\n");
+    },
+
+    /**
+     * If Sent folder pref is changed we need to clear the temporary 
+     * return receipt filter so that the new return receipt filter can
+     * be recreated (by ConfigureTemporaryReturnReceiptsFilter()).
+     */
+    //  void clearTemporaryReturnReceiptsFilter();
+    clearTemporaryReturnReceiptsFilter: function _clearTemporaryReturnReceiptsFilter() {
+        dump("function clearTemporaryReturnReceiptsFilter\n");
+    },
+
+    /**
+     * spam settings
+     */
+    //  readonly attribute nsISpamSettings spamSettings;
+    get spamSettings() {
+        dump("get spamSettings\n");
+    },
+
+    //  readonly attribute nsIMsgFilterPlugin spamFilterPlugin;
+    get spamFilterPlugin() {
+        dump("get spamFilterPlugin\n");
+    },
+
+    //  nsIMsgFolder getMsgFolderFromURI(in nsIMsgFolder aFolderResource, in ACString aURI);
+    getMsgFolderFromURI: function _getMsgFolderFromURI(aFolderResource, aURI) {
+        dump("function getMsgFolderFromURI\n");
+    },
+
+    //  readonly attribute boolean isDeferredTo;
+    get isDeferredTo() {
+        dump("get isDeferredTo\n");
+    },
+
+    //  const long keepDups = 0;
+    //  const long deleteDups = 1;
+    //  const long moveDupsToTrash = 2;
+    //  const long markDupsRead = 3;
+
+    //  attribute long incomingDuplicateAction;
+    get incomingDuplicateAction() {
+        dump("get incomingDuplicateAction\n");
+    },
+
+    set incomingDuplicateAction(aValue) {
+        dump("set incomingDuplicateAction aValue:" + aValue + "\n");
+    },
+
+    // check if new hdr is a duplicate of a recently arrived header
+    //  boolean isNewHdrDuplicate(in nsIMsgDBHdr aNewHdr);
+    isNewHdrDuplicate: function _isNewHdrDuplicate(aNewHdr) {
+        dump("function isNewHdrDuplicate\n");
+    },
+
+    /**
+     * Set a boolean to force an inherited propertyName to return empty instead
+     * of inheriting from a parent folder, server, or the global
+     *
+     * @param propertyName         The name of the property
+     * @param aForcePropertyEmpty  true if an empty inherited property should be returned
+     */
+    //  void setForcePropertyEmpty(in string propertyName, in boolean aForcePropertyEmpty);
+    setForcePropertyEmpty: function _setForcePropertyEmpty(propertyName, aForcePropertyEmpty) {
+        dump("function setForcePropertyEmpty\n");
+    },
+
+    /**
+     * Get a boolean to force an inherited propertyName to return empty instead
+     * of inheriting from a parent folder, server, or the global
+     *
+     * @param propertyName      The name of the property
+     *
+     * @return                  true if an empty inherited property should be returned
+     */
+    //  boolean getForcePropertyEmpty(in string propertyName);
+    getForcePropertyEmpty: function _getForcePropertyEmpty(propertyName) {
+        dump("function getForcePropertyEmpty\n");
+    },
+
+    /**
+     * Return the order in which this server type should appear in the folder pane.
+     * This sort order is a number between 100000000 and 900000000 so that RDF can
+     * use it as a string.
+     * The current return values are these:
+     * 0 = default account,       100000000 = mail accounts (POP3/IMAP4),
+     * 200000000 = Local Folders, 300000000 = IM accounts,
+     * 400000000 = RSS,           500000000 = News
+     * If a new server type is created a TB UI reviewer must decide its sort order.
+     */
+    //  readonly attribute long sortOrder;
+    get sortOrder() {
+        dump("get sortOrder\n");
+        return 100000000;
+    },
 
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeMsgIncomingServer) {
-			NSGetFactory.mivExchangeMsgIncomingServer = XPCOMUtils.generateNSGetFactory([mivExchangeMsgIncomingServer]);
+    try {
+        if (!NSGetFactory.mivExchangeMsgIncomingServer) {
+            NSGetFactory.mivExchangeMsgIncomingServer = XPCOMUtils.generateNSGetFactory([mivExchangeMsgIncomingServer]);
 
-	}
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeMsgIncomingServer(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeMsgIncomingServer(cid);
+}
diff --git a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js b/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js
index a99843fe..8908c7f7 100644
--- a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js
+++ b/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeMsgProtocolInfo() {
 
-	//this.logInfo("mivExchangeMsgProtocolInfo: init");
+    //this.logInfo("mivExchangeMsgProtocolInfo: init");
 
 }
 
@@ -37,110 +37,103 @@ var mivExchangeMsgProtocolInfoGUID = "ea4d2e73-b0bc-4b70-9f7d-95dbcb648930";
 
 mivExchangeMsgProtocolInfo.prototype = {
 
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeMsgProtocolInfo,
-				Ci.nsIMsgProtocolInfo,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeMsgProtocolInfo,
+        Ci.nsIMsgProtocolInfo,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
 
-	_className : "mivExchangeMsgProtocolInfo",
+    _className: "mivExchangeMsgProtocolInfo",
 
-	classDescription : "Exchange EWS Msg Protocol Info",
+    classDescription: "Exchange EWS Msg Protocol Info",
 
-	classID : components.ID("{"+mivExchangeMsgProtocolInfoGUID+"}"),
-	contractID : "@mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail",
-	flags : Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
+    classID: components.ID("{" + mivExchangeMsgProtocolInfoGUID + "}"),
+    contractID: "@mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
 
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeMsgProtocolInfo,
-				Ci.nsIMsgProtocolInfo,
-				Ci.nsIClassInfo,
-				Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeMsgProtocolInfo,
+            Ci.nsIMsgProtocolInfo,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
 
     /**
      * the default path to store local data for this type of
      * server. Each server is usually in a subdirectory below this
      */
-//    attribute nsIFile defaultLocalPath;
-	get defaultLocalPath()
-	{
-		var file = Cc["@mozilla.org/file/directory_service;1"].
-				getService(Ci.nsIProperties).
-				get("ProfD", Ci.nsIFile);
-		if (!file) return Cr.NS_ERROR_FAILURE;
-
-		if (!file.exists()) {
-			file.create(file.DIRECTORY_TYPE, 0775);
-		}
-	},
-
-	set defaultLocalPath(aValue)
-	{
-		return Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
+    //    attribute nsIFile defaultLocalPath;
+    get defaultLocalPath() {
+        var file = Cc["@mozilla.org/file/directory_service;1"].
+        getService(Ci.nsIProperties).
+        get("ProfD", Ci.nsIFile);
+        if (!file) return Cr.NS_ERROR_FAILURE;
+
+        if (!file.exists()) {
+            file.create(file.DIRECTORY_TYPE, 0775);
+        }
+    },
+
+    set defaultLocalPath(aValue) {
+        return Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
     /**
      * the IID of the protocol-specific interface for this server
      * usually used from JS to dynamically get server-specific attributes
      */
-//    readonly attribute nsIIDPtr serverIID;
-	get serverIID()
-	{
-		return Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
+    //    readonly attribute nsIIDPtr serverIID;
+    get serverIID() {
+        return Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
 
     /**
      * does this server type require a username?
      * for instance, news does not but IMAP/POP do
      */
-//    readonly attribute boolean requiresUsername;
-	get requiresUsername()
-	{
-		return true;
-	},
+    //    readonly attribute boolean requiresUsername;
+    get requiresUsername() {
+        return true;
+    },
 
     /**
      * if the pretty name of the server should
      * just be the e-mail address. Otherwise it usually
      * ends up being something like "news on hostname"
      */
-//    readonly attribute boolean preflightPrettyNameWithEmailAddress;
-	get preflightPrettyNameWithEmailAddress()
-	{
-		return Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
+    //    readonly attribute boolean preflightPrettyNameWithEmailAddress;
+    get preflightPrettyNameWithEmailAddress() {
+        return Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
 
     /**
      * can this type of server be removed from the account manager?
      * for instance, local mail is not removable
      */
-//    readonly attribute boolean canDelete;
-	get canDelete()
-	{
-		return true;
-	},
+    //    readonly attribute boolean canDelete;
+    get canDelete() {
+        return true;
+    },
 
     /**
      * can this type of server log in at startup?
      */
-//    readonly attribute boolean canLoginAtStartUp;
-	get canLoginAtStartUp()
-	{
-		return true;
-	},
+    //    readonly attribute boolean canLoginAtStartUp;
+    get canLoginAtStartUp() {
+        return true;
+    },
 
     /**
      * can you duplicate this server?
      * for instance, local mail is unique and should not be duplicated.
      */
-//    readonly attribute boolean canDuplicate;
-	get canDuplicate()
-	{
-		return true;
-	},
+    //    readonly attribute boolean canDuplicate;
+    get canDuplicate() {
+        return true;
+    },
 
     /* the default port
        This is similar to nsIProtocolHanderl.defaultPort,
@@ -148,69 +141,64 @@ mivExchangeMsgProtocolInfo.prototype = {
        When the input param isSecure is set to true, for all supported protocols, 
        the secure port value is returned. If isSecure is set to false the default
        port value is returned  */
-//    long getDefaultServerPort(in boolean isSecure);
-	getDefaultServerPort: function _getDefaultServerPort(isSecure)
-	{
-		return 443;
-	},
+    //    long getDefaultServerPort(in boolean isSecure);
+    getDefaultServerPort: function _getDefaultServerPort(isSecure) {
+        return 443;
+    },
 
     /**
      * An attribute that tell us whether on not we can 
      * get messages for the given server type 
-   * this is poorly named right now.
-   * it's really is there an inbox for this type?
-   * XXX todo, rename this.
+     * this is poorly named right now.
+     * it's really is there an inbox for this type?
+     * XXX todo, rename this.
      */
-//    readonly attribute boolean canGetMessages;
-	get canGetMessages()
-	{
-		return true;
-	},
+    //    readonly attribute boolean canGetMessages;
+    get canGetMessages() {
+        return true;
+    },
 
     /** 
-   * do messages arrive for this server
-   * if they do, we can use our junk controls on it.
-   */
-//    readonly attribute boolean canGetIncomingMessages;
-	get canGetIncomingMessages()
-	{
-		return true;
-	},
+     * do messages arrive for this server
+     * if they do, we can use our junk controls on it.
+     */
+    //    readonly attribute boolean canGetIncomingMessages;
+    get canGetIncomingMessages() {
+        return true;
+    },
 
     /**
      * do biff by default?
      */
-//    readonly attribute boolean defaultDoBiff;
-	get defaultDoBiff()
-	{
-		return true;
-	},
+    //    readonly attribute boolean defaultDoBiff;
+    get defaultDoBiff() {
+        return true;
+    },
 
     /**
      * do we need to show compose message link in the AccountCentral page ? 
      */
-//    readonly attribute boolean showComposeMsgLink;
-	get showComposeMsgLink()
-	{
-		return true;
-	},
+    //    readonly attribute boolean showComposeMsgLink;
+    get showComposeMsgLink() {
+        return true;
+    },
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeMsgProtocolInfo) {
-			NSGetFactory.mivExchangeMsgProtocolInfo = XPCOMUtils.generateNSGetFactory([mivExchangeMsgProtocolInfo]);
-
-	}
+    try {
+        if (!NSGetFactory.mivExchangeMsgProtocolInfo) {
+            NSGetFactory.mivExchangeMsgProtocolInfo = XPCOMUtils.generateNSGetFactory([mivExchangeMsgProtocolInfo]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeMsgProtocolInfo(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeMsgProtocolInfo(cid);
+}
diff --git a/interfaces/exchangeAccountManager/mivExchangeAccountManager.js b/interfaces/exchangeAccountManager/mivExchangeAccountManager.js
index 575372b1..212d6742 100644
--- a/interfaces/exchangeAccountManager/mivExchangeAccountManager.js
+++ b/interfaces/exchangeAccountManager/mivExchangeAccountManager.js
@@ -29,12 +29,12 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeAccountManager() {
 
-	this.prefs = Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService)
-				    .getBranch("extensions.exchangeWebServices.accounts."),
+    this.prefs = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService)
+        .getBranch("extensions.exchangeWebServices.accounts."),
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+        this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
 }
 
@@ -42,185 +42,190 @@ var mivExchangeAccountManagerGUID = "41397c22-bcea-4e98-a562-2f5f435c6111";
 
 mivExchangeAccountManager.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAccountManager,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange Account Manager.",
-	classID: components.ID("{"+mivExchangeAccountManagerGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/accountmanager;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods 
-	getAccountIds: function _getAccountIds()
-	{
-		var ids = this.globalFunctions.safeGetCharPref(this.prefs, "ids", "");
-		this.logInfo("ids:"+ids);
-		return ids.split(",");
-	},
-
-	getAccounts: function _getAccounts()
-	{
-		var result = {};
-		var ids = this.getAccountIds()
-		for each(var id in ids) {
-
-			if (id != "") {
-				this.logInfo("id:"+id);
-				var tmpResult = this.getAccountById(id);
-				if (tmpResult.result) {
-					result[id] = tmpResult.account;
-				}
-			}
-		}
-
-		return result;
-	},
-
-	getAccountById: function _getAccountById(aId)
-	{
-		var result = false;
-		var account = {};
-
-		this.logInfo("id:"+aId);
-		var children = this.prefs.getChildList(aId+".",{});
-		if (children.length > 0) {
-			result = true;
-			account["id"] = aId;
-			for (var index in children) {
-				var attribute = children[index].substr(children[index].indexOf(".")+1);
-				switch (this.prefs.getPrefType(children[index])) {
-				case this.prefs.PREF_STRING:
-					account[attribute] = { type: "string", value: this.prefs.getCharPref(children[index])};
-					break;
-				case this.prefs.PREF_INT:
-					account[attribute] = { type: "int", value: this.prefs.getIntPref(children[index])};
-					break;
-				case this.prefs.PREF_BOOL:
-					account[attribute] = { type: "bool", value: this.prefs.getBoolPref(children[index])};
-					break;
-				}
-			}
-		}
-
-		return  { result:result, account: account };
-	},
-
-	getAccountByServer: function _getAccountByServer(aServer)
-	{
-		var accounts = this.getAccounts();
-		for each(var account in accounts) {
-			if ((account.server) && (account.server.value) && (account.server.value.toLowerCase() == aServer.toLowerCase())) {
-				return account;
-			}
-		}
-		return null;
-	},
-
-	saveAccount: function _saveAccount(aAccount)
-	{
-		for (var index in aAccount) {
-			if (index != "id") {
-				switch (aAccount[index].type) {
-				case "string": 
-					this.prefs.setCharPref(aAccount.id+"."+index, aAccount[index].value);
-					break;
-				case "int":
-					this.prefs.setIntPref(aAccount.id+"."+index, aAccount[index].value);
-					break;
-				case "bool":
-					this.prefs.setBoolPref(aAccount.id+"."+index, aAccount[index].value);
-					break;
-				default:
-					this.logInfo("Unknown preference index:"+index+", value:"+aAccount[index].value+", type:"+aAccount[index].type);
-				}
-			}
-		}
-
-		// Check if the ids all ready exists. If not add it.
-		var ids = this.getAccountIds();
-		var idExists = false;
-		for (var index in ids) {
-			if (ids[index] == aAccount.id) {
-				idExists = true;
-				break;
-			}
-		}
-		if (!idExists) {
-			ids.push(aAccount.id);
-			ids = ids.join(",");
-			this.prefs.setCharPref("ids", ids);
-		}
-	},
-
-	removeAccount: function _removeAccount(aAccount)
-	{
-		if (aAccount.id) {
-			this.removeAccountById(aAccount.id);
-		}
-	},
-
-	removeAccountById: function _removeAccountById(aAccountId)
-	{
-		this.prefs.deleteBranch(aAccountId);
-		// Remove from ids list.
-		var oldIds = this.getAccountIds();
-		var newIds = [];
-		for (var index in oldIds) {
-			if (oldIds[index] != aAccountId) {
-				newIds.push(oldIds[index]);
-			}
-		}
-
-		if (newIds.length > 0) {
-			newIds = newIds.join(",");
-		}
-		else {
-			newIds = "";
-		}
-		this.prefs.setCharPref("ids", newIds);
-	},
-
-	// Internal methods 
-	logInfo: function _logInfo(aMsg, aDebugLevel) 
-	{
-		return;
-		/* if (!aDebugLevel) aDebugLevel = 1;
-
-		var prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
-
-		this.debugLevel = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.accounts.debuglevel", 0, true);
-		if (aDebugLevel <= this.debugLevel) {
-			this.globalFunctions.LOG("mivExchangeAccountManager: "+aMsg);
-		} */
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAccountManager,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange Account Manager.",
+    classID: components.ID("{" + mivExchangeAccountManagerGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/accountmanager;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods 
+    getAccountIds: function _getAccountIds() {
+        var ids = this.globalFunctions.safeGetCharPref(this.prefs, "ids", "");
+        this.logInfo("ids:" + ids);
+        return ids.split(",");
+    },
+
+    getAccounts: function _getAccounts() {
+        var result = {};
+        var ids = this.getAccountIds()
+        for each(var id in ids) {
+
+            if (id != "") {
+                this.logInfo("id:" + id);
+                var tmpResult = this.getAccountById(id);
+                if (tmpResult.result) {
+                    result[id] = tmpResult.account;
+                }
+            }
+        }
+
+        return result;
+    },
+
+    getAccountById: function _getAccountById(aId) {
+        var result = false;
+        var account = {};
+
+        this.logInfo("id:" + aId);
+        var children = this.prefs.getChildList(aId + ".", {});
+        if (children.length > 0) {
+            result = true;
+            account["id"] = aId;
+            for (var index in children) {
+                var attribute = children[index].substr(children[index].indexOf(".") + 1);
+                switch (this.prefs.getPrefType(children[index])) {
+                case this.prefs.PREF_STRING:
+                    account[attribute] = {
+                        type: "string",
+                        value: this.prefs.getCharPref(children[index])
+                    };
+                    break;
+                case this.prefs.PREF_INT:
+                    account[attribute] = {
+                        type: "int",
+                        value: this.prefs.getIntPref(children[index])
+                    };
+                    break;
+                case this.prefs.PREF_BOOL:
+                    account[attribute] = {
+                        type: "bool",
+                        value: this.prefs.getBoolPref(children[index])
+                    };
+                    break;
+                }
+            }
+        }
+
+        return {
+            result: result,
+            account: account
+        };
+    },
+
+    getAccountByServer: function _getAccountByServer(aServer) {
+        var accounts = this.getAccounts();
+        for each(var account in accounts) {
+            if ((account.server) && (account.server.value) && (account.server.value.toLowerCase() == aServer.toLowerCase())) {
+                return account;
+            }
+        }
+        return null;
+    },
+
+    saveAccount: function _saveAccount(aAccount) {
+        for (var index in aAccount) {
+            if (index != "id") {
+                switch (aAccount[index].type) {
+                case "string":
+                    this.prefs.setCharPref(aAccount.id + "." + index, aAccount[index].value);
+                    break;
+                case "int":
+                    this.prefs.setIntPref(aAccount.id + "." + index, aAccount[index].value);
+                    break;
+                case "bool":
+                    this.prefs.setBoolPref(aAccount.id + "." + index, aAccount[index].value);
+                    break;
+                default:
+                    this.logInfo("Unknown preference index:" + index + ", value:" + aAccount[index].value + ", type:" + aAccount[index].type);
+                }
+            }
+        }
+
+        // Check if the ids all ready exists. If not add it.
+        var ids = this.getAccountIds();
+        var idExists = false;
+        for (var index in ids) {
+            if (ids[index] == aAccount.id) {
+                idExists = true;
+                break;
+            }
+        }
+        if (!idExists) {
+            ids.push(aAccount.id);
+            ids = ids.join(",");
+            this.prefs.setCharPref("ids", ids);
+        }
+    },
+
+    removeAccount: function _removeAccount(aAccount) {
+        if (aAccount.id) {
+            this.removeAccountById(aAccount.id);
+        }
+    },
+
+    removeAccountById: function _removeAccountById(aAccountId) {
+        this.prefs.deleteBranch(aAccountId);
+        // Remove from ids list.
+        var oldIds = this.getAccountIds();
+        var newIds = [];
+        for (var index in oldIds) {
+            if (oldIds[index] != aAccountId) {
+                newIds.push(oldIds[index]);
+            }
+        }
+
+        if (newIds.length > 0) {
+            newIds = newIds.join(",");
+        }
+        else {
+            newIds = "";
+        }
+        this.prefs.setCharPref("ids", newIds);
+    },
+
+    // Internal methods 
+    logInfo: function _logInfo(aMsg, aDebugLevel) {
+        return;
+        /* if (!aDebugLevel) aDebugLevel = 1;
+
+        var prefB = Cc["@mozilla.org/preferences-service;1"]
+        	.getService(Ci.nsIPrefBranch);
+
+        this.debugLevel = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.accounts.debuglevel", 0, true);
+        if (aDebugLevel <= this.debugLevel) {
+        	this.globalFunctions.LOG("mivExchangeAccountManager: "+aMsg);
+        } */
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAccountManager) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAccountManager = XPCOMUtils.generateNSGetFactory([mivExchangeAccountManager]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeAccountManager) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAccountManager = XPCOMUtils.generateNSGetFactory([mivExchangeAccountManager]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeAccountManager(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAccountManager(cid);
+}
diff --git a/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js b/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js
index ee518abd..a14eea12 100644
--- a/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js
+++ b/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js
@@ -36,106 +36,104 @@ Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 Cu.import("resource://exchangecalendar/erGetAttachments.js");
 
 var photoHandlerInline = {
-	onLoad: function _onLoad(aCard, aDocument)
-	{
-		return true;
-	},
-
-	onShow: function _onShow(aCard, aDocument, aTargetID)
-	{
-		if ((aCard) && (aCard.getProperty("PhotoData", ""))) {
-			aDocument.getElementById(aTargetID).setAttribute("src", "data:image/jpeg;base64,"+aCard.getProperty("PhotoData", ""));
-			return true;
-		}
-		else {
-			return false;
-		}
-	},
-
-	onSave: function _onLoad(aCard, aDocument)
-	{
-		return true;
-	},
+    onLoad: function _onLoad(aCard, aDocument) {
+        return true;
+    },
+
+    onShow: function _onShow(aCard, aDocument, aTargetID) {
+        if ((aCard) && (aCard.getProperty("PhotoData", ""))) {
+            aDocument.getElementById(aTargetID).setAttribute("src", "data:image/jpeg;base64," + aCard.getProperty("PhotoData", ""));
+            return true;
+        }
+        else {
+            return false;
+        }
+    },
+
+    onSave: function _onLoad(aCard, aDocument) {
+        return true;
+    },
 }
 
 var photoHandlerExternal = {
-	onLoad: function _onLoad(aCard, aDocument)
-	{
-		return true;
-	},
-
-	onShow: function _onShow(aCard, aDocument, aTargetID)
-	{
-		if ((aCard) && (aCard.getProperty("PhotoData", ""))) {
-			this.downloadAttachment(aDocument.getElementById(aTargetID), aCard);
-			aDocument.getElementById(aTargetID).setAttribute("src", "chrome://exchangecontacts/content/loading-from-server.png");
-			return true;
-		}
-		else {
-			return false;
-		}
-	},
-
-	onSave: function _onLoad(aCard, aDocument)
-	{
-		return true;
-	},
-
-	downloadAttachment: function _downloadAttachment(aImg, aCard)
-	{
-		//dump("photoHandlerExternal.downloadAttachment\n");
-		if (!aImg) { return; }
-
-		var self = this;
-
-		var tmpObject = new erGetAttachmentsRequest(
-			{user: aCard.getProperty("exchangeUser", ""), 
-			 serverUrl:  aCard.getProperty("exchangeServerUrl", "") ,
-			 img: aImg,
-			 attachmentIds: [aCard.getProperty("PhotoData", "")]}, 
-			function(aExchangeRequest, aAttachments){ self.onDownloadAttachmentOk(aExchangeRequest, aAttachments);}, 
-			function(aExchangeRequest, aCode, aMsg){ self.onDownloadAttachmentError(aExchangeRequest, aCode, aMsg);});
-
-	},
-
-	onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments)
-	{
-		//dump("photoHandlerExternal.onDownloadAttachmentOk:"+aAttachments.length+"\n");
-
-		if (aAttachments.length > 0) {
-			aExchangeRequest.argument.img.setAttribute("src", "data:image/jpeg;base64,"+aAttachments[0].content);
-		}
-	},
-
-	onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg)
-	{
-		//dump("photoHandlerExternal.onDownloadAttachmentError: aCode:"+aCode+", aMsg:"+aMsg+"\n");
-		aExchangeRequest.argument.img.setAttribute("src", "chrome://exchangecontacts/content/error-loading-from-server.png");
-	},
+    onLoad: function _onLoad(aCard, aDocument) {
+        return true;
+    },
+
+    onShow: function _onShow(aCard, aDocument, aTargetID) {
+        if ((aCard) && (aCard.getProperty("PhotoData", ""))) {
+            this.downloadAttachment(aDocument.getElementById(aTargetID), aCard);
+            aDocument.getElementById(aTargetID).setAttribute("src", "chrome://exchangecontacts/content/loading-from-server.png");
+            return true;
+        }
+        else {
+            return false;
+        }
+    },
+
+    onSave: function _onLoad(aCard, aDocument) {
+        return true;
+    },
+
+    downloadAttachment: function _downloadAttachment(aImg, aCard) {
+        //dump("photoHandlerExternal.downloadAttachment\n");
+        if (!aImg) {
+            return;
+        }
+
+        var self = this;
+
+        var tmpObject = new erGetAttachmentsRequest({
+                user: aCard.getProperty("exchangeUser", ""),
+                serverUrl: aCard.getProperty("exchangeServerUrl", ""),
+                img: aImg,
+                attachmentIds: [aCard.getProperty("PhotoData", "")]
+            },
+            function (aExchangeRequest, aAttachments) {
+                self.onDownloadAttachmentOk(aExchangeRequest, aAttachments);
+            },
+            function (aExchangeRequest, aCode, aMsg) {
+                self.onDownloadAttachmentError(aExchangeRequest, aCode, aMsg);
+            });
+
+    },
+
+    onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments) {
+        //dump("photoHandlerExternal.onDownloadAttachmentOk:"+aAttachments.length+"\n");
+
+        if (aAttachments.length > 0) {
+            aExchangeRequest.argument.img.setAttribute("src", "data:image/jpeg;base64," + aAttachments[0].content);
+        }
+    },
+
+    onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg) {
+        //dump("photoHandlerExternal.onDownloadAttachmentError: aCode:"+aCode+", aMsg:"+aMsg+"\n");
+        aExchangeRequest.argument.img.setAttribute("src", "chrome://exchangecontacts/content/error-loading-from-server.png");
+    },
 
 }
 
-function exchAbCardOverlay(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchAbCardOverlay(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchAbCardOverlay.prototype = {
 
-	onLoad: function _onLoad()
-	{
-		var self = this;
+    onLoad: function _onLoad() {
+        var self = this;
 
-		registerPhotoHandler("exchangeContactPhotoInline", photoHandlerInline);
-		registerPhotoHandler("exchangeContactPhotoExternal", photoHandlerExternal);
-	},
+        registerPhotoHandler("exchangeContactPhotoInline", photoHandlerInline);
+        registerPhotoHandler("exchangeContactPhotoExternal", photoHandlerExternal);
+    },
 
 }
 
 var tmpAbCardOverlay = new exchAbCardOverlay(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpAbCardOverlay.onLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpAbCardOverlay.onLoad();
+}, true);
diff --git a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js b/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js
index 5750ce2f..ad5fec4e 100644
--- a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js
+++ b/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js
@@ -35,260 +35,273 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 Cu.import("resource://exchangecalendar/erGetAttachments.js");
 
-function exchAddressbookOverlay(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchAddressbookOverlay(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchAddressbookOverlay.prototype = {
 
-	deletePrevStatus : null,
+    deletePrevStatus: null,
 
-	doAddExchangeAccount: function _doAddExchangeAccount()
-	{
-		// TODO: We should open a dialog and ask for ActiveDirectory details.
-	//	var newName = getUUID();
+    doAddExchangeAccount: function _doAddExchangeAccount() {
+        // TODO: We should open a dialog and ask for ActiveDirectory details.
+        //	var newName = getUUID();
 
-		var input = { selectedDirectory: null,
-			      answer: "",
-			      newAccountObject: null
-				};
-		this._window.openDialog("chrome://exchangecontacts/content/exchangeContactSettings.xul",
-				"createexchangeaccount",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-				input); 
+        var input = {
+            selectedDirectory: null,
+            answer: "",
+            newAccountObject: null
+        };
+        this._window.openDialog("chrome://exchangecontacts/content/exchangeContactSettings.xul",
+            "createexchangeaccount",
+            "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+            input);
 
-		if (input.answer == "saved") {
-			var newUUID = exchWebService.commonAbFunctions.addAccount(input.newAccountObject);	
+        if (input.answer == "saved") {
+            var newUUID = exchWebService.commonAbFunctions.addAccount(input.newAccountObject);
 
 
-			this.prefs = Cc["@mozilla.org/preferences-service;1"]
-			    	.getService(Ci.nsIPrefService)
-			    	.getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+newUUID+".");
+            this.prefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + newUUID + ".");
 
-			this.prefs.setIntPref("pollinterval", input.newAccountObject.pollinterval);
-			this.prefs.setBoolPref("globalAddressList", input.newAccountObject.addGlobalAddressList);
+            this.prefs.setIntPref("pollinterval", input.newAccountObject.pollinterval);
+            this.prefs.setBoolPref("globalAddressList", input.newAccountObject.addGlobalAddressList);
 
 
-			var theParentDirectory = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://")
-							.QueryInterface(Ci.nsIAbDirectory);
+            var theParentDirectory = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://")
+                .QueryInterface(Ci.nsIAbDirectory);
 
-			var targetURI = "exchWebService-contactRoot-directory://" + newUUID;
-			var theChildDirectory = MailServices.ab.getDirectory(targetURI)
-							.QueryInterface(Ci.nsIAbDirectory);
+            var targetURI = "exchWebService-contactRoot-directory://" + newUUID;
+            var theChildDirectory = MailServices.ab.getDirectory(targetURI)
+                .QueryInterface(Ci.nsIAbDirectory);
 
-			MailServices.ab.notifyDirectoryItemAdded(theParentDirectory, theChildDirectory);
-		}
-	},
+            MailServices.ab.notifyDirectoryItemAdded(theParentDirectory, theChildDirectory);
+        }
+    },
 
-	doDeleteExchangeAccount:function _doDeleteExchangeAccount()
-	{
-		exchWebService.commonAbFunctions.logInfo("1. doDeleteExchangeAccount\n");
+    doDeleteExchangeAccount: function _doDeleteExchangeAccount() {
+        exchWebService.commonAbFunctions.logInfo("1. doDeleteExchangeAccount\n");
 
-		var theParentDirectory = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://")
-						.QueryInterface(Ci.nsIAbDirectory);
+        var theParentDirectory = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://")
+            .QueryInterface(Ci.nsIAbDirectory);
 
-		var theChildDirectory = MailServices.ab.getDirectory(GetSelectedDirectory())
-						.QueryInterface(Ci.nsIAbDirectory);
+        var theChildDirectory = MailServices.ab.getDirectory(GetSelectedDirectory())
+            .QueryInterface(Ci.nsIAbDirectory);
 
-		var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]		
-						.getService(Components.interfaces.nsIPromptService);
-		if (promptService.confirm(null, this.globalFunctions.getString("ExchangeContacts","promtpDeleteDirectoryTitle",[],"exchangecontacts"), 
-				this.globalFunctions.getString("ExchangeContacts","promptDeleteDirectoryText",[theChildDirectory.dirName],"exchangecontacts"))) {	
-			exchWebService.commonAbFunctions.deleteAccount(theChildDirectory.uuid);
+        var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+            .getService(Components.interfaces.nsIPromptService);
+        if (promptService.confirm(null, this.globalFunctions.getString("ExchangeContacts", "promtpDeleteDirectoryTitle", [], "exchangecontacts"),
+                this.globalFunctions.getString("ExchangeContacts", "promptDeleteDirectoryText", [theChildDirectory.dirName], "exchangecontacts"))) {
+            exchWebService.commonAbFunctions.deleteAccount(theChildDirectory.uuid);
 
-			MailServices.ab.notifyDirectoryItemDeleted(theParentDirectory, theChildDirectory);
-		}
+            MailServices.ab.notifyDirectoryItemDeleted(theParentDirectory, theChildDirectory);
+        }
 
-		exchWebService.commonAbFunctions.logInfo("2. doDeleteExchangeAccount\n");
-	},
+        exchWebService.commonAbFunctions.logInfo("2. doDeleteExchangeAccount\n");
+    },
 
-	onDirTreeSelect: function _onDirTreeSelect()
-	{
-		var selectedDir = GetSelectedDirectory();
+    onDirTreeSelect: function _onDirTreeSelect() {
+        var selectedDir = GetSelectedDirectory();
 
-		if ((selectedDir) && (selectedDir == "exchWebService-contactRoot-directory://")) {
+        if ((selectedDir) && (selectedDir == "exchWebService-contactRoot-directory://")) {
 
-			this._document.getElementById("button-deleteexchangeaccount").hidden = true;
-			this._document.getElementById("button-addexchangeaccount").hidden = false;
+            this._document.getElementById("button-deleteexchangeaccount").hidden = true;
+            this._document.getElementById("button-addexchangeaccount").hidden = false;
 
-			this._document.getElementById("button-newcard").disabled = true;
-			this._document.getElementById("menu_newContact").disabled = true;
+            this._document.getElementById("button-newcard").disabled = true;
+            this._document.getElementById("menu_newContact").disabled = true;
 
 
-			//this._document.getElementById("cmd_delete").setAttribute('disabled','true');
-			this._document.getElementById("button_delete").setAttribute('disabled','true');
-			this._document.getElementById("cmd_properties").setAttribute('disabled', 'true');
-			this._document.getElementById("button-editcard").setAttribute('disabled', 'true');
+            //this._document.getElementById("cmd_delete").setAttribute('disabled','true');
+            this._document.getElementById("button_delete").setAttribute('disabled', 'true');
+            this._document.getElementById("cmd_properties").setAttribute('disabled', 'true');
+            this._document.getElementById("button-editcard").setAttribute('disabled', 'true');
 
-			this._document.getElementById("cmd_deleteexchange").setAttribute('disabled','true');
+            this._document.getElementById("cmd_deleteexchange").setAttribute('disabled', 'true');
 
-			this._document.getElementById("menu_deleteexchangecontact").setAttribute('disabled','true');
+            this._document.getElementById("menu_deleteexchangecontact").setAttribute('disabled', 'true');
 
-		} 
-		else {
-			if ((selectedDir) && (selectedDir.indexOf("exchWebService-contactFolder-directory://") > -1)) {
+        }
+        else {
+            if ((selectedDir) && (selectedDir.indexOf("exchWebService-contactFolder-directory://") > -1)) {
 
-				this._document.getElementById("button-deleteexchangeaccount").hidden = false;
-				this._document.getElementById("button-addexchangeaccount").hidden = true;
+                this._document.getElementById("button-deleteexchangeaccount").hidden = false;
+                this._document.getElementById("button-addexchangeaccount").hidden = true;
 
-				//this._document.getElementById("cmd_delete").setAttribute('disabled','true');
-				this._document.getElementById("button_delete").setAttribute('disabled','true');
+                //this._document.getElementById("cmd_delete").setAttribute('disabled','true');
+                this._document.getElementById("button_delete").setAttribute('disabled', 'true');
 
-				this._document.getElementById("cmd_deleteexchange").setAttribute('disabled','false');
+                this._document.getElementById("cmd_deleteexchange").setAttribute('disabled', 'false');
 
-				this._document.getElementById("button-newcard").disabled = false;
-				this._document.getElementById("menu_newContact").disabled = false;
+                this._document.getElementById("button-newcard").disabled = false;
+                this._document.getElementById("menu_newContact").disabled = false;
 
-				this._document.getElementById("menu_deleteexchangecontact").setAttribute('disabled','false');
+                this._document.getElementById("menu_deleteexchangecontact").setAttribute('disabled', 'false');
 
-			}
-			else {
+            }
+            else {
 
-				this._document.getElementById("button-deleteexchangeaccount").hidden = true;
-				this._document.getElementById("button-addexchangeaccount").hidden = false;
+                this._document.getElementById("button-deleteexchangeaccount").hidden = true;
+                this._document.getElementById("button-addexchangeaccount").hidden = false;
 
-				this._document.getElementById("button-newcard").disabled = false;
-				this._document.getElementById("menu_newContact").disabled = false;
+                this._document.getElementById("button-newcard").disabled = false;
+                this._document.getElementById("menu_newContact").disabled = false;
+
+                this._document.getElementById("cmd_deleteexchange").setAttribute('disabled', 'true');
+
+                this._document.getElementById("menu_deleteexchangecontact").setAttribute('disabled', 'true');
 
-				this._document.getElementById("cmd_deleteexchange").setAttribute('disabled','true');
+            }
+            this._document.getElementById("cmd_properties").setAttribute('disabled', 'false');
+            this._document.getElementById("button-editcard").setAttribute('disabled', 'false');
+        }
 
-				this._document.getElementById("menu_deleteexchangecontact").setAttribute('disabled','true');
+        exchWebService.commonAbFunctions.logInfo("ondirTreeSelect selectedDir:" + selectedDir + "\n");
+    },
 
-			}
-			this._document.getElementById("cmd_properties").setAttribute('disabled', 'false');
-			this._document.getElementById("button-editcard").setAttribute('disabled', 'false');
-		}
+    onRightClick: function _onRightClick() {
+        var selectedDir = GetSelectedDirectory();
 
-		exchWebService.commonAbFunctions.logInfo("ondirTreeSelect selectedDir:"+selectedDir+"\n");
-	},
-
-	onRightClick: function _onRightClick()
-	{
-		var selectedDir = GetSelectedDirectory();
-
-		if ((selectedDir) && (selectedDir == "exchWebService-contactRoot-directory://")) {
-			this._document.getElementById("dirTreeContext-properties").disabled = true;
-			this._document.getElementById("dirTreeContext-newcard").hidden = true;
-			this._document.getElementById("dirTreeContext-newlist").hidden = true;
-
-			this._document.getElementById("dirTreeContext-delete").hidden = false;
-			this._document.getElementById("dirTreeContext_deleteexchangecontact").hidden = true;
-		}
-		else {
-			if ((selectedDir) && (selectedDir.indexOf("exchWebService-contactFolder-directory://") > -1)) {
-				this._document.getElementById("dirTreeContext-properties").disabled = false;
-				this._document.getElementById("dirTreeContext-newcard").hidden = true;
-				this._document.getElementById("dirTreeContext-newlist").hidden = true;
-
-				this._document.getElementById("dirTreeContext-delete").hidden = true;
-				this._document.getElementById("dirTreeContext_deleteexchangecontact").hidden = false;
-			}
-			else {
-				this._document.getElementById("dirTreeContext-properties").disabled = false;
-				this._document.getElementById("dirTreeContext-newcard").hidden = false;
-				this._document.getElementById("dirTreeContext-newlist").hidden = true;
-
-				this._document.getElementById("dirTreeContext-delete").hidden = false;
-				this._document.getElementById("dirTreeContext_deleteexchangecontact").hidden = true;
-			}
-		}
-	},
-
-	photoDisplayHandlerInline: function _photoDisplayHandler(aCard, aImg)
-	{
-		//dump("exchAddressbookOverlay.photoDisplayHandlerInline: aImg:"+aImg.id+"\n");
-		if ((aCard) && (aCard.getProperty("PhotoData"))) {
-			aImg.setAttribute("src", "data:image/jpeg;base64,"+aCard.getProperty("PhotoData"));
-			return true;
-		}
-		else {
-			return false;
-		}
-	},
-
-
-	photoDisplayHandlerExternal: function _photoDisplayHandlerExternal(aCard, aImg)
-	{
-		if ((aCard) && (aCard.getProperty("PhotoData"))) {
-			this.downloadAttachment(aImg, aCard);
-			aImg.setAttribute("src", "chrome://exchangecontacts/content/loading-from-server.png");
-			return true;
-		}
-		else {
-			return false;
-		}
-	},
-
-	onLoad: function _onLoad()
-	{
-		var self = this;
-
-		this.select = function(){self.onDirTreeSelect()}
-		this.focus = function(){self.onDirTreeSelect()}
-		this.addrbookSelect = function(){self.onDirTreeSelect()}
-		this.popupshown = function(){self.onRightClick()}
-
-		this._document.getElementById("dirTree").addEventListener("select", this.select, true);
-		this._document.getElementById("dirTree").addEventListener("focus", this.focus, true);
-		this._document.getElementById("dirTree").addEventListener("addrbook-select", this.addrbookSelect, true);
-
-		this._document.getElementById("dirTreeContext").addEventListener("popupshown", this.popupshown, true);
-
-		registerPhotoDisplayHandler("exchangeContactPhotoInline", function(aCard, aImg){ return self.photoDisplayHandlerInline(aCard, aImg);});
-		registerPhotoDisplayHandler("exchangeContactPhotoExternal", function(aCard, aImg){ return self.photoDisplayHandlerExternal(aCard, aImg);});
-		this.globalFunctions.LOG("exchAddressbookOverlay.onLoad");
-	},
-
-	unLoad: function _unLoad()
-	{
-		var self = this;
-		this._document.getElementById("dirTree").removeEventListener("select", this.select, false);
-		this._document.getElementById("dirTree").removeEventListener("focus", this.focus, false);
-		this._document.getElementById("dirTree").removeEventListener("addrbook-select", this.addrbookSelect, false);
-
-		this._document.getElementById("dirTreeContext").removeEventListener("popupshown", this.popupshown, false);
-	},
-
-	downloadAttachment: function _downloadAttachment(aImg, aCard)
-	{
-		this.globalFunctions.LOG("exchAddressbookOverlay.downloadAttachment");
-		if (!aImg) { return; }
-
-		var self = this;
-
-		var tmpObject = new erGetAttachmentsRequest(
-			{user: aCard.getProperty("exchangeUser"), 
-			 serverUrl:  aCard.getProperty("exchangeServerUrl") ,
-			 img: aImg,
-			 attachmentIds: [aCard.getProperty("PhotoData")]}, 
-			function(aExchangeRequest, aAttachments){ self.onDownloadAttachmentOk(aExchangeRequest, aAttachments);}, 
-			function(aExchangeRequest, aCode, aMsg){ self.onDownloadAttachmentError(aExchangeRequest, aCode, aMsg);});
-
-	},
-
-	onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments)
-	{
-		this.globalFunctions.LOG("exchAddressbookOverlay.onDownloadAttachmentOk:"+aAttachments.length);
-
-		if (aAttachments.length > 0) {
-			aExchangeRequest.argument.img.setAttribute("src", "data:image/jpeg;base64,"+aAttachments[0].content);
-		}
-	},
-
-	onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg)
-	{
-		this.globalFunctions.LOG("exchAddressbookOverlay.onDownloadAttachmentError: aCode:"+aCode+", aMsg:"+aMsg);
-		aExchangeRequest.argument.img.setAttribute("src", "chrome://exchangecontacts/content/error-loading-from-server.png");
-	},
+        if ((selectedDir) && (selectedDir == "exchWebService-contactRoot-directory://")) {
+            this._document.getElementById("dirTreeContext-properties").disabled = true;
+            this._document.getElementById("dirTreeContext-newcard").hidden = true;
+            this._document.getElementById("dirTreeContext-newlist").hidden = true;
+
+            this._document.getElementById("dirTreeContext-delete").hidden = false;
+            this._document.getElementById("dirTreeContext_deleteexchangecontact").hidden = true;
+        }
+        else {
+            if ((selectedDir) && (selectedDir.indexOf("exchWebService-contactFolder-directory://") > -1)) {
+                this._document.getElementById("dirTreeContext-properties").disabled = false;
+                this._document.getElementById("dirTreeContext-newcard").hidden = true;
+                this._document.getElementById("dirTreeContext-newlist").hidden = true;
+
+                this._document.getElementById("dirTreeContext-delete").hidden = true;
+                this._document.getElementById("dirTreeContext_deleteexchangecontact").hidden = false;
+            }
+            else {
+                this._document.getElementById("dirTreeContext-properties").disabled = false;
+                this._document.getElementById("dirTreeContext-newcard").hidden = false;
+                this._document.getElementById("dirTreeContext-newlist").hidden = true;
+
+                this._document.getElementById("dirTreeContext-delete").hidden = false;
+                this._document.getElementById("dirTreeContext_deleteexchangecontact").hidden = true;
+            }
+        }
+    },
+
+    photoDisplayHandlerInline: function _photoDisplayHandler(aCard, aImg) {
+        //dump("exchAddressbookOverlay.photoDisplayHandlerInline: aImg:"+aImg.id+"\n");
+        if ((aCard) && (aCard.getProperty("PhotoData"))) {
+            aImg.setAttribute("src", "data:image/jpeg;base64," + aCard.getProperty("PhotoData"));
+            return true;
+        }
+        else {
+            return false;
+        }
+    },
+
+
+    photoDisplayHandlerExternal: function _photoDisplayHandlerExternal(aCard, aImg) {
+        if ((aCard) && (aCard.getProperty("PhotoData"))) {
+            this.downloadAttachment(aImg, aCard);
+            aImg.setAttribute("src", "chrome://exchangecontacts/content/loading-from-server.png");
+            return true;
+        }
+        else {
+            return false;
+        }
+    },
+
+    onLoad: function _onLoad() {
+        var self = this;
+
+        this.select = function () {
+            self.onDirTreeSelect()
+        }
+        this.focus = function () {
+            self.onDirTreeSelect()
+        }
+        this.addrbookSelect = function () {
+            self.onDirTreeSelect()
+        }
+        this.popupshown = function () {
+            self.onRightClick()
+        }
+
+        this._document.getElementById("dirTree").addEventListener("select", this.select, true);
+        this._document.getElementById("dirTree").addEventListener("focus", this.focus, true);
+        this._document.getElementById("dirTree").addEventListener("addrbook-select", this.addrbookSelect, true);
+
+        this._document.getElementById("dirTreeContext").addEventListener("popupshown", this.popupshown, true);
+
+        registerPhotoDisplayHandler("exchangeContactPhotoInline", function (aCard, aImg) {
+            return self.photoDisplayHandlerInline(aCard, aImg);
+        });
+        registerPhotoDisplayHandler("exchangeContactPhotoExternal", function (aCard, aImg) {
+            return self.photoDisplayHandlerExternal(aCard, aImg);
+        });
+        this.globalFunctions.LOG("exchAddressbookOverlay.onLoad");
+    },
+
+    unLoad: function _unLoad() {
+        var self = this;
+        this._document.getElementById("dirTree").removeEventListener("select", this.select, false);
+        this._document.getElementById("dirTree").removeEventListener("focus", this.focus, false);
+        this._document.getElementById("dirTree").removeEventListener("addrbook-select", this.addrbookSelect, false);
+
+        this._document.getElementById("dirTreeContext").removeEventListener("popupshown", this.popupshown, false);
+    },
+
+    downloadAttachment: function _downloadAttachment(aImg, aCard) {
+        this.globalFunctions.LOG("exchAddressbookOverlay.downloadAttachment");
+        if (!aImg) {
+            return;
+        }
+
+        var self = this;
+
+        var tmpObject = new erGetAttachmentsRequest({
+                user: aCard.getProperty("exchangeUser"),
+                serverUrl: aCard.getProperty("exchangeServerUrl"),
+                img: aImg,
+                attachmentIds: [aCard.getProperty("PhotoData")]
+            },
+            function (aExchangeRequest, aAttachments) {
+                self.onDownloadAttachmentOk(aExchangeRequest, aAttachments);
+            },
+            function (aExchangeRequest, aCode, aMsg) {
+                self.onDownloadAttachmentError(aExchangeRequest, aCode, aMsg);
+            });
+
+    },
+
+    onDownloadAttachmentOk: function _onDownloadAttachmentOk(aExchangeRequest, aAttachments) {
+        this.globalFunctions.LOG("exchAddressbookOverlay.onDownloadAttachmentOk:" + aAttachments.length);
+
+        if (aAttachments.length > 0) {
+            aExchangeRequest.argument.img.setAttribute("src", "data:image/jpeg;base64," + aAttachments[0].content);
+        }
+    },
+
+    onDownloadAttachmentError: function _onDownloadAttachmentError(aExchangeRequest, aCode, aMsg) {
+        this.globalFunctions.LOG("exchAddressbookOverlay.onDownloadAttachmentError: aCode:" + aCode + ", aMsg:" + aMsg);
+        aExchangeRequest.argument.img.setAttribute("src", "chrome://exchangecontacts/content/error-loading-from-server.png");
+    },
 
 }
 
 var tmpAddressbookOverlay = new exchAddressbookOverlay(document, window);
-window.addEventListener("load", function () { window.removeEventListener("load",arguments.callee,false); tmpAddressbookOverlay.onLoad(); }, true);
-window.addEventListener("unload", function () { window.removeEventListener("unload",arguments.callee,false); tmpAddressbookOverlay.unLoad(); }, true);
-
+window.addEventListener("load", function () {
+    window.removeEventListener("load", arguments.callee, false);
+    tmpAddressbookOverlay.onLoad();
+}, true);
+window.addEventListener("unload", function () {
+    window.removeEventListener("unload", arguments.callee, false);
+    tmpAddressbookOverlay.unLoad();
+}, true);
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.js b/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.js
index 3ebd29b9..60a26cb6 100644
--- a/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.js
+++ b/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.js
@@ -26,96 +26,92 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-function exchExchangeContactSettings(aDocument, aWindow)
-{
-	this._document = aDocument;
-	this._window = aWindow;
+function exchExchangeContactSettings(aDocument, aWindow) {
+    this._document = aDocument;
+    this._window = aWindow;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 exchExchangeContactSettings.prototype = {
 
-	isNewDirectory : true,
-	dirUUID : "",
-
-	checkRequired: function _checkRequired()
-	{
-	    let canAdvance = true;
-	    let vbox = this._document.getElementById('exchWebService-exchange-settings');
-	    if (vbox) {
-		let eList = vbox.getElementsByAttribute('required', 'true');
-		for (let i = 0; i < eList.length && canAdvance; ++i) {
-		    canAdvance = (eList[i].value != "");
-		}
-
-		if (canAdvance) {
-			this._document.getElementById("exchWebService_ContactSettings_dialog").buttons = "accept,cancel";
-		}
-		else {
-			this._document.getElementById("exchWebService_ContactSettings_dialog").buttons = "cancel";
-		}
-	    }
-
-	},
-
-	onLoad: function _onLoad()
-	{
-		var directory = this._window.arguments[0].selectedDirectory;
-		if (!directory) {
-			// New directory to create
-			this.isNewDirectory = true;
-			this.dirUUID = "";
-			this._document.getElementById("exchWebService_folderbase").selectedIndex = 7;
-			tmpSettingsOverlay.exchWebServicesgFolderBase = "contacts";
-			this._document.getElementById("exchangeWebService_preference_contacts_pollinterval").value = 300;
-			this._document.getElementById("exchWebService-add-globaladdresslist").checked = false;
-		}
-		else {
-			this.isNewDirectory = false;
-
-			this.dirUUID = directory.uuid;
-
-			this.prefs = Cc["@mozilla.org/preferences-service;1"]
-		            	.getService(Ci.nsIPrefService)
-			    	.getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+this.dirUUID+".");
-
-			this._document.getElementById("exchangeWebService_preference_contacts_pollinterval").value = this.globalFunctions.safeGetIntPref(this.prefs, "pollinterval", 300, true);
-			this._document.getElementById("exchWebService-add-globaladdresslist").checked = this.globalFunctions.safeGetBoolPref(this.prefs, "globalAddressList", false, true);
-
-			// load preferences of current directory.
-			tmpSettingsOverlay.exchWebServicesLoadExchangeSettingsByContactUUID(directory.uuid);
-
-		}
-
-	},
-
-	onSave: function _onSave()
-	{
-		this._window.arguments[0].newAccountObject = tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByContactUUID(this.isNewDirectory, this.dirUUID);
-
-		this._window.arguments[0].newAccountObject.pollinterval = this._document.getElementById("exchangeWebService_preference_contacts_pollinterval").value;
-		this._window.arguments[0].newAccountObject.addGlobalAddressList = this._document.getElementById("exchWebService-add-globaladdresslist").checked;
-
-		this._window.arguments[0].answer = "saved";
-
-		if (!this.isNewDirectory) {
-
-			this.prefs = Cc["@mozilla.org/preferences-service;1"]
-			    	.getService(Ci.nsIPrefService)
-			    	.getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+this.dirUUID+".");
-
-			this.prefs.setIntPref("pollinterval", this._window.arguments[0].newAccountObject.pollinterval);
-			this.prefs.setBoolPref("globalAddressList", this._window.arguments[0].newAccountObject.addGlobalAddressList);
-
-			var observerService = Cc["@mozilla.org/observer-service;1"]  
-				                  .getService(Ci.nsIObserverService);  
-			observerService.notifyObservers(this, "onContactReset", this.dirUUID);  
-		}
-
-		return true;
-	},
+    isNewDirectory: true,
+    dirUUID: "",
+
+    checkRequired: function _checkRequired() {
+        let canAdvance = true;
+        let vbox = this._document.getElementById('exchWebService-exchange-settings');
+        if (vbox) {
+            let eList = vbox.getElementsByAttribute('required', 'true');
+            for (let i = 0; i < eList.length && canAdvance; ++i) {
+                canAdvance = (eList[i].value != "");
+            }
+
+            if (canAdvance) {
+                this._document.getElementById("exchWebService_ContactSettings_dialog").buttons = "accept,cancel";
+            }
+            else {
+                this._document.getElementById("exchWebService_ContactSettings_dialog").buttons = "cancel";
+            }
+        }
+
+    },
+
+    onLoad: function _onLoad() {
+        var directory = this._window.arguments[0].selectedDirectory;
+        if (!directory) {
+            // New directory to create
+            this.isNewDirectory = true;
+            this.dirUUID = "";
+            this._document.getElementById("exchWebService_folderbase").selectedIndex = 7;
+            tmpSettingsOverlay.exchWebServicesgFolderBase = "contacts";
+            this._document.getElementById("exchangeWebService_preference_contacts_pollinterval").value = 300;
+            this._document.getElementById("exchWebService-add-globaladdresslist").checked = false;
+        }
+        else {
+            this.isNewDirectory = false;
+
+            this.dirUUID = directory.uuid;
+
+            this.prefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + this.dirUUID + ".");
+
+            this._document.getElementById("exchangeWebService_preference_contacts_pollinterval").value = this.globalFunctions.safeGetIntPref(this.prefs, "pollinterval", 300, true);
+            this._document.getElementById("exchWebService-add-globaladdresslist").checked = this.globalFunctions.safeGetBoolPref(this.prefs, "globalAddressList", false, true);
+
+            // load preferences of current directory.
+            tmpSettingsOverlay.exchWebServicesLoadExchangeSettingsByContactUUID(directory.uuid);
+
+        }
+
+    },
+
+    onSave: function _onSave() {
+        this._window.arguments[0].newAccountObject = tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByContactUUID(this.isNewDirectory, this.dirUUID);
+
+        this._window.arguments[0].newAccountObject.pollinterval = this._document.getElementById("exchangeWebService_preference_contacts_pollinterval").value;
+        this._window.arguments[0].newAccountObject.addGlobalAddressList = this._document.getElementById("exchWebService-add-globaladdresslist").checked;
+
+        this._window.arguments[0].answer = "saved";
+
+        if (!this.isNewDirectory) {
+
+            this.prefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + this.dirUUID + ".");
+
+            this.prefs.setIntPref("pollinterval", this._window.arguments[0].newAccountObject.pollinterval);
+            this.prefs.setBoolPref("globalAddressList", this._window.arguments[0].newAccountObject.addGlobalAddressList);
+
+            var observerService = Cc["@mozilla.org/observer-service;1"]
+                .getService(Ci.nsIObserverService);
+            observerService.notifyObservers(this, "onContactReset", this.dirUUID);
+        }
+
+        return true;
+    },
 
 }
 
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.js b/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.js
index 82f71521..4c37d996 100644
--- a/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.js
+++ b/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.js
@@ -27,25 +27,24 @@ var Cr = Components.results;
 var components = Components;
 
 // Initialize the preferences
-function initPreferences(){
-var exchangeContactsInitPrefs = Cc["@mozilla.org/preferences-service;1"]
-    	.getService(Ci.nsIPrefService)
-    	.getBranch("ldap_2.servers.exchangecontacts.");
+function initPreferences() {
+    var exchangeContactsInitPrefs = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService)
+        .getBranch("ldap_2.servers.exchangecontacts.");
 
-exchangeContactsInitPrefs.setCharPref("description", "Exchange Contacts");
-exchangeContactsInitPrefs.setCharPref("uri", "exchWebService-contactRoot-directory://");
+    exchangeContactsInitPrefs.setCharPref("description", "Exchange Contacts");
+    exchangeContactsInitPrefs.setCharPref("uri", "exchWebService-contactRoot-directory://");
 
-Cc["@mozilla.org/preferences-service;1"]
-            .getService(Ci.nsIPrefService).savePrefFile(null);
+    Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService).savePrefFile(null);
 }
 
-window.addEventListener("load",function(){
-	var exchangeContactsInitPrefs = Cc["@mozilla.org/preferences-service;1"]
-	                               	.getService(Ci.nsIPrefService)
-	                               	.getBranch("");
-	if(exchangeContactsInitPrefs.getPrefType('ldap_2.servers.exchangecontacts')){
-		exchangeContactsInitPrefs.deleteBranch('ldap_2.servers.exchangecontacts');
-	}
-	initPreferences();
-},false);
- 
\ No newline at end of file
+window.addEventListener("load", function () {
+    var exchangeContactsInitPrefs = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService)
+        .getBranch("");
+    if (exchangeContactsInitPrefs.getPrefType('ldap_2.servers.exchangecontacts')) {
+        exchangeContactsInitPrefs.deleteBranch('ldap_2.servers.exchangecontacts');
+    }
+    initPreferences();
+}, false);
diff --git a/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.js b/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.js
index 7d31616f..04927134 100644
--- a/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.js
+++ b/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.js
@@ -29,15 +29,15 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeAbCard() {
 
-	this._abCard = Cc["@mozilla.org/addressbook/cardproperty;1"]
-		.createInstance(Ci.nsIAbCard);
+    this._abCard = Cc["@mozilla.org/addressbook/cardproperty;1"]
+        .createInstance(Ci.nsIAbCard);
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this._readOnly = false;
+    this._readOnly = false;
 
-	this._photo = null;
+    this._photo = null;
 }
 
 var PREF_MAINPART = 'extensions.1st-setup.exchangecalendar.abcard.';
@@ -46,572 +46,525 @@ var mivExchangeAbCardGUID = "5b42082a-d0f7-490a-80d2-a0a221bf23ec";
 
 mivExchangeAbCard.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAbCard,
-			Ci.nsIAbItem,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange Addressbook card.",
-	classID: components.ID("{"+mivExchangeAbCardGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/abcard;1",
-	flags: Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-	
-	// nsAbItem.idl
-	//  readonly attribute AUTF8String uuid;
-	get uuid()
-	{
-		return this._abCard.uuid;
-	},
-
-	//  AString generateName(in long aGenerateFormat,
-	//                       [optional] in nsIStringBundle aBundle);
-	generateName: function _generateName(aGenerateFormat, aBundle)
-	{
-		return this._abCard.generateName(aGenerateFormat, aBundle);
-	},
-
-	// nsAbCard.idl
-	//  attribute AUTF8String directoryId;
-	get directoryId()
-	{
-		return this._abCard.directoryId;
-	},
-
-	set directoryId(aValue)
-	{
-		this._abCard.directoryId = aValue;
-	},
-
-	//  attribute AUTF8String localId;
-	get localId()
-	{
-		return this._abCard.localId;
-	},
-
-	set localId(aValue)
-	{
-		this._abCard.localId = aValue;
-	},
-
-	//  readonly attribute nsISimpleEnumerator properties;
-	get properties()
-	{
-		return this._abCard.properties;
-	},
-
-	//  nsIVariant getProperty(in AUTF8String name, in nsIVariant defaultValue);
-	getProperty: function _getProperty(name, defaultValue)
-	{
-		return this._abCard.getProperty(name, defaultValue);
-	},
-
-	//  AString getPropertyAsAString(in string name);
-	getPropertyAsAString: function _getPropertyAsAString(name)
-	{
-		return this._abCard.getProperty(name, "");
-	},
-
-	//  AUTF8String getPropertyAsAUTF8String(in string name);
-	getPropertyAsAUTF8String: function _getPropertyAsAUTF8String(name)
-	{
-		return this._abCard.getProperty(name, "");
-	},
-
-	//  unsigned long getPropertyAsUint32(in string name);
-	getPropertyAsUint32: function _getPropertyAsUint32(name)
-	{
-		return this._abCard.getProperty(name, 0);
-	},
-
-	//  boolean getPropertyAsBool(in string name);
-	getPropertyAsBool: function _getPropertyAsBool(name)
-	{
-		return this._abCard.getProperty(name, true);
-	},
-
-	//  void setProperty(in AUTF8String name, in nsIVariant value);
-	setProperty: function _setProperty(name, value)
-	{
-		if (name == "PrimaryEmail") {
-			if ((value.indexOf("SMTP:") > -1) || (value.indexOf("smtp:") > -1)) {
-				value = value.substr(5);
-			}
-		}
-		this._abCard.setProperty(name, value);
-	},
-
-	//  void setPropertyAsAString(in string name, in AString value);
-	setPropertyAsAString: function _setPropertyAsAString(name, value)
-	{
-		this._abCard.setProperty(name, value);
-	},
-
-	//  void setPropertyAsAUTF8String(in string name, in AUTF8String value);
-	setPropertyAsAUTF8String: function _setPropertyAsAUTF8String(name, value)
-	{
-		this._abCard.setProperty(name, value);
-	},
-
-	//  void setPropertyAsUint32(in string name, in unsigned long value);
-	setPropertyAsUint32: function _setPropertyAsUint32(name, value)
-	{
-		this._abCard.setProperty(name, value);
-	},
-
-	//  void setPropertyAsBool(in string name, in boolean value);
-	setPropertyAsBool: function _setPropertyAsBool(name, value)
-	{
-		this._abCard.setProperty(name, value);
-	},
-
-	//  void deleteProperty(in AUTF8String name);
-	deleteProperty: function _deleteProperty(name)
-	{
-		this._abCard.deleteProperty(name);
-	},
-
-	//  attribute AString firstName;
-	get firstName()
-	{
-		return this._abCard.firstName;
-	},
-
-	set firstName(aValue)
-	{
-		this._abCard.firstName = aValue;
-	},
-
-	//  attribute AString lastName;
-	get lastName()
-	{
-		return this._abCard.lastName;
-	},
-
-	set lastName(aValue)
-	{
-		this._abCard.lastName = aValue;
-	},
-
-	//  attribute AString displayName;
-	get displayName()
-	{
-		return this._abCard.displayName;
-	},
-
-	set displayName(aValue)
-	{
-		this._abCard.displayName = aValue;
-	},
-
-	//  attribute AString primaryEmail;
-	get primaryEmail()
-	{
-		return this._abCard.primaryEmail;
-	},
-
-	set primaryEmail(aValue)
-	{
-		if ((aValue.indexOf("SMTP:") > -1) || (aValue.indexOf("smtp:") > -1)) {
-			this._abCard.primaryEmail = aValue.substr(5);
-		}
-		else {
-			this._abCard.primaryEmail = aValue;
-		}
-	},
-
-	//  boolean hasEmailAddress(in AUTF8String aEmailAddress);
-	hasEmailAddress: function _hasEmailAddress(aEmailAddress)
-	{
-		return this._abCard.hasEmailAddress(aEmailAddress);
-	},
-
-	//  AUTF8String translateTo(in AUTF8String aType);
-	translateTo: function _translateTo(aType)
-	{
-		return this._abCard.translateTo(aType);
-	},
-
-	//  AString generatePhoneticName(in boolean aLastNameFirst);
-	generatePhoneticName: function _generatePhoneticName(aLastNameFirst)
-	{
-		return this._abCard.generatePhoneticName(aLastNameFirst);
-	},
-
-	//  AString generateChatName();
-	generateChatName: function _generateChatName()
-	{
-		return this._abCard.generateChatName();
-	},
-
-	//  void copy(in nsIAbCard aSrcCard);
-	copy: function _copy(aSrcCard)
-	{
-		this._abCard.copy(aSrcCard);
-	},
-
-	//  boolean equals(in nsIAbCard aCard);
-	equals: function _equals(aCard)
-	{
-		return this._abCard.equals(aCard);
-	},
-
-	//  attribute boolean isMailList;
-	get isMailList()
-	{
-		return this._abCard.isMailList;
-	},
-
-	set isMailList(aValue)
-	{
-		this._abCard.isMailList = aValue;
-	},
-
-	//  attribute string mailListURI;
-	get mailListURI()
-	{
-		return this._abCard.mailListURI;
-	},
-
-	set mailListURI(aValue)
-	{
-		this._abCard.mailListURI = aValue;
-	},
-
-	// External methods.
-	//	attribute boolean readOnly;
-	get readOnly()
-	{
-		return this._readOnly;
-	},
-
-	set readOnly(aValue)
-	{
-		this._readOnly = aValue;
-	},
-
-	//	readonly attribute unsigned long type;
-	get type()
-	{
-		return this._type;
-	},
-
-	//	readonly attribute AUTF8String routingType;
-	get routingType()
-	{
-		return this._routingType;
-	},
-
-	//	readonly attribute AUTF8String mailboxType;
-	get mailboxType()
-	{
-		return this._mailboxType;
-	},
-
-	paramsToArray: function _paramsToArray(aParams, aSplitcharacter)
-	{
-		var tmpList = aParams.split(aSplitcharacter);
-		var result = {};
-		for (var index in tmpList) {
-			var tmpParam = tmpList[index].substr(0, tmpList[index].indexOf("="));
-			var tmpValue = tmpList[index].substr(tmpList[index].indexOf("=")+1);
-			result[tmpParam] = tmpValue;
-		}
-		return result;
-	},
-
-	//	void convertExchangeDistListToCard(in jsval aParent, in jsval aExchangeContact, in AUTF8String aURI);  
-	convertExchangeDistListToCard: function _convertExchangeDistListToCard(aParent, aExchangeContact, aURI)
-	{
-		this.logInfo("convertExchangeDistListToCard: aURI:"+aURI);
-
-		if (!aURI) {
-			return;
-		}
-
-		this.directoryId = aParent.uuid;
-		this.localId = aExchangeContact.getAttributeByTag("t:ItemId", "Id", null);
-		if (!this.localId) {
-			this.localId = aExchangeContact.getTagValue("t:RoutingType","SMTP")+":"+aExchangeContact.getTagValue("t:EmailAddress","");
-		}
-		var tmpAddress = aExchangeContact.getTagValue("t:EmailAddress", "");
-		if ((tmpAddress.indexOf("SMTP:") > -1) | (tmpAddress.indexOf("smtp:") > -1)) {
-			tmpAddress = tmpAddress.substr(5);
-		}
-		this.setProperty("PrimaryEmail", tmpAddress);
-		this.setProperty("DisplayName", decodeURIComponent(aExchangeContact.getTagValue("t:Name", "")));
-
-		this.isMailList = true;
-		this.mailListURI = aURI;
-		this._type = Ci.mivExchangeAbCard.CARD_TYPE_MAILLIST;
-
-	},
-
-	//	void convertExchangeContactToCard(in jsval aParent, in jsval aExchangeContact, in AUTF8String aMailboxType);
-	convertExchangeContactToCard: function _convertExchangeContactToCard(aParent, aExchangeContact, aMailboxType)
-	{
-		//this.logInfo("convertExchangeContactToCard: "+aExchangeContact.toString());
-
-		this.logInfo("convertExchangeContactToCard: aExchangeContact.tagName:"+aExchangeContact.tagName);
-
-		this._photo = null;
-
-		var contacts = new Array();
-		var mailbox = new Array();
-		if (aExchangeContact.tagName == "Resolution") {
-			var contacts = aExchangeContact.getTags("t:Contact");
-			var mailbox = aExchangeContact.getTags("t:Mailbox");
-			if ((contacts.length == 0) && (mailbox.length == 0)) {
-				this.logInfo("convertExchangeContactToCard: No valid contact information available in:"+aExchangeContact.toString());
-				return;
-			}
-
-			if (contacts.length > 0) {
-				aExchangeContact = contacts[0];
-			}
-			else {
-				aExchangeContact = mailbox[0];
-			}
-				
-		}
-
-		this.isMailList = false;
-		this.directoryId = aParent.uuid;
-		if (aExchangeContact.tagName == "Mailbox") {
-			this.logInfo("convertExchangeContactToCard: Processing as Mailbox only.");
-			this._type = Ci.mivExchangeAbCard.CARD_TYPE_MAILBOX;
-			this.localId = aExchangeContact.getTagValue("t:RoutingType","SMTP")+":"+aExchangeContact.getTagValue("t:EmailAddress","");
-			this.setProperty("DisplayName", aExchangeContact.getTagValue("t:Name", ""));
-			var tmpAddress = aExchangeContact.getTagValue("t:EmailAddress", "");
-			if ((tmpAddress.indexOf("SMTP:") > -1) | (tmpAddress.indexOf("smtp:") > -1)) {
-				tmpAddress = tmpAddress.substr(5);
-			}
-			this.setProperty("PrimaryEmail", tmpAddress);
-
-/*			this.setProperty("FirstName", "");
-			this.setProperty("LastName", "");
-			this.setProperty("JobTitle", "");
-			this.setProperty("Department", "");
-			this.setProperty("Company", "");
-
-			this.setProperty("HomePhone", "");
-
-			this.setProperty("WorkPhone", "");
-			this.setProperty("WorkPhone2", "");
-			this.setProperty("CellularNumber", "");
-			this.setProperty("PagerNumber", "");
-			this.setProperty("FaxNumber", "");
-
-			this.setProperty("_AimScreenName", "");
-			this.setProperty("WebPage1", "");
-
-			this.setProperty("Notes", "");*/
-
-			this.deleteProperty("PhotoType");
-			this.deleteProperty("PhotoData");
-
-			this._routingType = aExchangeContact.getTagValue("t:RoutingType");
-			this._mailboxType = aExchangeContact.getTagValue("t:MailboxType");
-		}
-		else {
-			switch (aMailboxType) {
-				case "Mailbox":
-					this._type = Ci.mivExchangeAbCard.CARD_TYPE_MAILBOX;
-					break;
-				case "Contact":
-					this._type = Ci.mivExchangeAbCard.CARD_TYPE_CONTACT;
-					break;
-				case "OneOff":
-					this._type = Ci.mivExchangeAbCard.CARD_TYPE_ONEOFF;
-					break;
-			}
-			this.localId = aExchangeContact.getAttributeByTag("t:ItemId", "Id", null);
-			this.setProperty("X-ChangeKey", aExchangeContact.getAttributeByTag("t:ItemId", "ChangeKey", ""));
-			this.setProperty("X-ContactSource", aExchangeContact.getTagValue("t:ContactSource", ""));
-			this.setProperty("DisplayName", aExchangeContact.getTagValue("t:DisplayName", ""));
-			this.setProperty("FirstName", aExchangeContact.getTagValue("t:GivenName", ""));
-			this.setProperty("LastName", aExchangeContact.getTagValue("t:Surname", ""));
-
-			// We need to check which email address is primary. For exchange it will start with 'SMTP:' (in capital)
-			if (mailbox.length > 0) {
-				this.logInfo("convertExchangeContactToCard: Processing as Contact and Mailbox.");
-				var primaryEmail = mailbox[0].getTagValue('t:EmailAddress', "");
-				if ((primaryEmail.indexOf("SMTP:") == 0) || (primaryEmail.indexOf("smtp:") == 0)) {
-					primaryEmail = primaryEmail.substr(5);
-				}
-				var secondEmail = aExchangeContact.getTagValueByXPath('/t:EmailAddresses/t:Entry[@Key="EmailAddress1"]', "");
-				if ((secondEmail.indexOf("SMTP:") == 0) || (secondEmail.indexOf("smtp:") == 0)) {
-					secondEmail = secondEmail.substr(5);
-				}
-				this._routingType = mailbox[0].getTagValue("t:RoutingType");
-				this._mailboxType = mailbox[0].getTagValue("t:MailboxType");
-			}
-			else {
-				this.logInfo("convertExchangeContactToCard: Processing as Contact only.");
-				var primaryEmail = aExchangeContact.getTagValueByXPath('/t:EmailAddresses/t:Entry[@Key="EmailAddress1"]', "");
-				var secondEmail = aExchangeContact.getTagValueByXPath('/t:EmailAddresses/t:Entry[@Key="EmailAddress2"]', "");
-				if (primaryEmail.indexOf("SMTP:") > -1) {
-					primaryEmail = primaryEmail.substr(primaryEmail.indexOf("SMTP:")+5);
-					if (secondEmail.indexOf("smtp:") > -1) {
-						secondEmail = secondEmail.substr(secondEmail.indexOf("smtp:")+5);
-					}
-				}
-				else {
-					if (secondEmail.indexOf("SMTP:") > -1) {
-						var tmpPrimary = primaryEmail;
-						primaryEmail = secondEmail.substr(secondEmail.indexOf("SMTP:")+5);
-						secondEmail = tmpPrimary;
-						if (secondEmail.indexOf("smtp:") > -1) {
-							secondEmail = secondEmail.substr(secondEmail.indexOf("smtp:")+5);
-						}
-					}
-				}
-			}
-
-			this.logInfo("convertExchangeContactToCard: primaryEmail:"+primaryEmail+", secondEmail:"+secondEmail);
-
-			if (!this.localId) {
-				this.localId = aExchangeContact.getTagValue("t:ContactSource", "")+":"+primaryEmail;
-			}
-			this.setProperty("PrimaryEmail", primaryEmail);
-			this.setProperty("SecondEmail", secondEmail);
-
-			this.setProperty("JobTitle", aExchangeContact.getTagValue("t:JobTitle", ""));
-			this.setProperty("Department", aExchangeContact.getTagValue("t:Department", ""));
-			this.setProperty("Company", aExchangeContact.getTagValue("t:CompanyName", ""));
-
-			this.setProperty("HomePhone", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="HomePhone"]', ""));
-
-			this.setProperty("WorkPhone", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="BusinessPhone"]', ""));
-			this.setProperty("WorkPhone2", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="BusinessPhone2"]', ""));
-			this.setProperty("CellularNumber", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="MobilePhone"]', ""));
-			this.setProperty("PagerNumber", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="Pager"]', ""));
-			this.setProperty("FaxNumber", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="Telex"]', ""));
-
-			var homeDetails = aExchangeContact.XPath('/t:PhysicalAddresses/t:Entry[@Key="Home"]');
-			if (homeDetails.length > 0) {
-				this.setProperty("HomeAddress", homeDetails[0].getTagValue('t:Street', ""));
-				this.setProperty("HomeCity", homeDetails[0].getTagValue('t:City', ""));
-				this.setProperty("HomeState", homeDetails[0].getTagValue('t:State', ""));
-				this.setProperty("HomeCountry", homeDetails[0].getTagValue('t:CountryOrRegion', ""));
-				this.setProperty("HomeZipCode", homeDetails[0].getTagValue('t:PostalCode', ""));
-			}
-
-			var workDetails = aExchangeContact.XPath('/t:PhysicalAddresses/t:Entry[@Key="Business"]');
-			if (workDetails.length > 0) {
-				this.setProperty("WorkAddress", workDetails[0].getTagValue('t:Street', ""));
-				this.setProperty("WorkCity", workDetails[0].getTagValue('t:City', ""));
-				this.setProperty("WorkState", workDetails[0].getTagValue('t:State', ""));
-				this.setProperty("WorkCountry", workDetails[0].getTagValue('t:CountryOrRegion', ""));
-				this.setProperty("WorkZipCode", workDetails[0].getTagValue('t:PostalCode', ""));
-			}
-
-			var otherDetails = aExchangeContact.XPath('/t:PhysicalAddresses/t:Entry[@Key="Other"]');
-			if (otherDetails.length > 0) {
-				this.setProperty("OtherAddress", otherDetails[0].getTagValue('t:Street', ""));
-				this.setProperty("OtherCity", otherDetails[0].getTagValue('t:City', ""));
-				this.setProperty("OtherState", otherDetails[0].getTagValue('t:State', ""));
-				this.setProperty("OtherCountry", otherDetails[0].getTagValue('t:CountryOrRegion', ""));
-				this.setProperty("OtherZipCode", otherDetails[0].getTagValue('t:PostalCode', ""));
-			}
-
-			this.setProperty("_AimScreenName", aExchangeContact.getTagValueByXPath('/t:ImAddresses/t:Entry[@Key="ImAddress"]', ""));
-			this.setProperty("WebPage1", aExchangeContact.getTagValue("t:BusinessHomePage", ""));
-
-			this.setProperty("Notes", aExchangeContact.getTagValue("t:Body", ""));
-
-			var birthDay = aExchangeContact.getTagValue("t:Birthday");
-
-			if (birthDay) {
-				this.setProperty("BirthYear", birthDay.substr(0,4));
-				this.setProperty("BirthMonth", birthDay.substr(5,2));
-				this.setProperty("BirthDay", birthDay.substr(8,2));
-			}
-
-				//dump("!!! Checking if we have a photo element: "+primaryEmail+"\n");
-			this._photo = aExchangeContact.getTagValue("t:Photo", null)
-			if (this._photo) {
-				this.setProperty("PhotoType", "exchangeContactPhotoInline");
-				this.setProperty("PhotoData", this._photo);
-				//dump("!!! We have a photo element: "+primaryEmail+"\n");
-			}
-			else {
-				// See if we have an IsContactPhoto attachment element.
-				var attachments = aExchangeContact.XPath('/t:Attachments/t:FileAttachment[/t:IsContactPhoto="true"]');
-				if (attachments.length > 0) {
-					this.setProperty("PhotoType", "exchangeContactPhotoExternal");
-					this.setProperty("PhotoData", attachments[0].getAttributeByTag("t:AttachmentId", "Id", null));
-				//dump("!!! We have a photo attachment: "+primaryEmail+"\n");
-				}
-				else {
-					this.deleteProperty("PhotoType");
-					this.deleteProperty("PhotoData");
-				//dump("no photo: "+primaryEmail+"\n");
-				}
-				attachments = null;
-			}
-		}
-	},  
-
-	get photo()
-	{
-		return this._photo;
-	},
-
-	set photo(aValue)
-	{
-	},
-
-	get hasPhoto()
-	{
-		return (this._photo !== null);
-	},
-
-	// Internal methods.
-
-	logInfo: function _logInfo(message, aDebugLevel) {
-
-		if (!aDebugLevel) {
-			var debugLevel = 1;
-		}
-		else {
-			var debugLevel = aDebugLevel;
-		}
-
-		this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"debuglevel", 0, true);
-		//this.storedDebugLevel = 1;
-
-		if (debugLevel <= this.storedDebugLevel) {
-			this.globalFunctions.LOG("[exchangeAbCard] "+message + " ("+this.globalFunctions.STACKshort()+")");
-		}
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAbCard,
+        Ci.nsIAbItem,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange Addressbook card.",
+    classID: components.ID("{" + mivExchangeAbCardGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/abcard;1",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+
+    // nsAbItem.idl
+    //  readonly attribute AUTF8String uuid;
+    get uuid() {
+        return this._abCard.uuid;
+    },
+
+    //  AString generateName(in long aGenerateFormat,
+    //                       [optional] in nsIStringBundle aBundle);
+    generateName: function _generateName(aGenerateFormat, aBundle) {
+        return this._abCard.generateName(aGenerateFormat, aBundle);
+    },
+
+    // nsAbCard.idl
+    //  attribute AUTF8String directoryId;
+    get directoryId() {
+        return this._abCard.directoryId;
+    },
+
+    set directoryId(aValue) {
+        this._abCard.directoryId = aValue;
+    },
+
+    //  attribute AUTF8String localId;
+    get localId() {
+        return this._abCard.localId;
+    },
+
+    set localId(aValue) {
+        this._abCard.localId = aValue;
+    },
+
+    //  readonly attribute nsISimpleEnumerator properties;
+    get properties() {
+        return this._abCard.properties;
+    },
+
+    //  nsIVariant getProperty(in AUTF8String name, in nsIVariant defaultValue);
+    getProperty: function _getProperty(name, defaultValue) {
+        return this._abCard.getProperty(name, defaultValue);
+    },
+
+    //  AString getPropertyAsAString(in string name);
+    getPropertyAsAString: function _getPropertyAsAString(name) {
+        return this._abCard.getProperty(name, "");
+    },
+
+    //  AUTF8String getPropertyAsAUTF8String(in string name);
+    getPropertyAsAUTF8String: function _getPropertyAsAUTF8String(name) {
+        return this._abCard.getProperty(name, "");
+    },
+
+    //  unsigned long getPropertyAsUint32(in string name);
+    getPropertyAsUint32: function _getPropertyAsUint32(name) {
+        return this._abCard.getProperty(name, 0);
+    },
+
+    //  boolean getPropertyAsBool(in string name);
+    getPropertyAsBool: function _getPropertyAsBool(name) {
+        return this._abCard.getProperty(name, true);
+    },
+
+    //  void setProperty(in AUTF8String name, in nsIVariant value);
+    setProperty: function _setProperty(name, value) {
+        if (name == "PrimaryEmail") {
+            if ((value.indexOf("SMTP:") > -1) || (value.indexOf("smtp:") > -1)) {
+                value = value.substr(5);
+            }
+        }
+        this._abCard.setProperty(name, value);
+    },
+
+    //  void setPropertyAsAString(in string name, in AString value);
+    setPropertyAsAString: function _setPropertyAsAString(name, value) {
+        this._abCard.setProperty(name, value);
+    },
+
+    //  void setPropertyAsAUTF8String(in string name, in AUTF8String value);
+    setPropertyAsAUTF8String: function _setPropertyAsAUTF8String(name, value) {
+        this._abCard.setProperty(name, value);
+    },
+
+    //  void setPropertyAsUint32(in string name, in unsigned long value);
+    setPropertyAsUint32: function _setPropertyAsUint32(name, value) {
+        this._abCard.setProperty(name, value);
+    },
+
+    //  void setPropertyAsBool(in string name, in boolean value);
+    setPropertyAsBool: function _setPropertyAsBool(name, value) {
+        this._abCard.setProperty(name, value);
+    },
+
+    //  void deleteProperty(in AUTF8String name);
+    deleteProperty: function _deleteProperty(name) {
+        this._abCard.deleteProperty(name);
+    },
+
+    //  attribute AString firstName;
+    get firstName() {
+        return this._abCard.firstName;
+    },
+
+    set firstName(aValue) {
+        this._abCard.firstName = aValue;
+    },
+
+    //  attribute AString lastName;
+    get lastName() {
+        return this._abCard.lastName;
+    },
+
+    set lastName(aValue) {
+        this._abCard.lastName = aValue;
+    },
+
+    //  attribute AString displayName;
+    get displayName() {
+        return this._abCard.displayName;
+    },
+
+    set displayName(aValue) {
+        this._abCard.displayName = aValue;
+    },
+
+    //  attribute AString primaryEmail;
+    get primaryEmail() {
+        return this._abCard.primaryEmail;
+    },
+
+    set primaryEmail(aValue) {
+        if ((aValue.indexOf("SMTP:") > -1) || (aValue.indexOf("smtp:") > -1)) {
+            this._abCard.primaryEmail = aValue.substr(5);
+        }
+        else {
+            this._abCard.primaryEmail = aValue;
+        }
+    },
+
+    //  boolean hasEmailAddress(in AUTF8String aEmailAddress);
+    hasEmailAddress: function _hasEmailAddress(aEmailAddress) {
+        return this._abCard.hasEmailAddress(aEmailAddress);
+    },
+
+    //  AUTF8String translateTo(in AUTF8String aType);
+    translateTo: function _translateTo(aType) {
+        return this._abCard.translateTo(aType);
+    },
+
+    //  AString generatePhoneticName(in boolean aLastNameFirst);
+    generatePhoneticName: function _generatePhoneticName(aLastNameFirst) {
+        return this._abCard.generatePhoneticName(aLastNameFirst);
+    },
+
+    //  AString generateChatName();
+    generateChatName: function _generateChatName() {
+        return this._abCard.generateChatName();
+    },
+
+    //  void copy(in nsIAbCard aSrcCard);
+    copy: function _copy(aSrcCard) {
+        this._abCard.copy(aSrcCard);
+    },
+
+    //  boolean equals(in nsIAbCard aCard);
+    equals: function _equals(aCard) {
+        return this._abCard.equals(aCard);
+    },
+
+    //  attribute boolean isMailList;
+    get isMailList() {
+        return this._abCard.isMailList;
+    },
+
+    set isMailList(aValue) {
+        this._abCard.isMailList = aValue;
+    },
+
+    //  attribute string mailListURI;
+    get mailListURI() {
+        return this._abCard.mailListURI;
+    },
+
+    set mailListURI(aValue) {
+        this._abCard.mailListURI = aValue;
+    },
+
+    // External methods.
+    //	attribute boolean readOnly;
+    get readOnly() {
+        return this._readOnly;
+    },
+
+    set readOnly(aValue) {
+        this._readOnly = aValue;
+    },
+
+    //	readonly attribute unsigned long type;
+    get type() {
+        return this._type;
+    },
+
+    //	readonly attribute AUTF8String routingType;
+    get routingType() {
+        return this._routingType;
+    },
+
+    //	readonly attribute AUTF8String mailboxType;
+    get mailboxType() {
+        return this._mailboxType;
+    },
+
+    paramsToArray: function _paramsToArray(aParams, aSplitcharacter) {
+        var tmpList = aParams.split(aSplitcharacter);
+        var result = {};
+        for (var index in tmpList) {
+            var tmpParam = tmpList[index].substr(0, tmpList[index].indexOf("="));
+            var tmpValue = tmpList[index].substr(tmpList[index].indexOf("=") + 1);
+            result[tmpParam] = tmpValue;
+        }
+        return result;
+    },
+
+    //	void convertExchangeDistListToCard(in jsval aParent, in jsval aExchangeContact, in AUTF8String aURI);  
+    convertExchangeDistListToCard: function _convertExchangeDistListToCard(aParent, aExchangeContact, aURI) {
+        this.logInfo("convertExchangeDistListToCard: aURI:" + aURI);
+
+        if (!aURI) {
+            return;
+        }
+
+        this.directoryId = aParent.uuid;
+        this.localId = aExchangeContact.getAttributeByTag("t:ItemId", "Id", null);
+        if (!this.localId) {
+            this.localId = aExchangeContact.getTagValue("t:RoutingType", "SMTP") + ":" + aExchangeContact.getTagValue("t:EmailAddress", "");
+        }
+        var tmpAddress = aExchangeContact.getTagValue("t:EmailAddress", "");
+        if ((tmpAddress.indexOf("SMTP:") > -1) | (tmpAddress.indexOf("smtp:") > -1)) {
+            tmpAddress = tmpAddress.substr(5);
+        }
+        this.setProperty("PrimaryEmail", tmpAddress);
+        this.setProperty("DisplayName", decodeURIComponent(aExchangeContact.getTagValue("t:Name", "")));
+
+        this.isMailList = true;
+        this.mailListURI = aURI;
+        this._type = Ci.mivExchangeAbCard.CARD_TYPE_MAILLIST;
+
+    },
+
+    //	void convertExchangeContactToCard(in jsval aParent, in jsval aExchangeContact, in AUTF8String aMailboxType);
+    convertExchangeContactToCard: function _convertExchangeContactToCard(aParent, aExchangeContact, aMailboxType) {
+        //this.logInfo("convertExchangeContactToCard: "+aExchangeContact.toString());
+
+        this.logInfo("convertExchangeContactToCard: aExchangeContact.tagName:" + aExchangeContact.tagName);
+
+        this._photo = null;
+
+        var contacts = new Array();
+        var mailbox = new Array();
+        if (aExchangeContact.tagName == "Resolution") {
+            var contacts = aExchangeContact.getTags("t:Contact");
+            var mailbox = aExchangeContact.getTags("t:Mailbox");
+            if ((contacts.length == 0) && (mailbox.length == 0)) {
+                this.logInfo("convertExchangeContactToCard: No valid contact information available in:" + aExchangeContact.toString());
+                return;
+            }
+
+            if (contacts.length > 0) {
+                aExchangeContact = contacts[0];
+            }
+            else {
+                aExchangeContact = mailbox[0];
+            }
+
+        }
+
+        this.isMailList = false;
+        this.directoryId = aParent.uuid;
+        if (aExchangeContact.tagName == "Mailbox") {
+            this.logInfo("convertExchangeContactToCard: Processing as Mailbox only.");
+            this._type = Ci.mivExchangeAbCard.CARD_TYPE_MAILBOX;
+            this.localId = aExchangeContact.getTagValue("t:RoutingType", "SMTP") + ":" + aExchangeContact.getTagValue("t:EmailAddress", "");
+            this.setProperty("DisplayName", aExchangeContact.getTagValue("t:Name", ""));
+            var tmpAddress = aExchangeContact.getTagValue("t:EmailAddress", "");
+            if ((tmpAddress.indexOf("SMTP:") > -1) | (tmpAddress.indexOf("smtp:") > -1)) {
+                tmpAddress = tmpAddress.substr(5);
+            }
+            this.setProperty("PrimaryEmail", tmpAddress);
+
+            /*			this.setProperty("FirstName", "");
+            			this.setProperty("LastName", "");
+            			this.setProperty("JobTitle", "");
+            			this.setProperty("Department", "");
+            			this.setProperty("Company", "");
+
+            			this.setProperty("HomePhone", "");
+
+            			this.setProperty("WorkPhone", "");
+            			this.setProperty("WorkPhone2", "");
+            			this.setProperty("CellularNumber", "");
+            			this.setProperty("PagerNumber", "");
+            			this.setProperty("FaxNumber", "");
+
+            			this.setProperty("_AimScreenName", "");
+            			this.setProperty("WebPage1", "");
+
+            			this.setProperty("Notes", "");*/
+
+            this.deleteProperty("PhotoType");
+            this.deleteProperty("PhotoData");
+
+            this._routingType = aExchangeContact.getTagValue("t:RoutingType");
+            this._mailboxType = aExchangeContact.getTagValue("t:MailboxType");
+        }
+        else {
+            switch (aMailboxType) {
+            case "Mailbox":
+                this._type = Ci.mivExchangeAbCard.CARD_TYPE_MAILBOX;
+                break;
+            case "Contact":
+                this._type = Ci.mivExchangeAbCard.CARD_TYPE_CONTACT;
+                break;
+            case "OneOff":
+                this._type = Ci.mivExchangeAbCard.CARD_TYPE_ONEOFF;
+                break;
+            }
+            this.localId = aExchangeContact.getAttributeByTag("t:ItemId", "Id", null);
+            this.setProperty("X-ChangeKey", aExchangeContact.getAttributeByTag("t:ItemId", "ChangeKey", ""));
+            this.setProperty("X-ContactSource", aExchangeContact.getTagValue("t:ContactSource", ""));
+            this.setProperty("DisplayName", aExchangeContact.getTagValue("t:DisplayName", ""));
+            this.setProperty("FirstName", aExchangeContact.getTagValue("t:GivenName", ""));
+            this.setProperty("LastName", aExchangeContact.getTagValue("t:Surname", ""));
+
+            // We need to check which email address is primary. For exchange it will start with 'SMTP:' (in capital)
+            if (mailbox.length > 0) {
+                this.logInfo("convertExchangeContactToCard: Processing as Contact and Mailbox.");
+                var primaryEmail = mailbox[0].getTagValue('t:EmailAddress', "");
+                if ((primaryEmail.indexOf("SMTP:") == 0) || (primaryEmail.indexOf("smtp:") == 0)) {
+                    primaryEmail = primaryEmail.substr(5);
+                }
+                var secondEmail = aExchangeContact.getTagValueByXPath('/t:EmailAddresses/t:Entry[@Key="EmailAddress1"]', "");
+                if ((secondEmail.indexOf("SMTP:") == 0) || (secondEmail.indexOf("smtp:") == 0)) {
+                    secondEmail = secondEmail.substr(5);
+                }
+                this._routingType = mailbox[0].getTagValue("t:RoutingType");
+                this._mailboxType = mailbox[0].getTagValue("t:MailboxType");
+            }
+            else {
+                this.logInfo("convertExchangeContactToCard: Processing as Contact only.");
+                var primaryEmail = aExchangeContact.getTagValueByXPath('/t:EmailAddresses/t:Entry[@Key="EmailAddress1"]', "");
+                var secondEmail = aExchangeContact.getTagValueByXPath('/t:EmailAddresses/t:Entry[@Key="EmailAddress2"]', "");
+                if (primaryEmail.indexOf("SMTP:") > -1) {
+                    primaryEmail = primaryEmail.substr(primaryEmail.indexOf("SMTP:") + 5);
+                    if (secondEmail.indexOf("smtp:") > -1) {
+                        secondEmail = secondEmail.substr(secondEmail.indexOf("smtp:") + 5);
+                    }
+                }
+                else {
+                    if (secondEmail.indexOf("SMTP:") > -1) {
+                        var tmpPrimary = primaryEmail;
+                        primaryEmail = secondEmail.substr(secondEmail.indexOf("SMTP:") + 5);
+                        secondEmail = tmpPrimary;
+                        if (secondEmail.indexOf("smtp:") > -1) {
+                            secondEmail = secondEmail.substr(secondEmail.indexOf("smtp:") + 5);
+                        }
+                    }
+                }
+            }
+
+            this.logInfo("convertExchangeContactToCard: primaryEmail:" + primaryEmail + ", secondEmail:" + secondEmail);
+
+            if (!this.localId) {
+                this.localId = aExchangeContact.getTagValue("t:ContactSource", "") + ":" + primaryEmail;
+            }
+            this.setProperty("PrimaryEmail", primaryEmail);
+            this.setProperty("SecondEmail", secondEmail);
+
+            this.setProperty("JobTitle", aExchangeContact.getTagValue("t:JobTitle", ""));
+            this.setProperty("Department", aExchangeContact.getTagValue("t:Department", ""));
+            this.setProperty("Company", aExchangeContact.getTagValue("t:CompanyName", ""));
+
+            this.setProperty("HomePhone", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="HomePhone"]', ""));
+
+            this.setProperty("WorkPhone", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="BusinessPhone"]', ""));
+            this.setProperty("WorkPhone2", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="BusinessPhone2"]', ""));
+            this.setProperty("CellularNumber", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="MobilePhone"]', ""));
+            this.setProperty("PagerNumber", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="Pager"]', ""));
+            this.setProperty("FaxNumber", aExchangeContact.getTagValueByXPath('/t:PhoneNumbers/t:Entry[@Key="Telex"]', ""));
+
+            var homeDetails = aExchangeContact.XPath('/t:PhysicalAddresses/t:Entry[@Key="Home"]');
+            if (homeDetails.length > 0) {
+                this.setProperty("HomeAddress", homeDetails[0].getTagValue('t:Street', ""));
+                this.setProperty("HomeCity", homeDetails[0].getTagValue('t:City', ""));
+                this.setProperty("HomeState", homeDetails[0].getTagValue('t:State', ""));
+                this.setProperty("HomeCountry", homeDetails[0].getTagValue('t:CountryOrRegion', ""));
+                this.setProperty("HomeZipCode", homeDetails[0].getTagValue('t:PostalCode', ""));
+            }
+
+            var workDetails = aExchangeContact.XPath('/t:PhysicalAddresses/t:Entry[@Key="Business"]');
+            if (workDetails.length > 0) {
+                this.setProperty("WorkAddress", workDetails[0].getTagValue('t:Street', ""));
+                this.setProperty("WorkCity", workDetails[0].getTagValue('t:City', ""));
+                this.setProperty("WorkState", workDetails[0].getTagValue('t:State', ""));
+                this.setProperty("WorkCountry", workDetails[0].getTagValue('t:CountryOrRegion', ""));
+                this.setProperty("WorkZipCode", workDetails[0].getTagValue('t:PostalCode', ""));
+            }
+
+            var otherDetails = aExchangeContact.XPath('/t:PhysicalAddresses/t:Entry[@Key="Other"]');
+            if (otherDetails.length > 0) {
+                this.setProperty("OtherAddress", otherDetails[0].getTagValue('t:Street', ""));
+                this.setProperty("OtherCity", otherDetails[0].getTagValue('t:City', ""));
+                this.setProperty("OtherState", otherDetails[0].getTagValue('t:State', ""));
+                this.setProperty("OtherCountry", otherDetails[0].getTagValue('t:CountryOrRegion', ""));
+                this.setProperty("OtherZipCode", otherDetails[0].getTagValue('t:PostalCode', ""));
+            }
+
+            this.setProperty("_AimScreenName", aExchangeContact.getTagValueByXPath('/t:ImAddresses/t:Entry[@Key="ImAddress"]', ""));
+            this.setProperty("WebPage1", aExchangeContact.getTagValue("t:BusinessHomePage", ""));
+
+            this.setProperty("Notes", aExchangeContact.getTagValue("t:Body", ""));
+
+            var birthDay = aExchangeContact.getTagValue("t:Birthday");
+
+            if (birthDay) {
+                this.setProperty("BirthYear", birthDay.substr(0, 4));
+                this.setProperty("BirthMonth", birthDay.substr(5, 2));
+                this.setProperty("BirthDay", birthDay.substr(8, 2));
+            }
+
+            //dump("!!! Checking if we have a photo element: "+primaryEmail+"\n");
+            this._photo = aExchangeContact.getTagValue("t:Photo", null)
+            if (this._photo) {
+                this.setProperty("PhotoType", "exchangeContactPhotoInline");
+                this.setProperty("PhotoData", this._photo);
+                //dump("!!! We have a photo element: "+primaryEmail+"\n");
+            }
+            else {
+                // See if we have an IsContactPhoto attachment element.
+                var attachments = aExchangeContact.XPath('/t:Attachments/t:FileAttachment[/t:IsContactPhoto="true"]');
+                if (attachments.length > 0) {
+                    this.setProperty("PhotoType", "exchangeContactPhotoExternal");
+                    this.setProperty("PhotoData", attachments[0].getAttributeByTag("t:AttachmentId", "Id", null));
+                    //dump("!!! We have a photo attachment: "+primaryEmail+"\n");
+                }
+                else {
+                    this.deleteProperty("PhotoType");
+                    this.deleteProperty("PhotoData");
+                    //dump("no photo: "+primaryEmail+"\n");
+                }
+                attachments = null;
+            }
+        }
+    },
+
+    get photo() {
+        return this._photo;
+    },
+
+    set photo(aValue) {},
+
+    get hasPhoto() {
+        return (this._photo !== null);
+    },
+
+    // Internal methods.
+
+    logInfo: function _logInfo(message, aDebugLevel) {
+
+        if (!aDebugLevel) {
+            var debugLevel = 1;
+        }
+        else {
+            var debugLevel = aDebugLevel;
+        }
+
+        this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART + "debuglevel", 0, true);
+        //this.storedDebugLevel = 1;
+
+        if (debugLevel <= this.storedDebugLevel) {
+            this.globalFunctions.LOG("[exchangeAbCard] " + message + " (" + this.globalFunctions.STACKshort() + ")");
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAbCard) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAbCard = XPCOMUtils.generateNSGetFactory([mivExchangeAbCard]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeAbCard) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAbCard = XPCOMUtils.generateNSGetFactory([mivExchangeAbCard]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeAbCard(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAbCard(cid);
+}
diff --git a/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.js b/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.js
index bb7415d8..c945fa92 100644
--- a/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.js
+++ b/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.js
@@ -35,62 +35,59 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 
 
-function exchangeAbDirFactory() {
-}
+function exchangeAbDirFactory() {}
 
 exchangeAbDirFactory.prototype = {
 
-	classID: components.ID("{e6f8074c-0236-4f51-b8e2-9c528727b4ee}"),
-	contractID: "@mozilla.org/addressbook/directory-factory;1?name=exchWebService-contactRoot-directory",
-	classDescription: "Exchange 2007/2010 Contacts DirFactory",
+    classID: components.ID("{e6f8074c-0236-4f51-b8e2-9c528727b4ee}"),
+    contractID: "@mozilla.org/addressbook/directory-factory;1?name=exchWebService-contactRoot-directory",
+    classDescription: "Exchange 2007/2010 Contacts DirFactory",
 
-	QueryInterface:  XPCOMUtils.generateQI([Ci.nsIAbDirFactory]),
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIAbDirFactory]),
 
-	getDirectories: function _getDirectories(aDirName, aURI, aPrefName) 
-	{
-		exchWebService.commonAbFunctions.logInfo("getDirectories aDirName:"+aDirName+", aUri:"+aURI+", aPrefName:"+aPrefName+"\n");
+    getDirectories: function _getDirectories(aDirName, aURI, aPrefName) {
+        exchWebService.commonAbFunctions.logInfo("getDirectories aDirName:" + aDirName + ", aUri:" + aURI + ", aPrefName:" + aPrefName + "\n");
 
-		var accounts = exchWebService.commonAbFunctions.getAccounts();
+        var accounts = exchWebService.commonAbFunctions.getAccounts();
 
-		let result = [];
-		var dir;
+        let result = [];
+        var dir;
 
-		// Add the root directory.
-		var parentDir = MailServices.ab.getDirectory(aURI);
-		result.push(parentDir);
+        // Add the root directory.
+        var parentDir = MailServices.ab.getDirectory(aURI);
+        result.push(parentDir);
 
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
-	},
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
+    },
 
-	deleteDirectory: function(aDirectory) 
-	{
-		// Currently unsupported.  Alert the user and bail out.
-		exchWebService.commonAbFunctions.logInfo("deleteDirectory uri");
-		exchWebService.commonAbFunctions.logInfo("Attempted to delete an EDS directory, which is currently"
-							+ " an unsupported action.");
-		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
+    deleteDirectory: function (aDirectory) {
+        // Currently unsupported.  Alert the user and bail out.
+        exchWebService.commonAbFunctions.logInfo("deleteDirectory uri");
+        exchWebService.commonAbFunctions.logInfo("Attempted to delete an EDS directory, which is currently"
+            + " an unsupported action.");
+        throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
 }
 
 function NSGetFactory(cid) {
 
-	exchWebService.commonAbFunctions.logInfo("NSGetFactory for exchangeAbDirFactory 1");
-	try {
-		if (!NSGetFactory.exchWebService_ab1) {
-			exchWebService.commonAbFunctions.logInfo("NSGetFactory for exchangeAbDirFactory 1a");
+    exchWebService.commonAbFunctions.logInfo("NSGetFactory for exchangeAbDirFactory 1");
+    try {
+        if (!NSGetFactory.exchWebService_ab1) {
+            exchWebService.commonAbFunctions.logInfo("NSGetFactory for exchangeAbDirFactory 1a");
 
-			NSGetFactory.exchWebService_ab1 = XPCOMUtils.generateNSGetFactory([exchangeAbDirFactory]);
-	}
+            NSGetFactory.exchWebService_ab1 = XPCOMUtils.generateNSGetFactory([exchangeAbDirFactory]);
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		exchWebService.commonAbFunctions.logInfo(e);
-		throw e;
-	}
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        exchWebService.commonAbFunctions.logInfo(e);
+        throw e;
+    }
 
-	exchWebService.commonAbFunctions.logInfo("NSGetFactory for exchangeAbDirFactory 2");
-	return NSGetFactory.exchWebService_ab1(cid);
+    exchWebService.commonAbFunctions.logInfo("NSGetFactory for exchangeAbDirFactory 2");
+    return NSGetFactory.exchWebService_ab1(cid);
 }
 
 exchWebService.commonAbFunctions.logInfo("exchangeAbDirFactory: init.");
-
diff --git a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js b/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
index 11119510..38a70183 100644
--- a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
+++ b/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
@@ -43,8 +43,8 @@ Cu.import("resource://exchangecalendar/erResolveNames.js");
 
 Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 
-const nsIAP = Ci.nsIActivityProcess;  
-const nsIAE = Ci.nsIActivityEvent;  
+const nsIAP = Ci.nsIActivityProcess;
+const nsIAE = Ci.nsIActivityEvent;
 const nsIAM = Ci.nsIActivityManager;
 
 
@@ -54,1409 +54,1372 @@ const nsIAM = Ci.nsIActivityManager;
 //
 
 function exchangeAbDistListDirectory() {
-	exchWebService.commonAbFunctions.logInfo("new exchangeAbDistListDirectory");
+    exchWebService.commonAbFunctions.logInfo("new exchangeAbDistListDirectory");
 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer);  
+    this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer);
 
-	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-			.getService(Ci.mivExchangeStatistics);
+    this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+        .getService(Ci.mivExchangeStatistics);
 
-	this._isRoot = true;
+    this._isRoot = true;
 
-	this._searchQuery = null;
-	this._UUID = "";
-	this._type = "unknown";
-	this._schema = null;
-	this._description = "";
+    this._searchQuery = null;
+    this._UUID = "";
+    this._type = "unknown";
+    this._schema = null;
+    this._description = "";
 
-	this.prefs = null;
-	this.isLoading = false;
-	this.findContactsRequest = null;
-	this.getContactsRequest = null;
+    this.prefs = null;
+    this.isLoading = false;
+    this.findContactsRequest = null;
+    this.getContactsRequest = null;
 
-	this.contacts = {};
-	this.distLists = new Array();
-	this.childDirs = {};
+    this.contacts = {};
+    this.distLists = new Array();
+    this.childDirs = {};
 
-	this._addressLists = Cc["@mozilla.org/array;1"]
-			.createInstance(Ci.nsIMutableArray);
+    this._addressLists = Cc["@mozilla.org/array;1"]
+        .createInstance(Ci.nsIMutableArray);
 
-	this._isInitialized = false;
+    this._isInitialized = false;
 
-	this._listNickName = null;
+    this._listNickName = null;
 
-	this.childNodeURI = "exchWebService-distList-directory://";
+    this.childNodeURI = "exchWebService-distList-directory://";
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService); 
+    this.observerService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
 
 }
 
 exchangeAbDistListDirectory.prototype = {
 
-	classID: components.ID("{9e260dc4-90d3-457b-8885-8dff0f69eea3}"),
-	contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-distList-directory",
-	classDescription: "Exchange 2007/2010 Distribution List",
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	QueryInterface: XPCOMUtils.generateQI([Ci.exchangeAbDistListDirectory,
-						Ci.nsIAbDirectory,
-						Ci.nsIAbCollection,
-						Ci.nsIAbItem,
-						Ci.nsISupports]),
-
-  /**
-   * A universally-unique identifier for this item.
-   *
-   * If this item cannot be associated with a UUID for some reason, it MUST
-   * return the empty string. The empty string MUST NOT be a valid UUID for any
-   * item. Under no circumstances may this function throw an error.
-   *
-   * It is STRONGLY RECOMMENDED that implementations guarantee that this UUID
-   * will not change between two different sessions of the application and that,
-   * if this item is deleted, the UUID will not be reused.
-   *
-   * The format of the UUID for a generic nsIAbItem is purposefully left
-   * undefined, although any item contained by an nsIAbDirectory SHOULD use
-   * nsIAbManager::generateUUID to generate the UUID.
-   */
-  //readonly attribute AUTF8String uuid;
-	get uuid()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: uuid");
-		if (this._UUID) {
-			return this._UUID;
-		}
-
-		return "";
-	},
-
-	get id()
-	{
-		return this.uuid;
-	},
-
-	get type()
-	{
-		return this._type;
-	},
-
-  /**
-   * @{
-   * These constants reflect the possible values of the
-   * mail.addr_book.lastnamefirst preferences. They are intended to be used in
-   * generateName, defined below.
-   */
-   //const unsigned long GENERATE_DISPLAY_NAME = 0;
-   //const unsigned long GENERATE_LAST_FIRST_ORDER = 1;
-   //const unsigned long GENERATE_FIRST_LAST_ORDER = 2;
-   /** @} */
-
-  /** 
-   * Generate a name from the item for display purposes.
-   *
-   * If this item is an nsIAbCard, then it will use the aGenerateFormat option
-   * to determine the string to return.
-   * If this item is not an nsIAbCard, then the aGenerateFormat option may be
-   * ignored, and the displayName of the item returned.
-   *
-   * @param  aGenerateFormat The format to generate as per the GENERATE_*
-   *                         constants above.
-   * @param  aBundle         An optional parameter that is a pointer to a string
-   *                         bundle that holds:
-   *           chrome://messenger/locale/addressbook/addressBook.properties
-   *                         If this bundle is not supplied, then the function
-   *                         will obtain the bundle itself. If cached by the
-   *                         caller and supplied to this function, then
-   *                         performance will be improved over many calls.
-   * @return                 A string containing the generated name.
-   */
-  //AString generateName(in long aGenerateFormat,
-  //                     [optional] in nsIStringBundle aBundle);
-	generateName: function _generateName(aGenerateFormat, aBundle)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: generateName");
-		return "generateName";
-	},
-
-  /**
-   * Generate a formatted email address from the card, that can be used for
-   * sending emails.
-   *
-   * @param  aExpandList     If this card is a list, and this parameter is set
-   *                         to true, then the list will be expanded to include
-   *                         the emails of the cards within the list.
-   * @param  aGroupMailLists If this card (or the items within this card) is a
-   *                         list, and this is set to true, then the list will
-   *                         be expanded in the RFC 2822 group format
-   *                         "displayname : email1 ; email2 ; etc".
-   * @param  aHeaderParser   An optional parameter pointing to the
-   *                         nsIMsgHeaderParser service. If this is not supplied
-   *                         the function will obtain the service itself. If
-   *                         cached by the called and supplied to this function,
-   *                         then performance will be improved over many calls.
-   * @return                 A string containing a comma-separated list of
-   *                         formatted addresses.
-   */
-  //AString generateFormattedEmail(in boolean aExpandList,
-  //                               in boolean aAsGroupMailLists,
-  //                               [optional] in nsIMsgHeaderParser aHeaderParser);
-	generateFormattedEmail: function _generateFormattedEmail( aExpandList, aAsGroupMailLists, aHeaderParser)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: generateFormattedEmail");
-		return "";
-	},
-
-  /**
-   * Returns true if this collection is read-only.
-   */
-  //readonly attribute boolean readOnly;
-	get readOnly()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: readOnly");
-		return true;
-	},
-
-  /**
-   * Returns true if this collection is accessed over a network connection.
-   */
-  //readonly attribute boolean isRemote;
-	get isRemote()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: isRemote");
-		return true;
-	},
-
-
-  /**
-   * Returns true if this collection is accessed over a secure connection.
-   *
-   * If isRemote returns false, then this value MUST be false as well.
-   */
-  //readonly attribute boolean isSecure;
-	get isSecure()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: isSecure");
-		return true;
-	},
-
-
-  /** 
-   * Returns an address book card for the specified email address if found.
-   *
-   * If there are multiple cards with the given email address, this method will
-   * return one of these cards in an implementation-defined manner.
-   *
-   * Matching is performed in a case-insensitive manner.
-   *
-   * This method performs a synchronous operation. If the collection cannot do
-   * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
-   *
-   * @param  emailAddress The email address to find in any of the email address
-   *                      fields. If emailAddress is empty, the database won't
-   *                      be searched and the function will return as if no card
-   *                      was found.
-   * @return              An nsIAbCard if one was found, else returns NULL.
-   * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
-   */
-  //nsIAbCard cardForEmailAddress(in AUTF8String emailAddress);
-	cardForEmailAddress: function _cardForEmailAddress(emailAddress)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: cardForEmailAddress");
-		return null;
-//		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
-
-  /**
-   * Returns an address book card for the specified property if found.
-   *
-   * If there are multiple cards with the given value for the property, this
-   * method will return one of these cards in an implementation-defined manner.
-   *
-   * This method performs a synchronous operation. If the collection cannot do
-   * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
-   *
-   * If the property is not natively a string, it can still be searched for
-   * using the string-encoded value of the property, e.g. "0". See
-   * nsIAbCard::getPropertyAsAUTF8String for more information. Empty values will
-   * return no match, to prevent spurious results.
-   *
-   * @param  aProperty      The property to look for.
-   * @param  aValue         The value to search for.
-   * @param  aCaseSensitive True if matching should be done case-sensitively.
-   * @result                An nsIAbCard if one was found, else returns NULL.
-   * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
-   */
-  //nsIAbCard getCardFromProperty(in string aProperty, in AUTF8String aValue,
-  //                              in boolean aCaseSensitive);
-	getCardFromProperty: function _cardForEmailAddress(aProperty, aValue, aCaseSensitive)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getCardFromProperty: aProperty:"+aProperty+", aValue:"+aValue);
-		//throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-		return null
-	},
-
-
-  /**
-   * Returns all address book cards with a specific property matching value
-   *
-   * This function is almost identical to getCardFromProperty, with the
-   * exception of returning all cards rather than just the first.
-   *
-   * @param  aProperty      The property to look for.
-   * @param  aValue         The value to search for.
-   * @param  aCaseSensitive True if matching should be done case-sensitively.
-   * @result                A nsISimpleEnumerator that holds nsIAbCard
-   *                        instances.
-   */
-  //nsISimpleEnumerator getCardsFromProperty(in string aProperty,
-  //                                         in AUTF8String aValue,
-  //                                         in boolean aCaseSensitive);
-
-	getCardsFromProperty: function _getCardsFromProperty(aProperty, aValue, aCaseSensitive)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getCardsFromProperty");
-		var result = [];
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
-	},
-
-
-  /**
-   * The chrome URI to use for bringing up a dialog to edit this directory.
-   * When opening the dialog, use a JS argument of
-   * {selectedDirectory: thisdir} where thisdir is this directory that you just
-   * got the chrome URI from.
-   */
-  //readonly attribute ACString propertiesChromeURI;
-	get propertiesChromeURI()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get propertiesChromeURI 1");
-		if (this.isMailList) {
-			return "";
-		}
-		return "chrome://exchangecontacts/content/exchangeContactSettings.xul";
-	},
-
-  /**
-   * The description of the directory. If this directory is not a mailing list,
-   * then setting this attribute will send round a "DirName" update via
-   * nsIAddrBookSession.
-   */
-  //attribute AString dirName;
-	get dirName()
-	{
-		if (this.isMailList) {
-			return this._dirName;
-		}
-
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get dirName");
-		return exchWebService.commonAbFunctions.getDescription(this.uuid);
-	},
-
-	set dirName(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set dirName");
-		if (this.isMailList) {
-			return; // Currently not allowed.
-		}
-
-		exchWebService.commonAbFunctions.setDescription(this.uuid. aValue);
-	},
-
-  // XXX This should really be replaced by a QI or something better
-  //readonly attribute long dirType;
-	get dirType()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get dirType");
-		return 0;
-	},
-
-  // eliminated a bit more.
-
-  // The filename for address books within this directory.
-  //readonly attribute ACString fileName;
-	get fileName()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get fileName");
-		return "filename";
-	},
-
-  // The URI of the address book
-  //readonly attribute ACString URI;
-	get URI()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get URI:"+this._URI);
-		return this._URI;
-	},
-
-  // The position of the directory on the display.
-  //readonly attribute long position;
-	get position()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get position");
-		return 2;
-	},
-
-  // will be used for LDAP replication
-  //attribute unsigned long lastModifiedDate;
-	get lastModifiedDate()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get lastModifiedDate");
-		return this._lastModifiedDate;
-	},
-
-	set lastModifiedDate(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set lastModifiedDate");
-		this._lastModifiedDate = aValue;
-	},
-
-  // Defines whether this directory is a mail
-  // list or not
-  //attribute boolean isMailList;
-	get isMailList()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get isMailList");
-		if (this._isMailList) {
-			return this._isMailList;
-		}
-
-		return false;
-	},
-
-	set isMailList(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set isMailList");
-		this._isMailList = aValue;
-	},
-
-  // Get the children directories
-  //readonly attribute nsISimpleEnumerator childNodes;
-	get childNodes()
-	{
-		var result = [];
-
-		if (this.distLists.length > 0) {
-			for each(var distList in this.distLists) {
-				result.push(distList);
-			}
-		}
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
-	},
-
-  /**
-   * Get the cards associated with the directory. This will return the cards
-   * associated with the mailing lists too.
-   */
-  //readonly attribute nsISimpleEnumerator childCards;
-	get childCards()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: 1 get childCards:"+ this.dirName+", uri:"+this.URI);
-		for (var index in this.contacts) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: 2 get childCards:"+ index+":"+this.contacts[index].displayName);
-		}
-		return exchWebService.commonFunctions.CreateSimpleObjectEnumerator(this.contacts);
-	},
-
-  /**
-   * Returns true if this directory represents a query - i.e. the rdf resource
-   * was something like moz-abmdbdirectory://abook.mab?....
-   */
-  //readonly attribute boolean isQuery;
-	get isQuery()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get isQuery");
-		if (this._searchQuery) {
-			return true;
-		}
-
-		return false;
-	},
-
-  /**
-   * Initializes a directory, pointing to a particular
-   * URI
-   */
-  //void init(in string aURI);
-	init: function _init(aURI)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: init. aURI:"+aURI+"");
-
-		if (this._isInitialized) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '"+this.dirName+"' is allready initialized");
-
-			var tmpStr = aURI.substr(aURI.indexOf("://")+3);
-			var params = exchWebService.commonAbFunctions.paramsToArray(tmpStr,"&");
-
-			if (aURI == this._URI) {
-				if (decodeURIComponent(params.id) == this.uuid) {
-					exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '"+this.dirName+"' aURI unchanged, id is the same and changKey is different. Going to reset/reload.");
-
-					// We could do this more clever by finding out the differences and only update those. 
-					// But how deep will a distlist go and how many cards will be in a distlist.!!??
-					// For now we clean this distlist and re add everything.
-
-					// Remove cards.
-					var oldList = this.contacts;
-					this.contacts = {};
-					for each(var contact in oldList) {
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '"+this.dirName+"' removed contact:"+contact.getProperty("DisplayName", ""));
-						MailServices.ab.notifyDirectoryItemDeleted(this, contact);
-						MailServices.ab.notifyDirectoryDeleted(this, contact);
-					}		
-
-					// Remove distLists.
-					var oldList = this.distLists;
-					this.distLists = new Array();
-					for each(var distList in oldList) {
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '"+this.dirName+"' removed distList:"+distList.dirName);
-						MailServices.ab.notifyDirectoryDeleted(this, distList);
-					}
-				}
-				else {
-					exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '"+this.dirName+"' aURI unchanged but id is different. Not allowed. Going to do nothing.");
-					return;
-				}
-			}
-			else {
-				exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '"+this.dirName+"' aURI changed. Going to do nothing.");
-				return;
-			}
-		}
-
-		this._URI = aURI;
-
-		this._Schema = null;
-		this._UUID = "";
-		this._searchQuery = null;
-
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: this is a childdir:"+aURI);
-
-		if (aURI.indexOf("://") > -1) {
-			this._Schema = aURI.substr(0, aURI.indexOf("://"));
-
-			var tmpStr = aURI.substr(aURI.indexOf("://")+3);
-
-			this._searchQuery = null;
-			if (tmpStr.indexOf("?") > -1) {
-				this._searchQuery = tmpStr.substr(tmpStr.indexOf("?")+1);
-				tmpStr = tmpStr.substr(0,tmpStr.indexOf("?")); 
-			}
-
-			var params = exchWebService.commonAbFunctions.paramsToArray(tmpStr,"&");
-
-			this._UUID = decodeURIComponent(params.id);
-			this._type = decodeURIComponent(params.type);
-
-			this.isMailList = true;
-
-			if (params.name) {
-				this._dirName = decodeURIComponent(params.name);
-			}
-			else {
-				this._dirName = null;
-			}
-
-			if (params.parentId) {
-				this.parentId = decodeURIComponent(params.parentId);
-			}
-			else {
-				this.parentId = null;
-			}
-
-			exchWebService.commonAbFunctions.logInfo("D: init: uuid:"+this.uuid+", type:"+this.type+", name:"+this.dirName);
-
-			if (this._searchQuery) {
-				var dirName = this._Schema+"://"+"id="+encodeURIComponent(this._UUID)+"&name="+encodeURIComponent(this.dirName)+"&parentId="+this.parentId+"&type="+this.type;
-
-				exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: this._searchQuery:"+this._searchQuery+", dirName:"+dirName);
-				
-
-				var dir = MailServices.ab.getDirectory(dirName);
-				if (dir) {
-					exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Going to get children of '"+dirName+"'");
-
-					this.contacts = exchWebService.commonAbFunctions.filterCardsOnQuery(this._searchQuery, dir.childCards);
-					exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Got children of '"+dirName+"'");
-
-					this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
-
-					for each(var contact in this.contacts) {
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Adding sub child A '"+contact.displayName+"' to contacts. dirName:"+this.dirName);
-						MailServices.ab.notifyDirectoryItemAdded(this, contact);
-					}
-
-					this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
-
-					exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Going to get children of distList.");
-					// Get contact in childNodes (distLists)
-					var childNodes = dir.childNodes;
-					while (childNodes.hasMoreElements()) {
-						var childNode = childNodes.getNext();
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Going to get children of distList '"+childNode.dirName+"':'"+childNode.URI+"' dirName:"+this.dirName);
-						var tmpDir = MailServices.ab.getDirectory(childNode.URI+"?"+this._searchQuery);
-						var childContacts = tmpDir.childCards;
-						while (childContacts.hasMoreElements()) {
-							var contact = childContacts.getNext().QueryInterface(Ci.nsIAbCard);
-							exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: ++ contact:"+contact);
-							exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Adding sub child B '"+contact.localId+"':'"+contact.displayName+"' to contacts. dirName:"+this.dirName);
-							this.contacts[contact.localId] = contact;
-						}
-					}
-				}
-				else {
-					exchWebService.commonAbFunctions.logInfo("ERROR Folderdirectory '"+dirName+"' does not exist.");
-				}
-
-			}
-			else {
-				if (this.parentId) {
-					this.prefs = Cc["@mozilla.org/preferences-service;1"]
-					    	.getService(Ci.nsIPrefService)
-					    	.getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+this.parentId+".");
-				}
-				else {
-					this.prefs = Cc["@mozilla.org/preferences-service;1"]
-					    	.getService(Ci.nsIPrefService)
-					    	.getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+this._UUID+".");
-				}
-
-				this.loadDistListFromExchange();
-			}
-
-
-		}
-		else {
-			// ERROR
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: exchangeAbDistListDirectory.init: WE GOT TO A POINT WERE WE NEVER SHOULD GET TO.");
-		}
-
-		this._isInitialized = true;
-	},
-
-  // Deletes either a mailing list or a top
-  // level directory, which also updates the
-  // preferences
-  //void deleteDirectory(in nsIAbDirectory directory);
-	deleteDirectory: function _deleteDirectory(directory)
-	{
-		// We cannot remove the root.
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: deleteDirectory this:"+this.URI+", directory:"+directory.URI+"");
-
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: deleteDirectory uri:"+directory.URI+"");
-	},
-
-  // Check if directory contains card
-  // If the implementation is asynchronous the card
-  // may not yet have arrived. If it is in the process
-  // of obtaining cards the method will throw an
-  // NS_ERROR_NOT_AVAILABLE exception if the card
-  // cannot be found.
-  //boolean hasCard(in nsIAbCard cards);
-	hasCard: function _hasCard(cards)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: hasCard");
-		return false;
-	},
-
-
-  // Check if directory contains directory
-  //boolean hasDirectory(in nsIAbDirectory dir);
-	hasDirectory: function _hasDirectory(dir)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: hasDirectory");
-
-		return false;
-	},
-
-  /**
-   * Adds a card to the database.
-   *
-   * This card does not need to be of the same type as the database, e.g., one
-   * can add an nsIAbLDAPCard to an nsIAbMDBDirectory.
-   *
-   * @return "Real" card (eg nsIAbLDAPCard) that can be used for some
-   *         extra functions.
-   */
-  //nsIAbCard addCard(in nsIAbCard card);
-	addCard: function _addCard(card)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: addCard");
-		return null;
-	},
-
-  /**
-   * Modifies a card in the database to match that supplied.
-   */
-  //void modifyCard(in nsIAbCard modifiedCard);
-	modifyCard: function _modifyCard(modifiedCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: modifyCard");
-	},
-
-  /**
-   * Deletes the array of cards from the database.
-   *
-   * @param  aCards  The cards to delete from the database.
-   */
-  //void deleteCards(in nsIArray aCards);
-	deleteCards: function _deleteCards(aCards)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: deleteCards");
-	},
-
-  //void dropCard(in nsIAbCard card, in boolean needToCopyCard);
-	dropCard: function _dropCard(Card, needToCopyCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: dropCard");
-	},
-
-  /**
-   * Whether or not the directory should be searched when doing autocomplete,
-   * (currently by using GetChildCards); LDAP does not support this in online
-   * mode, so that should return false; additionally any other directory types
-   * that also do not support GetChildCards should return false.
-   *
-   * @param aIdentity  An optional parameter detailing the identity key (see
-   *                   nsIMsgAccountManager) that this autocomplete is being
-   *                   run against.
-   * @return           True if this directory should/can be used during
-   *                   local autocomplete.
-   */
-  //boolean useForAutocomplete(in ACString aIdentityKey);
-	useForAutocomplete: function _useForAutocomplete(aIdentityKey)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: useForAutocomplete");
-
-		return true;
-
-//		return true;
-	},
-
-  /** 
-   * Does this directory support mailing lists? Note that in the case
-   * this directory is a mailing list and nested mailing lists are not
-   * supported, this will return false rather than true which the parent
-   * directory might.
-   */
-  //readonly attribute boolean supportsMailingLists;
-	get supportsMailingLists()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get supportsMailingLists");
-		return true;
-	},
-
-  /**
-   * This attribute serves two purposes
-   *  1. If this directory is not a mail list, directories are stored here
-   *  2. If it is a mail list card entries are stored here
-   *
-   * @note This is a *live* array and not a static copy
-   */
-  //attribute nsIMutableArray addressLists
-	get addressLists()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get addressLists");
-	
-		return this._addressLists;
-	},
-
-	set addressLists(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set addressLists");
-		this._addressLists = aValue;
-	},
-
-  // Specific to a directory which stores mail lists
-
-  /**
-   * Creates a new mailing list in the directory. Currently only supported 
-   * for top-level directories.
-   *
-   * @param  list  The new mailing list to add.
-   * @return The mailing list directory added, which may have been modified.
-   */
-  //nsIAbDirectory addMailList(in nsIAbDirectory list);
-	addMailList: function _addMailList(list)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: addMailList");
-		return list;
-	},
-
-  /**
-   * Nick Name of the mailing list. This attribute is only really used when
-   * the nsIAbDirectory represents a mailing list.
-   */
-  //attribute AString listNickName;
-	get listNickName()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get listNickName");
-		return this._listNickName;
-	},
-
-	set listNickName(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set listNickName");
-		this._listNickName = aValue;
-	},
-
-  /**
-   * Description of the mailing list. This attribute is only really used when
-   * the nsIAbDirectory represents a mailing list.
-   */
-  //attribute AString description;
-	get description()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get description");
-		return this._description;
-	},
-
-	set description(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set description");
-		this._description = aValue;
-	},
-
-  /**
-   * Edits an existing mailing list (specified as listCard) into its parent
-   * directory. You should call this function on the resource with the same
-   * uri as the listCard.
-   *
-   * @param  listCard  A nsIAbCard version of the mailing list with the new
-   *                   values.
-   */
-  //void editMailListToDatabase(in nsIAbCard listCard);
-	editMailListToDatabase: function _editMailListToDatabase(listCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: editMailListToDatabase");
-	},
-
-  // Copies mail list properties from the srcList
-  //void copyMailList(in nsIAbDirectory srcList);
-	copyMailList: function _copyMailList(srcList)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: copyMailList");
-	},
-
-
-  /**
-   * Only creates a top level address book
-   * which is stored in the preferences
-   *
-   * Need to change to factory based approach
-   * to create new address books
-   *
-   * This method should become redundant or 
-   * be only associated with card folders
-   *
-   * The parameters are the same as for
-   * nsIAbManager::newAddressBook
-   */
-  //ACString createNewDirectory(in AString aDirName, in ACString aURI,
-  //                            in unsigned long aType, in ACString aPrefName);
-	createNewDirectory: function _createNewDirectory(aDirName, aURI, aType, aPrefName)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: createNewDirectory uuid:"+this.uuid+"");
-		return "createNewDirectory";
-	},
-
-
-  /* create a directory by passing the display name and address book uri */
-  //void createDirectoryByURI(in AString displayName, in ACString aURI);
-	createDirectoryByURI: function _createDirectoryByURI(displayName, aURI)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: createDirectoryByURI uuid:"+this.uuid+"");
-	},
-  /**
-   * The id of the directory used in prefs e.g. "ldap_2.servers.pab"
-   * Setting this will cause directoryPrefs to be updated.
-   */
-  //attribute ACString dirPrefId;
-	get dirPrefId()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get dirPrefId: "+this.uuid);
-		return this._dirPrefId;
-	},
-
-	set dirPrefId(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set dirPrefId");
-		this._dirPrefId = aValue;
-	},
-  /**
-   * @name  getXXXValue
-   *
-   * Helper functions to get different types of pref, but return a default
-   * value if a pref value was not obtained.
-   *
-   * @param aName         The name of the pref within the branch dirPrefId to
-   *                      get a value from.
-   *
-   * @param aDefaultValue The default value to return if getting the pref fails
-   *                      or the pref is not present.
-   *
-   * @return              The value of the pref or the default value.
-   *
-   * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
-   *                      be obtained (e.g. dirPrefId isn't set).
-   */
-  //@{
-  //long getIntValue(in string aName, in long aDefaultValue);
-	getIntValue: function _getIntValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getIntValue");
-		return aDefaultValue;
-	},
-
-  //boolean getBoolValue(in string aName, in boolean aDefaultValue);
-	getBoolValue: function _getBoolValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getBoolValue");
-		return aDefaultValue;
-	},
-
-  //ACString getStringValue(in string aName, in ACString aDefaultValue);
-	getStringValue: function _getStringValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getStringValue");
-		return aDefaultValue;
-	},
-
-  //AUTF8String getLocalizedStringValue(in string aName, in AUTF8String aDefaultValue);
-	getLocalizedStringValue: function _getLocalizedStringValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getLocalizedStringValue");
-		return aDefaultValue;
-	},
-
-  //@}
-
-  /**
-   * The following attributes are read from an nsIAbDirectory via the above methods:
-   *
-   * HidesRecipients (Boolean)
-   *    If true, and this nsIAbDirectory is a mailing list, then when sending mail to
-   *    this list, recipients addresses will be hidden from one another by sending
-   *    via BCC.
-   */
-
-  /**
-   * @name  setXXXValue
-   *
-   * Helper functions to set different types of pref values.
-   *
-   * @param aName         The name of the pref within the branch dirPrefId to
-   *                      get a value from.
-   *
-   * @param aValue        The value to set the pref to.
-   *
-   * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
-   *                      be obtained (e.g. dirPrefId isn't set).
-   */
-  //@{
-  //void setIntValue(in string aName, in long aValue);
-	setIntValue: function _setIntValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setIntValue");
-	},
-
-  //void setBoolValue(in string aName, in boolean aValue);
-	setBoolValue: function _setBoolValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setBoolValue");
-	},
-
-  //void setStringValue(in string aName, in ACString aValue);
-	setStringValue: function _setStringValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setStringValue");
-	},
-
-  //void setLocalizedStringValue(in string aName, in AUTF8String aValue);
-	setLocalizedStringValue: function _setLocalizedStringValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setLocalizedStringValue");
-	},
-
-  //@}
-
-	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	{
-		//if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
-
-		this.loadBalancer.addToQueue({ calendar: this,
-				 ecRequest:aRequest,
-				 arguments: aArgument,
-				 cbOk: aCbOk,
-				 cbError: aCbError,
-				 listener: aListener});
-	},
-
-	get name()
-	{
-		return this.dirName;
-	},
-
-	get user() {
-		var username = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
-		if (username.indexOf("@") > -1) {
-			return username;
-		}
-		else {
-			if (this.domain == "") {
-				return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
-			}
-			else {
-				return this.domain+"\\"+exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
-			}
-		}
-	},
-
-	set user(value) {
-		if (value.indexOf("\\") > -1) {
-			this.domain = value.substr(0,value.indexOf("\\"));
-			this.prefs.setCharPref("user", value.substr(value.indexOf("\\")+1));
-		}
-		else {
-			this.prefs.setCharPref("user", value);
-		}
-	},
-
-	get domain() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "domain", "");
-	},
-
-	set domain(value) {
-		return this.prefs.setCharPref("domain", value);
-	},
-
-	get mailbox() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "mailbox", "");
-	},
-
-	get serverUrl() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "server", "");
-	},
-
-	get folderBase() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderbase", "contacts");
-	},
-
-	get folderPath() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderpath", "/");
-	},
-
-	get folderID() {
-		if (this.isMailList) {
-			return this.id;
-		}
-
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderid", null);
-	},
-
-	set folderID(aValue) {
-		if (this.isMailList) {
-			// Cannot be changed for a distlist.
-			return;
-		}
-
-		this.prefs.setCharPref("folderid", aValue);
-	},
-
-	get changeKey() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "changekey", null);
-	},
-
-	set changeKey(aValue) {
-		this.prefs.setCharPref("changekey", aValue);
-	},
-
-	loadDistListFromExchange: function _loadDistListFromExchange()
-	{
-		if (this.isLoading) {
-			return;
-		}
-
-		exchWebService.commonAbFunctions.logInfo("loadDistListFromExchange:"+this.dirName);
-
-		this.isLoading = true;
-
-		var self = this;
-
-		// changekey set to null because the same dislist can have different changeKey when it is also added as a member of another distlist.
-
-		switch (this._type) {
-		case "PrivateDL":
-			this.addToQueue( erExpandDLRequest,
-							{user: this.user, 
-							 serverUrl: this.serverUrl,
-					 		 actionStart: Date.now(),
-							 itemId: { id: this.id} },
-							function(erExpandDLRequest, aMailboxes) { self.distListExpandOk(erExpandDLRequest, aMailboxes);}, 
-							function(erExpandDLRequest, aCode, aMsg) { self.distListExpandError(erExpandDLRequest, aCode, aMsg);},
-							null);
-			break;
-		case "PublicDL":
-			var emailAddress = this.id.substr(this.id.indexOf(":")+1);
-			this.addToQueue( erExpandDLRequest,
-							{user: this.user, 
-							 serverUrl: this.serverUrl,
-					 		 actionStart: Date.now(),
-							 emailAddress: emailAddress },
-							function(erExpandDLRequest, aMailboxes) { self.distListExpandOk(erExpandDLRequest, aMailboxes);}, 
-							function(erExpandDLRequest, aCode, aMsg) { self.distListExpandError(erExpandDLRequest, aCode, aMsg);},
-							null);
-			break;
-		}
-	},
-
-	ecUpdateCard: function _ecUpdateCard(contact)
-	{
-		var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-			.createInstance(Ci.mivExchangeAbCard);
-		newCard.convertExchangeContactToCard(this, contact);
-		newCard.setProperty("exchangeUser", this.user);
-		newCard.setProperty("exchangeServerUrl", this.serverUrl);
-		this.updateList(newCard);
-	},
-
-	updateList: function _updateList(newCard)
-	{
-		if (!newCard) {
-			return;
-		}
-
-		if (this.contacts[newCard.localId]) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory:  == We allready know this card. Lets see what has changed:"+newCard.localId);
-
-			// Check which properties changed.
-			for (var cardProperty in fixIterator(newCard.properties, Ci.nsIProperty)) {
-				if (cardProperty.name) {
-					try {
-						var oldValue = this.contacts[newCard.localId].getProperty(cardProperty.name, "");
-						var newValue = cardProperty.value;
-						if ( oldValue != newValue) {
-							// And existing property has changed.
-							exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: --Property Changed name:"+cardProperty.name+", oldvalue:"+oldValue+", newValue:"+newValue);
-							this.contacts[newCard.localId].setProperty(cardProperty.name, newValue);
-							MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
-			                                 cardProperty.name,
-			                                 oldValue,
-			                                 newValue);
-						}
-					}
-					catch(err) {
-						// We have a new property which was not set in the previous state. Add it
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory:  == Err:"+err);
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: --Property added name:"+cardProperty.name+", value:"+cardProperty.value);
-						this.contacts[newCard.localId].setProperty(cardProperty.name, cardProperty.value);
-						MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
-		                                 cardProperty.name,
-		                                 null,
-		                                 newValue);
-					}
-				}
-			}
-
-			// We check if properties were removed.
-			for (var cardProperty in fixIterator(this.contacts[newCard.localId].properties, Ci.nsIProperty)) {
-				if (cardProperty.name) {
-					var oldValue = cardProperty.value; 
-					try {
-						var newValue = newCard.getProperty(cardProperty.name, "");
-						
-						if ( oldValue != newValue) {
-							// If we get here something went wrong before this call.
-						}
-					}
-					catch(err) {
-						// Property is not available in new state. We have to remove it.
-						exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: --Property removed name:"+cardProperty.name+", value:"+cardProperty.value);
-						this.contacts[newCard.localId].deleteProperty(cardProperty.name);
-						MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
-		                                 cardProperty.name,
-		                                 oldValue,
-		                                 null);
-					}
-				}
-			}
-		}
-		else {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory:  || This card is new. We do not know it yet.");
-			this.contacts[newCard.localId] = newCard;
-			MailServices.ab.notifyDirectoryItemAdded(this, newCard);
-		}
-
-		// This will eat performance when the list is long.
-		this._addressLists.clear();
-		for each(var contact in this.contacts) {
-			this._addressLists.appendElement(contact, false);
-		}
-
-		exchWebService.commonAbFunctions.logInfo(this.uuid+": newCard.localId:"+newCard.localId);		
-	},
-
-	convertExchangeMailbox: function _convertExchangeMailbox(aMailbox)
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: convertExchangeMailbox: Mailboxes:"+aMailbox.toString());
-		
-		var result = {
-			name: aMailbox.getTagValue("t:Name"),
-			emailAddress: aMailbox.getTagValue("t:EmailAddress"),
-			routingType: aMailbox.getTagValue("t:RoutingType"),
-			mailboxType: aMailbox.getTagValue("t:MailboxType"),
-			mailbox: aMailbox
-		};
-
-		if (aMailbox.getTags("t:ItemId").length > 0) {
-			result.itemId = {	id: aMailbox.getAttributeByTag("t:ItemId", "Id", null), 
-					changeKey:aMailbox.getAttributeByTag("t:ItemId", "ChangeKey", null)
-				};
-		}
-
-		return result;		
-	},
-
-	distListExpandOk: function _contactsFoundOk(erExpandDLRequest, aMailboxes)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: distListExpandOk: Mailboxes:"+aMailboxes.length);
-
-		if (aMailboxes.length > 0) {
-			var aStoreContacts = new Array();
-			var aADContacts = new Array();
-			this.distLists = new Array()
-			for each(var mailbox in aMailboxes) {
-				var calMailbox = this.convertExchangeMailbox(mailbox);
-
-				switch (calMailbox.mailboxType) {
-				case "Contact": // A normal in store or AD contact
-					exchWebService.commonAbFunctions.logInfo("distListLoadOk: new Contact:"+calMailbox.name);
-					if ((calMailbox.itemId) && (calMailbox.itemId.id)) {
-						// It is a private store contact.
-						aStoreContacts.push({ Id: calMailbox.itemId.id });
-					}
-					break;
-				case "PrivateDL": // Private Store distribution list.
-					if ((calMailbox.itemId) && (calMailbox.itemId.id)) {
-						// It is a private store distList.
-						exchWebService.commonAbFunctions.logInfo("distListLoadOk: new Private distList:"+calMailbox.name+" in dir:"+this.dirName);
-
-						var dirName = this.childNodeURI+"id="+encodeURIComponent(calMailbox.itemId.id)+"&name="+encodeURIComponent(calMailbox.name)+"&parentId="+this.parentId+"&type=PrivateDL";
-
-						try {
-							var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-								.createInstance(Ci.mivExchangeAbCard);
-							newCard.convertExchangeDistListToCard(this, mailbox, dirName);
-							this.updateList(newCard);
-							var dir = MailServices.ab.getDirectory(dirName);
-							if (dir) {
-								this.distLists.push(dir);
-								MailServices.ab.notifyDirectoryItemAdded(this, dir);
-							}
-						}
-						catch(err) {
-							exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Error adding dislist '"+dirName+"' Error:"+err);
-						}
-					}
-					break; 
-				case "PublicDL": // An Active Directory distribution list.
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: distListExpandOk: new Public distList:"+calMailbox.name+" in GAL of "+this.serverUrl);
-
-					var dirName = this.childNodeURI+"id="+encodeURIComponent(calMailbox.routingType+":"+calMailbox.emailAddress)+"&name="+encodeURIComponent(calMailbox.name)+"&parentId="+this.parentId+"&type=PublicDL";
-
-					// Make a card from the contact details.
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeDistListToCard(this, mailbox, dirName);
-					this.updateList(newCard);
-					var dir = MailServices.ab.getDirectory(dirName);
-					if (dir) {
-						this.distLists.push(dir);
-						MailServices.ab.notifyDirectoryItemAdded(this, dir);
-					}
-
-					break; 
-				case "OneOff":
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: distListExpandOk: new OneOff Contact:"+calMailbox.name+" in GAL of "+this.serverUrl);
-					
-					// Make a card from the contact details.
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeContactToCard(this, mailbox, calMailbox.mailboxType);
-					newCard.setProperty("exchangeUser", this.user);
-					newCard.setProperty("exchangeServerUrl", this.serverUrl);
-					this.updateList(newCard);
-
-					break;
-				case "Mailbox": // An Active Directory mailbox
-					exchWebService.commonAbFunctions.logInfo("distListExpandOk: new Mailbox:"+calMailbox.name);
-					aADContacts.push(calMailbox);
-					break;
-				default:
-					 exchWebService.commonAbFunctions.logInfo("distListExpandOk: Unknown mailboxtype:"+calMailbox.mailboxType);
-				}
-			}
-
-			var self = this;
-			if (aStoreContacts.length > 0) {
-				this.addToQueue( erGetContactsRequest,
-								{user: this.user, 
-								 mailbox: this.mailbox,
-								 folderBase: this.folderBase,
-								 serverUrl: this.serverUrl,
-								 folderID: this.folderID,
-								 changeKey: this.changeKey,
-								 ids: aStoreContacts,
-						 		 actionStart: Date.now()},
-								function(erGetContactsRequest, aContacts) { self.contactsLoadOk(erGetContactsRequest, aContacts);}, 
-								function(erGetContactsRequest, aCode, aMsg) { self.distListExpandError(erGetContactsRequest, aCode, aMsg);},
-								null);
-			}
-
-			for (var index in aADContacts) { 
-				this.addToQueue( erResolveNames,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 ids: aADContacts[index],
-					 		 actionStart: Date.now()},
-							function(erResolveNames, aResolutions) { self.resolveNamesOk(erResolveNames, aResolutions);}, 
-							function(erResolveNames, aCode, aMsg) { self.distListExpandError(erResolveNames, aCode, aMsg);},
-							null);
-			}
-		}
-
-	},
-
-	distListExpandError: function _distListExpandError(erExpandDLRequest, aCode, aMsg)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: distListExpandError: aCode:"+aCode+", aMsg:"+aMsg);
-		this.isLoading = false;
-
-		if ((aCode == 0) && (aMsg == "ErrorNameResolutionNoResults")) {
-			// Name could not be resolved we use the mailbox element instead of the contacts.
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Could not resolve mailbox. Going to use mailbox details for card");
-			this.ecUpdateCard(erExpandDLRequest.ids.mailbox);
-		}
-	},
-
-	contactsLoadOk: function _contactsLoadOk(erGetContactsRequest, aContacts)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: contactsLoadOk: contacts:"+aContacts.length);
-
-		for each(var contact in aContacts) {
-			//exchWebService.commonAbFunctions.logInfo("Contact card:"+contact.toString(),2);
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: new childCards:"+contact.getTagValue("t:DisplayName"));
-			this.ecUpdateCard(contact);
-
-		}
-
-		this.isLoading = false;
-
-	},
-
-	resolveNamesOk: function _resolveNamesOk(erResolveNames, aResolutions)
-	{
-
-		exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: resolveNamesOk: contacts:"+aResolutions.length);
-
-		for each(var resolution in aResolutions) {
-			exchWebService.commonAbFunctions.logInfo("resolution card:"+resolution.toString());
-
-			var mailbox = resolution.getTags("t:Mailbox");
-			exchWebService.commonAbFunctions.logInfo("resolution mailbox card:"+mailbox[0].toString());
-			var contact = resolution.getTags("t:Contact");
-			if (contact.length > 0) {
-				exchWebService.commonAbFunctions.logInfo("resolution contact card:"+contact[0].toString());
-			}
-			var calMailbox;
-			if (mailbox.length > 0) {
-				calMailbox = this.convertExchangeMailbox(mailbox[0]);
-
-				switch (calMailbox.mailboxType) {
-				case "PrivateDL": // An Contact folder distribution list.
-try {
-					var dirName = this.childNodeURI+"id="+encodeURIComponent(calMailbox.itemId.id)+"&name="+encodeURIComponent(calMailbox.name)+"&parentId="+this.parentId+"&type=PrivateDL";
-
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeDistListToCard(this, mailbox[0], dirName);
-					this.updateList(newCard);
-					var dir = MailServices.ab.getDirectory(dirName);
-					if (dir) {
-						this.distLists.push(dir);
-						MailServices.ab.notifyDirectoryItemAdded(this, dir);
-					}
-} catch(err) {
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Foutje:"+err);
-}
-					break;
-				case "PublicDL": // An Active Directory distribution list.
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Public distList:"+calMailbox.name+" in GAL of "+this.serverUrl);
-
-					var dirName = this.childNodeURI+"id="+encodeURIComponent(calMailbox.routingType+":"+calMailbox.emailAddress)+"&name="+encodeURIComponent(calMailbox.name)+"&parentId="+this.parentId+"&type=PublicDL";
-
-					// Make a card from the contact details.
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeDistListToCard(this, contact[0], dirName);
-					this.updateList(newCard);
-					var dir = MailServices.ab.getDirectory(dirName);
-					if (dir) {
-						this.distLists.push(dir);
-						MailServices.ab.notifyDirectoryItemAdded(this, dir);
-					}
-
-					break; 
-				case "Contact":
-				case "Mailbox": // An Active Directory Contact Mailbox.
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Mailbox Contact:"+calMailbox.name+" in GAL of "+this.serverUrl);
-					
-					// Make a card from the contact details.
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeContactToCard(this, contact[0], calMailbox.mailboxType);
-					newCard.setProperty("exchangeUser", this.user);
-					newCard.setProperty("exchangeServerUrl", this.serverUrl);
-					this.updateList(newCard);
-
-					break;
-				default:
-					 exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Unknown mailboxtype:"+calMailbox.mailboxType);
-				}
-			}
-		}
-
-		this.isLoading = false;
-
-	},
+    classID: components.ID("{9e260dc4-90d3-457b-8885-8dff0f69eea3}"),
+    contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-distList-directory",
+    classDescription: "Exchange 2007/2010 Distribution List",
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    QueryInterface: XPCOMUtils.generateQI([Ci.exchangeAbDistListDirectory,
+        Ci.nsIAbDirectory,
+        Ci.nsIAbCollection,
+        Ci.nsIAbItem,
+        Ci.nsISupports
+    ]),
+
+    /**
+     * A universally-unique identifier for this item.
+     *
+     * If this item cannot be associated with a UUID for some reason, it MUST
+     * return the empty string. The empty string MUST NOT be a valid UUID for any
+     * item. Under no circumstances may this function throw an error.
+     *
+     * It is STRONGLY RECOMMENDED that implementations guarantee that this UUID
+     * will not change between two different sessions of the application and that,
+     * if this item is deleted, the UUID will not be reused.
+     *
+     * The format of the UUID for a generic nsIAbItem is purposefully left
+     * undefined, although any item contained by an nsIAbDirectory SHOULD use
+     * nsIAbManager::generateUUID to generate the UUID.
+     */
+    //readonly attribute AUTF8String uuid;
+    get uuid() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: uuid");
+        if (this._UUID) {
+            return this._UUID;
+        }
+
+        return "";
+    },
+
+    get id() {
+        return this.uuid;
+    },
+
+    get type() {
+        return this._type;
+    },
+
+    /**
+     * @{
+     * These constants reflect the possible values of the
+     * mail.addr_book.lastnamefirst preferences. They are intended to be used in
+     * generateName, defined below.
+     */
+    //const unsigned long GENERATE_DISPLAY_NAME = 0;
+    //const unsigned long GENERATE_LAST_FIRST_ORDER = 1;
+    //const unsigned long GENERATE_FIRST_LAST_ORDER = 2;
+    /** @} */
+
+    /** 
+     * Generate a name from the item for display purposes.
+     *
+     * If this item is an nsIAbCard, then it will use the aGenerateFormat option
+     * to determine the string to return.
+     * If this item is not an nsIAbCard, then the aGenerateFormat option may be
+     * ignored, and the displayName of the item returned.
+     *
+     * @param  aGenerateFormat The format to generate as per the GENERATE_*
+     *                         constants above.
+     * @param  aBundle         An optional parameter that is a pointer to a string
+     *                         bundle that holds:
+     *           chrome://messenger/locale/addressbook/addressBook.properties
+     *                         If this bundle is not supplied, then the function
+     *                         will obtain the bundle itself. If cached by the
+     *                         caller and supplied to this function, then
+     *                         performance will be improved over many calls.
+     * @return                 A string containing the generated name.
+     */
+    //AString generateName(in long aGenerateFormat,
+    //                     [optional] in nsIStringBundle aBundle);
+    generateName: function _generateName(aGenerateFormat, aBundle) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: generateName");
+        return "generateName";
+    },
+
+    /**
+     * Generate a formatted email address from the card, that can be used for
+     * sending emails.
+     *
+     * @param  aExpandList     If this card is a list, and this parameter is set
+     *                         to true, then the list will be expanded to include
+     *                         the emails of the cards within the list.
+     * @param  aGroupMailLists If this card (or the items within this card) is a
+     *                         list, and this is set to true, then the list will
+     *                         be expanded in the RFC 2822 group format
+     *                         "displayname : email1 ; email2 ; etc".
+     * @param  aHeaderParser   An optional parameter pointing to the
+     *                         nsIMsgHeaderParser service. If this is not supplied
+     *                         the function will obtain the service itself. If
+     *                         cached by the called and supplied to this function,
+     *                         then performance will be improved over many calls.
+     * @return                 A string containing a comma-separated list of
+     *                         formatted addresses.
+     */
+    //AString generateFormattedEmail(in boolean aExpandList,
+    //                               in boolean aAsGroupMailLists,
+    //                               [optional] in nsIMsgHeaderParser aHeaderParser);
+    generateFormattedEmail: function _generateFormattedEmail(aExpandList, aAsGroupMailLists, aHeaderParser) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: generateFormattedEmail");
+        return "";
+    },
+
+    /**
+     * Returns true if this collection is read-only.
+     */
+    //readonly attribute boolean readOnly;
+    get readOnly() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: readOnly");
+        return true;
+    },
+
+    /**
+     * Returns true if this collection is accessed over a network connection.
+     */
+    //readonly attribute boolean isRemote;
+    get isRemote() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: isRemote");
+        return true;
+    },
+
+
+    /**
+     * Returns true if this collection is accessed over a secure connection.
+     *
+     * If isRemote returns false, then this value MUST be false as well.
+     */
+    //readonly attribute boolean isSecure;
+    get isSecure() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: isSecure");
+        return true;
+    },
+
+
+    /** 
+     * Returns an address book card for the specified email address if found.
+     *
+     * If there are multiple cards with the given email address, this method will
+     * return one of these cards in an implementation-defined manner.
+     *
+     * Matching is performed in a case-insensitive manner.
+     *
+     * This method performs a synchronous operation. If the collection cannot do
+     * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
+     *
+     * @param  emailAddress The email address to find in any of the email address
+     *                      fields. If emailAddress is empty, the database won't
+     *                      be searched and the function will return as if no card
+     *                      was found.
+     * @return              An nsIAbCard if one was found, else returns NULL.
+     * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
+     */
+    //nsIAbCard cardForEmailAddress(in AUTF8String emailAddress);
+    cardForEmailAddress: function _cardForEmailAddress(emailAddress) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: cardForEmailAddress");
+        return null;
+        //		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
+
+    /**
+     * Returns an address book card for the specified property if found.
+     *
+     * If there are multiple cards with the given value for the property, this
+     * method will return one of these cards in an implementation-defined manner.
+     *
+     * This method performs a synchronous operation. If the collection cannot do
+     * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
+     *
+     * If the property is not natively a string, it can still be searched for
+     * using the string-encoded value of the property, e.g. "0". See
+     * nsIAbCard::getPropertyAsAUTF8String for more information. Empty values will
+     * return no match, to prevent spurious results.
+     *
+     * @param  aProperty      The property to look for.
+     * @param  aValue         The value to search for.
+     * @param  aCaseSensitive True if matching should be done case-sensitively.
+     * @result                An nsIAbCard if one was found, else returns NULL.
+     * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
+     */
+    //nsIAbCard getCardFromProperty(in string aProperty, in AUTF8String aValue,
+    //                              in boolean aCaseSensitive);
+    getCardFromProperty: function _cardForEmailAddress(aProperty, aValue, aCaseSensitive) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getCardFromProperty: aProperty:" + aProperty + ", aValue:" + aValue);
+        //throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+        return null
+    },
+
+
+    /**
+     * Returns all address book cards with a specific property matching value
+     *
+     * This function is almost identical to getCardFromProperty, with the
+     * exception of returning all cards rather than just the first.
+     *
+     * @param  aProperty      The property to look for.
+     * @param  aValue         The value to search for.
+     * @param  aCaseSensitive True if matching should be done case-sensitively.
+     * @result                A nsISimpleEnumerator that holds nsIAbCard
+     *                        instances.
+     */
+    //nsISimpleEnumerator getCardsFromProperty(in string aProperty,
+    //                                         in AUTF8String aValue,
+    //                                         in boolean aCaseSensitive);
+
+    getCardsFromProperty: function _getCardsFromProperty(aProperty, aValue, aCaseSensitive) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getCardsFromProperty");
+        var result = [];
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
+    },
+
+
+    /**
+     * The chrome URI to use for bringing up a dialog to edit this directory.
+     * When opening the dialog, use a JS argument of
+     * {selectedDirectory: thisdir} where thisdir is this directory that you just
+     * got the chrome URI from.
+     */
+    //readonly attribute ACString propertiesChromeURI;
+    get propertiesChromeURI() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get propertiesChromeURI 1");
+        if (this.isMailList) {
+            return "";
+        }
+        return "chrome://exchangecontacts/content/exchangeContactSettings.xul";
+    },
+
+    /**
+     * The description of the directory. If this directory is not a mailing list,
+     * then setting this attribute will send round a "DirName" update via
+     * nsIAddrBookSession.
+     */
+    //attribute AString dirName;
+    get dirName() {
+        if (this.isMailList) {
+            return this._dirName;
+        }
+
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get dirName");
+        return exchWebService.commonAbFunctions.getDescription(this.uuid);
+    },
+
+    set dirName(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set dirName");
+        if (this.isMailList) {
+            return; // Currently not allowed.
+        }
+
+        exchWebService.commonAbFunctions.setDescription(this.uuid.aValue);
+    },
+
+    // XXX This should really be replaced by a QI or something better
+    //readonly attribute long dirType;
+    get dirType() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get dirType");
+        return 0;
+    },
+
+    // eliminated a bit more.
+
+    // The filename for address books within this directory.
+    //readonly attribute ACString fileName;
+    get fileName() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get fileName");
+        return "filename";
+    },
+
+    // The URI of the address book
+    //readonly attribute ACString URI;
+    get URI() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get URI:"+this._URI);
+        return this._URI;
+    },
+
+    // The position of the directory on the display.
+    //readonly attribute long position;
+    get position() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get position");
+        return 2;
+    },
+
+    // will be used for LDAP replication
+    //attribute unsigned long lastModifiedDate;
+    get lastModifiedDate() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get lastModifiedDate");
+        return this._lastModifiedDate;
+    },
+
+    set lastModifiedDate(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set lastModifiedDate");
+        this._lastModifiedDate = aValue;
+    },
+
+    // Defines whether this directory is a mail
+    // list or not
+    //attribute boolean isMailList;
+    get isMailList() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get isMailList");
+        if (this._isMailList) {
+            return this._isMailList;
+        }
+
+        return false;
+    },
+
+    set isMailList(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set isMailList");
+        this._isMailList = aValue;
+    },
+
+    // Get the children directories
+    //readonly attribute nsISimpleEnumerator childNodes;
+    get childNodes() {
+        var result = [];
+
+        if (this.distLists.length > 0) {
+            for each(var distList in this.distLists) {
+                result.push(distList);
+            }
+        }
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
+    },
+
+    /**
+     * Get the cards associated with the directory. This will return the cards
+     * associated with the mailing lists too.
+     */
+    //readonly attribute nsISimpleEnumerator childCards;
+    get childCards() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: 1 get childCards:" + this.dirName + ", uri:" + this.URI);
+        for (var index in this.contacts) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: 2 get childCards:" + index + ":" + this.contacts[index].displayName);
+        }
+        return exchWebService.commonFunctions.CreateSimpleObjectEnumerator(this.contacts);
+    },
+
+    /**
+     * Returns true if this directory represents a query - i.e. the rdf resource
+     * was something like moz-abmdbdirectory://abook.mab?....
+     */
+    //readonly attribute boolean isQuery;
+    get isQuery() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get isQuery");
+        if (this._searchQuery) {
+            return true;
+        }
+
+        return false;
+    },
+
+    /**
+     * Initializes a directory, pointing to a particular
+     * URI
+     */
+    //void init(in string aURI);
+    init: function _init(aURI) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: init. aURI:" + aURI + "");
+
+        if (this._isInitialized) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '" + this.dirName + "' is allready initialized");
+
+            var tmpStr = aURI.substr(aURI.indexOf("://") + 3);
+            var params = exchWebService.commonAbFunctions.paramsToArray(tmpStr, "&");
+
+            if (aURI == this._URI) {
+                if (decodeURIComponent(params.id) == this.uuid) {
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '" + this.dirName + "' aURI unchanged, id is the same and changKey is different. Going to reset/reload.");
+
+                    // We could do this more clever by finding out the differences and only update those. 
+                    // But how deep will a distlist go and how many cards will be in a distlist.!!??
+                    // For now we clean this distlist and re add everything.
+
+                    // Remove cards.
+                    var oldList = this.contacts;
+                    this.contacts = {};
+                    for each(var contact in oldList) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '" + this.dirName + "' removed contact:" + contact.getProperty("DisplayName", ""));
+                        MailServices.ab.notifyDirectoryItemDeleted(this, contact);
+                        MailServices.ab.notifyDirectoryDeleted(this, contact);
+                    }
+
+                    // Remove distLists.
+                    var oldList = this.distLists;
+                    this.distLists = new Array();
+                    for each(var distList in oldList) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '" + this.dirName + "' removed distList:" + distList.dirName);
+                        MailServices.ab.notifyDirectoryDeleted(this, distList);
+                    }
+                }
+                else {
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '" + this.dirName + "' aURI unchanged but id is different. Not allowed. Going to do nothing.");
+                    return;
+                }
+            }
+            else {
+                exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: '" + this.dirName + "' aURI changed. Going to do nothing.");
+                return;
+            }
+        }
+
+        this._URI = aURI;
+
+        this._Schema = null;
+        this._UUID = "";
+        this._searchQuery = null;
+
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: this is a childdir:" + aURI);
+
+        if (aURI.indexOf("://") > -1) {
+            this._Schema = aURI.substr(0, aURI.indexOf("://"));
+
+            var tmpStr = aURI.substr(aURI.indexOf("://") + 3);
+
+            this._searchQuery = null;
+            if (tmpStr.indexOf("?") > -1) {
+                this._searchQuery = tmpStr.substr(tmpStr.indexOf("?") + 1);
+                tmpStr = tmpStr.substr(0, tmpStr.indexOf("?"));
+            }
+
+            var params = exchWebService.commonAbFunctions.paramsToArray(tmpStr, "&");
+
+            this._UUID = decodeURIComponent(params.id);
+            this._type = decodeURIComponent(params.type);
+
+            this.isMailList = true;
+
+            if (params.name) {
+                this._dirName = decodeURIComponent(params.name);
+            }
+            else {
+                this._dirName = null;
+            }
+
+            if (params.parentId) {
+                this.parentId = decodeURIComponent(params.parentId);
+            }
+            else {
+                this.parentId = null;
+            }
+
+            exchWebService.commonAbFunctions.logInfo("D: init: uuid:" + this.uuid + ", type:" + this.type + ", name:" + this.dirName);
+
+            if (this._searchQuery) {
+                var dirName = this._Schema + "://" + "id=" + encodeURIComponent(this._UUID) + "&name=" + encodeURIComponent(this.dirName) + "&parentId=" + this.parentId + "&type=" + this.type;
+
+                exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: this._searchQuery:" + this._searchQuery + ", dirName:" + dirName);
+
+
+                var dir = MailServices.ab.getDirectory(dirName);
+                if (dir) {
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Going to get children of '" + dirName + "'");
+
+                    this.contacts = exchWebService.commonAbFunctions.filterCardsOnQuery(this._searchQuery, dir.childCards);
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Got children of '" + dirName + "'");
+
+                    this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
+
+                    for each(var contact in this.contacts) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Adding sub child A '" + contact.displayName + "' to contacts. dirName:" + this.dirName);
+                        MailServices.ab.notifyDirectoryItemAdded(this, contact);
+                    }
+
+                    this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
+
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Going to get children of distList.");
+                    // Get contact in childNodes (distLists)
+                    var childNodes = dir.childNodes;
+                    while (childNodes.hasMoreElements()) {
+                        var childNode = childNodes.getNext();
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Going to get children of distList '" + childNode.dirName + "':'" + childNode.URI + "' dirName:" + this.dirName);
+                        var tmpDir = MailServices.ab.getDirectory(childNode.URI + "?" + this._searchQuery);
+                        var childContacts = tmpDir.childCards;
+                        while (childContacts.hasMoreElements()) {
+                            var contact = childContacts.getNext().QueryInterface(Ci.nsIAbCard);
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: ++ contact:" + contact);
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Adding sub child B '" + contact.localId + "':'" + contact.displayName + "' to contacts. dirName:" + this.dirName);
+                            this.contacts[contact.localId] = contact;
+                        }
+                    }
+                }
+                else {
+                    exchWebService.commonAbFunctions.logInfo("ERROR Folderdirectory '" + dirName + "' does not exist.");
+                }
+
+            }
+            else {
+                if (this.parentId) {
+                    this.prefs = Cc["@mozilla.org/preferences-service;1"]
+                        .getService(Ci.nsIPrefService)
+                        .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + this.parentId + ".");
+                }
+                else {
+                    this.prefs = Cc["@mozilla.org/preferences-service;1"]
+                        .getService(Ci.nsIPrefService)
+                        .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + this._UUID + ".");
+                }
+
+                this.loadDistListFromExchange();
+            }
+
+
+        }
+        else {
+            // ERROR
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: exchangeAbDistListDirectory.init: WE GOT TO A POINT WERE WE NEVER SHOULD GET TO.");
+        }
+
+        this._isInitialized = true;
+    },
+
+    // Deletes either a mailing list or a top
+    // level directory, which also updates the
+    // preferences
+    //void deleteDirectory(in nsIAbDirectory directory);
+    deleteDirectory: function _deleteDirectory(directory) {
+        // We cannot remove the root.
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: deleteDirectory this:" + this.URI + ", directory:" + directory.URI + "");
+
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: deleteDirectory uri:"+directory.URI+"");
+    },
+
+    // Check if directory contains card
+    // If the implementation is asynchronous the card
+    // may not yet have arrived. If it is in the process
+    // of obtaining cards the method will throw an
+    // NS_ERROR_NOT_AVAILABLE exception if the card
+    // cannot be found.
+    //boolean hasCard(in nsIAbCard cards);
+    hasCard: function _hasCard(cards) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: hasCard");
+        return false;
+    },
+
+
+    // Check if directory contains directory
+    //boolean hasDirectory(in nsIAbDirectory dir);
+    hasDirectory: function _hasDirectory(dir) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: hasDirectory");
+
+        return false;
+    },
+
+    /**
+     * Adds a card to the database.
+     *
+     * This card does not need to be of the same type as the database, e.g., one
+     * can add an nsIAbLDAPCard to an nsIAbMDBDirectory.
+     *
+     * @return "Real" card (eg nsIAbLDAPCard) that can be used for some
+     *         extra functions.
+     */
+    //nsIAbCard addCard(in nsIAbCard card);
+    addCard: function _addCard(card) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: addCard");
+        return null;
+    },
+
+    /**
+     * Modifies a card in the database to match that supplied.
+     */
+    //void modifyCard(in nsIAbCard modifiedCard);
+    modifyCard: function _modifyCard(modifiedCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: modifyCard");
+    },
+
+    /**
+     * Deletes the array of cards from the database.
+     *
+     * @param  aCards  The cards to delete from the database.
+     */
+    //void deleteCards(in nsIArray aCards);
+    deleteCards: function _deleteCards(aCards) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: deleteCards");
+    },
+
+    //void dropCard(in nsIAbCard card, in boolean needToCopyCard);
+    dropCard: function _dropCard(Card, needToCopyCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: dropCard");
+    },
+
+    /**
+     * Whether or not the directory should be searched when doing autocomplete,
+     * (currently by using GetChildCards); LDAP does not support this in online
+     * mode, so that should return false; additionally any other directory types
+     * that also do not support GetChildCards should return false.
+     *
+     * @param aIdentity  An optional parameter detailing the identity key (see
+     *                   nsIMsgAccountManager) that this autocomplete is being
+     *                   run against.
+     * @return           True if this directory should/can be used during
+     *                   local autocomplete.
+     */
+    //boolean useForAutocomplete(in ACString aIdentityKey);
+    useForAutocomplete: function _useForAutocomplete(aIdentityKey) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: useForAutocomplete");
+
+        return true;
+
+        //		return true;
+    },
+
+    /** 
+     * Does this directory support mailing lists? Note that in the case
+     * this directory is a mailing list and nested mailing lists are not
+     * supported, this will return false rather than true which the parent
+     * directory might.
+     */
+    //readonly attribute boolean supportsMailingLists;
+    get supportsMailingLists() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get supportsMailingLists");
+        return true;
+    },
+
+    /**
+     * This attribute serves two purposes
+     *  1. If this directory is not a mail list, directories are stored here
+     *  2. If it is a mail list card entries are stored here
+     *
+     * @note This is a *live* array and not a static copy
+     */
+    //attribute nsIMutableArray addressLists
+    get addressLists() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get addressLists");
+
+        return this._addressLists;
+    },
+
+    set addressLists(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set addressLists");
+        this._addressLists = aValue;
+    },
+
+    // Specific to a directory which stores mail lists
+
+    /**
+     * Creates a new mailing list in the directory. Currently only supported 
+     * for top-level directories.
+     *
+     * @param  list  The new mailing list to add.
+     * @return The mailing list directory added, which may have been modified.
+     */
+    //nsIAbDirectory addMailList(in nsIAbDirectory list);
+    addMailList: function _addMailList(list) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: addMailList");
+        return list;
+    },
+
+    /**
+     * Nick Name of the mailing list. This attribute is only really used when
+     * the nsIAbDirectory represents a mailing list.
+     */
+    //attribute AString listNickName;
+    get listNickName() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get listNickName");
+        return this._listNickName;
+    },
+
+    set listNickName(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set listNickName");
+        this._listNickName = aValue;
+    },
+
+    /**
+     * Description of the mailing list. This attribute is only really used when
+     * the nsIAbDirectory represents a mailing list.
+     */
+    //attribute AString description;
+    get description() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get description");
+        return this._description;
+    },
+
+    set description(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set description");
+        this._description = aValue;
+    },
+
+    /**
+     * Edits an existing mailing list (specified as listCard) into its parent
+     * directory. You should call this function on the resource with the same
+     * uri as the listCard.
+     *
+     * @param  listCard  A nsIAbCard version of the mailing list with the new
+     *                   values.
+     */
+    //void editMailListToDatabase(in nsIAbCard listCard);
+    editMailListToDatabase: function _editMailListToDatabase(listCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: editMailListToDatabase");
+    },
+
+    // Copies mail list properties from the srcList
+    //void copyMailList(in nsIAbDirectory srcList);
+    copyMailList: function _copyMailList(srcList) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: copyMailList");
+    },
+
+
+    /**
+     * Only creates a top level address book
+     * which is stored in the preferences
+     *
+     * Need to change to factory based approach
+     * to create new address books
+     *
+     * This method should become redundant or 
+     * be only associated with card folders
+     *
+     * The parameters are the same as for
+     * nsIAbManager::newAddressBook
+     */
+    //ACString createNewDirectory(in AString aDirName, in ACString aURI,
+    //                            in unsigned long aType, in ACString aPrefName);
+    createNewDirectory: function _createNewDirectory(aDirName, aURI, aType, aPrefName) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: createNewDirectory uuid:" + this.uuid + "");
+        return "createNewDirectory";
+    },
+
+
+    /* create a directory by passing the display name and address book uri */
+    //void createDirectoryByURI(in AString displayName, in ACString aURI);
+    createDirectoryByURI: function _createDirectoryByURI(displayName, aURI) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: createDirectoryByURI uuid:" + this.uuid + "");
+    },
+    /**
+     * The id of the directory used in prefs e.g. "ldap_2.servers.pab"
+     * Setting this will cause directoryPrefs to be updated.
+     */
+    //attribute ACString dirPrefId;
+    get dirPrefId() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: get dirPrefId: " + this.uuid);
+        return this._dirPrefId;
+    },
+
+    set dirPrefId(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: set dirPrefId");
+        this._dirPrefId = aValue;
+    },
+    /**
+     * @name  getXXXValue
+     *
+     * Helper functions to get different types of pref, but return a default
+     * value if a pref value was not obtained.
+     *
+     * @param aName         The name of the pref within the branch dirPrefId to
+     *                      get a value from.
+     *
+     * @param aDefaultValue The default value to return if getting the pref fails
+     *                      or the pref is not present.
+     *
+     * @return              The value of the pref or the default value.
+     *
+     * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
+     *                      be obtained (e.g. dirPrefId isn't set).
+     */
+    //@{
+    //long getIntValue(in string aName, in long aDefaultValue);
+    getIntValue: function _getIntValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getIntValue");
+        return aDefaultValue;
+    },
+
+    //boolean getBoolValue(in string aName, in boolean aDefaultValue);
+    getBoolValue: function _getBoolValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getBoolValue");
+        return aDefaultValue;
+    },
+
+    //ACString getStringValue(in string aName, in ACString aDefaultValue);
+    getStringValue: function _getStringValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getStringValue");
+        return aDefaultValue;
+    },
+
+    //AUTF8String getLocalizedStringValue(in string aName, in AUTF8String aDefaultValue);
+    getLocalizedStringValue: function _getLocalizedStringValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: getLocalizedStringValue");
+        return aDefaultValue;
+    },
+
+    //@}
+
+    /**
+     * The following attributes are read from an nsIAbDirectory via the above methods:
+     *
+     * HidesRecipients (Boolean)
+     *    If true, and this nsIAbDirectory is a mailing list, then when sending mail to
+     *    this list, recipients addresses will be hidden from one another by sending
+     *    via BCC.
+     */
+
+    /**
+     * @name  setXXXValue
+     *
+     * Helper functions to set different types of pref values.
+     *
+     * @param aName         The name of the pref within the branch dirPrefId to
+     *                      get a value from.
+     *
+     * @param aValue        The value to set the pref to.
+     *
+     * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
+     *                      be obtained (e.g. dirPrefId isn't set).
+     */
+    //@{
+    //void setIntValue(in string aName, in long aValue);
+    setIntValue: function _setIntValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setIntValue");
+    },
+
+    //void setBoolValue(in string aName, in boolean aValue);
+    setBoolValue: function _setBoolValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setBoolValue");
+    },
+
+    //void setStringValue(in string aName, in ACString aValue);
+    setStringValue: function _setStringValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setStringValue");
+    },
+
+    //void setLocalizedStringValue(in string aName, in AUTF8String aValue);
+    setLocalizedStringValue: function _setLocalizedStringValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: setLocalizedStringValue");
+    },
+
+    //@}
+
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        //if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
+
+        this.loadBalancer.addToQueue({
+            calendar: this,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+
+    get name() {
+        return this.dirName;
+    },
+
+    get user() {
+        var username = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+        if (username.indexOf("@") > -1) {
+            return username;
+        }
+        else {
+            if (this.domain == "") {
+                return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+            }
+            else {
+                return this.domain + "\\" + exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+            }
+        }
+    },
+
+    set user(value) {
+        if (value.indexOf("\\") > -1) {
+            this.domain = value.substr(0, value.indexOf("\\"));
+            this.prefs.setCharPref("user", value.substr(value.indexOf("\\") + 1));
+        }
+        else {
+            this.prefs.setCharPref("user", value);
+        }
+    },
+
+    get domain() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "domain", "");
+    },
+
+    set domain(value) {
+        return this.prefs.setCharPref("domain", value);
+    },
+
+    get mailbox() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "mailbox", "");
+    },
+
+    get serverUrl() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "server", "");
+    },
+
+    get folderBase() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderbase", "contacts");
+    },
+
+    get folderPath() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderpath", "/");
+    },
+
+    get folderID() {
+        if (this.isMailList) {
+            return this.id;
+        }
+
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderid", null);
+    },
+
+    set folderID(aValue) {
+        if (this.isMailList) {
+            // Cannot be changed for a distlist.
+            return;
+        }
+
+        this.prefs.setCharPref("folderid", aValue);
+    },
+
+    get changeKey() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "changekey", null);
+    },
+
+    set changeKey(aValue) {
+        this.prefs.setCharPref("changekey", aValue);
+    },
+
+    loadDistListFromExchange: function _loadDistListFromExchange() {
+        if (this.isLoading) {
+            return;
+        }
+
+        exchWebService.commonAbFunctions.logInfo("loadDistListFromExchange:" + this.dirName);
+
+        this.isLoading = true;
+
+        var self = this;
+
+        // changekey set to null because the same dislist can have different changeKey when it is also added as a member of another distlist.
+
+        switch (this._type) {
+        case "PrivateDL":
+            this.addToQueue(erExpandDLRequest, {
+                    user: this.user,
+                    serverUrl: this.serverUrl,
+                    actionStart: Date.now(),
+                    itemId: {
+                        id: this.id
+                    }
+                },
+                function (erExpandDLRequest, aMailboxes) {
+                    self.distListExpandOk(erExpandDLRequest, aMailboxes);
+                },
+                function (erExpandDLRequest, aCode, aMsg) {
+                    self.distListExpandError(erExpandDLRequest, aCode, aMsg);
+                },
+                null);
+            break;
+        case "PublicDL":
+            var emailAddress = this.id.substr(this.id.indexOf(":") + 1);
+            this.addToQueue(erExpandDLRequest, {
+                    user: this.user,
+                    serverUrl: this.serverUrl,
+                    actionStart: Date.now(),
+                    emailAddress: emailAddress
+                },
+                function (erExpandDLRequest, aMailboxes) {
+                    self.distListExpandOk(erExpandDLRequest, aMailboxes);
+                },
+                function (erExpandDLRequest, aCode, aMsg) {
+                    self.distListExpandError(erExpandDLRequest, aCode, aMsg);
+                },
+                null);
+            break;
+        }
+    },
+
+    ecUpdateCard: function _ecUpdateCard(contact) {
+        var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+            .createInstance(Ci.mivExchangeAbCard);
+        newCard.convertExchangeContactToCard(this, contact);
+        newCard.setProperty("exchangeUser", this.user);
+        newCard.setProperty("exchangeServerUrl", this.serverUrl);
+        this.updateList(newCard);
+    },
+
+    updateList: function _updateList(newCard) {
+        if (!newCard) {
+            return;
+        }
+
+        if (this.contacts[newCard.localId]) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory:  == We allready know this card. Lets see what has changed:" + newCard.localId);
+
+            // Check which properties changed.
+            for (var cardProperty in fixIterator(newCard.properties, Ci.nsIProperty)) {
+                if (cardProperty.name) {
+                    try {
+                        var oldValue = this.contacts[newCard.localId].getProperty(cardProperty.name, "");
+                        var newValue = cardProperty.value;
+                        if (oldValue != newValue) {
+                            // And existing property has changed.
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: --Property Changed name:" + cardProperty.name + ", oldvalue:" + oldValue + ", newValue:" + newValue);
+                            this.contacts[newCard.localId].setProperty(cardProperty.name, newValue);
+                            MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
+                                cardProperty.name,
+                                oldValue,
+                                newValue);
+                        }
+                    }
+                    catch (err) {
+                        // We have a new property which was not set in the previous state. Add it
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory:  == Err:" + err);
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: --Property added name:" + cardProperty.name + ", value:" + cardProperty.value);
+                        this.contacts[newCard.localId].setProperty(cardProperty.name, cardProperty.value);
+                        MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
+                            cardProperty.name,
+                            null,
+                            newValue);
+                    }
+                }
+            }
+
+            // We check if properties were removed.
+            for (var cardProperty in fixIterator(this.contacts[newCard.localId].properties, Ci.nsIProperty)) {
+                if (cardProperty.name) {
+                    var oldValue = cardProperty.value;
+                    try {
+                        var newValue = newCard.getProperty(cardProperty.name, "");
+
+                        if (oldValue != newValue) {
+                            // If we get here something went wrong before this call.
+                        }
+                    }
+                    catch (err) {
+                        // Property is not available in new state. We have to remove it.
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: --Property removed name:" + cardProperty.name + ", value:" + cardProperty.value);
+                        this.contacts[newCard.localId].deleteProperty(cardProperty.name);
+                        MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
+                            cardProperty.name,
+                            oldValue,
+                            null);
+                    }
+                }
+            }
+        }
+        else {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory:  || This card is new. We do not know it yet.");
+            this.contacts[newCard.localId] = newCard;
+            MailServices.ab.notifyDirectoryItemAdded(this, newCard);
+        }
+
+        // This will eat performance when the list is long.
+        this._addressLists.clear();
+        for each(var contact in this.contacts) {
+            this._addressLists.appendElement(contact, false);
+        }
+
+        exchWebService.commonAbFunctions.logInfo(this.uuid + ": newCard.localId:" + newCard.localId);
+    },
+
+    convertExchangeMailbox: function _convertExchangeMailbox(aMailbox) {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: convertExchangeMailbox: Mailboxes:"+aMailbox.toString());
+
+        var result = {
+            name: aMailbox.getTagValue("t:Name"),
+            emailAddress: aMailbox.getTagValue("t:EmailAddress"),
+            routingType: aMailbox.getTagValue("t:RoutingType"),
+            mailboxType: aMailbox.getTagValue("t:MailboxType"),
+            mailbox: aMailbox
+        };
+
+        if (aMailbox.getTags("t:ItemId").length > 0) {
+            result.itemId = {
+                id: aMailbox.getAttributeByTag("t:ItemId", "Id", null),
+                changeKey: aMailbox.getAttributeByTag("t:ItemId", "ChangeKey", null)
+            };
+        }
+
+        return result;
+    },
+
+    distListExpandOk: function _contactsFoundOk(erExpandDLRequest, aMailboxes) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: distListExpandOk: Mailboxes:" + aMailboxes.length);
+
+        if (aMailboxes.length > 0) {
+            var aStoreContacts = new Array();
+            var aADContacts = new Array();
+            this.distLists = new Array()
+            for each(var mailbox in aMailboxes) {
+                var calMailbox = this.convertExchangeMailbox(mailbox);
+
+                switch (calMailbox.mailboxType) {
+                case "Contact": // A normal in store or AD contact
+                    exchWebService.commonAbFunctions.logInfo("distListLoadOk: new Contact:" + calMailbox.name);
+                    if ((calMailbox.itemId) && (calMailbox.itemId.id)) {
+                        // It is a private store contact.
+                        aStoreContacts.push({
+                            Id: calMailbox.itemId.id
+                        });
+                    }
+                    break;
+                case "PrivateDL": // Private Store distribution list.
+                    if ((calMailbox.itemId) && (calMailbox.itemId.id)) {
+                        // It is a private store distList.
+                        exchWebService.commonAbFunctions.logInfo("distListLoadOk: new Private distList:" + calMailbox.name + " in dir:" + this.dirName);
+
+                        var dirName = this.childNodeURI + "id=" + encodeURIComponent(calMailbox.itemId.id) + "&name=" + encodeURIComponent(calMailbox.name) + "&parentId=" + this.parentId + "&type=PrivateDL";
+
+                        try {
+                            var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                                .createInstance(Ci.mivExchangeAbCard);
+                            newCard.convertExchangeDistListToCard(this, mailbox, dirName);
+                            this.updateList(newCard);
+                            var dir = MailServices.ab.getDirectory(dirName);
+                            if (dir) {
+                                this.distLists.push(dir);
+                                MailServices.ab.notifyDirectoryItemAdded(this, dir);
+                            }
+                        }
+                        catch (err) {
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Error adding dislist '" + dirName + "' Error:" + err);
+                        }
+                    }
+                    break;
+                case "PublicDL": // An Active Directory distribution list.
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: distListExpandOk: new Public distList:" + calMailbox.name + " in GAL of " + this.serverUrl);
+
+                    var dirName = this.childNodeURI + "id=" + encodeURIComponent(calMailbox.routingType + ":" + calMailbox.emailAddress) + "&name=" + encodeURIComponent(calMailbox.name) + "&parentId=" + this.parentId + "&type=PublicDL";
+
+                    // Make a card from the contact details.
+                    var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                        .createInstance(Ci.mivExchangeAbCard);
+                    newCard.convertExchangeDistListToCard(this, mailbox, dirName);
+                    this.updateList(newCard);
+                    var dir = MailServices.ab.getDirectory(dirName);
+                    if (dir) {
+                        this.distLists.push(dir);
+                        MailServices.ab.notifyDirectoryItemAdded(this, dir);
+                    }
+
+                    break;
+                case "OneOff":
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: distListExpandOk: new OneOff Contact:" + calMailbox.name + " in GAL of " + this.serverUrl);
+
+                    // Make a card from the contact details.
+                    var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                        .createInstance(Ci.mivExchangeAbCard);
+                    newCard.convertExchangeContactToCard(this, mailbox, calMailbox.mailboxType);
+                    newCard.setProperty("exchangeUser", this.user);
+                    newCard.setProperty("exchangeServerUrl", this.serverUrl);
+                    this.updateList(newCard);
+
+                    break;
+                case "Mailbox": // An Active Directory mailbox
+                    exchWebService.commonAbFunctions.logInfo("distListExpandOk: new Mailbox:" + calMailbox.name);
+                    aADContacts.push(calMailbox);
+                    break;
+                default:
+                    exchWebService.commonAbFunctions.logInfo("distListExpandOk: Unknown mailboxtype:" + calMailbox.mailboxType);
+                }
+            }
+
+            var self = this;
+            if (aStoreContacts.length > 0) {
+                this.addToQueue(erGetContactsRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        folderBase: this.folderBase,
+                        serverUrl: this.serverUrl,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        ids: aStoreContacts,
+                        actionStart: Date.now()
+                    },
+                    function (erGetContactsRequest, aContacts) {
+                        self.contactsLoadOk(erGetContactsRequest, aContacts);
+                    },
+                    function (erGetContactsRequest, aCode, aMsg) {
+                        self.distListExpandError(erGetContactsRequest, aCode, aMsg);
+                    },
+                    null);
+            }
+
+            for (var index in aADContacts) {
+                this.addToQueue(erResolveNames, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        folderBase: this.folderBase,
+                        serverUrl: this.serverUrl,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        ids: aADContacts[index],
+                        actionStart: Date.now()
+                    },
+                    function (erResolveNames, aResolutions) {
+                        self.resolveNamesOk(erResolveNames, aResolutions);
+                    },
+                    function (erResolveNames, aCode, aMsg) {
+                        self.distListExpandError(erResolveNames, aCode, aMsg);
+                    },
+                    null);
+            }
+        }
+
+    },
+
+    distListExpandError: function _distListExpandError(erExpandDLRequest, aCode, aMsg) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: distListExpandError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.isLoading = false;
+
+        if ((aCode == 0) && (aMsg == "ErrorNameResolutionNoResults")) {
+            // Name could not be resolved we use the mailbox element instead of the contacts.
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: Could not resolve mailbox. Going to use mailbox details for card");
+            this.ecUpdateCard(erExpandDLRequest.ids.mailbox);
+        }
+    },
+
+    contactsLoadOk: function _contactsLoadOk(erGetContactsRequest, aContacts) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: contactsLoadOk: contacts:" + aContacts.length);
+
+        for each(var contact in aContacts) {
+            //exchWebService.commonAbFunctions.logInfo("Contact card:"+contact.toString(),2);
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: new childCards:" + contact.getTagValue("t:DisplayName"));
+            this.ecUpdateCard(contact);
+
+        }
+
+        this.isLoading = false;
+
+    },
+
+    resolveNamesOk: function _resolveNamesOk(erResolveNames, aResolutions) {
+
+        exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: resolveNamesOk: contacts:" + aResolutions.length);
+
+        for each(var resolution in aResolutions) {
+            exchWebService.commonAbFunctions.logInfo("resolution card:" + resolution.toString());
+
+            var mailbox = resolution.getTags("t:Mailbox");
+            exchWebService.commonAbFunctions.logInfo("resolution mailbox card:" + mailbox[0].toString());
+            var contact = resolution.getTags("t:Contact");
+            if (contact.length > 0) {
+                exchWebService.commonAbFunctions.logInfo("resolution contact card:" + contact[0].toString());
+            }
+            var calMailbox;
+            if (mailbox.length > 0) {
+                calMailbox = this.convertExchangeMailbox(mailbox[0]);
+
+                switch (calMailbox.mailboxType) {
+                case "PrivateDL": // An Contact folder distribution list.
+                    try {
+                        var dirName = this.childNodeURI + "id=" + encodeURIComponent(calMailbox.itemId.id) + "&name=" + encodeURIComponent(calMailbox.name) + "&parentId=" + this.parentId + "&type=PrivateDL";
+
+                        var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                            .createInstance(Ci.mivExchangeAbCard);
+                        newCard.convertExchangeDistListToCard(this, mailbox[0], dirName);
+                        this.updateList(newCard);
+                        var dir = MailServices.ab.getDirectory(dirName);
+                        if (dir) {
+                            this.distLists.push(dir);
+                            MailServices.ab.notifyDirectoryItemAdded(this, dir);
+                        }
+                    }
+                    catch (err) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Foutje:" + err);
+                    }
+                    break;
+                case "PublicDL": // An Active Directory distribution list.
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Public distList:" + calMailbox.name + " in GAL of " + this.serverUrl);
+
+                    var dirName = this.childNodeURI + "id=" + encodeURIComponent(calMailbox.routingType + ":" + calMailbox.emailAddress) + "&name=" + encodeURIComponent(calMailbox.name) + "&parentId=" + this.parentId + "&type=PublicDL";
+
+                    // Make a card from the contact details.
+                    var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                        .createInstance(Ci.mivExchangeAbCard);
+                    newCard.convertExchangeDistListToCard(this, contact[0], dirName);
+                    this.updateList(newCard);
+                    var dir = MailServices.ab.getDirectory(dirName);
+                    if (dir) {
+                        this.distLists.push(dir);
+                        MailServices.ab.notifyDirectoryItemAdded(this, dir);
+                    }
+
+                    break;
+                case "Contact":
+                case "Mailbox": // An Active Directory Contact Mailbox.
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Mailbox Contact:" + calMailbox.name + " in GAL of " + this.serverUrl);
+
+                    // Make a card from the contact details.
+                    var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                        .createInstance(Ci.mivExchangeAbCard);
+                    newCard.convertExchangeContactToCard(this, contact[0], calMailbox.mailboxType);
+                    newCard.setProperty("exchangeUser", this.user);
+                    newCard.setProperty("exchangeServerUrl", this.serverUrl);
+                    this.updateList(newCard);
+
+                    break;
+                default:
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Unknown mailboxtype:" + calMailbox.mailboxType);
+                }
+            }
+        }
+
+        this.isLoading = false;
+
+    },
 
 };
 
 
 function NSGetFactory(cid) {
 
-	exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: NSGetFactory for exchangeAbDistListDirectory 1");
-	try {
-		if (!NSGetFactory.exchWebService_ab5) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: NSGetFactory for exchangeAbDistListDirectory 1a");
+    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: NSGetFactory for exchangeAbDistListDirectory 1");
+    try {
+        if (!NSGetFactory.exchWebService_ab5) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: NSGetFactory for exchangeAbDistListDirectory 1a");
 
-			NSGetFactory.exchWebService_ab5 = XPCOMUtils.generateNSGetFactory([exchangeAbDistListDirectory]);
-	}
+            NSGetFactory.exchWebService_ab5 = XPCOMUtils.generateNSGetFactory([exchangeAbDistListDirectory]);
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		exchWebService.commonAbFunctions.logInfo(e);
-		throw e;
-	}
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        exchWebService.commonAbFunctions.logInfo(e);
+        throw e;
+    }
 
-	exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: NSGetFactory for exchangeAbDistListDirectory 2");
-	return NSGetFactory.exchWebService_ab5(cid);
+    exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: NSGetFactory for exchangeAbDistListDirectory 2");
+    return NSGetFactory.exchWebService_ab5(cid);
 }
 
 exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: init.");
-
diff --git a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js b/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
index 69f9077a..75b895ff 100644
--- a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
+++ b/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
@@ -45,8 +45,8 @@ Cu.import("resource://exchangecalendar/erResolveNames.js");
 
 Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 
-const nsIAP = Ci.nsIActivityProcess;  
-const nsIAE = Ci.nsIActivityEvent;  
+const nsIAP = Ci.nsIActivityProcess;
+const nsIAE = Ci.nsIActivityEvent;
 const nsIAM = Ci.nsIActivityManager;
 
 
@@ -56,1488 +56,1452 @@ const nsIAM = Ci.nsIActivityManager;
 //
 
 function exchangeAbFolderDirectory() {
-	exchWebService.commonAbFunctions.logInfo("new exchangeAbFolderDirectory");
+    exchWebService.commonAbFunctions.logInfo("new exchangeAbFolderDirectory");
 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer);  
+    this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer);
 
-	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-			.getService(Ci.mivExchangeStatistics);
+    this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+        .getService(Ci.mivExchangeStatistics);
 
-	this._isRoot = true;
+    this._isRoot = true;
 
-	this._searchQuery = null;
-	this._UUID = "";
-	this._type = "unknown";
-	this._schema = null;
+    this._searchQuery = null;
+    this._UUID = "";
+    this._type = "unknown";
+    this._schema = null;
 
-	this.prefs = null;
-	this.isLoading = false;
-	this.findContactsRequest = null;
-	this.getContactsRequest = null;
+    this.prefs = null;
+    this.isLoading = false;
+    this.findContactsRequest = null;
+    this.getContactsRequest = null;
 
-	this.pollTimer = Cc["@mozilla.org/timer;1"]
-					.createInstance(Ci.nsITimer);
+    this.pollTimer = Cc["@mozilla.org/timer;1"]
+        .createInstance(Ci.nsITimer);
 
-	this.contacts = {};
-	this.distLists = new Array();
-	this.childDirs = {};
+    this.contacts = {};
+    this.distLists = new Array();
+    this.childDirs = {};
 
-	this.syncState = null;
-	this.weAreSyncing = false;
+    this.syncState = null;
+    this.weAreSyncing = false;
 
-	this._isInitialized = false;
+    this._isInitialized = false;
 
-	this.childNodeURI = "exchWebService-distList-directory://";
+    this.childNodeURI = "exchWebService-distList-directory://";
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService); 
+    this.observerService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
 
-	if (Cc["@mozilla.org/activity-manager;1"]) {
-		this.activityManager = Cc["@mozilla.org/activity-manager;1"].getService(nsIAM);  
-	}
+    if (Cc["@mozilla.org/activity-manager;1"]) {
+        this.activityManager = Cc["@mozilla.org/activity-manager;1"].getService(nsIAM);
+    }
 }
 
 exchangeAbFolderDirectory.prototype = {
 
-	classID: components.ID("{5963e917-bc68-4b68-b704-65538c81a628}"),
-	contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-contactFolder-directory",
-	classDescription: "Exchange 2007/2010 Contacts Folder directory",
-
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	QueryInterface: XPCOMUtils.generateQI([Ci,exchangeAbFolderDirectory,
-						Ci.nsIAbDirectory,
-						Ci.nsIAbCollection,
-						Ci.nsIAbItem,
-						Ci.nsISupports]),
-
-  /**
-   * A universally-unique identifier for this item.
-   *
-   * If this item cannot be associated with a UUID for some reason, it MUST
-   * return the empty string. The empty string MUST NOT be a valid UUID for any
-   * item. Under no circumstances may this function throw an error.
-   *
-   * It is STRONGLY RECOMMENDED that implementations guarantee that this UUID
-   * will not change between two different sessions of the application and that,
-   * if this item is deleted, the UUID will not be reused.
-   *
-   * The format of the UUID for a generic nsIAbItem is purposefully left
-   * undefined, although any item contained by an nsIAbDirectory SHOULD use
-   * nsIAbManager::generateUUID to generate the UUID.
-   */
-  //readonly attribute AUTF8String uuid;
-	get uuid()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: uuid\n");
-		if (this._UUID) {
-			return this._UUID;
-		}
-
-		return "";
-	},
-
-	get id()
-	{
-		return this.uuid;
-	},
-
-	get type()
-	{
-		return this._type;
-	},
-
-  /**
-   * @{
-   * These constants reflect the possible values of the
-   * mail.addr_book.lastnamefirst preferences. They are intended to be used in
-   * generateName, defined below.
-   */
-   //const unsigned long GENERATE_DISPLAY_NAME = 0;
-   //const unsigned long GENERATE_LAST_FIRST_ORDER = 1;
-   //const unsigned long GENERATE_FIRST_LAST_ORDER = 2;
-   /** @} */
-
-  /** 
-   * Generate a name from the item for display purposes.
-   *
-   * If this item is an nsIAbCard, then it will use the aGenerateFormat option
-   * to determine the string to return.
-   * If this item is not an nsIAbCard, then the aGenerateFormat option may be
-   * ignored, and the displayName of the item returned.
-   *
-   * @param  aGenerateFormat The format to generate as per the GENERATE_*
-   *                         constants above.
-   * @param  aBundle         An optional parameter that is a pointer to a string
-   *                         bundle that holds:
-   *           chrome://messenger/locale/addressbook/addressBook.properties
-   *                         If this bundle is not supplied, then the function
-   *                         will obtain the bundle itself. If cached by the
-   *                         caller and supplied to this function, then
-   *                         performance will be improved over many calls.
-   * @return                 A string containing the generated name.
-   */
-  //AString generateName(in long aGenerateFormat,
-  //                     [optional] in nsIStringBundle aBundle);
-	generateName: function _generateName(aGenerateFormat, aBundle)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: generateName\n");
-		return "generateName";
-	},
-
-  /**
-   * Generate a formatted email address from the card, that can be used for
-   * sending emails.
-   *
-   * @param  aExpandList     If this card is a list, and this parameter is set
-   *                         to true, then the list will be expanded to include
-   *                         the emails of the cards within the list.
-   * @param  aGroupMailLists If this card (or the items within this card) is a
-   *                         list, and this is set to true, then the list will
-   *                         be expanded in the RFC 2822 group format
-   *                         "displayname : email1 ; email2 ; etc".
-   * @param  aHeaderParser   An optional parameter pointing to the
-   *                         nsIMsgHeaderParser service. If this is not supplied
-   *                         the function will obtain the service itself. If
-   *                         cached by the called and supplied to this function,
-   *                         then performance will be improved over many calls.
-   * @return                 A string containing a comma-separated list of
-   *                         formatted addresses.
-   */
-  //AString generateFormattedEmail(in boolean aExpandList,
-  //                               in boolean aAsGroupMailLists,
-  //                               [optional] in nsIMsgHeaderParser aHeaderParser);
-	generateFormattedEmail: function _generateFormattedEmail( aExpandList, aAsGroupMailLists, aHeaderParser)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: generateFormattedEmail\n");
-		return "";
-	},
-
-  /**
-   * Returns true if this collection is read-only.
-   */
-  //readonly attribute boolean readOnly;
-	get readOnly()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: readOnly\n");
-		return true;
-	},
-
-  /**
-   * Returns true if this collection is accessed over a network connection.
-   */
-  //readonly attribute boolean isRemote;
-	get isRemote()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: isRemote\n");
-		return true;
-	},
-
-
-  /**
-   * Returns true if this collection is accessed over a secure connection.
-   *
-   * If isRemote returns false, then this value MUST be false as well.
-   */
-  //readonly attribute boolean isSecure;
-	get isSecure()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: isSecure\n");
-		return true;
-	},
-
-
-  /** 
-   * Returns an address book card for the specified email address if found.
-   *
-   * If there are multiple cards with the given email address, this method will
-   * return one of these cards in an implementation-defined manner.
-   *
-   * Matching is performed in a case-insensitive manner.
-   *
-   * This method performs a synchronous operation. If the collection cannot do
-   * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
-   *
-   * @param  emailAddress The email address to find in any of the email address
-   *                      fields. If emailAddress is empty, the database won't
-   *                      be searched and the function will return as if no card
-   *                      was found.
-   * @return              An nsIAbCard if one was found, else returns NULL.
-   * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
-   */
-  //nsIAbCard cardForEmailAddress(in AUTF8String emailAddress);
-	cardForEmailAddress: function _cardForEmailAddress(emailAddress)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: cardForEmailAddress");
-		return null;
-//		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
-
-  /**
-   * Returns an address book card for the specified property if found.
-   *
-   * If there are multiple cards with the given value for the property, this
-   * method will return one of these cards in an implementation-defined manner.
-   *
-   * This method performs a synchronous operation. If the collection cannot do
-   * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
-   *
-   * If the property is not natively a string, it can still be searched for
-   * using the string-encoded value of the property, e.g. "0". See
-   * nsIAbCard::getPropertyAsAUTF8String for more information. Empty values will
-   * return no match, to prevent spurious results.
-   *
-   * @param  aProperty      The property to look for.
-   * @param  aValue         The value to search for.
-   * @param  aCaseSensitive True if matching should be done case-sensitively.
-   * @result                An nsIAbCard if one was found, else returns NULL.
-   * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
-   */
-  //nsIAbCard getCardFromProperty(in string aProperty, in AUTF8String aValue,
-  //                              in boolean aCaseSensitive);
-	getCardFromProperty: function _cardForEmailAddress(aProperty, aValue, aCaseSensitive)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getCardFromProperty: aProperty:"+aProperty+", aValue:"+aValue);
-		//throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-		return null;
-	},
-
-
-  /**
-   * Returns all address book cards with a specific property matching value
-   *
-   * This function is almost identical to getCardFromProperty, with the
-   * exception of returning all cards rather than just the first.
-   *
-   * @param  aProperty      The property to look for.
-   * @param  aValue         The value to search for.
-   * @param  aCaseSensitive True if matching should be done case-sensitively.
-   * @result                A nsISimpleEnumerator that holds nsIAbCard
-   *                        instances.
-   */
-  //nsISimpleEnumerator getCardsFromProperty(in string aProperty,
-  //                                         in AUTF8String aValue,
-  //                                         in boolean aCaseSensitive);
-
-	getCardsFromProperty: function _getCardsFromProperty(aProperty, aValue, aCaseSensitive)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getCardsFromProperty");
-		var result = [];
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
-	},
-
-
-  /**
-   * The chrome URI to use for bringing up a dialog to edit this directory.
-   * When opening the dialog, use a JS argument of
-   * {selectedDirectory: thisdir} where thisdir is this directory that you just
-   * got the chrome URI from.
-   */
-  //readonly attribute ACString propertiesChromeURI;
-	get propertiesChromeURI()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get propertiesChromeURI 1");
-		return "chrome://exchangecontacts/content/exchangeContactSettings.xul";
-	},
-
-  /**
-   * The description of the directory. If this directory is not a mailing list,
-   * then setting this attribute will send round a "DirName" update via
-   * nsIAddrBookSession.
-   */
-  //attribute AString dirName;
-	get dirName()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get dirName\n");
-		var result = exchWebService.commonAbFunctions.getDescription(this.uuid);
-		if (this.useGAL) {
-			result = result + " (+GAL)";
-		}
-		return result;
-	},
-
-	set dirName(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set dirName\n");
-
-		exchWebService.commonAbFunctions.setDescription(this.uuid. aValue);
-	},
-
-  // XXX This should really be replaced by a QI or something better
-  //readonly attribute long dirType;
-	get dirType()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get dirType\n");
-		return 2;
-	},
-
-  // eliminated a bit more.
-
-  // The filename for address books within this directory.
-  //readonly attribute ACString fileName;
-	get fileName()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get fileName\n");
-		return "filename";
-	},
-
-  // The URI of the address book
-  //readonly attribute ACString URI;
-	get URI()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get URI:"+this._URI);
-		return this._URI;
-	},
-
-  // The position of the directory on the display.
-  //readonly attribute long position;
-	get position()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get position\n");
-		return 2;
-	},
-
-  // will be used for LDAP replication
-  //attribute unsigned long lastModifiedDate;
-	get lastModifiedDate()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get lastModifiedDate\n");
-		return this._lastModifiedDate;
-	},
-
-	set lastModifiedDate(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set lastModifiedDate\n");
-		this._lastModifiedDate = aValue;
-	},
-
-  // Defines whether this directory is a mail
-  // list or not
-  //attribute boolean isMailList;
-	get isMailList()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get isMailList\n");
-		if (this._isMailList) {
-			return this._isMailList;
-		}
-
-		return false;
-	},
-
-	set isMailList(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set isMailList\n");
-		this._isMailList = aValue;
-	},
-
-  // Get the children directories
-  //readonly attribute nsISimpleEnumerator childNodes;
-	get childNodes()
-	{
-		var result = [];
-
-		if (this.distLists.length > 0) {
-			for each(var distList in this.distLists) {
-				result.push(distList);
-			}
-		}
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
-	},
-
-  /**
-   * Get the cards associated with the directory. This will return the cards
-   * associated with the mailing lists too.
-   */
-  //readonly attribute nsISimpleEnumerator childCards;
-	get childCards()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get childCards:"+ this.dirName+", uri:"+this.URI);
-		return exchWebService.commonFunctions.CreateSimpleObjectEnumerator(this.contacts);
-	},
-
-  /**
-   * Returns true if this directory represents a query - i.e. the rdf resource
-   * was something like moz-abmdbdirectory://abook.mab?....
-   */
-  //readonly attribute boolean isQuery;
-	get isQuery()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get isQuery");
-		if (this._searchQuery) {
-			return true;
-		}
-
-		return false;
-	},
-
-	get searchQuery()
-	{
-		return this._searchQuery;
-	},
-
-	searchGAL: function _searchGAL(aQuery)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL: Going to search Global Address List also for url:"+this.serverUrl);
-		//(PrimaryEmail,c,wezel)(DisplayName,c,wezel)(FirstName,c,wezel)(LastName,c,wezel)
-
-		var wordToSearch;
-		if (aQuery.indexOf("(PrimaryEmail,") > -1) {
-			wordToSearch = aQuery.substr(aQuery.indexOf("(PrimaryEmail,")+14);
-		}
-
-		if ((!wordToSearch) && (aQuery.indexOf("(DisplayName,") > -1)) {
-			wordToSearch = aQuery.substr(aQuery.indexOf("(DisplayName,")+13);
-		}
-
-		if ((!wordToSearch) && (aQuery.indexOf("(FirstName,") > -1)) {
-			wordToSearch = aQuery.substr(aQuery.indexOf("(FirstName,")+11);
-		}
-
-		if ((!wordToSearch) && (aQuery.indexOf("(LastName,") > -1)) {
-			wordToSearch = aQuery.substr(aQuery.indexOf("(LastName,")+10);
-		}
-
-		if (!wordToSearch) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL: Could not determine word to search for.");
-		}
-
-		wordToSearch = wordToSearch.substr(wordToSearch.indexOf(",")+1);
-		wordToSearch = wordToSearch.substr(0, wordToSearch.indexOf(")"));
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL 3: Going to search the Global Address List with the word '"+wordToSearch+"'.");
-
-		// Launch the query for exchange
-
-		var self = this;
-
-		this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
-
-		this.addToQueue( erResolveNames,
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 folderBase: this.folderBase,
-					 serverUrl: this.serverUrl,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 ids: { name: decodeURI(wordToSearch) },
-					 searchScope: "ActiveDirectory",
- 					 GALQuery: true,
-			 		 actionStart: Date.now()},
-					function(erResolveNames, aResolutions) { self.resolveNamesOk(erResolveNames, aResolutions);}, 
-					function(erResolveNames, aCode, aMsg) { self.resolveNamesError(erResolveNames, aCode, aMsg);},
-					null);
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL 4: Send request for the Global Address List with the word '"+wordToSearch+"'.");
-	},
-
-	convertExchangeMailbox: function _convertExchangeMailbox(aMailbox)
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: convertExchangeMailbox: Mailboxes:"+aMailbox.toString());
-		
-		var result = {
-			name: aMailbox.getTagValue("t:Name"),
-			emailAddress: aMailbox.getTagValue("t:EmailAddress"),
-			routingType: aMailbox.getTagValue("t:RoutingType"),
-			mailboxType: aMailbox.getTagValue("t:MailboxType"),
-			mailbox: aMailbox
-		};
-
-		if (aMailbox.getTags("t:ItemId").length > 0) {
-			result.itemId = { id: aMailbox.getAttributeByTag("t:ItemId", "Id", null), 
-					changeKey:aMailbox.getAttributeByTag("t:ItemId", "ChangeKey", null)
-				};
-		}
-
-		return result;		
-	},
-
-	resolveNamesOk: function _resolveNamesOk(erResolveNames, aResolutions)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: contacts:"+aResolutions.length);
-
-		for each(var resolution in aResolutions) {
-			exchWebService.commonAbFunctions.logInfo("resolution card:"+resolution.toString());
-
-			var mailbox = resolution.getTags("t:Mailbox");
-			exchWebService.commonAbFunctions.logInfo("resolution mailbox card:"+mailbox[0].toString());
-			var contact = resolution.getTags("t:Contact");
-			if (contact.length > 0) {
-				exchWebService.commonAbFunctions.logInfo("resolution contact card:"+contact[0].toString());
-			}
-			var calMailbox;
-			if (mailbox.length > 0) {
-				calMailbox = this.convertExchangeMailbox(mailbox[0]);
-
-				switch (calMailbox.mailboxType) {
-				case "PrivateDL": // An Contact folder distribution list.
-try {
-					var dirName = this.childNodeURI+"id="+encodeURIComponent(calMailbox.itemId.id)+"&name="+encodeURIComponent(calMailbox.name)+"&parentId="+this.uuid+"&type=PrivateDL";
-
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeDistListToCard(this, mailbox[0], dirName);
-					this.updateList(newCard);
-
-					if (!this.isQuery) {
-						var dir = MailServices.ab.getDirectory(dirName);
-						if (dir) {
-							this.distLists.push(dir);
-							MailServices.ab.notifyDirectoryItemAdded(this, dir);
-						}
-					}
-	} catch(err) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Foutje:"+err);
-	}
-					break;
-				case "PublicDL": // An Active Directory distribution list.
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Public distList:"+calMailbox.name+" in GAL of "+this.serverUrl);
-
-					var dirName = this.childNodeURI+"id="+encodeURIComponent(calMailbox.routingType+":"+calMailbox.emailAddress)+"&name="+encodeURIComponent(calMailbox.name)+"&parentId="+this.uuid+"&type=PublicDL";
-
-					// Make a card from the contact details.
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-					newCard.convertExchangeDistListToCard(this, mailbox[0], dirName);
-					this.updateList(newCard);
-
-					break; 
-				case "Contact":
-				case "Mailbox": // An Active Directory Contact Mailbox.
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Mailbox Contact:"+calMailbox.name+" in GAL of "+this.serverUrl);
-					
-					// Make a card from the contact details.
-					var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-						.createInstance(Ci.mivExchangeAbCard);
-//					newCard.convertExchangeContactToCard(this, contact[0], calMailbox.mailboxType);
-					newCard.convertExchangeContactToCard(this, resolution, calMailbox.mailboxType);
-					newCard.setProperty("exchangeUser", this.user);
-					newCard.setProperty("exchangeServerUrl", this.serverUrl);
-					this.updateList(newCard);
-
-					break;
-				default:
-					 exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Unknown mailboxtype:"+calMailbox.mailboxType);
-				}
-			}
-		}
-
-		this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
-
-	},
-
-	resolveNamesError: function _resolveNamesError(erResolveNames, aCode, aMsg)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesError: aCode:"+aCode+", aMsg:"+aMsg);
-		this.isLoading = false;
-
-		if ((aCode == 0) && (aMsg == "ErrorNameResolutionNoResults")) {
-			// Name could not be resolved we use the mailbox element instead of the contacts.
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Could not resolve name.");
-			//this.ecUpdateCard(erResolveNames.ids.mailbox);
-		}
-
-		this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
-
-	},
-
-  /**
-   * Initializes a directory, pointing to a particular
-   * URI
-   */
-  //void init(in string aURI);
-	init: function _init(aURI)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: init. aURI:"+aURI+"\n");
-		this._URI = aURI;
-
-		this._Schema = null;
-		this._UUID = "";
-		this._searchQuery = null;
-
-		if (this._isInitialized) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: '"+this.dirName+"' is allready initialized");
-			return;
-		}
-
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: this is a childdir:"+aURI);
-
-		if (aURI.indexOf("://") > -1) {
-			this._Schema = aURI.substr(0, aURI.indexOf("://"));
-
-			var tmpStr = aURI.substr(aURI.indexOf("://")+3);
-
-			this._searchQuery = null;
-			if (tmpStr.indexOf("?") > -1) {
-				this._searchQuery = tmpStr.substr(tmpStr.indexOf("?")+1);
-				tmpStr = tmpStr.substr(0,tmpStr.indexOf("?")); 
-			}
-
-			var params = exchWebService.commonAbFunctions.paramsToArray(tmpStr,"&");
-
-			this._UUID = decodeURIComponent(params.id);
-			this._type = decodeURIComponent(params.type);
-
-			this.prefs = Cc["@mozilla.org/preferences-service;1"]
-			    	.getService(Ci.nsIPrefService)
-			    	.getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account."+this._UUID+".");
-
-			if (this._searchQuery) {
-				var dirName = this._Schema+"://"+"id="+encodeURIComponent(this._UUID)+"&type="+this.type;
-
-				exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: this._searchQuery:"+this._searchQuery+", dirName:"+dirName);
-				
-				var dir = MailServices.ab.getDirectory(dirName);
-				if (dir) {
-
-					this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
-
-					if (this.useGAL) {
-						this.searchGAL(this._searchQuery);
-					}
-
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Going to get children of '"+dirName+"'");
-
-					this.contacts = exchWebService.commonAbFunctions.filterCardsOnQuery(this._searchQuery, dir.childCards);
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Got children of '"+dirName+"'");
-
-					for each(var contact in this.contacts) {
-						exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Adding sub child A '"+contact.displayName+"' to contacts. dirName:"+this.dirName);
-						MailServices.ab.notifyDirectoryItemAdded(this, contact);
-					}
-
-					exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Going to get children of distList.");
-					// Get contact in childNodes (distLists)
-					var childNodes = dir.childNodes;
-					while (childNodes.hasMoreElements()) {
-						var childNode = childNodes.getNext();
-						exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Going to get children of distList '"+childNode.dirName+"':'"+childNode.URI+"' dirName:"+this.dirName);
-						var tmpDir = MailServices.ab.getDirectory(childNode.URI+"?"+this._searchQuery);
-						var childContacts = tmpDir.childCards;
-						exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Got children of distList '"+childNode.dirName);
-						while (childContacts.hasMoreElements()) {
-							var contact = childContacts.getNext().QueryInterface(Ci.nsIAbCard);
-							exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: == contact:"+contact);
-							exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Adding sub child B '"+contact.localId+"':'"+contact.displayName+"' to contacts. dirName:"+this.dirName);				
-							this.contacts[contact.localId] = contact;
-						}
-					}
-
-					this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
-
-				}
-				else {
-					exchWebService.commonAbFunctions.logInfo("ERROR Folderdirectory '"+dirName+"' does not exist.");
-				}
-
-			}
-			else {
-				// Non query directories we set the refresh timer for
-				exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: init. Going to do first sync. aURI:"+aURI+"\n");
-				this.syncFolder();  // First sync to initialize.
-
-			        let self = this;
-				let timerCallback = {
-					notify: function setTimeout_notify() {
-						self.syncFolder();
-					}
-				};
-
-				this.pollTimer.initWithCallback(timerCallback, exchWebService.commonFunctions.safeGetIntPref(this.prefs, "pollinterval", 300, true) * 1000, this.pollTimer.TYPE_REPEATING_SLACK);
-
-				this.loadContactsFromExchange();
-			}
-
-
-		}
-		else {
-			// ERROR
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: exchangeAbFolderDirectory.init: WE GOT TO A POINT WERE WE NEVER SHOULD GET TO.");
-		}
-
-		this._isInitialized = true;
-	},
-
-  // Deletes either a mailing list or a top
-  // level directory, which also updates the
-  // preferences
-  //void deleteDirectory(in nsIAbDirectory directory);
-	deleteDirectory: function _deleteDirectory(directory)
-	{
-		// We cannot remove the root.
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: deleteDirectory this:"+this.URI+", directory:"+directory.URI+"\n");
-
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: deleteDirectory uri:"+directory.URI+"\n");
-	},
-
-  // Check if directory contains card
-  // If the implementation is asynchronous the card
-  // may not yet have arrived. If it is in the process
-  // of obtaining cards the method will throw an
-  // NS_ERROR_NOT_AVAILABLE exception if the card
-  // cannot be found.
-  //boolean hasCard(in nsIAbCard cards);
-	hasCard: function _hasCard(cards)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: hasCard\n");
-		return false;
-	},
-
-
-  // Check if directory contains directory
-  //boolean hasDirectory(in nsIAbDirectory dir);
-	hasDirectory: function _hasDirectory(dir)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: hasDirectory\n");
-
-		return false;
-	},
-
-  /**
-   * Adds a card to the database.
-   *
-   * This card does not need to be of the same type as the database, e.g., one
-   * can add an nsIAbLDAPCard to an nsIAbMDBDirectory.
-   *
-   * @return "Real" card (eg nsIAbLDAPCard) that can be used for some
-   *         extra functions.
-   */
-  //nsIAbCard addCard(in nsIAbCard card);
-	addCard: function _addCard(card)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: addCard\n");
-		return null;
-	},
-
-  /**
-   * Modifies a card in the database to match that supplied.
-   */
-  //void modifyCard(in nsIAbCard modifiedCard);
-	modifyCard: function _modifyCard(modifiedCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: modifyCard\n");
-	},
-
-  /**
-   * Deletes the array of cards from the database.
-   *
-   * @param  aCards  The cards to delete from the database.
-   */
-  //void deleteCards(in nsIArray aCards);
-	deleteCards: function _deleteCards(aCards)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: deleteCards\n");
-	},
-
-  //void dropCard(in nsIAbCard card, in boolean needToCopyCard);
-	dropCard: function _dropCard(Card, needToCopyCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: dropCard\n");
-	},
-
-  /**
-   * Whether or not the directory should be searched when doing autocomplete,
-   * (currently by using GetChildCards); LDAP does not support this in online
-   * mode, so that should return false; additionally any other directory types
-   * that also do not support GetChildCards should return false.
-   *
-   * @param aIdentity  An optional parameter detailing the identity key (see
-   *                   nsIMsgAccountManager) that this autocomplete is being
-   *                   run against.
-   * @return           True if this directory should/can be used during
-   *                   local autocomplete.
-   */
-  //boolean useForAutocomplete(in ACString aIdentityKey);
-	useForAutocomplete: function _useForAutocomplete(aIdentityKey)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: useForAutocomplete\n");
-
-		return true;
-
-//		return true;
-	},
-
-  /** 
-   * Does this directory support mailing lists? Note that in the case
-   * this directory is a mailing list and nested mailing lists are not
-   * supported, this will return false rather than true which the parent
-   * directory might.
-   */
-  //readonly attribute boolean supportsMailingLists;
-	get supportsMailingLists()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get supportsMailingLists\n");
-		return true;
-	},
-
-  /**
-   * This attribute serves two purposes
-   *  1. If this directory is not a mail list, directories are stored here
-   *  2. If it is a mail list card entries are stored here
-   *
-   * @note This is a *live* array and not a static copy
-   */
-  //attribute nsIMutableArray addressLists
-	get addressLists()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get addressLists\n");
-		return this._addressLists;
-	},
-
-	set addressLists(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set addressLists\n");
-		this._addressLists = aValue;
-	},
-
-  // Specific to a directory which stores mail lists
-
-  /**
-   * Creates a new mailing list in the directory. Currently only supported 
-   * for top-level directories.
-   *
-   * @param  list  The new mailing list to add.
-   * @return The mailing list directory added, which may have been modified.
-   */
-  //nsIAbDirectory addMailList(in nsIAbDirectory list);
-	addMailList: function _addMailList(list)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: addMailList\n");
-		return list;
-	},
-
-  /**
-   * Nick Name of the mailing list. This attribute is only really used when
-   * the nsIAbDirectory represents a mailing list.
-   */
-  //attribute AString listNickName;
-	get listNickName()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get listNickName\n");
-		return this._listNickName;
-	},
-
-	set listNickName(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set listNickName\n");
-		this._listNickName = aValue;
-	},
-
-  /**
-   * Description of the mailing list. This attribute is only really used when
-   * the nsIAbDirectory represents a mailing list.
-   */
-  //attribute AString description;
-	get description()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get description\n");
-		return this._description;
-	},
-
-	set description(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set description\n");
-		this._description = aValue;
-	},
-
-  /**
-   * Edits an existing mailing list (specified as listCard) into its parent
-   * directory. You should call this function on the resource with the same
-   * uri as the listCard.
-   *
-   * @param  listCard  A nsIAbCard version of the mailing list with the new
-   *                   values.
-   */
-  //void editMailListToDatabase(in nsIAbCard listCard);
-	editMailListToDatabase: function _editMailListToDatabase(listCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: editMailListToDatabase\n");
-	},
-
-  // Copies mail list properties from the srcList
-  //void copyMailList(in nsIAbDirectory srcList);
-	copyMailList: function _copyMailList(srcList)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: copyMailList\n");
-	},
-
-
-  /**
-   * Only creates a top level address book
-   * which is stored in the preferences
-   *
-   * Need to change to factory based approach
-   * to create new address books
-   *
-   * This method should become redundant or 
-   * be only associated with card folders
-   *
-   * The parameters are the same as for
-   * nsIAbManager::newAddressBook
-   */
-  //ACString createNewDirectory(in AString aDirName, in ACString aURI,
-  //                            in unsigned long aType, in ACString aPrefName);
-	createNewDirectory: function _createNewDirectory(aDirName, aURI, aType, aPrefName)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: createNewDirectory uuid:"+this.uuid+"\n");
-		return "createNewDirectory";
-	},
-
-
-  /* create a directory by passing the display name and address book uri */
-  //void createDirectoryByURI(in AString displayName, in ACString aURI);
-	createDirectoryByURI: function _createDirectoryByURI(displayName, aURI)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: createDirectoryByURI uuid:"+this.uuid+"\n");
-	},
-  /**
-   * The id of the directory used in prefs e.g. "ldap_2.servers.pab"
-   * Setting this will cause directoryPrefs to be updated.
-   */
-  //attribute ACString dirPrefId;
-	get dirPrefId()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get dirPrefId: "+this.uuid);
-		return this._dirPrefId;
-	},
-
-	set dirPrefId(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set dirPrefId\n");
-		this._dirPrefId = aValue;
-	},
-  /**
-   * @name  getXXXValue
-   *
-   * Helper functions to get different types of pref, but return a default
-   * value if a pref value was not obtained.
-   *
-   * @param aName         The name of the pref within the branch dirPrefId to
-   *                      get a value from.
-   *
-   * @param aDefaultValue The default value to return if getting the pref fails
-   *                      or the pref is not present.
-   *
-   * @return              The value of the pref or the default value.
-   *
-   * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
-   *                      be obtained (e.g. dirPrefId isn't set).
-   */
-  //@{
-  //long getIntValue(in string aName, in long aDefaultValue);
-	getIntValue: function _getIntValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getIntValue\n");
-		return aDefaultValue;
-	},
-
-  //boolean getBoolValue(in string aName, in boolean aDefaultValue);
-	getBoolValue: function _getBoolValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getBoolValue\n");
-		return aDefaultValue;
-	},
-
-  //ACString getStringValue(in string aName, in ACString aDefaultValue);
-	getStringValue: function _getStringValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getStringValue\n");
-		return aDefaultValue;
-	},
-
-  //AUTF8String getLocalizedStringValue(in string aName, in AUTF8String aDefaultValue);
-	getLocalizedStringValue: function _getLocalizedStringValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getLocalizedStringValue\n");
-		return aDefaultValue;
-	},
-
-  //@}
-
-  /**
-   * The following attributes are read from an nsIAbDirectory via the above methods:
-   *
-   * HidesRecipients (Boolean)
-   *    If true, and this nsIAbDirectory is a mailing list, then when sending mail to
-   *    this list, recipients addresses will be hidden from one another by sending
-   *    via BCC.
-   */
-
-  /**
-   * @name  setXXXValue
-   *
-   * Helper functions to set different types of pref values.
-   *
-   * @param aName         The name of the pref within the branch dirPrefId to
-   *                      get a value from.
-   *
-   * @param aValue        The value to set the pref to.
-   *
-   * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
-   *                      be obtained (e.g. dirPrefId isn't set).
-   */
-  //@{
-  //void setIntValue(in string aName, in long aValue);
-	setIntValue: function _setIntValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setIntValue\n");
-	},
-
-  //void setBoolValue(in string aName, in boolean aValue);
-	setBoolValue: function _setBoolValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setBoolValue\n");
-	},
-
-  //void setStringValue(in string aName, in ACString aValue);
-	setStringValue: function _setStringValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setStringValue\n");
-	},
-
-  //void setLocalizedStringValue(in string aName, in AUTF8String aValue);
-	setLocalizedStringValue: function _setLocalizedStringValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setLocalizedStringValue\n");
-	},
-
-  //@}
-
-	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener)
-	{
-		//if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
-
-		this.loadBalancer.addToQueue({ calendar: this,
-				 ecRequest:aRequest,
-				 arguments: aArgument,
-				 cbOk: aCbOk,
-				 cbError: aCbError,
-				 listener: aListener});
-	},
-
-	get name()
-	{
-		return this.dirName;
-	},
-
-	get useGAL() {
-		var result = exchWebService.commonFunctions.safeGetBoolPref(this.prefs, "globalAddressList", false);
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: useGAL:"+result);
-
-		return result;
-	},
-
-	get user() {
-		var username = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
-		if (username.indexOf("@") > -1) {
-			return username;
-		}
-		else {
-			if (this.domain == "") {
-				return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
-			}
-			else {
-				return this.domain+"\\"+exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
-			}
-		}
-	},
-
-	set user(value) {
-		if (value.indexOf("\\") > -1) {
-			this.domain = value.substr(0,value.indexOf("\\"));
-			this.prefs.setCharPref("user", value.substr(value.indexOf("\\")+1));
-		}
-		else {
-			this.prefs.setCharPref("user", value);
-		}
-	},
-
-	get domain() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "domain", "");
-	},
-
-	set domain(value) {
-		return this.prefs.setCharPref("domain", value);
-	},
-
-	get mailbox() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "mailbox", "");
-	},
-
-	get serverUrl() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "server", "");
-	},
-
-	get folderBase() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderbase", "contacts");
-	},
-
-	get folderPath() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderpath", "/");
-	},
-
-	get folderID() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderid", null);
-	},
-
-	set folderID(aValue) {
-		this.prefs.setCharPref("folderid", aValue);
-	},
-
-	get changeKey() {
-		return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "changekey", null);
-	},
-
-	set changeKey(aValue) {
-		this.prefs.setCharPref("changekey", aValue);
-	},
-
-	loadContactsFromExchange: function _loadContactsFromExchange()
-	{
-		if (this.isLoading) {
-			return;
-		}
-
-		exchWebService.commonAbFunctions.logInfo("loadContactsFromExchange:"+this.dirName);
-
-		this.isLoading = true;
-
-		var self = this;
-
-		this.addToQueue( erFindContactsRequest,
-						{user: this.user, 
-						 mailbox: this.mailbox,
-						 folderBase: this.folderBase,
-						 serverUrl: this.serverUrl,
-						 folderID: this.folderID,
-						 changeKey: this.changeKey,
-				 		 actionStart: Date.now()},
-						function(erFindContactsRequest, aContacts, aDistLists) { self.contactsFoundOk(erFindContactsRequest, aContacts, aDistLists);}, 
-						function(erFindContactsRequest, aCode, aMsg) { self.contactsFindError(erFindContactsRequest, aCode, aMsg);},
-						null);
-
-	},
-
-	ecUpdateCard: function _ecUpdateCard(contact)
-	{
-		var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
-			.createInstance(Ci.mivExchangeAbCard);
-		newCard.convertExchangeContactToCard(this, contact);
-		newCard.setProperty("exchangeUser", this.user);
-		newCard.setProperty("exchangeServerUrl", this.serverUrl);
-		this.updateList(newCard);
-	},
-
-	updateList: function _updateList(newCard)
-	{
-		if (!newCard) {
-			return;
-		}
-
-		if (this.contacts[newCard.localId]) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:  == We allready know this card. Lets see what has changed");
-
-			// Check which properties changed.
-			for (var cardProperty in fixIterator(newCard.properties, Ci.nsIProperty)) {
-				if (cardProperty.name) {
-					try {
-						var oldValue = this.contacts[newCard.localId].getProperty(cardProperty.name, "");
-						var newValue = cardProperty.value;
-						if ( oldValue != newValue) {
-							// And existing property has changed.
-							exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: --Property Changed name:"+cardProperty.name+", oldvalue:"+oldValue+", newValue:"+newValue);
-							this.contacts[newCard.localId].setProperty(cardProperty.name, newValue);
-							MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
-			                                 cardProperty.name,
-			                                 oldValue,
-			                                 newValue);
-						}
-					}
-					catch(err) {
-						// We have a new property which was not set in the previous state. Add it
-						exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:  == Err:"+err);
-						exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: --Property added name:"+cardProperty.name+", value:"+cardProperty.value);
-						this.contacts[newCard.localId].setProperty(cardProperty.name, cardProperty.value);
-						MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
-		                                 cardProperty.name,
-		                                 null,
-		                                 newValue);
-					}
-				}
-			}
-
-			// We check if properties were removed.
-			for (var cardProperty in fixIterator(this.contacts[newCard.localId].properties, Ci.nsIProperty)) {
-				if (cardProperty.name) {
-					var oldValue = cardProperty.value; 
-					try {
-						var newValue = newCard.getProperty(cardProperty.name, "");
-						
-						if ( oldValue != newValue) {
-							// If we get here something went wrong before this call.
-						}
-					}
-					catch(err) {
-						// Property is not available in new state. We have to remove it.
-						exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: --Property removed name:"+cardProperty.name+", value:"+cardProperty.value);
-						this.contacts[newCard.localId].deleteProperty(cardProperty.name);
-						MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
-		                                 cardProperty.name,
-		                                 oldValue,
-		                                 null);
-					}
-				}
-			}
-		}
-		else {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:  || This card is new. We do not know it yet.");
-			this.contacts[newCard.localId] = newCard;
-			MailServices.ab.notifyDirectoryItemAdded(this, newCard);
-		}
-
-		exchWebService.commonAbFunctions.logInfo(this.uuid+": newCard.localId:"+newCard.localId);		
-	},
-
-	contactsFoundOk: function _contactsFoundOk(erFindContactsRequest, aContacts, aDistLists)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: contactsFoundOk: contacts:"+aContacts.length+", distributionlists:"+aDistLists.length);
-
-		if (aContacts.length > 0) {
-			var self = this;
-			this.addToQueue( erGetContactsRequest,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 ids: aContacts,
-					 		 actionStart: Date.now()},
-							function(erGetContactsRequest, aContacts) { self.contactsLoadOk(erGetContactsRequest, aContacts);}, 
-							function(erGetContactsRequest, aCode, aMsg) { self.contactsFindError(erGetContactsRequest, aCode, aMsg);},
-							null);
-
-		}
-
-		this.distLists = new Array()
-
-		for each(var distList in aDistLists) {
-			this.addDistList(distList);
-		}
-
-	},
-
-	addDistList: function _addDistList(aDistList)
-	{
-		exchWebService.commonAbFunctions.logInfo("distListLoadOk: new distList:"+aDistList.name);
-
-		this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
-
-		var self = this;
-		this.addToQueue( erResolveNames,
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 folderBase: this.folderBase,
-					 serverUrl: this.serverUrl,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 ids: { name: aDistList.name },
-					 searchScope: "Contacts",
-			 		 actionStart: Date.now()},
-					function(erResolveNames, aResolutions) { self.resolveNamesOk(erResolveNames, aResolutions);}, 
-					function(erResolveNames, aCode, aMsg) { self.resolveNamesError(erResolveNames, aCode, aMsg);},
-					null);
-	},
-
-	contactsFindError: function _contactsFindError(erFindContactsRequest, aCode, aMsg)
-	{
-		this.isLoading = false;
-	},
-
-	contactsLoadOk: function _contactsLoadOk(erGetContactsRequest, aContacts)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: contactsLoadOk: contacts:"+aContacts.length);
-
-		for each(var contact in aContacts) {
-			//exchWebService.commonAbFunctions.logInfo("Contact card:"+contact.toString(),2);
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: new childCards:"+contact.getTagValue("t:DisplayName"));
-			this.ecUpdateCard(contact);
-
-		}
-
-		this.isLoading = false;
-
-	},
-
-	syncFolder: function _syncFolder()
-	{
-		if ((this.weAreSyncing) || (this.isLoading)) {
-			return;
-		}
-
-		this.weAreSyncing = true;
-		var self = this;
-
-		this.addToQueue( erSyncContactsFolderRequest,
-			{user: this.user, 
-			 mailbox: this.mailbox,
-			 serverUrl: this.serverUrl,
-			 folderBase: this.folderBase,
-			 folderID: this.folderID,
-			 changeKey: this.changeKey,
-			 syncState: this.syncState,
-			 actionStart: Date.now() }, 
-			function(erSyncContactsFolderRequest, creations, updates, deletions, syncState) { self.syncFolderOK(erSyncContactsFolderRequest, creations, updates, deletions, syncState);}, 
-			function(erSyncContactsFolderRequest, aCode, aMsg) { self.syncFolderError(erSyncContactsFolderRequest, aCode, aMsg);},
-			null);
-	},
-
-	syncFolderOK: function _syncFolderOK(erSyncContactsFolderRequest, creations, updates, deletions, syncState)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: syncFolderOK "+ this.dirName);
-
-		if (!this.syncState) {
-			exchWebService.commonAbFunctions.logInfo("syncFolderOK: First sync we are not going to use the data.");
-			this.syncState = syncState;
-			this.weAreSyncing = false;
-			return;
-		}
-
-		if ((creations.contacts.length > 0) || (updates.contacts.length > 0) || (deletions.contacts.length > 0)) {
-			this.addActivity(exchWebService.commonFunctions.getString("ExchangeContacts","syncFolderEventMessage",[creations.contacts.length, updates.contacts.length, deletions.contacts.length, this.dirName],"exchangecalendar"), "", erSyncContactsFolderRequest.argument.actionStart, Date.now())
-			exchWebService.commonAbFunctions.logInfo(exchWebService.commonFunctions.getString("ExchangeContacts","syncFolderEventMessage",[creations.contacts.length, updates.contacts.length, deletions.contacts.length, this.dirName],"exchangecalendar"));
-		}
-
-		var newCards = [];
-		for each(var newCard in creations.contacts) {
-			//exchWebService.commonAbFunctions.logInfo("New Contact card:"+newCard.toString(),2);
-			newCards.push(newCard)
-		}
-
-		for each(var updatedCard in updates.contacts) {
-			//exchWebService.commonAbFunctions.logInfo("Updated Contact card:"+updatedCard.toString(),2);
-			newCards.push(updatedCard)
-		}
-		
-		if (newCards.length > 0) {
-			var self = this;
-			this.addToQueue( erGetContactsRequest,
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 ids: newCards,
-					 		 actionStart: Date.now()},
-							function(erGetContactsRequest, aContacts) { self.contactsLoadOk2(erGetContactsRequest, aContacts);}, 
-							function(erGetContactsRequest, aCode, aMsg) { self.contactsFindError(erGetContactsRequest, aCode, aMsg);},
-							null);
-		}
-	
-		for each(var deletedCard in deletions.contacts) {
-			//exchWebService.commonAbFunctions.logInfo("Deleted Contact card:"+deletedCard.toString(),2);
-			if (this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")]) {
-				MailServices.ab.notifyDirectoryItemDeleted(this, this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")]);
-				MailServices.ab.notifyDirectoryDeleted(this, this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")]);
-				delete this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")];
-			}
-		}
-
-		if ((creations.distlists.length > 0) || (updates.distlists.length > 0) || (deletions.distlists.length > 0)) {
-			this.addActivity(exchWebService.commonFunctions.getString("ExchangeDistLists","syncFolderEventMessage",[creations.distlists.length, updates.distlists.length, deletions.distlists.length, this.dirName],"exchangecalendar"), "", erSyncContactsFolderRequest.argument.actionStart, Date.now())
-			exchWebService.commonAbFunctions.logInfo(exchWebService.commonFunctions.getString("ExchangeDistLists","syncFolderEventMessage",[creations.distlists.length, updates.distlists.length, deletions.distlists.length, this.dirName],"exchangecalendar"));
-		}
-
-		for each(var newDistList in creations.distlists) {
-			exchWebService.commonAbFunctions.logInfo("New distribution list:"+newDistList.toString(),2);
-			this.addDistList(newDistList);
-		}
-
-		for each(var updatedDistList in updates.distlists) {
-			exchWebService.commonAbFunctions.logInfo("Updated distribution list:"+updatedDistList.toString(),2);
-
-			// Find current distList;
-			var oldDistList;
-			for each(var distList in this.distLists) {
-				if (distList.uuid == updatedDistList.Id) {
-					oldDistList = distList;
-					break;
-				}
-			}
-			
-			if (oldDistList) {
-				var newUri = this.childNodeURI+"id="+encodeURIComponent(updatedDistList.Id)+"&name="+encodeURIComponent(updatedDistList.name)+"&parentId="+this.uuid+"&type=PrivateDL";
-				oldDistList.init(newUri);
-			}
-			else {
-				exchWebService.commonAbFunctions.logInfo("Updated distribution list: Could not find old DistList!!?",2);
-			}
-		}
-
-		this.syncState = syncState;
-
-		if (newCards.length == 0) {
-			this.weAreSyncing = false;
-		}
-	},
-
-	syncFolderError: function _syncFolderError(erSyncContactsFolderRequest, aCode, aMsg)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: syncFolderError: aCode:"+aCode+", aMsg:"+aMsg);
-		this.weAreSyncing = false;
-	},
-
-	contactsLoadOk2: function _contactsLoadOk2(erGetContactsRequest, aContacts)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: contactsLoadOk2: contacts:"+aContacts.length);
-
-		for each(var contact in aContacts) {
-			//exchWebService.commonAbFunctions.logInfo("Contact card:"+contact.toString(),2);
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: new childCards:"+contact.getTagValue("t:DisplayName"));
-			this.ecUpdateCard(contact);
-
-		}
-
-		this.weAreSyncing = false;
-
-	},
-
-	addActivity: function _addActivity(aTitle, aText, aStartDate, aEndDate)
-	{
-		if (!this.activityManager) return;
-
-		let event = Cc["@mozilla.org/activity-event;1"].createInstance(nsIAE);  
-  
-		event.init(aTitle,  
-		           null,   
-		           aText,   
-		           aStartDate,     
-		           aEndDate);          
-  
-		this.activityManager.addActivity(event);
-	},
+    classID: components.ID("{5963e917-bc68-4b68-b704-65538c81a628}"),
+    contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-contactFolder-directory",
+    classDescription: "Exchange 2007/2010 Contacts Folder directory",
+
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    QueryInterface: XPCOMUtils.generateQI([Ci, exchangeAbFolderDirectory,
+        Ci.nsIAbDirectory,
+        Ci.nsIAbCollection,
+        Ci.nsIAbItem,
+        Ci.nsISupports
+    ]),
+
+    /**
+     * A universally-unique identifier for this item.
+     *
+     * If this item cannot be associated with a UUID for some reason, it MUST
+     * return the empty string. The empty string MUST NOT be a valid UUID for any
+     * item. Under no circumstances may this function throw an error.
+     *
+     * It is STRONGLY RECOMMENDED that implementations guarantee that this UUID
+     * will not change between two different sessions of the application and that,
+     * if this item is deleted, the UUID will not be reused.
+     *
+     * The format of the UUID for a generic nsIAbItem is purposefully left
+     * undefined, although any item contained by an nsIAbDirectory SHOULD use
+     * nsIAbManager::generateUUID to generate the UUID.
+     */
+    //readonly attribute AUTF8String uuid;
+    get uuid() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: uuid\n");
+        if (this._UUID) {
+            return this._UUID;
+        }
+
+        return "";
+    },
+
+    get id() {
+        return this.uuid;
+    },
+
+    get type() {
+        return this._type;
+    },
+
+    /**
+     * @{
+     * These constants reflect the possible values of the
+     * mail.addr_book.lastnamefirst preferences. They are intended to be used in
+     * generateName, defined below.
+     */
+    //const unsigned long GENERATE_DISPLAY_NAME = 0;
+    //const unsigned long GENERATE_LAST_FIRST_ORDER = 1;
+    //const unsigned long GENERATE_FIRST_LAST_ORDER = 2;
+    /** @} */
+
+    /** 
+     * Generate a name from the item for display purposes.
+     *
+     * If this item is an nsIAbCard, then it will use the aGenerateFormat option
+     * to determine the string to return.
+     * If this item is not an nsIAbCard, then the aGenerateFormat option may be
+     * ignored, and the displayName of the item returned.
+     *
+     * @param  aGenerateFormat The format to generate as per the GENERATE_*
+     *                         constants above.
+     * @param  aBundle         An optional parameter that is a pointer to a string
+     *                         bundle that holds:
+     *           chrome://messenger/locale/addressbook/addressBook.properties
+     *                         If this bundle is not supplied, then the function
+     *                         will obtain the bundle itself. If cached by the
+     *                         caller and supplied to this function, then
+     *                         performance will be improved over many calls.
+     * @return                 A string containing the generated name.
+     */
+    //AString generateName(in long aGenerateFormat,
+    //                     [optional] in nsIStringBundle aBundle);
+    generateName: function _generateName(aGenerateFormat, aBundle) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: generateName\n");
+        return "generateName";
+    },
+
+    /**
+     * Generate a formatted email address from the card, that can be used for
+     * sending emails.
+     *
+     * @param  aExpandList     If this card is a list, and this parameter is set
+     *                         to true, then the list will be expanded to include
+     *                         the emails of the cards within the list.
+     * @param  aGroupMailLists If this card (or the items within this card) is a
+     *                         list, and this is set to true, then the list will
+     *                         be expanded in the RFC 2822 group format
+     *                         "displayname : email1 ; email2 ; etc".
+     * @param  aHeaderParser   An optional parameter pointing to the
+     *                         nsIMsgHeaderParser service. If this is not supplied
+     *                         the function will obtain the service itself. If
+     *                         cached by the called and supplied to this function,
+     *                         then performance will be improved over many calls.
+     * @return                 A string containing a comma-separated list of
+     *                         formatted addresses.
+     */
+    //AString generateFormattedEmail(in boolean aExpandList,
+    //                               in boolean aAsGroupMailLists,
+    //                               [optional] in nsIMsgHeaderParser aHeaderParser);
+    generateFormattedEmail: function _generateFormattedEmail(aExpandList, aAsGroupMailLists, aHeaderParser) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: generateFormattedEmail\n");
+        return "";
+    },
+
+    /**
+     * Returns true if this collection is read-only.
+     */
+    //readonly attribute boolean readOnly;
+    get readOnly() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: readOnly\n");
+        return true;
+    },
+
+    /**
+     * Returns true if this collection is accessed over a network connection.
+     */
+    //readonly attribute boolean isRemote;
+    get isRemote() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: isRemote\n");
+        return true;
+    },
+
+
+    /**
+     * Returns true if this collection is accessed over a secure connection.
+     *
+     * If isRemote returns false, then this value MUST be false as well.
+     */
+    //readonly attribute boolean isSecure;
+    get isSecure() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: isSecure\n");
+        return true;
+    },
+
+
+    /** 
+     * Returns an address book card for the specified email address if found.
+     *
+     * If there are multiple cards with the given email address, this method will
+     * return one of these cards in an implementation-defined manner.
+     *
+     * Matching is performed in a case-insensitive manner.
+     *
+     * This method performs a synchronous operation. If the collection cannot do
+     * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
+     *
+     * @param  emailAddress The email address to find in any of the email address
+     *                      fields. If emailAddress is empty, the database won't
+     *                      be searched and the function will return as if no card
+     *                      was found.
+     * @return              An nsIAbCard if one was found, else returns NULL.
+     * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
+     */
+    //nsIAbCard cardForEmailAddress(in AUTF8String emailAddress);
+    cardForEmailAddress: function _cardForEmailAddress(emailAddress) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: cardForEmailAddress");
+        return null;
+        //		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
+
+    /**
+     * Returns an address book card for the specified property if found.
+     *
+     * If there are multiple cards with the given value for the property, this
+     * method will return one of these cards in an implementation-defined manner.
+     *
+     * This method performs a synchronous operation. If the collection cannot do
+     * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
+     *
+     * If the property is not natively a string, it can still be searched for
+     * using the string-encoded value of the property, e.g. "0". See
+     * nsIAbCard::getPropertyAsAUTF8String for more information. Empty values will
+     * return no match, to prevent spurious results.
+     *
+     * @param  aProperty      The property to look for.
+     * @param  aValue         The value to search for.
+     * @param  aCaseSensitive True if matching should be done case-sensitively.
+     * @result                An nsIAbCard if one was found, else returns NULL.
+     * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
+     */
+    //nsIAbCard getCardFromProperty(in string aProperty, in AUTF8String aValue,
+    //                              in boolean aCaseSensitive);
+    getCardFromProperty: function _cardForEmailAddress(aProperty, aValue, aCaseSensitive) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getCardFromProperty: aProperty:" + aProperty + ", aValue:" + aValue);
+        //throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+        return null;
+    },
+
+
+    /**
+     * Returns all address book cards with a specific property matching value
+     *
+     * This function is almost identical to getCardFromProperty, with the
+     * exception of returning all cards rather than just the first.
+     *
+     * @param  aProperty      The property to look for.
+     * @param  aValue         The value to search for.
+     * @param  aCaseSensitive True if matching should be done case-sensitively.
+     * @result                A nsISimpleEnumerator that holds nsIAbCard
+     *                        instances.
+     */
+    //nsISimpleEnumerator getCardsFromProperty(in string aProperty,
+    //                                         in AUTF8String aValue,
+    //                                         in boolean aCaseSensitive);
+
+    getCardsFromProperty: function _getCardsFromProperty(aProperty, aValue, aCaseSensitive) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getCardsFromProperty");
+        var result = [];
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
+    },
+
+
+    /**
+     * The chrome URI to use for bringing up a dialog to edit this directory.
+     * When opening the dialog, use a JS argument of
+     * {selectedDirectory: thisdir} where thisdir is this directory that you just
+     * got the chrome URI from.
+     */
+    //readonly attribute ACString propertiesChromeURI;
+    get propertiesChromeURI() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get propertiesChromeURI 1");
+        return "chrome://exchangecontacts/content/exchangeContactSettings.xul";
+    },
+
+    /**
+     * The description of the directory. If this directory is not a mailing list,
+     * then setting this attribute will send round a "DirName" update via
+     * nsIAddrBookSession.
+     */
+    //attribute AString dirName;
+    get dirName() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get dirName\n");
+        var result = exchWebService.commonAbFunctions.getDescription(this.uuid);
+        if (this.useGAL) {
+            result = result + " (+GAL)";
+        }
+        return result;
+    },
+
+    set dirName(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set dirName\n");
+
+        exchWebService.commonAbFunctions.setDescription(this.uuid.aValue);
+    },
+
+    // XXX This should really be replaced by a QI or something better
+    //readonly attribute long dirType;
+    get dirType() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get dirType\n");
+        return 2;
+    },
+
+    // eliminated a bit more.
+
+    // The filename for address books within this directory.
+    //readonly attribute ACString fileName;
+    get fileName() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get fileName\n");
+        return "filename";
+    },
+
+    // The URI of the address book
+    //readonly attribute ACString URI;
+    get URI() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get URI:"+this._URI);
+        return this._URI;
+    },
+
+    // The position of the directory on the display.
+    //readonly attribute long position;
+    get position() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get position\n");
+        return 2;
+    },
+
+    // will be used for LDAP replication
+    //attribute unsigned long lastModifiedDate;
+    get lastModifiedDate() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get lastModifiedDate\n");
+        return this._lastModifiedDate;
+    },
+
+    set lastModifiedDate(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set lastModifiedDate\n");
+        this._lastModifiedDate = aValue;
+    },
+
+    // Defines whether this directory is a mail
+    // list or not
+    //attribute boolean isMailList;
+    get isMailList() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get isMailList\n");
+        if (this._isMailList) {
+            return this._isMailList;
+        }
+
+        return false;
+    },
+
+    set isMailList(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set isMailList\n");
+        this._isMailList = aValue;
+    },
+
+    // Get the children directories
+    //readonly attribute nsISimpleEnumerator childNodes;
+    get childNodes() {
+        var result = [];
+
+        if (this.distLists.length > 0) {
+            for each(var distList in this.distLists) {
+                result.push(distList);
+            }
+        }
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
+    },
+
+    /**
+     * Get the cards associated with the directory. This will return the cards
+     * associated with the mailing lists too.
+     */
+    //readonly attribute nsISimpleEnumerator childCards;
+    get childCards() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get childCards:" + this.dirName + ", uri:" + this.URI);
+        return exchWebService.commonFunctions.CreateSimpleObjectEnumerator(this.contacts);
+    },
+
+    /**
+     * Returns true if this directory represents a query - i.e. the rdf resource
+     * was something like moz-abmdbdirectory://abook.mab?....
+     */
+    //readonly attribute boolean isQuery;
+    get isQuery() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get isQuery");
+        if (this._searchQuery) {
+            return true;
+        }
+
+        return false;
+    },
+
+    get searchQuery() {
+        return this._searchQuery;
+    },
+
+    searchGAL: function _searchGAL(aQuery) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL: Going to search Global Address List also for url:" + this.serverUrl);
+        //(PrimaryEmail,c,wezel)(DisplayName,c,wezel)(FirstName,c,wezel)(LastName,c,wezel)
+
+        var wordToSearch;
+        if (aQuery.indexOf("(PrimaryEmail,") > -1) {
+            wordToSearch = aQuery.substr(aQuery.indexOf("(PrimaryEmail,") + 14);
+        }
+
+        if ((!wordToSearch) && (aQuery.indexOf("(DisplayName,") > -1)) {
+            wordToSearch = aQuery.substr(aQuery.indexOf("(DisplayName,") + 13);
+        }
+
+        if ((!wordToSearch) && (aQuery.indexOf("(FirstName,") > -1)) {
+            wordToSearch = aQuery.substr(aQuery.indexOf("(FirstName,") + 11);
+        }
+
+        if ((!wordToSearch) && (aQuery.indexOf("(LastName,") > -1)) {
+            wordToSearch = aQuery.substr(aQuery.indexOf("(LastName,") + 10);
+        }
+
+        if (!wordToSearch) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL: Could not determine word to search for.");
+        }
+
+        wordToSearch = wordToSearch.substr(wordToSearch.indexOf(",") + 1);
+        wordToSearch = wordToSearch.substr(0, wordToSearch.indexOf(")"));
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL 3: Going to search the Global Address List with the word '" + wordToSearch + "'.");
+
+        // Launch the query for exchange
+
+        var self = this;
+
+        this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
+
+        this.addToQueue(erResolveNames, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                ids: {
+                    name: decodeURI(wordToSearch)
+                },
+                searchScope: "ActiveDirectory",
+                GALQuery: true,
+                actionStart: Date.now()
+            },
+            function (erResolveNames, aResolutions) {
+                self.resolveNamesOk(erResolveNames, aResolutions);
+            },
+            function (erResolveNames, aCode, aMsg) {
+                self.resolveNamesError(erResolveNames, aCode, aMsg);
+            },
+            null);
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:searchGAL 4: Send request for the Global Address List with the word '" + wordToSearch + "'.");
+    },
+
+    convertExchangeMailbox: function _convertExchangeMailbox(aMailbox) {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbDistListDirectory: convertExchangeMailbox: Mailboxes:"+aMailbox.toString());
+
+        var result = {
+            name: aMailbox.getTagValue("t:Name"),
+            emailAddress: aMailbox.getTagValue("t:EmailAddress"),
+            routingType: aMailbox.getTagValue("t:RoutingType"),
+            mailboxType: aMailbox.getTagValue("t:MailboxType"),
+            mailbox: aMailbox
+        };
+
+        if (aMailbox.getTags("t:ItemId").length > 0) {
+            result.itemId = {
+                id: aMailbox.getAttributeByTag("t:ItemId", "Id", null),
+                changeKey: aMailbox.getAttributeByTag("t:ItemId", "ChangeKey", null)
+            };
+        }
+
+        return result;
+    },
+
+    resolveNamesOk: function _resolveNamesOk(erResolveNames, aResolutions) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: contacts:" + aResolutions.length);
+
+        for each(var resolution in aResolutions) {
+            exchWebService.commonAbFunctions.logInfo("resolution card:" + resolution.toString());
+
+            var mailbox = resolution.getTags("t:Mailbox");
+            exchWebService.commonAbFunctions.logInfo("resolution mailbox card:" + mailbox[0].toString());
+            var contact = resolution.getTags("t:Contact");
+            if (contact.length > 0) {
+                exchWebService.commonAbFunctions.logInfo("resolution contact card:" + contact[0].toString());
+            }
+            var calMailbox;
+            if (mailbox.length > 0) {
+                calMailbox = this.convertExchangeMailbox(mailbox[0]);
+
+                switch (calMailbox.mailboxType) {
+                case "PrivateDL": // An Contact folder distribution list.
+                    try {
+                        var dirName = this.childNodeURI + "id=" + encodeURIComponent(calMailbox.itemId.id) + "&name=" + encodeURIComponent(calMailbox.name) + "&parentId=" + this.uuid + "&type=PrivateDL";
+
+                        var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                            .createInstance(Ci.mivExchangeAbCard);
+                        newCard.convertExchangeDistListToCard(this, mailbox[0], dirName);
+                        this.updateList(newCard);
+
+                        if (!this.isQuery) {
+                            var dir = MailServices.ab.getDirectory(dirName);
+                            if (dir) {
+                                this.distLists.push(dir);
+                                MailServices.ab.notifyDirectoryItemAdded(this, dir);
+                            }
+                        }
+                    }
+                    catch (err) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Foutje:" + err);
+                    }
+                    break;
+                case "PublicDL": // An Active Directory distribution list.
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Public distList:" + calMailbox.name + " in GAL of " + this.serverUrl);
+
+                    var dirName = this.childNodeURI + "id=" + encodeURIComponent(calMailbox.routingType + ":" + calMailbox.emailAddress) + "&name=" + encodeURIComponent(calMailbox.name) + "&parentId=" + this.uuid + "&type=PublicDL";
+
+                    // Make a card from the contact details.
+                    var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                        .createInstance(Ci.mivExchangeAbCard);
+                    newCard.convertExchangeDistListToCard(this, mailbox[0], dirName);
+                    this.updateList(newCard);
+
+                    break;
+                case "Contact":
+                case "Mailbox": // An Active Directory Contact Mailbox.
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: new Mailbox Contact:" + calMailbox.name + " in GAL of " + this.serverUrl);
+
+                    // Make a card from the contact details.
+                    var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+                        .createInstance(Ci.mivExchangeAbCard);
+                    //					newCard.convertExchangeContactToCard(this, contact[0], calMailbox.mailboxType);
+                    newCard.convertExchangeContactToCard(this, resolution, calMailbox.mailboxType);
+                    newCard.setProperty("exchangeUser", this.user);
+                    newCard.setProperty("exchangeServerUrl", this.serverUrl);
+                    this.updateList(newCard);
+
+                    break;
+                default:
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesOk: Unknown mailboxtype:" + calMailbox.mailboxType);
+                }
+            }
+        }
+
+        this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
+
+    },
+
+    resolveNamesError: function _resolveNamesError(erResolveNames, aCode, aMsg) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: resolveNamesError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.isLoading = false;
+
+        if ((aCode == 0) && (aMsg == "ErrorNameResolutionNoResults")) {
+            // Name could not be resolved we use the mailbox element instead of the contacts.
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Could not resolve name.");
+            //this.ecUpdateCard(erResolveNames.ids.mailbox);
+        }
+
+        this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
+
+    },
+
+    /**
+     * Initializes a directory, pointing to a particular
+     * URI
+     */
+    //void init(in string aURI);
+    init: function _init(aURI) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: init. aURI:" + aURI + "\n");
+        this._URI = aURI;
+
+        this._Schema = null;
+        this._UUID = "";
+        this._searchQuery = null;
+
+        if (this._isInitialized) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: '" + this.dirName + "' is allready initialized");
+            return;
+        }
+
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: this is a childdir:" + aURI);
+
+        if (aURI.indexOf("://") > -1) {
+            this._Schema = aURI.substr(0, aURI.indexOf("://"));
+
+            var tmpStr = aURI.substr(aURI.indexOf("://") + 3);
+
+            this._searchQuery = null;
+            if (tmpStr.indexOf("?") > -1) {
+                this._searchQuery = tmpStr.substr(tmpStr.indexOf("?") + 1);
+                tmpStr = tmpStr.substr(0, tmpStr.indexOf("?"));
+            }
+
+            var params = exchWebService.commonAbFunctions.paramsToArray(tmpStr, "&");
+
+            this._UUID = decodeURIComponent(params.id);
+            this._type = decodeURIComponent(params.type);
+
+            this.prefs = Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch("extensions.exchangecontacts@extensions.1st-setup.nl.account." + this._UUID + ".");
+
+            if (this._searchQuery) {
+                var dirName = this._Schema + "://" + "id=" + encodeURIComponent(this._UUID) + "&type=" + this.type;
+
+                exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: this._searchQuery:" + this._searchQuery + ", dirName:" + dirName);
+
+                var dir = MailServices.ab.getDirectory(dirName);
+                if (dir) {
+
+                    this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
+
+                    if (this.useGAL) {
+                        this.searchGAL(this._searchQuery);
+                    }
+
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Going to get children of '" + dirName + "'");
+
+                    this.contacts = exchWebService.commonAbFunctions.filterCardsOnQuery(this._searchQuery, dir.childCards);
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Got children of '" + dirName + "'");
+
+                    for each(var contact in this.contacts) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Adding sub child A '" + contact.displayName + "' to contacts. dirName:" + this.dirName);
+                        MailServices.ab.notifyDirectoryItemAdded(this, contact);
+                    }
+
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Going to get children of distList.");
+                    // Get contact in childNodes (distLists)
+                    var childNodes = dir.childNodes;
+                    while (childNodes.hasMoreElements()) {
+                        var childNode = childNodes.getNext();
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Going to get children of distList '" + childNode.dirName + "':'" + childNode.URI + "' dirName:" + this.dirName);
+                        var tmpDir = MailServices.ab.getDirectory(childNode.URI + "?" + this._searchQuery);
+                        var childContacts = tmpDir.childCards;
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Got children of distList '" + childNode.dirName);
+                        while (childContacts.hasMoreElements()) {
+                            var contact = childContacts.getNext().QueryInterface(Ci.nsIAbCard);
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: == contact:" + contact);
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: Adding sub child B '" + contact.localId + "':'" + contact.displayName + "' to contacts. dirName:" + this.dirName);
+                            this.contacts[contact.localId] = contact;
+                        }
+                    }
+
+                    this.observerService.notifyObservers(this, "onExchangeGALSearchEnd", this._searchQuery);
+
+                }
+                else {
+                    exchWebService.commonAbFunctions.logInfo("ERROR Folderdirectory '" + dirName + "' does not exist.");
+                }
+
+            }
+            else {
+                // Non query directories we set the refresh timer for
+                exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: init. Going to do first sync. aURI:" + aURI + "\n");
+                this.syncFolder(); // First sync to initialize.
+
+                let self = this;
+                let timerCallback = {
+                    notify: function setTimeout_notify() {
+                        self.syncFolder();
+                    }
+                };
+
+                this.pollTimer.initWithCallback(timerCallback, exchWebService.commonFunctions.safeGetIntPref(this.prefs, "pollinterval", 300, true) * 1000, this.pollTimer.TYPE_REPEATING_SLACK);
+
+                this.loadContactsFromExchange();
+            }
+
+
+        }
+        else {
+            // ERROR
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: exchangeAbFolderDirectory.init: WE GOT TO A POINT WERE WE NEVER SHOULD GET TO.");
+        }
+
+        this._isInitialized = true;
+    },
+
+    // Deletes either a mailing list or a top
+    // level directory, which also updates the
+    // preferences
+    //void deleteDirectory(in nsIAbDirectory directory);
+    deleteDirectory: function _deleteDirectory(directory) {
+        // We cannot remove the root.
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: deleteDirectory this:" + this.URI + ", directory:" + directory.URI + "\n");
+
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: deleteDirectory uri:"+directory.URI+"\n");
+    },
+
+    // Check if directory contains card
+    // If the implementation is asynchronous the card
+    // may not yet have arrived. If it is in the process
+    // of obtaining cards the method will throw an
+    // NS_ERROR_NOT_AVAILABLE exception if the card
+    // cannot be found.
+    //boolean hasCard(in nsIAbCard cards);
+    hasCard: function _hasCard(cards) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: hasCard\n");
+        return false;
+    },
+
+
+    // Check if directory contains directory
+    //boolean hasDirectory(in nsIAbDirectory dir);
+    hasDirectory: function _hasDirectory(dir) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: hasDirectory\n");
+
+        return false;
+    },
+
+    /**
+     * Adds a card to the database.
+     *
+     * This card does not need to be of the same type as the database, e.g., one
+     * can add an nsIAbLDAPCard to an nsIAbMDBDirectory.
+     *
+     * @return "Real" card (eg nsIAbLDAPCard) that can be used for some
+     *         extra functions.
+     */
+    //nsIAbCard addCard(in nsIAbCard card);
+    addCard: function _addCard(card) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: addCard\n");
+        return null;
+    },
+
+    /**
+     * Modifies a card in the database to match that supplied.
+     */
+    //void modifyCard(in nsIAbCard modifiedCard);
+    modifyCard: function _modifyCard(modifiedCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: modifyCard\n");
+    },
+
+    /**
+     * Deletes the array of cards from the database.
+     *
+     * @param  aCards  The cards to delete from the database.
+     */
+    //void deleteCards(in nsIArray aCards);
+    deleteCards: function _deleteCards(aCards) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: deleteCards\n");
+    },
+
+    //void dropCard(in nsIAbCard card, in boolean needToCopyCard);
+    dropCard: function _dropCard(Card, needToCopyCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: dropCard\n");
+    },
+
+    /**
+     * Whether or not the directory should be searched when doing autocomplete,
+     * (currently by using GetChildCards); LDAP does not support this in online
+     * mode, so that should return false; additionally any other directory types
+     * that also do not support GetChildCards should return false.
+     *
+     * @param aIdentity  An optional parameter detailing the identity key (see
+     *                   nsIMsgAccountManager) that this autocomplete is being
+     *                   run against.
+     * @return           True if this directory should/can be used during
+     *                   local autocomplete.
+     */
+    //boolean useForAutocomplete(in ACString aIdentityKey);
+    useForAutocomplete: function _useForAutocomplete(aIdentityKey) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: useForAutocomplete\n");
+
+        return true;
+
+        //		return true;
+    },
+
+    /** 
+     * Does this directory support mailing lists? Note that in the case
+     * this directory is a mailing list and nested mailing lists are not
+     * supported, this will return false rather than true which the parent
+     * directory might.
+     */
+    //readonly attribute boolean supportsMailingLists;
+    get supportsMailingLists() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get supportsMailingLists\n");
+        return true;
+    },
+
+    /**
+     * This attribute serves two purposes
+     *  1. If this directory is not a mail list, directories are stored here
+     *  2. If it is a mail list card entries are stored here
+     *
+     * @note This is a *live* array and not a static copy
+     */
+    //attribute nsIMutableArray addressLists
+    get addressLists() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get addressLists\n");
+        return this._addressLists;
+    },
+
+    set addressLists(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set addressLists\n");
+        this._addressLists = aValue;
+    },
+
+    // Specific to a directory which stores mail lists
+
+    /**
+     * Creates a new mailing list in the directory. Currently only supported 
+     * for top-level directories.
+     *
+     * @param  list  The new mailing list to add.
+     * @return The mailing list directory added, which may have been modified.
+     */
+    //nsIAbDirectory addMailList(in nsIAbDirectory list);
+    addMailList: function _addMailList(list) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: addMailList\n");
+        return list;
+    },
+
+    /**
+     * Nick Name of the mailing list. This attribute is only really used when
+     * the nsIAbDirectory represents a mailing list.
+     */
+    //attribute AString listNickName;
+    get listNickName() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get listNickName\n");
+        return this._listNickName;
+    },
+
+    set listNickName(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set listNickName\n");
+        this._listNickName = aValue;
+    },
+
+    /**
+     * Description of the mailing list. This attribute is only really used when
+     * the nsIAbDirectory represents a mailing list.
+     */
+    //attribute AString description;
+    get description() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get description\n");
+        return this._description;
+    },
+
+    set description(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set description\n");
+        this._description = aValue;
+    },
+
+    /**
+     * Edits an existing mailing list (specified as listCard) into its parent
+     * directory. You should call this function on the resource with the same
+     * uri as the listCard.
+     *
+     * @param  listCard  A nsIAbCard version of the mailing list with the new
+     *                   values.
+     */
+    //void editMailListToDatabase(in nsIAbCard listCard);
+    editMailListToDatabase: function _editMailListToDatabase(listCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: editMailListToDatabase\n");
+    },
+
+    // Copies mail list properties from the srcList
+    //void copyMailList(in nsIAbDirectory srcList);
+    copyMailList: function _copyMailList(srcList) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: copyMailList\n");
+    },
+
+
+    /**
+     * Only creates a top level address book
+     * which is stored in the preferences
+     *
+     * Need to change to factory based approach
+     * to create new address books
+     *
+     * This method should become redundant or 
+     * be only associated with card folders
+     *
+     * The parameters are the same as for
+     * nsIAbManager::newAddressBook
+     */
+    //ACString createNewDirectory(in AString aDirName, in ACString aURI,
+    //                            in unsigned long aType, in ACString aPrefName);
+    createNewDirectory: function _createNewDirectory(aDirName, aURI, aType, aPrefName) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: createNewDirectory uuid:" + this.uuid + "\n");
+        return "createNewDirectory";
+    },
+
+
+    /* create a directory by passing the display name and address book uri */
+    //void createDirectoryByURI(in AString displayName, in ACString aURI);
+    createDirectoryByURI: function _createDirectoryByURI(displayName, aURI) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: createDirectoryByURI uuid:" + this.uuid + "\n");
+    },
+    /**
+     * The id of the directory used in prefs e.g. "ldap_2.servers.pab"
+     * Setting this will cause directoryPrefs to be updated.
+     */
+    //attribute ACString dirPrefId;
+    get dirPrefId() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: get dirPrefId: " + this.uuid);
+        return this._dirPrefId;
+    },
+
+    set dirPrefId(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: set dirPrefId\n");
+        this._dirPrefId = aValue;
+    },
+    /**
+     * @name  getXXXValue
+     *
+     * Helper functions to get different types of pref, but return a default
+     * value if a pref value was not obtained.
+     *
+     * @param aName         The name of the pref within the branch dirPrefId to
+     *                      get a value from.
+     *
+     * @param aDefaultValue The default value to return if getting the pref fails
+     *                      or the pref is not present.
+     *
+     * @return              The value of the pref or the default value.
+     *
+     * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
+     *                      be obtained (e.g. dirPrefId isn't set).
+     */
+    //@{
+    //long getIntValue(in string aName, in long aDefaultValue);
+    getIntValue: function _getIntValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getIntValue\n");
+        return aDefaultValue;
+    },
+
+    //boolean getBoolValue(in string aName, in boolean aDefaultValue);
+    getBoolValue: function _getBoolValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getBoolValue\n");
+        return aDefaultValue;
+    },
+
+    //ACString getStringValue(in string aName, in ACString aDefaultValue);
+    getStringValue: function _getStringValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getStringValue\n");
+        return aDefaultValue;
+    },
+
+    //AUTF8String getLocalizedStringValue(in string aName, in AUTF8String aDefaultValue);
+    getLocalizedStringValue: function _getLocalizedStringValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: getLocalizedStringValue\n");
+        return aDefaultValue;
+    },
+
+    //@}
+
+    /**
+     * The following attributes are read from an nsIAbDirectory via the above methods:
+     *
+     * HidesRecipients (Boolean)
+     *    If true, and this nsIAbDirectory is a mailing list, then when sending mail to
+     *    this list, recipients addresses will be hidden from one another by sending
+     *    via BCC.
+     */
+
+    /**
+     * @name  setXXXValue
+     *
+     * Helper functions to set different types of pref values.
+     *
+     * @param aName         The name of the pref within the branch dirPrefId to
+     *                      get a value from.
+     *
+     * @param aValue        The value to set the pref to.
+     *
+     * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
+     *                      be obtained (e.g. dirPrefId isn't set).
+     */
+    //@{
+    //void setIntValue(in string aName, in long aValue);
+    setIntValue: function _setIntValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setIntValue\n");
+    },
+
+    //void setBoolValue(in string aName, in boolean aValue);
+    setBoolValue: function _setBoolValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setBoolValue\n");
+    },
+
+    //void setStringValue(in string aName, in ACString aValue);
+    setStringValue: function _setStringValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setStringValue\n");
+    },
+
+    //void setLocalizedStringValue(in string aName, in AUTF8String aValue);
+    setLocalizedStringValue: function _setLocalizedStringValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: setLocalizedStringValue\n");
+    },
+
+    //@}
+
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        //if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
+
+        this.loadBalancer.addToQueue({
+            calendar: this,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+
+    get name() {
+        return this.dirName;
+    },
+
+    get useGAL() {
+        var result = exchWebService.commonFunctions.safeGetBoolPref(this.prefs, "globalAddressList", false);
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: useGAL:" + result);
+
+        return result;
+    },
+
+    get user() {
+        var username = exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+        if (username.indexOf("@") > -1) {
+            return username;
+        }
+        else {
+            if (this.domain == "") {
+                return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+            }
+            else {
+                return this.domain + "\\" + exchWebService.commonFunctions.safeGetCharPref(this.prefs, "user", "");
+            }
+        }
+    },
+
+    set user(value) {
+        if (value.indexOf("\\") > -1) {
+            this.domain = value.substr(0, value.indexOf("\\"));
+            this.prefs.setCharPref("user", value.substr(value.indexOf("\\") + 1));
+        }
+        else {
+            this.prefs.setCharPref("user", value);
+        }
+    },
+
+    get domain() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "domain", "");
+    },
+
+    set domain(value) {
+        return this.prefs.setCharPref("domain", value);
+    },
+
+    get mailbox() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "mailbox", "");
+    },
+
+    get serverUrl() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "server", "");
+    },
+
+    get folderBase() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderbase", "contacts");
+    },
+
+    get folderPath() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderpath", "/");
+    },
+
+    get folderID() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "folderid", null);
+    },
+
+    set folderID(aValue) {
+        this.prefs.setCharPref("folderid", aValue);
+    },
+
+    get changeKey() {
+        return exchWebService.commonFunctions.safeGetCharPref(this.prefs, "changekey", null);
+    },
+
+    set changeKey(aValue) {
+        this.prefs.setCharPref("changekey", aValue);
+    },
+
+    loadContactsFromExchange: function _loadContactsFromExchange() {
+        if (this.isLoading) {
+            return;
+        }
+
+        exchWebService.commonAbFunctions.logInfo("loadContactsFromExchange:" + this.dirName);
+
+        this.isLoading = true;
+
+        var self = this;
+
+        this.addToQueue(erFindContactsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                actionStart: Date.now()
+            },
+            function (erFindContactsRequest, aContacts, aDistLists) {
+                self.contactsFoundOk(erFindContactsRequest, aContacts, aDistLists);
+            },
+            function (erFindContactsRequest, aCode, aMsg) {
+                self.contactsFindError(erFindContactsRequest, aCode, aMsg);
+            },
+            null);
+
+    },
+
+    ecUpdateCard: function _ecUpdateCard(contact) {
+        var newCard = Cc["@1st-setup.nl/exchange/abcard;1"]
+            .createInstance(Ci.mivExchangeAbCard);
+        newCard.convertExchangeContactToCard(this, contact);
+        newCard.setProperty("exchangeUser", this.user);
+        newCard.setProperty("exchangeServerUrl", this.serverUrl);
+        this.updateList(newCard);
+    },
+
+    updateList: function _updateList(newCard) {
+        if (!newCard) {
+            return;
+        }
+
+        if (this.contacts[newCard.localId]) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:  == We allready know this card. Lets see what has changed");
+
+            // Check which properties changed.
+            for (var cardProperty in fixIterator(newCard.properties, Ci.nsIProperty)) {
+                if (cardProperty.name) {
+                    try {
+                        var oldValue = this.contacts[newCard.localId].getProperty(cardProperty.name, "");
+                        var newValue = cardProperty.value;
+                        if (oldValue != newValue) {
+                            // And existing property has changed.
+                            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: --Property Changed name:" + cardProperty.name + ", oldvalue:" + oldValue + ", newValue:" + newValue);
+                            this.contacts[newCard.localId].setProperty(cardProperty.name, newValue);
+                            MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
+                                cardProperty.name,
+                                oldValue,
+                                newValue);
+                        }
+                    }
+                    catch (err) {
+                        // We have a new property which was not set in the previous state. Add it
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:  == Err:" + err);
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: --Property added name:" + cardProperty.name + ", value:" + cardProperty.value);
+                        this.contacts[newCard.localId].setProperty(cardProperty.name, cardProperty.value);
+                        MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
+                            cardProperty.name,
+                            null,
+                            newValue);
+                    }
+                }
+            }
+
+            // We check if properties were removed.
+            for (var cardProperty in fixIterator(this.contacts[newCard.localId].properties, Ci.nsIProperty)) {
+                if (cardProperty.name) {
+                    var oldValue = cardProperty.value;
+                    try {
+                        var newValue = newCard.getProperty(cardProperty.name, "");
+
+                        if (oldValue != newValue) {
+                            // If we get here something went wrong before this call.
+                        }
+                    }
+                    catch (err) {
+                        // Property is not available in new state. We have to remove it.
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: --Property removed name:" + cardProperty.name + ", value:" + cardProperty.value);
+                        this.contacts[newCard.localId].deleteProperty(cardProperty.name);
+                        MailServices.ab.notifyItemPropertyChanged(this.contacts[newCard.localId],
+                            cardProperty.name,
+                            oldValue,
+                            null);
+                    }
+                }
+            }
+        }
+        else {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory:  || This card is new. We do not know it yet.");
+            this.contacts[newCard.localId] = newCard;
+            MailServices.ab.notifyDirectoryItemAdded(this, newCard);
+        }
+
+        exchWebService.commonAbFunctions.logInfo(this.uuid + ": newCard.localId:" + newCard.localId);
+    },
+
+    contactsFoundOk: function _contactsFoundOk(erFindContactsRequest, aContacts, aDistLists) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: contactsFoundOk: contacts:" + aContacts.length + ", distributionlists:" + aDistLists.length);
+
+        if (aContacts.length > 0) {
+            var self = this;
+            this.addToQueue(erGetContactsRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    ids: aContacts,
+                    actionStart: Date.now()
+                },
+                function (erGetContactsRequest, aContacts) {
+                    self.contactsLoadOk(erGetContactsRequest, aContacts);
+                },
+                function (erGetContactsRequest, aCode, aMsg) {
+                    self.contactsFindError(erGetContactsRequest, aCode, aMsg);
+                },
+                null);
+
+        }
+
+        this.distLists = new Array()
+
+        for each(var distList in aDistLists) {
+            this.addDistList(distList);
+        }
+
+    },
+
+    addDistList: function _addDistList(aDistList) {
+        exchWebService.commonAbFunctions.logInfo("distListLoadOk: new distList:" + aDistList.name);
+
+        this.observerService.notifyObservers(this, "onExchangeGALSearchStart", this._searchQuery);
+
+        var self = this;
+        this.addToQueue(erResolveNames, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                ids: {
+                    name: aDistList.name
+                },
+                searchScope: "Contacts",
+                actionStart: Date.now()
+            },
+            function (erResolveNames, aResolutions) {
+                self.resolveNamesOk(erResolveNames, aResolutions);
+            },
+            function (erResolveNames, aCode, aMsg) {
+                self.resolveNamesError(erResolveNames, aCode, aMsg);
+            },
+            null);
+    },
+
+    contactsFindError: function _contactsFindError(erFindContactsRequest, aCode, aMsg) {
+        this.isLoading = false;
+    },
+
+    contactsLoadOk: function _contactsLoadOk(erGetContactsRequest, aContacts) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: contactsLoadOk: contacts:" + aContacts.length);
+
+        for each(var contact in aContacts) {
+            //exchWebService.commonAbFunctions.logInfo("Contact card:"+contact.toString(),2);
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: new childCards:" + contact.getTagValue("t:DisplayName"));
+            this.ecUpdateCard(contact);
+
+        }
+
+        this.isLoading = false;
+
+    },
+
+    syncFolder: function _syncFolder() {
+        if ((this.weAreSyncing) || (this.isLoading)) {
+            return;
+        }
+
+        this.weAreSyncing = true;
+        var self = this;
+
+        this.addToQueue(erSyncContactsFolderRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                folderBase: this.folderBase,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                syncState: this.syncState,
+                actionStart: Date.now()
+            },
+            function (erSyncContactsFolderRequest, creations, updates, deletions, syncState) {
+                self.syncFolderOK(erSyncContactsFolderRequest, creations, updates, deletions, syncState);
+            },
+            function (erSyncContactsFolderRequest, aCode, aMsg) {
+                self.syncFolderError(erSyncContactsFolderRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    syncFolderOK: function _syncFolderOK(erSyncContactsFolderRequest, creations, updates, deletions, syncState) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: syncFolderOK " + this.dirName);
+
+        if (!this.syncState) {
+            exchWebService.commonAbFunctions.logInfo("syncFolderOK: First sync we are not going to use the data.");
+            this.syncState = syncState;
+            this.weAreSyncing = false;
+            return;
+        }
+
+        if ((creations.contacts.length > 0) || (updates.contacts.length > 0) || (deletions.contacts.length > 0)) {
+            this.addActivity(exchWebService.commonFunctions.getString("ExchangeContacts", "syncFolderEventMessage", [creations.contacts.length, updates.contacts.length, deletions.contacts.length, this.dirName], "exchangecalendar"), "", erSyncContactsFolderRequest.argument.actionStart, Date.now())
+            exchWebService.commonAbFunctions.logInfo(exchWebService.commonFunctions.getString("ExchangeContacts", "syncFolderEventMessage", [creations.contacts.length, updates.contacts.length, deletions.contacts.length, this.dirName], "exchangecalendar"));
+        }
+
+        var newCards = [];
+        for each(var newCard in creations.contacts) {
+            //exchWebService.commonAbFunctions.logInfo("New Contact card:"+newCard.toString(),2);
+            newCards.push(newCard)
+        }
+
+        for each(var updatedCard in updates.contacts) {
+            //exchWebService.commonAbFunctions.logInfo("Updated Contact card:"+updatedCard.toString(),2);
+            newCards.push(updatedCard)
+        }
+
+        if (newCards.length > 0) {
+            var self = this;
+            this.addToQueue(erGetContactsRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    ids: newCards,
+                    actionStart: Date.now()
+                },
+                function (erGetContactsRequest, aContacts) {
+                    self.contactsLoadOk2(erGetContactsRequest, aContacts);
+                },
+                function (erGetContactsRequest, aCode, aMsg) {
+                    self.contactsFindError(erGetContactsRequest, aCode, aMsg);
+                },
+                null);
+        }
+
+        for each(var deletedCard in deletions.contacts) {
+            //exchWebService.commonAbFunctions.logInfo("Deleted Contact card:"+deletedCard.toString(),2);
+            if (this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")]) {
+                MailServices.ab.notifyDirectoryItemDeleted(this, this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")]);
+                MailServices.ab.notifyDirectoryDeleted(this, this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")]);
+                delete this.contacts[deletedCard.getAttributeByTag("t:ItemId", "Id")];
+            }
+        }
+
+        if ((creations.distlists.length > 0) || (updates.distlists.length > 0) || (deletions.distlists.length > 0)) {
+            this.addActivity(exchWebService.commonFunctions.getString("ExchangeDistLists", "syncFolderEventMessage", [creations.distlists.length, updates.distlists.length, deletions.distlists.length, this.dirName], "exchangecalendar"), "", erSyncContactsFolderRequest.argument.actionStart, Date.now())
+            exchWebService.commonAbFunctions.logInfo(exchWebService.commonFunctions.getString("ExchangeDistLists", "syncFolderEventMessage", [creations.distlists.length, updates.distlists.length, deletions.distlists.length, this.dirName], "exchangecalendar"));
+        }
+
+        for each(var newDistList in creations.distlists) {
+            exchWebService.commonAbFunctions.logInfo("New distribution list:" + newDistList.toString(), 2);
+            this.addDistList(newDistList);
+        }
+
+        for each(var updatedDistList in updates.distlists) {
+            exchWebService.commonAbFunctions.logInfo("Updated distribution list:" + updatedDistList.toString(), 2);
+
+            // Find current distList;
+            var oldDistList;
+            for each(var distList in this.distLists) {
+                if (distList.uuid == updatedDistList.Id) {
+                    oldDistList = distList;
+                    break;
+                }
+            }
+
+            if (oldDistList) {
+                var newUri = this.childNodeURI + "id=" + encodeURIComponent(updatedDistList.Id) + "&name=" + encodeURIComponent(updatedDistList.name) + "&parentId=" + this.uuid + "&type=PrivateDL";
+                oldDistList.init(newUri);
+            }
+            else {
+                exchWebService.commonAbFunctions.logInfo("Updated distribution list: Could not find old DistList!!?", 2);
+            }
+        }
+
+        this.syncState = syncState;
+
+        if (newCards.length == 0) {
+            this.weAreSyncing = false;
+        }
+    },
+
+    syncFolderError: function _syncFolderError(erSyncContactsFolderRequest, aCode, aMsg) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: syncFolderError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.weAreSyncing = false;
+    },
+
+    contactsLoadOk2: function _contactsLoadOk2(erGetContactsRequest, aContacts) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: contactsLoadOk2: contacts:" + aContacts.length);
+
+        for each(var contact in aContacts) {
+            //exchWebService.commonAbFunctions.logInfo("Contact card:"+contact.toString(),2);
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: new childCards:" + contact.getTagValue("t:DisplayName"));
+            this.ecUpdateCard(contact);
+
+        }
+
+        this.weAreSyncing = false;
+
+    },
+
+    addActivity: function _addActivity(aTitle, aText, aStartDate, aEndDate) {
+        if (!this.activityManager) return;
+
+        let event = Cc["@mozilla.org/activity-event;1"].createInstance(nsIAE);
+
+        event.init(aTitle,
+            null,
+            aText,
+            aStartDate,
+            aEndDate);
+
+        this.activityManager.addActivity(event);
+    },
 
 };
 
 
 function NSGetFactory(cid) {
 
-	exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: NSGetFactory for exchangeAbFolderDirectory 1");
-	try {
-		if (!NSGetFactory.exchWebService_ab4) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: NSGetFactory for exchangeAbFolderDirectory 1a");
+    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: NSGetFactory for exchangeAbFolderDirectory 1");
+    try {
+        if (!NSGetFactory.exchWebService_ab4) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: NSGetFactory for exchangeAbFolderDirectory 1a");
 
-			NSGetFactory.exchWebService_ab4 = XPCOMUtils.generateNSGetFactory([exchangeAbFolderDirectory]);
-	}
+            NSGetFactory.exchWebService_ab4 = XPCOMUtils.generateNSGetFactory([exchangeAbFolderDirectory]);
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		exchWebService.commonAbFunctions.logInfo(e);
-		throw e;
-	}
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        exchWebService.commonAbFunctions.logInfo(e);
+        throw e;
+    }
 
-	exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: NSGetFactory for exchangeAbFolderDirectory 2");
-	return NSGetFactory.exchWebService_ab4(cid);
+    exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: NSGetFactory for exchangeAbFolderDirectory 2");
+    return NSGetFactory.exchWebService_ab4(cid);
 }
 
 exchWebService.commonAbFunctions.logInfo("exchangeAbFolderDirectory: init.");
-
diff --git a/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.js b/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.js
index ac914ef9..a145f3f0 100644
--- a/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.js
+++ b/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.js
@@ -42,816 +42,761 @@ Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 //
 
 function exchangeAbRootDirectory() {
-	exchWebService.commonAbFunctions.logInfo("new exchangeAbRootDirectory");
-	this._searchQuery = null;
-	this._UUID = "";
-	this._schema = null;
-
-	this.childDirs = {};
-
-	this._isInitialized = false;
-
-	this.childNodeURI = "exchWebService-contactFolder-directory://";
-
-	this.contacts = {};
-
-	var self = this;
-	var adBookListener = {
-		// nsIAbListener.idl
-		//  void onItemAdded(in nsISupports parentDir, in nsISupports item);
-		onItemAdded: function adBookListener_onItemAdded(aParentDir, aItem)
-		{
-			if (!aParentDir.uuid) return;
-			if ((aParentDir.uuid != self.uuid) && (aParentDir.isQuery)) {
-				var card = aItem.QueryInterface(Ci.mivExchangeAbCard);
-			exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: onItemAdded: Card:"+card.displayName);
-	try {
-			self.contacts[card.localId] = card;
-	}
-	catch(err) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: onItemAdded: Error:"+err);
-	}
-				MailServices.ab.notifyDirectoryItemAdded(self, card);
-			
-			}
-		},
-
-	}
-
-	MailServices.ab.addAddressBookListener(adBookListener, Ci.nsIAbListener.itemAdded);
+    exchWebService.commonAbFunctions.logInfo("new exchangeAbRootDirectory");
+    this._searchQuery = null;
+    this._UUID = "";
+    this._schema = null;
+
+    this.childDirs = {};
+
+    this._isInitialized = false;
+
+    this.childNodeURI = "exchWebService-contactFolder-directory://";
+
+    this.contacts = {};
+
+    var self = this;
+    var adBookListener = {
+        // nsIAbListener.idl
+        //  void onItemAdded(in nsISupports parentDir, in nsISupports item);
+        onItemAdded: function adBookListener_onItemAdded(aParentDir, aItem) {
+            if (!aParentDir.uuid) return;
+            if ((aParentDir.uuid != self.uuid) && (aParentDir.isQuery)) {
+                var card = aItem.QueryInterface(Ci.mivExchangeAbCard);
+                exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: onItemAdded: Card:" + card.displayName);
+                try {
+                    self.contacts[card.localId] = card;
+                }
+                catch (err) {
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: onItemAdded: Error:" + err);
+                }
+                MailServices.ab.notifyDirectoryItemAdded(self, card);
+
+            }
+        },
+
+    }
+
+    MailServices.ab.addAddressBookListener(adBookListener, Ci.nsIAbListener.itemAdded);
 
 }
 
 exchangeAbRootDirectory.prototype = {
 
-	classID: components.ID("{227664eb-cce6-4b7a-8d57-0bb0c6c9b362}"),
-	contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-contactRoot-directory",
-	classDescription: "Exchange 2007/2010 Contacts Root Directory",
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	QueryInterface: XPCOMUtils.generateQI([Ci.exchangeAbRootDirectory,
-						Ci.nsIAbDirectory,
-						Ci.nsIAbCollection,
-						Ci.nsIAbItem,
-						Ci.nsISupports]),
-
-  /**
-   * A universally-unique identifier for this item.
-   *
-   * If this item cannot be associated with a UUID for some reason, it MUST
-   * return the empty string. The empty string MUST NOT be a valid UUID for any
-   * item. Under no circumstances may this function throw an error.
-   *
-   * It is STRONGLY RECOMMENDED that implementations guarantee that this UUID
-   * will not change between two different sessions of the application and that,
-   * if this item is deleted, the UUID will not be reused.
-   *
-   * The format of the UUID for a generic nsIAbItem is purposefully left
-   * undefined, although any item contained by an nsIAbDirectory SHOULD use
-   * nsIAbManager::generateUUID to generate the UUID.
-   */
-  //readonly attribute AUTF8String uuid;
-	get uuid()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: uuid\n");
-		if (this._UUID) {
-			return this._UUID;
-		}
-
-		return "";
-	},
-
-  /**
-   * @{
-   * These constants reflect the possible values of the
-   * mail.addr_book.lastnamefirst preferences. They are intended to be used in
-   * generateName, defined below.
-   */
-   //const unsigned long GENERATE_DISPLAY_NAME = 0;
-   //const unsigned long GENERATE_LAST_FIRST_ORDER = 1;
-   //const unsigned long GENERATE_FIRST_LAST_ORDER = 2;
-   /** @} */
-
-  /** 
-   * Generate a name from the item for display purposes.
-   *
-   * If this item is an nsIAbCard, then it will use the aGenerateFormat option
-   * to determine the string to return.
-   * If this item is not an nsIAbCard, then the aGenerateFormat option may be
-   * ignored, and the displayName of the item returned.
-   *
-   * @param  aGenerateFormat The format to generate as per the GENERATE_*
-   *                         constants above.
-   * @param  aBundle         An optional parameter that is a pointer to a string
-   *                         bundle that holds:
-   *           chrome://messenger/locale/addressbook/addressBook.properties
-   *                         If this bundle is not supplied, then the function
-   *                         will obtain the bundle itself. If cached by the
-   *                         caller and supplied to this function, then
-   *                         performance will be improved over many calls.
-   * @return                 A string containing the generated name.
-   */
-  //AString generateName(in long aGenerateFormat,
-  //                     [optional] in nsIStringBundle aBundle);
-	generateName: function _generateName(aGenerateFormat, aBundle)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: generateName\n");
-		return "generateName";
-	},
-
-  /**
-   * Generate a formatted email address from the card, that can be used for
-   * sending emails.
-   *
-   * @param  aExpandList     If this card is a list, and this parameter is set
-   *                         to true, then the list will be expanded to include
-   *                         the emails of the cards within the list.
-   * @param  aGroupMailLists If this card (or the items within this card) is a
-   *                         list, and this is set to true, then the list will
-   *                         be expanded in the RFC 2822 group format
-   *                         "displayname : email1 ; email2 ; etc".
-   * @param  aHeaderParser   An optional parameter pointing to the
-   *                         nsIMsgHeaderParser service. If this is not supplied
-   *                         the function will obtain the service itself. If
-   *                         cached by the called and supplied to this function,
-   *                         then performance will be improved over many calls.
-   * @return                 A string containing a comma-separated list of
-   *                         formatted addresses.
-   */
-  //AString generateFormattedEmail(in boolean aExpandList,
-  //                               in boolean aAsGroupMailLists,
-  //                               [optional] in nsIMsgHeaderParser aHeaderParser);
-	generateFormattedEmail: function _generateFormattedEmail( aExpandList, aAsGroupMailLists, aHeaderParser)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: generateFormattedEmail\n");
-		return "";
-	},
-
-  /**
-   * Returns true if this collection is read-only.
-   */
-  //readonly attribute boolean readOnly;
-	get readOnly()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: readOnly\n");
-		return true;
-	},
-
-  /**
-   * Returns true if this collection is accessed over a network connection.
-   */
-  //readonly attribute boolean isRemote;
-	get isRemote()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: isRemote\n");
-//		return true;
-		return false; // This to fake the compose->addressing preferences Directory Server list.
-	},
-
-
-  /**
-   * Returns true if this collection is accessed over a secure connection.
-   *
-   * If isRemote returns false, then this value MUST be false as well.
-   */
-  //readonly attribute boolean isSecure;
-	get isSecure()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: isSecure\n");
-		return true;
-	},
-
-
-  /** 
-   * Returns an address book card for the specified email address if found.
-   *
-   * If there are multiple cards with the given email address, this method will
-   * return one of these cards in an implementation-defined manner.
-   *
-   * Matching is performed in a case-insensitive manner.
-   *
-   * This method performs a synchronous operation. If the collection cannot do
-   * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
-   *
-   * @param  emailAddress The email address to find in any of the email address
-   *                      fields. If emailAddress is empty, the database won't
-   *                      be searched and the function will return as if no card
-   *                      was found.
-   * @return              An nsIAbCard if one was found, else returns NULL.
-   * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
-   */
-  //nsIAbCard cardForEmailAddress(in AUTF8String emailAddress);
-	cardForEmailAddress: function _cardForEmailAddress(emailAddress)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: cardForEmailAddress");
-		return null;
-//		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-	},
-
-  /**
-   * Returns an address book card for the specified property if found.
-   *
-   * If there are multiple cards with the given value for the property, this
-   * method will return one of these cards in an implementation-defined manner.
-   *
-   * This method performs a synchronous operation. If the collection cannot do
-   * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
-   *
-   * If the property is not natively a string, it can still be searched for
-   * using the string-encoded value of the property, e.g. "0". See
-   * nsIAbCard::getPropertyAsAUTF8String for more information. Empty values will
-   * return no match, to prevent spurious results.
-   *
-   * @param  aProperty      The property to look for.
-   * @param  aValue         The value to search for.
-   * @param  aCaseSensitive True if matching should be done case-sensitively.
-   * @result                An nsIAbCard if one was found, else returns NULL.
-   * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
-   */
-  //nsIAbCard getCardFromProperty(in string aProperty, in AUTF8String aValue,
-  //                              in boolean aCaseSensitive);
-	getCardFromProperty: function _cardForEmailAddress(aProperty, aValue, aCaseSensitive)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getCardFromProperty: aProperty:"+aProperty+", aValue:"+aValue);
-		//throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-		return null;
-	},
-
-
-  /**
-   * Returns all address book cards with a specific property matching value
-   *
-   * This function is almost identical to getCardFromProperty, with the
-   * exception of returning all cards rather than just the first.
-   *
-   * @param  aProperty      The property to look for.
-   * @param  aValue         The value to search for.
-   * @param  aCaseSensitive True if matching should be done case-sensitively.
-   * @result                A nsISimpleEnumerator that holds nsIAbCard
-   *                        instances.
-   */
-  //nsISimpleEnumerator getCardsFromProperty(in string aProperty,
-  //                                         in AUTF8String aValue,
-  //                                         in boolean aCaseSensitive);
-
-	getCardsFromProperty: function _getCardsFromProperty(aProperty, aValue, aCaseSensitive)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getCardsFromProperty");
-		var result = [];
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
-	},
-
-
-  /**
-   * The chrome URI to use for bringing up a dialog to edit this directory.
-   * When opening the dialog, use a JS argument of
-   * {selectedDirectory: thisdir} where thisdir is this directory that you just
-   * got the chrome URI from.
-   */
-  //readonly attribute ACString propertiesChromeURI;
-	get propertiesChromeURI()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get propertiesChromeURI 1");
-		return "";
-	},
-
-  /**
-   * The description of the directory. If this directory is not a mailing list,
-   * then setting this attribute will send round a "DirName" update via
-   * nsIAddrBookSession.
-   */
-  //attribute AString dirName;
-	get dirName()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get dirName\n");
-		return "Exchange contacts";
-	},
-
-	set dirName(aValue)
-	{
-	},
-
-  // XXX This should really be replaced by a QI or something better
-  //readonly attribute long dirType;
-	get dirType()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get dirType\n");
-		return 2;
-	},
-
-  // eliminated a bit more.
-
-  // The filename for address books within this directory.
-  //readonly attribute ACString fileName;
-	get fileName()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get fileName\n");
-		return "filename";
-	},
-
-  // The URI of the address book
-  //readonly attribute ACString URI;
-	get URI()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get URI:"+this._URI);
-		return this._URI;
-	},
-
-  // The position of the directory on the display.
-  //readonly attribute long position;
-	get position()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get position\n");
-		return 1;
-	},
-
-  // will be used for LDAP replication
-  //attribute unsigned long lastModifiedDate;
-	get lastModifiedDate()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get lastModifiedDate\n");
-		return this._lastModifiedDate;
-	},
-
-	set lastModifiedDate(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set lastModifiedDate\n");
-		this._lastModifiedDate = aValue;
-	},
-
-  // Defines whether this directory is a mail
-  // list or not
-  //attribute boolean isMailList;
-	get isMailList()
-	{
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get isMailList\n");
-		return false;
-	},
-
-	set isMailList(aValue)
-	{
-		return;
-	},
-
-  // Get the children directories
-  //readonly attribute nsISimpleEnumerator childNodes;
-	get childNodes()
-	{
-		var accounts = exchWebService.commonAbFunctions.getAccounts();
-		this.childDirs = {};
-		var results = [];
-		if (accounts.length > 0) {
-			var dir;
-			for each(var account in accounts) {
-				if (account != "") {
-					var dirName = this.childNodeURI+"id="+encodeURI(account)+"&type=basefolder";
-					try {
-						dir = MailServices.ab.getDirectory(dirName);
-						results.push(dir);
-						this.childDirs[dir.uuid] = dir;
-					}
-					catch(err) {
-						exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Error getDirectory for '"+dirName+"'.:"+err+"\n");
-					}
-				}
-			}
-		}
-		return exchWebService.commonFunctions.CreateSimpleEnumerator(results);
-	},
-
-  /**
-   * Get the cards associated with the directory. This will return the cards
-   * associated with the mailing lists too.
-   */
-  //readonly attribute nsISimpleEnumerator childCards;
-	get childCards()
-	{
-		var result = {};
-
-		if (this._searchQuery) {
-			result = this.contacts;
-		}
-
-		return exchWebService.commonFunctions.CreateSimpleObjectEnumerator(result);
-
-	},
-
-  /**
-   * Returns true if this directory represents a query - i.e. the rdf resource
-   * was something like moz-abmdbdirectory://abook.mab?....
-   */
-  //readonly attribute boolean isQuery;
-	get isQuery()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get isQuery");
-		if (this._searchQuery) {
-			return true;
-		}
-
-		return false;
-	},
-
-  /**
-   * Initializes a directory, pointing to a particular
-   * URI
-   */
-  //void init(in string aURI);
-	init: function _init(aURI)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: init. aURI:"+aURI+"\n");
-		this._URI = aURI;
-
-		this._Schema = null;
-		this._UUID = "";
-		this._searchQuery = null;
-
-		if (this._isInitialized) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: '"+this.dirName+"' is allready initialized");
-			return;
-		}
-
-		if (aURI.indexOf("?") > -1) {
-			this._searchQuery = aURI.substr(aURI.indexOf("?")+1);
-			this.contacts = {};
-
-			var schema = aURI.substr(0, aURI.indexOf("://")+3);
-
-			exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: this._searchQuery:"+this._searchQuery+", dirName:"+schema);
-				
-			var dir = MailServices.ab.getDirectory(schema);
-			if (dir) {
-				exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Going to get children of '"+schema+"'");
-
-				// Get contact in childNodes (distLists)
-				var childNodes = dir.childNodes;
-				while (childNodes.hasMoreElements()) {
-					var childNode = childNodes.getNext();
-					exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Going to get children of distList '"+childNode.dirName+"':'"+childNode.URI+"' dirName:"+this.dirName);
-					var tmpDir = MailServices.ab.getDirectory(childNode.URI+"?"+this._searchQuery);
-					var childContacts = tmpDir.childCards;
-					while (childContacts.hasMoreElements()) {
-						var contact = childContacts.getNext().QueryInterface(Ci.nsIAbCard);
-						exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Adding sub child '"+contact.displayName+"' to contacts.");
-						this.contacts[contact.localId] = contact;
-					}
-				}
-			}
-			else {
-				exchWebService.commonAbFunctions.logInfo("ERROR Rootdirectory '"+schema+"' does not exist.");
-			}
-		}
-
-		this._UUID = exchWebService.commonAbFunctions.getRootUUID();
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: this is a root:"+aURI);
-
-		this._isInitialized = true;
-	},
-
-  // Deletes either a mailing list or a top
-  // level directory, which also updates the
-  // preferences
-  //void deleteDirectory(in nsIAbDirectory directory);
-	deleteDirectory: function _deleteDirectory(directory)
-	{
-		// We cannot remove the root.
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: deleteDirectory this:"+this.URI+", directory:"+directory.URI+"\n");
-
-		return;
-
-		//exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: deleteDirectory uri:"+directory.URI+"\n");
-	},
-
-  // Check if directory contains card
-  // If the implementation is asynchronous the card
-  // may not yet have arrived. If it is in the process
-  // of obtaining cards the method will throw an
-  // NS_ERROR_NOT_AVAILABLE exception if the card
-  // cannot be found.
-  //boolean hasCard(in nsIAbCard cards);
-	hasCard: function _hasCard(cards)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: hasCard\n");
-		return false;
-	},
-
-
-  // Check if directory contains directory
-  //boolean hasDirectory(in nsIAbDirectory dir);
-	hasDirectory: function _hasDirectory(dir)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: hasDirectory\n");
-
-		return false;
-	},
-
-  /**
-   * Adds a card to the database.
-   *
-   * This card does not need to be of the same type as the database, e.g., one
-   * can add an nsIAbLDAPCard to an nsIAbMDBDirectory.
-   *
-   * @return "Real" card (eg nsIAbLDAPCard) that can be used for some
-   *         extra functions.
-   */
-  //nsIAbCard addCard(in nsIAbCard card);
-	addCard: function _addCard(card)
-	{
-		return null;
-	},
-
-  /**
-   * Modifies a card in the database to match that supplied.
-   */
-  //void modifyCard(in nsIAbCard modifiedCard);
-	modifyCard: function _modifyCard(modifiedCard)
-	{
-		return null;
-	},
-
-  /**
-   * Deletes the array of cards from the database.
-   *
-   * @param  aCards  The cards to delete from the database.
-   */
-  //void deleteCards(in nsIArray aCards);
-	deleteCards: function _deleteCards(aCards)
-	{
-		return null;
-	},
-
-  //void dropCard(in nsIAbCard card, in boolean needToCopyCard);
-	dropCard: function _dropCard(Card, needToCopyCard)
-	{
-		return null;
-	},
-
-  /**
-   * Whether or not the directory should be searched when doing autocomplete,
-   * (currently by using GetChildCards); LDAP does not support this in online
-   * mode, so that should return false; additionally any other directory types
-   * that also do not support GetChildCards should return false.
-   *
-   * @param aIdentity  An optional parameter detailing the identity key (see
-   *                   nsIMsgAccountManager) that this autocomplete is being
-   *                   run against.
-   * @return           True if this directory should/can be used during
-   *                   local autocomplete.
-   */
-  //boolean useForAutocomplete(in ACString aIdentityKey);
-	useForAutocomplete: function _useForAutocomplete(aIdentityKey)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: useForAutocomplete\n");
-
-		return false;
-	},
-
-  /** 
-   * Does this directory support mailing lists? Note that in the case
-   * this directory is a mailing list and nested mailing lists are not
-   * supported, this will return false rather than true which the parent
-   * directory might.
-   */
-  //readonly attribute boolean supportsMailingLists;
-	get supportsMailingLists()
-	{
-		return false;
-	},
-
-  /**
-   * This attribute serves two purposes
-   *  1. If this directory is not a mail list, directories are stored here
-   *  2. If it is a mail list card entries are stored here
-   *
-   * @note This is a *live* array and not a static copy
-   */
-  //attribute nsIMutableArray addressLists
-	get addressLists()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get addressLists\n");
-		return this._addressLists;
-	},
-
-	set addressLists(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set addressLists\n");
-		this._addressLists = aValue;
-	},
-
-  // Specific to a directory which stores mail lists
-
-  /**
-   * Creates a new mailing list in the directory. Currently only supported 
-   * for top-level directories.
-   *
-   * @param  list  The new mailing list to add.
-   * @return The mailing list directory added, which may have been modified.
-   */
-  //nsIAbDirectory addMailList(in nsIAbDirectory list);
-	addMailList: function _addMailList(list)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: addMailList\n");
-		return list;
-	},
-
-  /**
-   * Nick Name of the mailing list. This attribute is only really used when
-   * the nsIAbDirectory represents a mailing list.
-   */
-  //attribute AString listNickName;
-	get listNickName()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get listNickName\n");
-		return this._listNickName;
-	},
-
-	set listNickName(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set listNickName\n");
-		this._listNickName = aValue;
-	},
-
-  /**
-   * Description of the mailing list. This attribute is only really used when
-   * the nsIAbDirectory represents a mailing list.
-   */
-  //attribute AString description;
-	get description()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get description\n");
-		return this._description;
-	},
-
-	set description(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set description\n");
-		this._description = aValue;
-	},
-
-  /**
-   * Edits an existing mailing list (specified as listCard) into its parent
-   * directory. You should call this function on the resource with the same
-   * uri as the listCard.
-   *
-   * @param  listCard  A nsIAbCard version of the mailing list with the new
-   *                   values.
-   */
-  //void editMailListToDatabase(in nsIAbCard listCard);
-	editMailListToDatabase: function _editMailListToDatabase(listCard)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: editMailListToDatabase\n");
-	},
-
-  // Copies mail list properties from the srcList
-  //void copyMailList(in nsIAbDirectory srcList);
-	copyMailList: function _copyMailList(srcList)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: copyMailList\n");
-	},
-
-
-  /**
-   * Only creates a top level address book
-   * which is stored in the preferences
-   *
-   * Need to change to factory based approach
-   * to create new address books
-   *
-   * This method should become redundant or 
-   * be only associated with card folders
-   *
-   * The parameters are the same as for
-   * nsIAbManager::newAddressBook
-   */
-  //ACString createNewDirectory(in AString aDirName, in ACString aURI,
-  //                            in unsigned long aType, in ACString aPrefName);
-	createNewDirectory: function _createNewDirectory(aDirName, aURI, aType, aPrefName)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: createNewDirectory uuid:"+this.uuid+"\n");
-		return "createNewDirectory";
-	},
-
-
-  /* create a directory by passing the display name and address book uri */
-  //void createDirectoryByURI(in AString displayName, in ACString aURI);
-	createDirectoryByURI: function _createDirectoryByURI(displayName, aURI)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: createDirectoryByURI uuid:"+this.uuid+"\n");
-	},
-  /**
-   * The id of the directory used in prefs e.g. "ldap_2.servers.pab"
-   * Setting this will cause directoryPrefs to be updated.
-   */
-  //attribute ACString dirPrefId;
-	get dirPrefId()
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get dirPrefId: "+this.uuid);
-		if (this._dirPrefId) {
-			return this._dirPrefId;
-		}
-		return "ldap_2.servers.exchangecontacts"; 
-	},
-
-	set dirPrefId(aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set dirPrefId\n");
-		this._dirPrefId = aValue;
-	},
-  /**
-   * @name  getXXXValue
-   *
-   * Helper functions to get different types of pref, but return a default
-   * value if a pref value was not obtained.
-   *
-   * @param aName         The name of the pref within the branch dirPrefId to
-   *                      get a value from.
-   *
-   * @param aDefaultValue The default value to return if getting the pref fails
-   *                      or the pref is not present.
-   *
-   * @return              The value of the pref or the default value.
-   *
-   * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
-   *                      be obtained (e.g. dirPrefId isn't set).
-   */
-  //@{
-  //long getIntValue(in string aName, in long aDefaultValue);
-	getIntValue: function _getIntValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getIntValue\n");
-		return aDefaultValue;
-	},
-
-  //boolean getBoolValue(in string aName, in boolean aDefaultValue);
-	getBoolValue: function _getBoolValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getBoolValue\n");
-		return aDefaultValue;
-	},
-
-  //ACString getStringValue(in string aName, in ACString aDefaultValue);
-	getStringValue: function _getStringValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getStringValue\n");
-		return aDefaultValue;
-	},
-
-  //AUTF8String getLocalizedStringValue(in string aName, in AUTF8String aDefaultValue);
-	getLocalizedStringValue: function _getLocalizedStringValue(aName, aDefaultValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getLocalizedStringValue\n");
-		return aDefaultValue;
-	},
-
-  //@}
-
-  /**
-   * The following attributes are read from an nsIAbDirectory via the above methods:
-   *
-   * HidesRecipients (Boolean)
-   *    If true, and this nsIAbDirectory is a mailing list, then when sending mail to
-   *    this list, recipients addresses will be hidden from one another by sending
-   *    via BCC.
-   */
-
-  /**
-   * @name  setXXXValue
-   *
-   * Helper functions to set different types of pref values.
-   *
-   * @param aName         The name of the pref within the branch dirPrefId to
-   *                      get a value from.
-   *
-   * @param aValue        The value to set the pref to.
-   *
-   * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
-   *                      be obtained (e.g. dirPrefId isn't set).
-   */
-  //@{
-  //void setIntValue(in string aName, in long aValue);
-	setIntValue: function _setIntValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setIntValue\n");
-	},
-
-  //void setBoolValue(in string aName, in boolean aValue);
-	setBoolValue: function _setBoolValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setBoolValue\n");
-	},
-
-  //void setStringValue(in string aName, in ACString aValue);
-	setStringValue: function _setStringValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setStringValue\n");
-	},
-
-  //void setLocalizedStringValue(in string aName, in AUTF8String aValue);
-	setLocalizedStringValue: function _setLocalizedStringValue(aName, aValue)
-	{
-		exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setLocalizedStringValue\n");
-	},
-
-  //@}
+    classID: components.ID("{227664eb-cce6-4b7a-8d57-0bb0c6c9b362}"),
+    contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-contactRoot-directory",
+    classDescription: "Exchange 2007/2010 Contacts Root Directory",
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    QueryInterface: XPCOMUtils.generateQI([Ci.exchangeAbRootDirectory,
+        Ci.nsIAbDirectory,
+        Ci.nsIAbCollection,
+        Ci.nsIAbItem,
+        Ci.nsISupports
+    ]),
+
+    /**
+     * A universally-unique identifier for this item.
+     *
+     * If this item cannot be associated with a UUID for some reason, it MUST
+     * return the empty string. The empty string MUST NOT be a valid UUID for any
+     * item. Under no circumstances may this function throw an error.
+     *
+     * It is STRONGLY RECOMMENDED that implementations guarantee that this UUID
+     * will not change between two different sessions of the application and that,
+     * if this item is deleted, the UUID will not be reused.
+     *
+     * The format of the UUID for a generic nsIAbItem is purposefully left
+     * undefined, although any item contained by an nsIAbDirectory SHOULD use
+     * nsIAbManager::generateUUID to generate the UUID.
+     */
+    //readonly attribute AUTF8String uuid;
+    get uuid() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: uuid\n");
+        if (this._UUID) {
+            return this._UUID;
+        }
+
+        return "";
+    },
+
+    /**
+     * @{
+     * These constants reflect the possible values of the
+     * mail.addr_book.lastnamefirst preferences. They are intended to be used in
+     * generateName, defined below.
+     */
+    //const unsigned long GENERATE_DISPLAY_NAME = 0;
+    //const unsigned long GENERATE_LAST_FIRST_ORDER = 1;
+    //const unsigned long GENERATE_FIRST_LAST_ORDER = 2;
+    /** @} */
+
+    /** 
+     * Generate a name from the item for display purposes.
+     *
+     * If this item is an nsIAbCard, then it will use the aGenerateFormat option
+     * to determine the string to return.
+     * If this item is not an nsIAbCard, then the aGenerateFormat option may be
+     * ignored, and the displayName of the item returned.
+     *
+     * @param  aGenerateFormat The format to generate as per the GENERATE_*
+     *                         constants above.
+     * @param  aBundle         An optional parameter that is a pointer to a string
+     *                         bundle that holds:
+     *           chrome://messenger/locale/addressbook/addressBook.properties
+     *                         If this bundle is not supplied, then the function
+     *                         will obtain the bundle itself. If cached by the
+     *                         caller and supplied to this function, then
+     *                         performance will be improved over many calls.
+     * @return                 A string containing the generated name.
+     */
+    //AString generateName(in long aGenerateFormat,
+    //                     [optional] in nsIStringBundle aBundle);
+    generateName: function _generateName(aGenerateFormat, aBundle) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: generateName\n");
+        return "generateName";
+    },
+
+    /**
+     * Generate a formatted email address from the card, that can be used for
+     * sending emails.
+     *
+     * @param  aExpandList     If this card is a list, and this parameter is set
+     *                         to true, then the list will be expanded to include
+     *                         the emails of the cards within the list.
+     * @param  aGroupMailLists If this card (or the items within this card) is a
+     *                         list, and this is set to true, then the list will
+     *                         be expanded in the RFC 2822 group format
+     *                         "displayname : email1 ; email2 ; etc".
+     * @param  aHeaderParser   An optional parameter pointing to the
+     *                         nsIMsgHeaderParser service. If this is not supplied
+     *                         the function will obtain the service itself. If
+     *                         cached by the called and supplied to this function,
+     *                         then performance will be improved over many calls.
+     * @return                 A string containing a comma-separated list of
+     *                         formatted addresses.
+     */
+    //AString generateFormattedEmail(in boolean aExpandList,
+    //                               in boolean aAsGroupMailLists,
+    //                               [optional] in nsIMsgHeaderParser aHeaderParser);
+    generateFormattedEmail: function _generateFormattedEmail(aExpandList, aAsGroupMailLists, aHeaderParser) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: generateFormattedEmail\n");
+        return "";
+    },
+
+    /**
+     * Returns true if this collection is read-only.
+     */
+    //readonly attribute boolean readOnly;
+    get readOnly() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: readOnly\n");
+        return true;
+    },
+
+    /**
+     * Returns true if this collection is accessed over a network connection.
+     */
+    //readonly attribute boolean isRemote;
+    get isRemote() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: isRemote\n");
+        //		return true;
+        return false; // This to fake the compose->addressing preferences Directory Server list.
+    },
+
+
+    /**
+     * Returns true if this collection is accessed over a secure connection.
+     *
+     * If isRemote returns false, then this value MUST be false as well.
+     */
+    //readonly attribute boolean isSecure;
+    get isSecure() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: isSecure\n");
+        return true;
+    },
+
+
+    /** 
+     * Returns an address book card for the specified email address if found.
+     *
+     * If there are multiple cards with the given email address, this method will
+     * return one of these cards in an implementation-defined manner.
+     *
+     * Matching is performed in a case-insensitive manner.
+     *
+     * This method performs a synchronous operation. If the collection cannot do
+     * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
+     *
+     * @param  emailAddress The email address to find in any of the email address
+     *                      fields. If emailAddress is empty, the database won't
+     *                      be searched and the function will return as if no card
+     *                      was found.
+     * @return              An nsIAbCard if one was found, else returns NULL.
+     * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
+     */
+    //nsIAbCard cardForEmailAddress(in AUTF8String emailAddress);
+    cardForEmailAddress: function _cardForEmailAddress(emailAddress) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: cardForEmailAddress");
+        return null;
+        //		throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+    },
+
+    /**
+     * Returns an address book card for the specified property if found.
+     *
+     * If there are multiple cards with the given value for the property, this
+     * method will return one of these cards in an implementation-defined manner.
+     *
+     * This method performs a synchronous operation. If the collection cannot do
+     * the search in such a manner, then it should throw NS_ERROR_NOT_IMPLEMENTED.
+     *
+     * If the property is not natively a string, it can still be searched for
+     * using the string-encoded value of the property, e.g. "0". See
+     * nsIAbCard::getPropertyAsAUTF8String for more information. Empty values will
+     * return no match, to prevent spurious results.
+     *
+     * @param  aProperty      The property to look for.
+     * @param  aValue         The value to search for.
+     * @param  aCaseSensitive True if matching should be done case-sensitively.
+     * @result                An nsIAbCard if one was found, else returns NULL.
+     * @exception NS_ERROR_NOT_IMPLEMENTED If the collection cannot do this.
+     */
+    //nsIAbCard getCardFromProperty(in string aProperty, in AUTF8String aValue,
+    //                              in boolean aCaseSensitive);
+    getCardFromProperty: function _cardForEmailAddress(aProperty, aValue, aCaseSensitive) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getCardFromProperty: aProperty:" + aProperty + ", aValue:" + aValue);
+        //throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+        return null;
+    },
+
+
+    /**
+     * Returns all address book cards with a specific property matching value
+     *
+     * This function is almost identical to getCardFromProperty, with the
+     * exception of returning all cards rather than just the first.
+     *
+     * @param  aProperty      The property to look for.
+     * @param  aValue         The value to search for.
+     * @param  aCaseSensitive True if matching should be done case-sensitively.
+     * @result                A nsISimpleEnumerator that holds nsIAbCard
+     *                        instances.
+     */
+    //nsISimpleEnumerator getCardsFromProperty(in string aProperty,
+    //                                         in AUTF8String aValue,
+    //                                         in boolean aCaseSensitive);
+
+    getCardsFromProperty: function _getCardsFromProperty(aProperty, aValue, aCaseSensitive) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getCardsFromProperty");
+        var result = [];
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(result);
+    },
+
+
+    /**
+     * The chrome URI to use for bringing up a dialog to edit this directory.
+     * When opening the dialog, use a JS argument of
+     * {selectedDirectory: thisdir} where thisdir is this directory that you just
+     * got the chrome URI from.
+     */
+    //readonly attribute ACString propertiesChromeURI;
+    get propertiesChromeURI() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get propertiesChromeURI 1");
+        return "";
+    },
+
+    /**
+     * The description of the directory. If this directory is not a mailing list,
+     * then setting this attribute will send round a "DirName" update via
+     * nsIAddrBookSession.
+     */
+    //attribute AString dirName;
+    get dirName() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get dirName\n");
+        return "Exchange contacts";
+    },
+
+    set dirName(aValue) {},
+
+    // XXX This should really be replaced by a QI or something better
+    //readonly attribute long dirType;
+    get dirType() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get dirType\n");
+        return 2;
+    },
+
+    // eliminated a bit more.
+
+    // The filename for address books within this directory.
+    //readonly attribute ACString fileName;
+    get fileName() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get fileName\n");
+        return "filename";
+    },
+
+    // The URI of the address book
+    //readonly attribute ACString URI;
+    get URI() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get URI:"+this._URI);
+        return this._URI;
+    },
+
+    // The position of the directory on the display.
+    //readonly attribute long position;
+    get position() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get position\n");
+        return 1;
+    },
+
+    // will be used for LDAP replication
+    //attribute unsigned long lastModifiedDate;
+    get lastModifiedDate() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get lastModifiedDate\n");
+        return this._lastModifiedDate;
+    },
+
+    set lastModifiedDate(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set lastModifiedDate\n");
+        this._lastModifiedDate = aValue;
+    },
+
+    // Defines whether this directory is a mail
+    // list or not
+    //attribute boolean isMailList;
+    get isMailList() {
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get isMailList\n");
+        return false;
+    },
+
+    set isMailList(aValue) {
+        return;
+    },
+
+    // Get the children directories
+    //readonly attribute nsISimpleEnumerator childNodes;
+    get childNodes() {
+        var accounts = exchWebService.commonAbFunctions.getAccounts();
+        this.childDirs = {};
+        var results = [];
+        if (accounts.length > 0) {
+            var dir;
+            for each(var account in accounts) {
+                if (account != "") {
+                    var dirName = this.childNodeURI + "id=" + encodeURI(account) + "&type=basefolder";
+                    try {
+                        dir = MailServices.ab.getDirectory(dirName);
+                        results.push(dir);
+                        this.childDirs[dir.uuid] = dir;
+                    }
+                    catch (err) {
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Error getDirectory for '" + dirName + "'.:" + err + "\n");
+                    }
+                }
+            }
+        }
+        return exchWebService.commonFunctions.CreateSimpleEnumerator(results);
+    },
+
+    /**
+     * Get the cards associated with the directory. This will return the cards
+     * associated with the mailing lists too.
+     */
+    //readonly attribute nsISimpleEnumerator childCards;
+    get childCards() {
+        var result = {};
+
+        if (this._searchQuery) {
+            result = this.contacts;
+        }
+
+        return exchWebService.commonFunctions.CreateSimpleObjectEnumerator(result);
+
+    },
+
+    /**
+     * Returns true if this directory represents a query - i.e. the rdf resource
+     * was something like moz-abmdbdirectory://abook.mab?....
+     */
+    //readonly attribute boolean isQuery;
+    get isQuery() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get isQuery");
+        if (this._searchQuery) {
+            return true;
+        }
+
+        return false;
+    },
+
+    /**
+     * Initializes a directory, pointing to a particular
+     * URI
+     */
+    //void init(in string aURI);
+    init: function _init(aURI) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: init. aURI:" + aURI + "\n");
+        this._URI = aURI;
+
+        this._Schema = null;
+        this._UUID = "";
+        this._searchQuery = null;
+
+        if (this._isInitialized) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: '" + this.dirName + "' is allready initialized");
+            return;
+        }
+
+        if (aURI.indexOf("?") > -1) {
+            this._searchQuery = aURI.substr(aURI.indexOf("?") + 1);
+            this.contacts = {};
+
+            var schema = aURI.substr(0, aURI.indexOf("://") + 3);
+
+            exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: this._searchQuery:" + this._searchQuery + ", dirName:" + schema);
+
+            var dir = MailServices.ab.getDirectory(schema);
+            if (dir) {
+                exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Going to get children of '" + schema + "'");
+
+                // Get contact in childNodes (distLists)
+                var childNodes = dir.childNodes;
+                while (childNodes.hasMoreElements()) {
+                    var childNode = childNodes.getNext();
+                    exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Going to get children of distList '" + childNode.dirName + "':'" + childNode.URI + "' dirName:" + this.dirName);
+                    var tmpDir = MailServices.ab.getDirectory(childNode.URI + "?" + this._searchQuery);
+                    var childContacts = tmpDir.childCards;
+                    while (childContacts.hasMoreElements()) {
+                        var contact = childContacts.getNext().QueryInterface(Ci.nsIAbCard);
+                        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: Adding sub child '" + contact.displayName + "' to contacts.");
+                        this.contacts[contact.localId] = contact;
+                    }
+                }
+            }
+            else {
+                exchWebService.commonAbFunctions.logInfo("ERROR Rootdirectory '" + schema + "' does not exist.");
+            }
+        }
+
+        this._UUID = exchWebService.commonAbFunctions.getRootUUID();
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: this is a root:" + aURI);
+
+        this._isInitialized = true;
+    },
+
+    // Deletes either a mailing list or a top
+    // level directory, which also updates the
+    // preferences
+    //void deleteDirectory(in nsIAbDirectory directory);
+    deleteDirectory: function _deleteDirectory(directory) {
+        // We cannot remove the root.
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: deleteDirectory this:" + this.URI + ", directory:" + directory.URI + "\n");
+
+        return;
+
+        //exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: deleteDirectory uri:"+directory.URI+"\n");
+    },
+
+    // Check if directory contains card
+    // If the implementation is asynchronous the card
+    // may not yet have arrived. If it is in the process
+    // of obtaining cards the method will throw an
+    // NS_ERROR_NOT_AVAILABLE exception if the card
+    // cannot be found.
+    //boolean hasCard(in nsIAbCard cards);
+    hasCard: function _hasCard(cards) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: hasCard\n");
+        return false;
+    },
+
+
+    // Check if directory contains directory
+    //boolean hasDirectory(in nsIAbDirectory dir);
+    hasDirectory: function _hasDirectory(dir) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: hasDirectory\n");
+
+        return false;
+    },
+
+    /**
+     * Adds a card to the database.
+     *
+     * This card does not need to be of the same type as the database, e.g., one
+     * can add an nsIAbLDAPCard to an nsIAbMDBDirectory.
+     *
+     * @return "Real" card (eg nsIAbLDAPCard) that can be used for some
+     *         extra functions.
+     */
+    //nsIAbCard addCard(in nsIAbCard card);
+    addCard: function _addCard(card) {
+        return null;
+    },
+
+    /**
+     * Modifies a card in the database to match that supplied.
+     */
+    //void modifyCard(in nsIAbCard modifiedCard);
+    modifyCard: function _modifyCard(modifiedCard) {
+        return null;
+    },
+
+    /**
+     * Deletes the array of cards from the database.
+     *
+     * @param  aCards  The cards to delete from the database.
+     */
+    //void deleteCards(in nsIArray aCards);
+    deleteCards: function _deleteCards(aCards) {
+        return null;
+    },
+
+    //void dropCard(in nsIAbCard card, in boolean needToCopyCard);
+    dropCard: function _dropCard(Card, needToCopyCard) {
+        return null;
+    },
+
+    /**
+     * Whether or not the directory should be searched when doing autocomplete,
+     * (currently by using GetChildCards); LDAP does not support this in online
+     * mode, so that should return false; additionally any other directory types
+     * that also do not support GetChildCards should return false.
+     *
+     * @param aIdentity  An optional parameter detailing the identity key (see
+     *                   nsIMsgAccountManager) that this autocomplete is being
+     *                   run against.
+     * @return           True if this directory should/can be used during
+     *                   local autocomplete.
+     */
+    //boolean useForAutocomplete(in ACString aIdentityKey);
+    useForAutocomplete: function _useForAutocomplete(aIdentityKey) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: useForAutocomplete\n");
+
+        return false;
+    },
+
+    /** 
+     * Does this directory support mailing lists? Note that in the case
+     * this directory is a mailing list and nested mailing lists are not
+     * supported, this will return false rather than true which the parent
+     * directory might.
+     */
+    //readonly attribute boolean supportsMailingLists;
+    get supportsMailingLists() {
+        return false;
+    },
+
+    /**
+     * This attribute serves two purposes
+     *  1. If this directory is not a mail list, directories are stored here
+     *  2. If it is a mail list card entries are stored here
+     *
+     * @note This is a *live* array and not a static copy
+     */
+    //attribute nsIMutableArray addressLists
+    get addressLists() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get addressLists\n");
+        return this._addressLists;
+    },
+
+    set addressLists(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set addressLists\n");
+        this._addressLists = aValue;
+    },
+
+    // Specific to a directory which stores mail lists
+
+    /**
+     * Creates a new mailing list in the directory. Currently only supported 
+     * for top-level directories.
+     *
+     * @param  list  The new mailing list to add.
+     * @return The mailing list directory added, which may have been modified.
+     */
+    //nsIAbDirectory addMailList(in nsIAbDirectory list);
+    addMailList: function _addMailList(list) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: addMailList\n");
+        return list;
+    },
+
+    /**
+     * Nick Name of the mailing list. This attribute is only really used when
+     * the nsIAbDirectory represents a mailing list.
+     */
+    //attribute AString listNickName;
+    get listNickName() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get listNickName\n");
+        return this._listNickName;
+    },
+
+    set listNickName(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set listNickName\n");
+        this._listNickName = aValue;
+    },
+
+    /**
+     * Description of the mailing list. This attribute is only really used when
+     * the nsIAbDirectory represents a mailing list.
+     */
+    //attribute AString description;
+    get description() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get description\n");
+        return this._description;
+    },
+
+    set description(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set description\n");
+        this._description = aValue;
+    },
+
+    /**
+     * Edits an existing mailing list (specified as listCard) into its parent
+     * directory. You should call this function on the resource with the same
+     * uri as the listCard.
+     *
+     * @param  listCard  A nsIAbCard version of the mailing list with the new
+     *                   values.
+     */
+    //void editMailListToDatabase(in nsIAbCard listCard);
+    editMailListToDatabase: function _editMailListToDatabase(listCard) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: editMailListToDatabase\n");
+    },
+
+    // Copies mail list properties from the srcList
+    //void copyMailList(in nsIAbDirectory srcList);
+    copyMailList: function _copyMailList(srcList) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: copyMailList\n");
+    },
+
+
+    /**
+     * Only creates a top level address book
+     * which is stored in the preferences
+     *
+     * Need to change to factory based approach
+     * to create new address books
+     *
+     * This method should become redundant or 
+     * be only associated with card folders
+     *
+     * The parameters are the same as for
+     * nsIAbManager::newAddressBook
+     */
+    //ACString createNewDirectory(in AString aDirName, in ACString aURI,
+    //                            in unsigned long aType, in ACString aPrefName);
+    createNewDirectory: function _createNewDirectory(aDirName, aURI, aType, aPrefName) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: createNewDirectory uuid:" + this.uuid + "\n");
+        return "createNewDirectory";
+    },
+
+
+    /* create a directory by passing the display name and address book uri */
+    //void createDirectoryByURI(in AString displayName, in ACString aURI);
+    createDirectoryByURI: function _createDirectoryByURI(displayName, aURI) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: createDirectoryByURI uuid:" + this.uuid + "\n");
+    },
+    /**
+     * The id of the directory used in prefs e.g. "ldap_2.servers.pab"
+     * Setting this will cause directoryPrefs to be updated.
+     */
+    //attribute ACString dirPrefId;
+    get dirPrefId() {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: get dirPrefId: " + this.uuid);
+        if (this._dirPrefId) {
+            return this._dirPrefId;
+        }
+        return "ldap_2.servers.exchangecontacts";
+    },
+
+    set dirPrefId(aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: set dirPrefId\n");
+        this._dirPrefId = aValue;
+    },
+    /**
+     * @name  getXXXValue
+     *
+     * Helper functions to get different types of pref, but return a default
+     * value if a pref value was not obtained.
+     *
+     * @param aName         The name of the pref within the branch dirPrefId to
+     *                      get a value from.
+     *
+     * @param aDefaultValue The default value to return if getting the pref fails
+     *                      or the pref is not present.
+     *
+     * @return              The value of the pref or the default value.
+     *
+     * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
+     *                      be obtained (e.g. dirPrefId isn't set).
+     */
+    //@{
+    //long getIntValue(in string aName, in long aDefaultValue);
+    getIntValue: function _getIntValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getIntValue\n");
+        return aDefaultValue;
+    },
+
+    //boolean getBoolValue(in string aName, in boolean aDefaultValue);
+    getBoolValue: function _getBoolValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getBoolValue\n");
+        return aDefaultValue;
+    },
+
+    //ACString getStringValue(in string aName, in ACString aDefaultValue);
+    getStringValue: function _getStringValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getStringValue\n");
+        return aDefaultValue;
+    },
+
+    //AUTF8String getLocalizedStringValue(in string aName, in AUTF8String aDefaultValue);
+    getLocalizedStringValue: function _getLocalizedStringValue(aName, aDefaultValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: getLocalizedStringValue\n");
+        return aDefaultValue;
+    },
+
+    //@}
+
+    /**
+     * The following attributes are read from an nsIAbDirectory via the above methods:
+     *
+     * HidesRecipients (Boolean)
+     *    If true, and this nsIAbDirectory is a mailing list, then when sending mail to
+     *    this list, recipients addresses will be hidden from one another by sending
+     *    via BCC.
+     */
+
+    /**
+     * @name  setXXXValue
+     *
+     * Helper functions to set different types of pref values.
+     *
+     * @param aName         The name of the pref within the branch dirPrefId to
+     *                      get a value from.
+     *
+     * @param aValue        The value to set the pref to.
+     *
+     * @exception           NS_ERROR_NOT_INITIALIZED if the pref branch couldn't
+     *                      be obtained (e.g. dirPrefId isn't set).
+     */
+    //@{
+    //void setIntValue(in string aName, in long aValue);
+    setIntValue: function _setIntValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setIntValue\n");
+    },
+
+    //void setBoolValue(in string aName, in boolean aValue);
+    setBoolValue: function _setBoolValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setBoolValue\n");
+    },
+
+    //void setStringValue(in string aName, in ACString aValue);
+    setStringValue: function _setStringValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setStringValue\n");
+    },
+
+    //void setLocalizedStringValue(in string aName, in AUTF8String aValue);
+    setLocalizedStringValue: function _setLocalizedStringValue(aName, aValue) {
+        exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: setLocalizedStringValue\n");
+    },
+
+    //@}
 
 
 };
@@ -859,23 +804,23 @@ exchangeAbRootDirectory.prototype = {
 
 function NSGetFactory(cid) {
 
-	exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: NSGetFactory for exchangeAbRootDirectory 1");
-	try {
-		if (!NSGetFactory.exchWebService_ab2) {
-			exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: NSGetFactory for exchangeAbRootDirectory 1a");
+    exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: NSGetFactory for exchangeAbRootDirectory 1");
+    try {
+        if (!NSGetFactory.exchWebService_ab2) {
+            exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: NSGetFactory for exchangeAbRootDirectory 1a");
 
-			NSGetFactory.exchWebService_ab2 = XPCOMUtils.generateNSGetFactory([exchangeAbRootDirectory]);
-	}
+            NSGetFactory.exchWebService_ab2 = XPCOMUtils.generateNSGetFactory([exchangeAbRootDirectory]);
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		exchWebService.commonAbFunctions.logInfo(e);
-		throw e;
-	}
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        exchWebService.commonAbFunctions.logInfo(e);
+        throw e;
+    }
 
-	exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: NSGetFactory for exchangeAbRootDirectory 2");
-	return NSGetFactory.exchWebService_ab2(cid);
+    exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory: NSGetFactory for exchangeAbRootDirectory 2");
+    return NSGetFactory.exchWebService_ab2(cid);
 }
 
 exchWebService.commonAbFunctions.logInfo("exchangeAbRootDirectory. init.");
-
diff --git a/interfaces/exchangeAttendee/mivExchangeAttendee.js b/interfaces/exchangeAttendee/mivExchangeAttendee.js
index 29e06d21..3e05e6ef 100644
--- a/interfaces/exchangeAttendee/mivExchangeAttendee.js
+++ b/interfaces/exchangeAttendee/mivExchangeAttendee.js
@@ -30,340 +30,310 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 const participationMap = {
-	"Unknown"	: "NEEDS-ACTION",
-	"NoResponseReceived" : "NEEDS-ACTION",
-	"Tentative"	: "TENTATIVE",
-	"Accept"	: "ACCEPTED",
-	"Decline"	: "DECLINED",
-	"Organizer"	: "ACCEPTED"
+    "Unknown": "NEEDS-ACTION",
+    "NoResponseReceived": "NEEDS-ACTION",
+    "Tentative": "TENTATIVE",
+    "Accept": "ACCEPTED",
+    "Decline": "DECLINED",
+    "Organizer": "ACCEPTED"
 };
 
 var EXPORTED_SYMBOLS = ["mivExchangeAttendee"];
 
 function mivExchangeAttendee() {
-	this._attendee = Cc["@mozilla.org/calendar/attendee;1"].createInstance(Ci.calIAttendee);
+    this._attendee = Cc["@mozilla.org/calendar/attendee;1"].createInstance(Ci.calIAttendee);
 }
 
 var mivExchangeAttendeeGUID = "0bc8c910-70f4-4c5c-a2cd-e2657ca53595";
 
 mivExchangeAttendee.prototype = {
 
-	_className: "mivExchangeAttendee",
-
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAttendee,
-			Ci.calIAttendee,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange calendar Attendee.",
-	classID: components.ID("{"+mivExchangeAttendeeGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/attendee;1",
-	flags: 0,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// methods from nsIClassInfo
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeAttendee,
-			Ci.calIAttendee,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-  //  readonly attribute boolean isMutable;
-	get isMutable()
-	{
-		return this._attendee.isMutable;
-	},
-
-  // makes this item immutable
-  //  void makeImmutable();
-	makeImmutable: function _makeImmutable()
-	{
-		this._attendee.makeImmutable();
-	},
-
-	cloneToCalAttendee: function _cloneToCalAttendee(aCalAttendee)
-	{
-		this._attendee = aCalAttendee.clone();
-	},
-
-  // clone always returns a mutable event
-  //  calIAttendee clone();
-	clone: function _clone()
-	{
-		
-		var a = new mivExchangeAttendee();
-		a.cloneToCalAttendee(this._attendee);
-		a.parent = this.parent;
-		return a;
-	},
-
-  //  attribute AUTF8String id;
-	get id()
-	{
-		return this._attendee.id;
-	},
-
-	set id(aValue)
-	{
-		this._attendee.id = aValue;
-	},
-
-  //  attribute AUTF8String commonName;
-	get commonName()
-	{
-		return this._attendee.commonName;
-	},
-
-	set commonName(aValue)
-	{
-		this._attendee.commonName = aValue;
-	},
-
-  //  attribute AUTF8String rsvp;
-	get rsvp()
-	{
-		return this._attendee.rsvp;
-	},
-
-	set rsvp(aValue)
-	{
-		this._attendee.rsvp = aValue;
-	},
-
-  /** 
-   * If true, indicates that this is not a standard attendee, but rather this
-   * icalProperty corresponds to the organizer of the event (rfc2445 Sec 4.8.4.3)
-   */
-  //  attribute boolean isOrganizer;
-	get isOrganizer()
-	{
-		return this._attendee.isOrganizer;
-	},
-
-	set isOrganizer(aValue)
-	{
-		this._attendee.isOrganizer = aValue;
-	},
-
-  /**
-   * CHAIR
-   * REQ-PARTICIPANT
-   * OPT-PARTICIPANT
-   * NON-PARTICIPANT
-   */
-  //  attribute AUTF8String    role;
-	get role()
-	{
-		return this._attendee.role;
-	},
-
-	set role(aValue)
-	{
-		this._attendee.role = aValue;
-	},
-
-  /**
-   * NEEDS-ACTION
-   * ACCEPTED
-   * DECLINED
-   * TENTATIVE
-   * DELEGATED
-   * COMPLETED
-   * IN-PROCESS
-   */
-  //  attribute AUTF8String    participationStatus;
-	get participationStatus()
-	{
-		return this._attendee.participationStatus;
-	},
-
-	set participationStatus(aValue)
-	{
-		//dump("attendee: changing participationStatus from '"+this._attendee.participationStatus+"' to '"+aValue+"' for id:"+this.id+"\n");
-		this._attendee.participationStatus = aValue;
-	},
-
-  /**
-   * INDIVIDUAL
-   * GROUP
-   * RESOURCE
-   * ROOM
-   * UNKNOWN
-   */
-  //  attribute AUTF8String    userType;
-	get userType()
-	{
-		return this._attendee.userType;
-	},
-
-	set userType(aValue)
-	{
-		this._attendee.userType = aValue;
-	},
-
-  //  readonly attribute nsISimpleEnumerator propertyEnumerator;
-	get propertyEnumerator()
-	{
-		return this._attendee.propertyEnumerator;
-	},
-  
-  // If you use the has/get/set/deleteProperty
-  // methods, property names are case-insensitive.
-  // 
-  // For purposes of ICS serialization, all property names in
-  // the hashbag are in uppercase.
-  //  AUTF8String getProperty(in AString name);
-	getProperty: function _getProperty(name)
-	{
-		return this._attendee.getProperty(name);
-	},
-
-  //  void setProperty(in AString name, in AUTF8String value);
-	setProperty: function _setProperty(name, value)
-	{
-		this._attendee.setProperty(name, value);
-	},
-
-  //  void deleteProperty(in AString name);
-	deleteProperty: function _deleteProperty(name)
-	{
-		this._attendee.deleteProperty(name);
-	},
-
-  //  attribute calIIcalProperty icalProperty;
-	get icalProperty()
-	{
-		return this._attendee.icalProperty;
-	},
-
-	set icalProperty(aValue)
-	{
-		this._attendee.icalProperty = aValue;
-	},
-
-  //  attribute AUTF8String icalString;
-	get icalString()
-	{
-		return this._attendee.icalString;
-	},
-
-	set icalString(aValue)
-	{
-		this._attendee.icalString = aValue;
-	},
-
-
-  /**
-   * The display name of the attendee. If the attendee has a common name, this
-   * is used. Otherwise, the attendee id is displayed (often an email), with the
-   * mailto: prefix dropped.
-   */
-  //  AUTF8String toString();
-	toString: function _toString()
-	{
-		return this._attendee.toString();
-	},
-
-	// attribute mivExchangeBaseItem parent;
-	get parent()
-	{
-		return this._parent;
-	},
-
-	set parent(aValue)
-	{
-		this._parent = aValue;
-	},
-
-	convertFromExchange: function _convertFromExchange(aParent, aElement, aType) 
-	{
-		if (!aElement) return null;
-
-		this._parent = aParent;
-
-		let mbox = xml2json.getTag(aElement, "t:Mailbox");
-
-		if (!aType) {
-			aType = "REQ-PARTICIPANT";
-		}
-
-		var me = false;
-
-		for each(var alias in aParent.mailboxAliases) {
-			if (xml2json.getTagValue(mbox, "t:EmailAddress","unknown").toLowerCase() == alias.toLowerCase()) {
-				me = true;
-				//dump("convertFromExchange: Title:"+aParent.title+", email:"+xml2json.getTagValue(mbox, "t:EmailAddress","unknown")+". This address is mine ("+alias+").\n");
-				break;
-			}
-		}
-
-		// We also need to check aliases but these do not get stored yet.
-
-		switch (xml2json.getTagValue(mbox, "t:RoutingType","unknown")) {
-			case "SMTP" :
-				this.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
-				break;
-			case "EX" :
-				this.id = 'ldap:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
-				break;
-			default:
-				//dump("convertFromExchange: Unknown RoutingType:'"+xml2json.getTagValue(mbox, "t:RoutingType")+"'\n");
-				this.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
-				break;
-		}
-		this.commonName = xml2json.getTagValue(mbox, "t:Name");
-		this.rsvp = "FALSE";
-		this.userType = "INDIVIDUAL";
-		this.role = aType;
-
-		if (me) {
-			this.participationStatus = participationMap[aParent.myResponseType];
-			//dump("convertFromExchange A: Title:"+aParent.title+", attendee:"+this.id+", myResponseType:"+aParent.myResponseType+", this.participationStatus:"+this.participationStatus+"\n");
-		}
-		else {
-			if (xml2json.getTagValue(aElement, "t:ResponseType", "") != "") {
-				this.participationStatus = participationMap[xml2json.getTagValue(aElement, "t:ResponseType")];
-				//dump("convertFromExchange B: Title:"+aParent.title+", attendee:"+this.id+", ResponseType:"+xml2json.getTagValue(aElement, "t:ResponseType")+", this.participationStatus:"+this.participationStatus+"\n");
-			}
-		}
-	},
+    _className: "mivExchangeAttendee",
+
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAttendee,
+        Ci.calIAttendee,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange calendar Attendee.",
+    classID: components.ID("{" + mivExchangeAttendeeGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/attendee;1",
+    flags: 0,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // methods from nsIClassInfo
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeAttendee,
+            Ci.calIAttendee,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    //  readonly attribute boolean isMutable;
+    get isMutable() {
+        return this._attendee.isMutable;
+    },
+
+    // makes this item immutable
+    //  void makeImmutable();
+    makeImmutable: function _makeImmutable() {
+        this._attendee.makeImmutable();
+    },
+
+    cloneToCalAttendee: function _cloneToCalAttendee(aCalAttendee) {
+        this._attendee = aCalAttendee.clone();
+    },
+
+    // clone always returns a mutable event
+    //  calIAttendee clone();
+    clone: function _clone() {
+
+        var a = new mivExchangeAttendee();
+        a.cloneToCalAttendee(this._attendee);
+        a.parent = this.parent;
+        return a;
+    },
+
+    //  attribute AUTF8String id;
+    get id() {
+        return this._attendee.id;
+    },
+
+    set id(aValue) {
+        this._attendee.id = aValue;
+    },
+
+    //  attribute AUTF8String commonName;
+    get commonName() {
+        return this._attendee.commonName;
+    },
+
+    set commonName(aValue) {
+        this._attendee.commonName = aValue;
+    },
+
+    //  attribute AUTF8String rsvp;
+    get rsvp() {
+        return this._attendee.rsvp;
+    },
+
+    set rsvp(aValue) {
+        this._attendee.rsvp = aValue;
+    },
+
+    /** 
+     * If true, indicates that this is not a standard attendee, but rather this
+     * icalProperty corresponds to the organizer of the event (rfc2445 Sec 4.8.4.3)
+     */
+    //  attribute boolean isOrganizer;
+    get isOrganizer() {
+        return this._attendee.isOrganizer;
+    },
+
+    set isOrganizer(aValue) {
+        this._attendee.isOrganizer = aValue;
+    },
+
+    /**
+     * CHAIR
+     * REQ-PARTICIPANT
+     * OPT-PARTICIPANT
+     * NON-PARTICIPANT
+     */
+    //  attribute AUTF8String    role;
+    get role() {
+        return this._attendee.role;
+    },
+
+    set role(aValue) {
+        this._attendee.role = aValue;
+    },
+
+    /**
+     * NEEDS-ACTION
+     * ACCEPTED
+     * DECLINED
+     * TENTATIVE
+     * DELEGATED
+     * COMPLETED
+     * IN-PROCESS
+     */
+    //  attribute AUTF8String    participationStatus;
+    get participationStatus() {
+        return this._attendee.participationStatus;
+    },
+
+    set participationStatus(aValue) {
+        //dump("attendee: changing participationStatus from '"+this._attendee.participationStatus+"' to '"+aValue+"' for id:"+this.id+"\n");
+        this._attendee.participationStatus = aValue;
+    },
+
+    /**
+     * INDIVIDUAL
+     * GROUP
+     * RESOURCE
+     * ROOM
+     * UNKNOWN
+     */
+    //  attribute AUTF8String    userType;
+    get userType() {
+        return this._attendee.userType;
+    },
+
+    set userType(aValue) {
+        this._attendee.userType = aValue;
+    },
+
+    //  readonly attribute nsISimpleEnumerator propertyEnumerator;
+    get propertyEnumerator() {
+        return this._attendee.propertyEnumerator;
+    },
+
+    // If you use the has/get/set/deleteProperty
+    // methods, property names are case-insensitive.
+    // 
+    // For purposes of ICS serialization, all property names in
+    // the hashbag are in uppercase.
+    //  AUTF8String getProperty(in AString name);
+    getProperty: function _getProperty(name) {
+        return this._attendee.getProperty(name);
+    },
+
+    //  void setProperty(in AString name, in AUTF8String value);
+    setProperty: function _setProperty(name, value) {
+        this._attendee.setProperty(name, value);
+    },
+
+    //  void deleteProperty(in AString name);
+    deleteProperty: function _deleteProperty(name) {
+        this._attendee.deleteProperty(name);
+    },
+
+    //  attribute calIIcalProperty icalProperty;
+    get icalProperty() {
+        return this._attendee.icalProperty;
+    },
+
+    set icalProperty(aValue) {
+        this._attendee.icalProperty = aValue;
+    },
+
+    //  attribute AUTF8String icalString;
+    get icalString() {
+        return this._attendee.icalString;
+    },
+
+    set icalString(aValue) {
+        this._attendee.icalString = aValue;
+    },
+
+
+    /**
+     * The display name of the attendee. If the attendee has a common name, this
+     * is used. Otherwise, the attendee id is displayed (often an email), with the
+     * mailto: prefix dropped.
+     */
+    //  AUTF8String toString();
+    toString: function _toString() {
+        return this._attendee.toString();
+    },
+
+    // attribute mivExchangeBaseItem parent;
+    get parent() {
+        return this._parent;
+    },
+
+    set parent(aValue) {
+        this._parent = aValue;
+    },
+
+    convertFromExchange: function _convertFromExchange(aParent, aElement, aType) {
+        if (!aElement) return null;
+
+        this._parent = aParent;
+
+        let mbox = xml2json.getTag(aElement, "t:Mailbox");
+
+        if (!aType) {
+            aType = "REQ-PARTICIPANT";
+        }
+
+        var me = false;
+
+        for each(var alias in aParent.mailboxAliases) {
+            if (xml2json.getTagValue(mbox, "t:EmailAddress", "unknown").toLowerCase() == alias.toLowerCase()) {
+                me = true;
+                //dump("convertFromExchange: Title:"+aParent.title+", email:"+xml2json.getTagValue(mbox, "t:EmailAddress","unknown")+". This address is mine ("+alias+").\n");
+                break;
+            }
+        }
+
+        // We also need to check aliases but these do not get stored yet.
+
+        switch (xml2json.getTagValue(mbox, "t:RoutingType", "unknown")) {
+        case "SMTP":
+            this.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress", "unknown");
+            break;
+        case "EX":
+            this.id = 'ldap:' + xml2json.getTagValue(mbox, "t:EmailAddress", "unknown");
+            break;
+        default:
+            //dump("convertFromExchange: Unknown RoutingType:'"+xml2json.getTagValue(mbox, "t:RoutingType")+"'\n");
+            this.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress", "unknown");
+            break;
+        }
+        this.commonName = xml2json.getTagValue(mbox, "t:Name");
+        this.rsvp = "FALSE";
+        this.userType = "INDIVIDUAL";
+        this.role = aType;
+
+        if (me) {
+            this.participationStatus = participationMap[aParent.myResponseType];
+            //dump("convertFromExchange A: Title:"+aParent.title+", attendee:"+this.id+", myResponseType:"+aParent.myResponseType+", this.participationStatus:"+this.participationStatus+"\n");
+        }
+        else {
+            if (xml2json.getTagValue(aElement, "t:ResponseType", "") != "") {
+                this.participationStatus = participationMap[xml2json.getTagValue(aElement, "t:ResponseType")];
+                //dump("convertFromExchange B: Title:"+aParent.title+", attendee:"+this.id+", ResponseType:"+xml2json.getTagValue(aElement, "t:ResponseType")+", this.participationStatus:"+this.participationStatus+"\n");
+            }
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAttendee) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAttendee = XPCOMUtils.generateNSGetFactory([mivExchangeAttendee]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeAttendee) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAttendee = XPCOMUtils.generateNSGetFactory([mivExchangeAttendee]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeAttendee(cid);
-} 
+        }
 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAttendee(cid);
+}
diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index 3cfc9656..c2bd6c58 100644
--- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -29,770 +29,781 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeAuthPrompt2() {
 
-	this.passwordCache = {};
-	this.details = {};
+    this.passwordCache = {};
+    this.details = {};
 
-	this.showPassword = false;
+    this.showPassword = false;
 
-	this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 var mivExchangeAuthPrompt2GUID = "b3ab11c0-20f7-11e2-81c1-0800200c9a66";
 
 mivExchangeAuthPrompt2.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAuthPrompt2,
-			Ci.nsIAuthPrompt2,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange Add-on AuthPrompt2 interface",
-	classID: components.ID("{"+mivExchangeAuthPrompt2GUID+"}"),
-	contractID: "@1st-setup.nl/exchange/authprompt2;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-
-	getUserCanceled: function _getUserCanceled(aURL)
-	{
-		if (this.details[aURL]) {
-			return this.details[aURL].canceled;
-		}
-
-		return false;
-	},
-
-	removeUserCanceled: function _removeUserCanceled(aURL)
-	{
-		if (this.details[aURL]) {
-			this.details[aURL].canceled = false;
-			this.logInfo("removeUserCanceled: Cleared userCancel for URL:"+aURL);
-		}
-	},
-
-	removePasswordCache: function _removePasswordCache(aUsername, aURL)
-	{
-		for (var name in this.passwordCache) {
-			if (name.indexOf("|"+aURL+"|")) {
-				this.logInfo("removePasswordCache: Clearing passwordCache for URL:"+aURL);
-
-				delete this.passwordCache[name];
-			}
-		}
-	},
-
-	getPassword: function _getPassword(aChannel, username, aURL, aRealm, alwaysGetPassword, useCached)
-	{
-		if ((!username) || (!aURL)) {
-			this.logInfo("getPassword: No username or URL specified. Aborting.");
-			return null;
-		}
-
-		if ((this.details[aURL]) && (this.details[aURL].showing) && (!alwaysGetPassword)) {
-			this.logInfo("getPassword: We are in the progress of asking the user for a valid password. So we do not have one yet.");
-			return null;
-		}
-
-		this.showPassword = this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.authentication.showpassword", false, true);
-
-//		var realm = aRealm;
-		var realm = "Exchange Web Service";
-
-		if (!realm) {
-			this.logInfo("getPassword: No realm specified. Trying to get it from the URL.");
-			var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-			var tmpURI = ioService.newURI(aURL, null, null);
-			realm = tmpURI.host;
-			this.logInfo("getPassword: Set realm to:"+realm);
-		}
-		else {
-			this.logInfo("getPassword: A realm was specified:"+realm);
-		}
-
-/* If we get here it means that we did not yet have a password or we had a password in the channel.
-	So first we going to see if there is a password in cache. If so we use it.
-	If there is no password in cache we going to query the password manager and use it when available.
-
-	if we have password from cache or manager, and we have a password in the channel. We are going to match them.
-	Because when they are equal then the cached and stored password were wrong. Otherwise we did not get here.
-
-	When no password at all always ask. */
-
-		var password;
-		if (this.passwordCache[username+"|"+aURL+"|"+realm]) {
-			this.logInfo("getPassword: There is a password in the passwordCache["+username+"|"+aURL+"|"+realm+"]");
-			password = this.passwordCache[username+"|"+aURL+"|"+realm];
-		}
-		else {
-			this.logInfo("getPassword: There is no password in the passwordCache["+username+"|"+aURL+"|"+realm+"]");
-		}
-		if (this.showPassword) {
-			this.logInfo("getPassword: password(1)="+password);
-		}
-		else {
-			this.logInfo("getPassword: password(1)=********");
-		}
-		
-		var oldSavedPassword;
- 		if (!password) {
-			this.logInfo("getPassword: There is no password in the cache. Going to see if there is one in the passwordManager.");
-			var savedPassword = this.passwordManagerGet(username, aURL, realm);
-			if (savedPassword.result) {
-				this.logInfo("getPassword: There is a password stored in the passwordManager.");
-				password = savedPassword.password;
-				oldSavedPassword = savedPassword.password;
-			}
-			else {
-				this.logInfo("getPassword: There is no password stored in the passwordManager.");
-			}
-		}
-		if (this.showPassword) {
-			this.logInfo("getPassword: password(2)="+password);
-		}
-		else {
-			this.logInfo("getPassword: password(2)=********");
-		}
-
-		if ((password) && (aChannel) && (aChannel.URI.password)
-			&& (decodeURIComponent(aChannel.URI.password) != "")) {
-			this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. Going to see if they are the same.");
-			if ((password === decodeURIComponent(aChannel.URI.password)) && (!useCached)) {
-				this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. Going to ask user to provide a new password.");
-				if ((this.details[aURL]) && (this.details[aURL].ntlmCount === 1)) {
-					this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. But it is a first pass on an NTLM authentication. Using stored password and going to see if it can be used.");
-				}
-				else { 
-					this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. Going to ask user to provide a new password.");
-					var channel = aChannel.QueryInterface(Ci.nsIHttpChannel); 
-					 if( channel.responseStatus === 401 ){
-						 password=null;
-						 this.logInfo("getPassword: Login Failed, Going to ask user to provide a new password.");
-					 } 
-				}
-			}
-			else {
-				if (!useCached) {
-					this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are NOT the same. Going to use cached/stored password.");
-				}
-				else {
-					this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And useCached specified.");
-				}
-				if (this.showPassword) {
-					this.logInfo("getPassword: cached/store='"+password+"', on channel='"+decodeURIComponent(aChannel.URI.password)+"', useCached='"+useCached+"'.");
-				}
-				else {
-					this.logInfo("getPassword: cached/store='********', on channel='********'.");
-				}
-			}
-		}
-
-//try {
-		if (!password) {
-
-			if (!this.details[aURL]) { 
-				this.logInfo("getPassword: First request for a password. Not going to ask user for it because we want to see if we need a password. For Kerberos for example we do not need a password.");
-				return null;
-			}
-
-/*			if (!this.details[aURL]) this.details[aURL] = { 
-							showing: true, 
-							canceled: false,
-							queue: new Array(),
-							ntlmCount: 0
-						};*/
-
-			this.logInfo("getPassword: Going to ask user to provide a new password.");
-
-			this.details[aURL].ntlmCount = 0;
-			var answer = this.getCredentials(username, aURL);
-
-			if (answer.result) {
-				password = answer.password;
-				if (this.showPassword) {
-					this.logInfo("getPassword: User specified a password:"+password);
-				}
-				else {
-					this.logInfo("getPassword: User specified a password:********");
-				}
-				if (answer.save) {
-					this.logInfo("getPassword: User requested to store password in passwordmanager.");
-					this.passwordManagerSave(username, password, aURL, realm);
-				}
-				else{
-					this.logInfo("getPassword: User requested not to store password in passwordmanager."); 
-					this.passwordManagerRemove(username, oldSavedPassword, aURL, realm); 
-				}
-				this.passwordCache[username+"|"+aURL+"|"+realm] = password;
-				this.details[aURL].showing = false;
-			}
-			else {
-				// user canceled the entering of a password. 
-				// What do we do next.. Clear queue and !!??
-				this.details[aURL].canceled = true;
-				this.logInfo("getPassword: User canceled entering a password.");
-				this.details[aURL].showing = false;
-				throw "getPassword: User canceled entering a password.";
-			}
-		}
-
-		if (this.showPassword) {
-			this.logInfo("getPassword: We have a password:"+password);
-		}
-		else {
-			this.logInfo("getPassword: We have a password:********");
-		}
-
-//} catch(err) { this.logInfo("getPassword: Error:"+err); }
-		return password;
-	},
- 
-	asyncPromptAuthNotifyCallback: function _asyncPromptAuthNotifyCallback(aURL)
-	{
-		if (!this.details[aURL]) {
-			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have this URL '"
-				+ aURL + "' in queue");
-			return;
-		}
-
-		if (this.details[aURL].showing) {
-			this.logInfo("asyncPromptAuthNotifyCallback: Already showing a prompt or trying to get the password for URL '"
-				+ aURL + "'. Not going to try again until the active one has finished.");
-			return;
-		}
-		else {
-			this.details[aURL].showing = true;
-		}
-
-		if (this.details[aURL].queue.length === 0) {
-			this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have a request in queue for URL '"
-				+ aURL +"'.");
-			return;
-		}
-
-		while (this.details[aURL].queue.length > 0) {
-
-			// We grab the first one from the queue.
-			var request = this.details[aURL].queue.shift();
-			this.logInfo("asyncPromptAuthNotifyCallback: Removed request from queue["
-				+ aURL + "]. There are now '"
-				+ this.details[aURL].queue.length + "' requests in queue left.");
-			var aChannel = request.channel;
-			var aCallback = request.callback;
-			var aContext = request.context;
-			var level = request.level;
-			var authInfo = request.authInfo;
-			var canUseBasicAuth = false;
-
-			if (this.details[aURL].previousFailedCount > 4) { // Maybe make this a user preference
-				this.logInfo("asyncPromptAuthNotifyCallback: We have more than '"
-					+ this.details[aURL].previousFailedCount + "' previous failed for '"
-					+ aURL +"'.");
-				aCallback.onAuthCancelled(aContext, false);
-				return;
-			}
-
-			var username;
-			var password;
-			var error = false;
-
-			if (this.details[aURL].canceled) {
-				error = true;
-				this.logInfo("asyncPromptAuthNotifyCallback: User canceled entering a password in the past so we going to cancel this request also.");
-				aCallback.onAuthCancelled(aContext, true);
-			}
-			else {
-				this.logInfo("asyncPromptAuthNotifyCallback: Trying to detect username.");
-				username = decodeURIComponent(aChannel.URI.username);
-				if (username) {
-					username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
-				}
-
-				if (username === "") {
-					// We do not have a username. We need to prompt for one.
-					// This should always be filled in. So for now we error.
-					this.logInfo("asyncPromptAuthNotifyCallback: username is empty. This is not allowed.");
-					aCallback.onAuthCancelled(aContext, false);
-					error = true;
-				}
-				this.logInfo("asyncPromptAuthNotifyCallback: username="+username);
-
-				if (!error) {
-					// Trying to get realm from response header.
-					// This is used when basic authentication is available.
-					var realm = "exchange.server";
-					try {
-						var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
-						acceptedAuthentications = acceptedAuthentications.split("\n");
-
-						for (let acceptAuth of acceptedAuthentications) {
-							this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate:" + acceptAuth);
-							if (acceptAuth.indexOf("realm=") > -1) {
-								realm = acceptAuth.substr(index.indexOf("realm=") + 6);
-								realm = realm.replace(/"/g, "");
-								this.logInfo("asyncPromptAuthNotifyCallback: Found a realm going to use it. realm=" + realm);
-								canUseBasicAuth = true;
-							}
-						}
-					}
-					catch(err) {
-							this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate HTTP response header not found !");
-					}
-
-					// try to get password.
-					try {
-						password = this.getPassword(aChannel, username, aURL, realm, true, !(authInfo.flags & Ci.nsIAuthInformation.PREVIOUS_FAILED));
-					}
-					catch(err) {
-						this.logInfo("asyncPromptAuthNotifyCallback: getPassword exception. err:"+err);
-						aCallback.onAuthCancelled(aContext, true);
-						error = true;
-					}
-
-					if ((!password)) {
-						error = true;
-					}
-					else {
-						aChannel.URI.password = encodeURIComponent(password);
-					}
-				}
-			}
-
-			// Return credentials we have obtained
-			if (!error) {
-				if (!(authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD)) {
-					this.logInfo("asyncPromptAuthNotifyCallback: authInfo wants username and password and possibly domainname.");
-					if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) {
-						this.logInfo("asyncPromptAuthNotifyCallback: authInfo also wants domainname.");
-//						authInfo.domain = "";
-						if (username.indexOf("\\") > -1) {
-							authInfo.domain = username.substr(0,username.indexOf("\\"));
-							authInfo.username = username.substr(username.indexOf("\\")+1);
-							this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain="+authInfo.domain);
-						}
-						else if (username.indexOf("@") > -1) {
-								authInfo.username = username;
-								authInfo.domain = "";
-								this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain="+authInfo.domain);
-						}
-						else {
-								this.logInfo("asyncPromptAuthNotifyCallback: We do not have a domainname part in the username. Specifying empty one.");
-								authInfo.username = username;
-						}
-					}
-					else {
-						authInfo.username = username;
-					}
-				}
-				else {
-					this.logInfo("asyncPromptAuthNotifyCallback: authInfo only wants a password.");
-				}
-				authInfo.password = password;
-				if (this.showPassword) {
-					this.logInfo("asyncPromptAuthNotifyCallback: authInfo{ password:"+authInfo.password+", username:"+authInfo.username+", domain:"+authInfo.domain+"}");
-				}
-				else {
-					this.logInfo("asyncPromptAuthNotifyCallback: authInfo{ password:*******, username:"+authInfo.username+", domain:"+authInfo.domain+"}");
-				}
-				try {
-					this.logInfo("asyncPromptAuthNotifyCallback: Sending authInfo to callback function.");
-					if (canUseBasicAuth == true) {
-						this.logInfo("asyncPromptAuthNotifyCallback: We can also use Basic authorization going to add header.");
-						var tok = authInfo.username + ':' + authInfo.password;
-						var basicAuthHash = btoa(tok);
-						try {
-							aChannel.setRequestHeader('Authorization', "Basic " + basicAuthHash, true);
-						}
-						catch(err) {
-							this.logInfo("asyncPromptAuthNotifyCallback: Error adding Basic authorization header. err:"+err);
-						}
-					}
-					aCallback.onAuthAvailable(aContext, authInfo);
-				}
-				catch(err) {
-					this.logInfo("asyncPromptAuthNotifyCallback: Error on calling onAuthAvailable of provided callback. ERROR:"+err);
-					aCallback.onAuthCancelled(aContext, false);
-				}
-			}
-		}
-		this.details[aURL].showing = false;
-	},
-
-	asyncPromptAuthCancelCallback: function _asyncPromptAuthCallBack(aReason, aURL, aUUID)
-	{
-		// Try to find the canceled request and remove from queue.
-		var oldQueue = this.details[aURL].queue;
-		this.details[aURL].queue = new Array();
-		for (var index in oldQueue) {
-			if (oldQueue[index].uuid == aUUID) {
-				oldQueue[index].callback.onAuthCancelled(oldQueue[index].context, false);
-			}
-			else {
-				this.details[aURL].queue.push(oldQueue[index]);
-			}
-		}
-	},
-
-	//nsICancelable asyncPromptAuth(in nsIChannel aChannel, in nsIAuthPromptCallback aCallback, in nsISupports aContext, in PRUint32 level, in nsIAuthInformation authInfo);
-	asyncPromptAuth: function _asyncPromptAuth(aChannel, aCallback, aContext, level, authInfo)
-	{
-		if (!aCallback) {
-			this.logInfo("asyncPromptAuth: callback is undefined. This is not allowed!!!");
-			return null;
-		}
-
-		var channel = aChannel.QueryInterface(Ci.nsIHttpChannel);
-		this.logInfo("asyncPromptAuth: level="+level);
-		this.logInfo("asyncPromptAuth: channel.status="+channel.status);
-
-		this.logInfo("asyncPromptAuth: channel.responseStatus="+channel.responseStatus);
-		this.logInfo("asyncPromptAuth: channel.responseStatusText="+channel.responseStatusText);
-
-		this.logInfo("asyncPromptAuth: authInfo.authenticationScheme="+authInfo.authenticationScheme);
-		this.logInfo("asyncPromptAuth: authInfo.realm="+authInfo.realm);
-		this.logInfo("asyncPromptAuth: authInfo.username="+authInfo.username);
-		
-		if (this.showPassword) {
-			this.logInfo("asyncPromptAuth: authInfo.password="+authInfo.password);
-		}
-		else {
-			this.logInfo("asyncPromptAuth: authInfo.password=************");
-		}
-		this.logInfo("asyncPromptAuth: authInfo.domain="+authInfo.domain);
-
-		var URL = decodeURIComponent(aChannel.URI.scheme+"://"+aChannel.URI.hostPort+aChannel.URI.path);
-		if (this.showPassword) {
-			this.logInfo("asyncPromptAuth: aChannel.URL="+URL+", username="+decodeURIComponent(aChannel.URI.username)+", password="+decodeURIComponent(aChannel.URI.password));
-		}
-		else {
-			this.logInfo("asyncPromptAuth: aChannel.URL="+URL+", username="+decodeURIComponent(aChannel.URI.username)+", password=********");
-		}
-
-		var uuid = this.globalFunctions.getUUID();
-
-		if (!this.details[URL]) this.details[URL] = { 
-						showing: false, 
-						canceled: false,
-						queue: new Array(),
-						ntlmCount: 0,
-						previousFailedCount: 0,
-					};
-
-		if (authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD) this.logInfo("asyncPromptAuth: authInfo.flags & ONLY_PASSWORD");
-		if (authInfo.flags & Ci.nsIAuthInformation.AUTH_HOST) this.logInfo("asyncPromptAuth: authInfo.flags & AUTH_HOST");
-		if (authInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY) this.logInfo("asyncPromptAuth: authInfo.flags & AUTH_PROXY");
-		if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) this.logInfo("asyncPromptAuth: authInfo.flags & NEED_DOMAIN");
-		if (authInfo.flags & Ci.nsIAuthInformation.PREVIOUS_FAILED) {
-			this.logInfo("asyncPromptAuth: authInfo.flags & PREVIOUS_FAILED");
-			this.details[URL].previousFailedCount++;
-		}
-		else {
-			this.details[URL].previousFailedCount = 0;
-		}
-
-		try {
-			var offeredAuthentications = channel.getRequestHeader("Authorization");
-			this.logInfo("asyncPromptAuth: Authorization:"+offeredAuthentications);
-			if (offeredAuthentications.indexOf("NTLM ") > -1) {
-				this.details[URL].ntlmCount++;
-			}
-			
-		}
-		catch(err) {
-				this.logInfo("asyncPromptAuth: NO Authorization in request header!?");
-		}
-
-
-		this.details[URL].queue.push( {
-			uuid: uuid,
-			channel: aChannel,
-			callback: aCallback,
-			context: aContext,
-			level: level,
-			authInfo: authInfo });
-		this.logInfo("asyncPromptAuth: Added request to queue["+URL+"]. There are now '"+this.details[URL].queue.length+"' request in queue.");
-
-		var self = this;
-		var notifyCallback = {
-			notify: function asyncPromptAuth_notify() {
-				self.asyncPromptAuthNotifyCallback(URL);
-			}
-		};
-		this.timer.initWithCallback(notifyCallback, 0, Ci.nsITimer.TYPE_ONE_SHOT);
-
-		var cancelCallback = {
-			cancel: function asyncPromptAuth_cancel(aReason) {
-				self.asyncPromptAuthCancelCallback(aReason, URL, uuid);
-			}
-		};
-		return cancelCallback;
-	},
-
-	//boolean promptAuth(in nsIChannel aChannel, in PRUint32 level, in nsIAuthInformation authInfo);
-	promptAuth: function _promptAuth(aChannel, level, authInfo)
-	{
-
-		var error = false;
-
-		var URL = decodeURIComponent(aChannel.URI.scheme+aChannel.URI.hostPort+aChannel.URI.path);
-		var password;
-		var username;
-
-		if (this.details[URL].canceled) {
-			this.logInfo("promptAuth: User canceled entering a password in the past so we going to cancel this request also.");
-			return false;
-		}
-		else {
-			username = decodeURIComponent(aChannel.URI.username);
-			if (username) {
-				username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
-			}
-
-			if (username == "") {
-				// We do not have a username. We need to prompt for one.
-				// This should always be filled in. So for now we error.
-				this.logInfo("promptAuth: username is empty. This is not allowed.");
-				return false;
-			}
-			this.logInfo("promptAuth: username="+username);
-
-			// Trying to get realm from response header. This is used when basic authentication is available.
-			var realm = "exchange.server";
-			try {
-				var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
-				acceptedAuthentications = acceptedAuthentications.split("\n");
-				for (let authenticateHeader of acceptedAuthentications) {
-					this.logInfo("promptAuth: WWW-Authenticate:" + authenticateHeader);
-					if (authenticateHeader.indexOf("realm=") > -1) {
-						realm = index.substr(authenticateHeader.indexOf("realm=")+6);
-						this.logInfo("promptAuth: Found a realm going to use it. realm=" + realm);
-					}
-				}
-			}
-			catch(err) {
-					this.logInfo("promptAuth: NO WWW-Authenticate in response header!?");
-			}
-
-			password = this.getPassword(aChannel, username, URL, realm);
-			if ((!password) || (password == null)) {
-				this.logInfo("promptAuth: No password.");
-				return false;
-			}
-		}
-
-		if (!(authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD)) {
-			if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) {
-				if (this.username.indexOf("\\") > -1) {
-					authInfo.domain = username.substr(0,username.indexOf("\\"));
-					authInfo.username = username.substr(username.indexOf("\\")+1);
-				}
-				else {
-					authInfo.domain = "";
-					authInfo.username = username;
-				}
-			}
-			else {
-				authInfo.username = username;
-			}
-		}
-		authInfo.password = password;
-		return true;
-	},
-
-	/**
-	* Helper to retrieve an entry from the password manager.
-	*
-	* @param in  aUsername     The username to search
-	* @param aHostName         The corresponding hostname
-	* @param aRealm            The password realm (unused on branch)
-	* @return                  An object of form { result: boolean, [optional] password: <found password> }
-	*				result == false when password not found.
-	*/
-	passwordManagerGet: function _passwordManagerGet(aUsername, aURL, aRealm) 
-	{
-		if ((!aUsername) || (this.globalFunctions.trim(aUsername) == "")) {
-			this.logInfo("passwordManagerGet: username is undefined or empty.")
-			return { result: false };
-		}
-
-		this.logInfo("passwordManagerGet: username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
-
-		try {
-			var loginManager = Cc["@mozilla.org/login-manager;1"]
-						.getService(Ci.nsILoginManager);
-
-			var logins = loginManager.findLogins({}, aURL, null, aRealm);
-			for (let loginInfo of logins) {
-				if (loginInfo.username == aUsername) {
-					this.logInfo("passwordManagerGet found password for: username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
-					return { result: true, password: loginInfo.password};
-				}
-			}
-		} catch (exc) {
-			this.logInfo(exc);
-		}
-		return { result: false };
-	},
-	
-	passwordManagerRemove: function _passwordManagerRemove(aUsername, aPassword, aURL, aRealm) 
-	{
-
-		if ((!aUsername) || (!aURL) || (!aRealm)) {
-			this.logInfo("passwordManagerRemove: username or hostname or realm is empty. Not allowed!!!");
-			return;
-		}
-
-		try {
-			var loginManager = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
-			var logins = loginManager.findLogins({}, aURL, null, aRealm);
-
-			var newLoginInfo = Cc["@mozilla.org/login-manager/loginInfo;1"].createInstance(Ci.nsILoginInfo);
-			newLoginInfo.init(aURL, null, aRealm, aUsername, aPassword, "", "");
-
-			if (logins.length > 0) {
-				var modified = false;
-				for (let loginInfo of logins) {
-					if (loginInfo.username === aUsername) {
-						this.logInfo("Login credentials updated:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
-						loginManager.removeLogin(loginInfo);
-						modified = true;
-				    break;
-					}
-				}
-				if (!modified) {
-					this.logInfo("Login credentials saved:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
- 				}
-			} else {
-				this.logInfo("Login credentials saved:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
- 			}
-		} catch (exc) {
-			this.logInfo(exc);
-		}
-	},
-	
-	/**
-	* Helper to insert/update an entry to the password manager.
-	*
-	* @param aUserName     The username
-	* @param aPassword     The corresponding password
-	* @param aURL     The corresponding hostname
-	* @param aRealm        The password realm (unused on branch)
-	*/
-
-	passwordManagerSave: function _passwordManagerSave(aUsername, aPassword, aURL, aRealm) 
-	{
-
-		if ((!aUsername) || (!aURL) || (!aRealm)) {
-			this.logInfo("passwordManagerSave: username or hostname or realm is empty. Not allowed!!!");
-			return;
-		}
-
-		try {
-			var loginManager = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
-			var logins = loginManager.findLogins({}, aURL, null, aRealm);
-
-			var newLoginInfo = Cc["@mozilla.org/login-manager/loginInfo;1"].createInstance(Ci.nsILoginInfo);
-			newLoginInfo.init(aURL, null, aRealm, aUsername, aPassword, "", "");
-
-			if (logins.length > 0) {
-				var modified = false;
-				for (let loginInfo of logins) {
-					if (loginInfo.username == aUsername) {
-						this.logInfo("Login credentials updated:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
-						loginManager.modifyLogin(loginInfo, newLoginInfo);
-						modified = true;
-				    		break;
-					}
-				}
-				if (!modified) {
-					this.logInfo("Login credentials saved:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
-					loginManager.addLogin(newLoginInfo);
-				}
-			} else {
-				this.logInfo("Login credentials saved:username="+aUsername+", aURL="+aURL+", aRealm="+aRealm);
-				loginManager.addLogin(newLoginInfo);
-			}
-		} catch (exc) {
-			this.logInfo(exc);
-		}
-	},
-
-	/**
-	* Helper to retrieve a password from the usr via a prompt.
-	*
-	* @param in  aUsername     The username to search
-	* @param in aURL           The corresponding hostname
-	* @return                  An object of form { result: boolean, [optional] password: <found password>, save: boolean }
-	*				result == false when password not found.
-	*/
-	getCredentials: function _getCredentials(aUsername, aURL)
-	{
-
-		if ((!aUsername) || (!aURL)) {
-			this.logInfo("getCredentials: Username or URL is empty. Not allowed!");
-			return { result: false };
-		}
-
-		var watcher = Cc["@mozilla.org/embedcomp/window-watcher;1"].getService(Ci.nsIWindowWatcher);
-
-		var prompter = watcher.getNewPrompter(null);
-
-	// Only show the save password box if we are supposed to.
-		var savepasswordMsg = this.globalFunctions.getString("passwordmgr", "rememberPassword", null, "passwordmgr");
-
-		var aTitle = "Microsoft Exchange EWS: Password request.";
-
-		var aText = this.globalFunctions.getString("commonDialogs", "EnterPasswordFor", [aUsername, aURL], "global");
-
-		var aPassword = { value: "" };
-		var aSavePassword = { value: false };
-
-		var result = prompter.promptPassword(aTitle,
-						aText,
-						aPassword,
-						savepasswordMsg,
-						aSavePassword);
-		return { result: result, password: aPassword.value, save: aSavePassword.value };
-	},
-
-	logInfo: function _logInfo(aMsg, aDebugLevel) 
-	{
-		var prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
-
-		this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
-		if (this.debug) {
-			this.globalFunctions.LOG("mivExchangeAuthPrompt2: "+aMsg + " ("+this.globalFunctions.STACKshort()+")");
-		}
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAuthPrompt2,
+        Ci.nsIAuthPrompt2,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange Add-on AuthPrompt2 interface",
+    classID: components.ID("{" + mivExchangeAuthPrompt2GUID + "}"),
+    contractID: "@1st-setup.nl/exchange/authprompt2;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+
+    getUserCanceled: function _getUserCanceled(aURL) {
+        if (this.details[aURL]) {
+            return this.details[aURL].canceled;
+        }
+
+        return false;
+    },
+
+    removeUserCanceled: function _removeUserCanceled(aURL) {
+        if (this.details[aURL]) {
+            this.details[aURL].canceled = false;
+            this.logInfo("removeUserCanceled: Cleared userCancel for URL:" + aURL);
+        }
+    },
+
+    removePasswordCache: function _removePasswordCache(aUsername, aURL) {
+        for (var name in this.passwordCache) {
+            if (name.indexOf("|" + aURL + "|")) {
+                this.logInfo("removePasswordCache: Clearing passwordCache for URL:" + aURL);
+
+                delete this.passwordCache[name];
+            }
+        }
+    },
+
+    getPassword: function _getPassword(aChannel, username, aURL, aRealm, alwaysGetPassword, useCached) {
+        if ((!username) || (!aURL)) {
+            this.logInfo("getPassword: No username or URL specified. Aborting.");
+            return null;
+        }
+
+        if ((this.details[aURL]) && (this.details[aURL].showing) && (!alwaysGetPassword)) {
+            this.logInfo("getPassword: We are in the progress of asking the user for a valid password. So we do not have one yet.");
+            return null;
+        }
+
+        this.showPassword = this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.authentication.showpassword", false, true);
+
+        //		var realm = aRealm;
+        var realm = "Exchange Web Service";
+
+        if (!realm) {
+            this.logInfo("getPassword: No realm specified. Trying to get it from the URL.");
+            var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+            var tmpURI = ioService.newURI(aURL, null, null);
+            realm = tmpURI.host;
+            this.logInfo("getPassword: Set realm to:" + realm);
+        }
+        else {
+            this.logInfo("getPassword: A realm was specified:" + realm);
+        }
+
+        /* If we get here it means that we did not yet have a password or we had a password in the channel.
+        	So first we going to see if there is a password in cache. If so we use it.
+        	If there is no password in cache we going to query the password manager and use it when available.
+
+        	if we have password from cache or manager, and we have a password in the channel. We are going to match them.
+        	Because when they are equal then the cached and stored password were wrong. Otherwise we did not get here.
+
+        	When no password at all always ask. */
+
+        var password;
+        if (this.passwordCache[username + "|" + aURL + "|" + realm]) {
+            this.logInfo("getPassword: There is a password in the passwordCache[" + username + "|" + aURL + "|" + realm + "]");
+            password = this.passwordCache[username + "|" + aURL + "|" + realm];
+        }
+        else {
+            this.logInfo("getPassword: There is no password in the passwordCache[" + username + "|" + aURL + "|" + realm + "]");
+        }
+        if (this.showPassword) {
+            this.logInfo("getPassword: password(1)=" + password);
+        }
+        else {
+            this.logInfo("getPassword: password(1)=********");
+        }
+
+        var oldSavedPassword;
+        if (!password) {
+            this.logInfo("getPassword: There is no password in the cache. Going to see if there is one in the passwordManager.");
+            var savedPassword = this.passwordManagerGet(username, aURL, realm);
+            if (savedPassword.result) {
+                this.logInfo("getPassword: There is a password stored in the passwordManager.");
+                password = savedPassword.password;
+                oldSavedPassword = savedPassword.password;
+            }
+            else {
+                this.logInfo("getPassword: There is no password stored in the passwordManager.");
+            }
+        }
+        if (this.showPassword) {
+            this.logInfo("getPassword: password(2)=" + password);
+        }
+        else {
+            this.logInfo("getPassword: password(2)=********");
+        }
+
+        if ((password) && (aChannel) && (aChannel.URI.password)
+            && (decodeURIComponent(aChannel.URI.password) != "")) {
+            this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. Going to see if they are the same.");
+            if ((password === decodeURIComponent(aChannel.URI.password)) && (!useCached)) {
+                this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. Going to ask user to provide a new password.");
+                if ((this.details[aURL]) && (this.details[aURL].ntlmCount === 1)) {
+                    this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. But it is a first pass on an NTLM authentication. Using stored password and going to see if it can be used.");
+                }
+                else {
+                    this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are the same. Going to ask user to provide a new password.");
+                    var channel = aChannel.QueryInterface(Ci.nsIHttpChannel);
+                    if (channel.responseStatus === 401) {
+                        password = null;
+                        this.logInfo("getPassword: Login Failed, Going to ask user to provide a new password.");
+                    }
+                }
+            }
+            else {
+                if (!useCached) {
+                    this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And they are NOT the same. Going to use cached/stored password.");
+                }
+                else {
+                    this.logInfo("getPassword: There was a password in cache or passwordManager and one on the channel. And useCached specified.");
+                }
+                if (this.showPassword) {
+                    this.logInfo("getPassword: cached/store='" + password + "', on channel='" + decodeURIComponent(aChannel.URI.password) + "', useCached='" + useCached + "'.");
+                }
+                else {
+                    this.logInfo("getPassword: cached/store='********', on channel='********'.");
+                }
+            }
+        }
+
+        //try {
+        if (!password) {
+
+            if (!this.details[aURL]) {
+                this.logInfo("getPassword: First request for a password. Not going to ask user for it because we want to see if we need a password. For Kerberos for example we do not need a password.");
+                return null;
+            }
+
+            /*			if (!this.details[aURL]) this.details[aURL] = { 
+            							showing: true, 
+            							canceled: false,
+            							queue: new Array(),
+            							ntlmCount: 0
+            						};*/
+
+            this.logInfo("getPassword: Going to ask user to provide a new password.");
+
+            this.details[aURL].ntlmCount = 0;
+            var answer = this.getCredentials(username, aURL);
+
+            if (answer.result) {
+                password = answer.password;
+                if (this.showPassword) {
+                    this.logInfo("getPassword: User specified a password:" + password);
+                }
+                else {
+                    this.logInfo("getPassword: User specified a password:********");
+                }
+                if (answer.save) {
+                    this.logInfo("getPassword: User requested to store password in passwordmanager.");
+                    this.passwordManagerSave(username, password, aURL, realm);
+                }
+                else {
+                    this.logInfo("getPassword: User requested not to store password in passwordmanager.");
+                    this.passwordManagerRemove(username, oldSavedPassword, aURL, realm);
+                }
+                this.passwordCache[username + "|" + aURL + "|" + realm] = password;
+                this.details[aURL].showing = false;
+            }
+            else {
+                // user canceled the entering of a password. 
+                // What do we do next.. Clear queue and !!??
+                this.details[aURL].canceled = true;
+                this.logInfo("getPassword: User canceled entering a password.");
+                this.details[aURL].showing = false;
+                throw "getPassword: User canceled entering a password.";
+            }
+        }
+
+        if (this.showPassword) {
+            this.logInfo("getPassword: We have a password:" + password);
+        }
+        else {
+            this.logInfo("getPassword: We have a password:********");
+        }
+
+        //} catch(err) { this.logInfo("getPassword: Error:"+err); }
+        return password;
+    },
+
+    asyncPromptAuthNotifyCallback: function _asyncPromptAuthNotifyCallback(aURL) {
+        if (!this.details[aURL]) {
+            this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have this URL '"
+                + aURL + "' in queue");
+            return;
+        }
+
+        if (this.details[aURL].showing) {
+            this.logInfo("asyncPromptAuthNotifyCallback: Already showing a prompt or trying to get the password for URL '"
+                + aURL + "'. Not going to try again until the active one has finished.");
+            return;
+        }
+        else {
+            this.details[aURL].showing = true;
+        }
+
+        if (this.details[aURL].queue.length === 0) {
+            this.logInfo("asyncPromptAuthNotifyCallback: This is strange, We do not have a request in queue for URL '"
+                + aURL + "'.");
+            return;
+        }
+
+        while (this.details[aURL].queue.length > 0) {
+
+            // We grab the first one from the queue.
+            var request = this.details[aURL].queue.shift();
+            this.logInfo("asyncPromptAuthNotifyCallback: Removed request from queue["
+                + aURL + "]. There are now '"
+                + this.details[aURL].queue.length + "' requests in queue left.");
+            var aChannel = request.channel;
+            var aCallback = request.callback;
+            var aContext = request.context;
+            var level = request.level;
+            var authInfo = request.authInfo;
+            var canUseBasicAuth = false;
+
+            if (this.details[aURL].previousFailedCount > 4) { // Maybe make this a user preference
+                this.logInfo("asyncPromptAuthNotifyCallback: We have more than '"
+                    + this.details[aURL].previousFailedCount + "' previous failed for '"
+                    + aURL + "'.");
+                aCallback.onAuthCancelled(aContext, false);
+                return;
+            }
+
+            var username;
+            var password;
+            var error = false;
+
+            if (this.details[aURL].canceled) {
+                error = true;
+                this.logInfo("asyncPromptAuthNotifyCallback: User canceled entering a password in the past so we going to cancel this request also.");
+                aCallback.onAuthCancelled(aContext, true);
+            }
+            else {
+                this.logInfo("asyncPromptAuthNotifyCallback: Trying to detect username.");
+                username = decodeURIComponent(aChannel.URI.username);
+                if (username) {
+                    username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
+                }
+
+                if (username === "") {
+                    // We do not have a username. We need to prompt for one.
+                    // This should always be filled in. So for now we error.
+                    this.logInfo("asyncPromptAuthNotifyCallback: username is empty. This is not allowed.");
+                    aCallback.onAuthCancelled(aContext, false);
+                    error = true;
+                }
+                this.logInfo("asyncPromptAuthNotifyCallback: username=" + username);
+
+                if (!error) {
+                    // Trying to get realm from response header.
+                    // This is used when basic authentication is available.
+                    var realm = "exchange.server";
+                    try {
+                        var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
+                        acceptedAuthentications = acceptedAuthentications.split("\n");
+
+                        for (let acceptAuth of acceptedAuthentications) {
+                            this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate:" + acceptAuth);
+                            if (acceptAuth.indexOf("realm=") > -1) {
+                                realm = acceptAuth.substr(index.indexOf("realm=") + 6);
+                                realm = realm.replace(/"/g, "");
+                                this.logInfo("asyncPromptAuthNotifyCallback: Found a realm going to use it. realm=" + realm);
+                                canUseBasicAuth = true;
+                            }
+                        }
+                    }
+                    catch (err) {
+                        this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate HTTP response header not found !");
+                    }
+
+                    // try to get password.
+                    try {
+                        password = this.getPassword(aChannel, username, aURL, realm, true, !(authInfo.flags & Ci.nsIAuthInformation.PREVIOUS_FAILED));
+                    }
+                    catch (err) {
+                        this.logInfo("asyncPromptAuthNotifyCallback: getPassword exception. err:" + err);
+                        aCallback.onAuthCancelled(aContext, true);
+                        error = true;
+                    }
+
+                    if ((!password)) {
+                        error = true;
+                    }
+                    else {
+                        aChannel.URI.password = encodeURIComponent(password);
+                    }
+                }
+            }
+
+            // Return credentials we have obtained
+            if (!error) {
+                if (!(authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD)) {
+                    this.logInfo("asyncPromptAuthNotifyCallback: authInfo wants username and password and possibly domainname.");
+                    if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) {
+                        this.logInfo("asyncPromptAuthNotifyCallback: authInfo also wants domainname.");
+                        //						authInfo.domain = "";
+                        if (username.indexOf("\\") > -1) {
+                            authInfo.domain = username.substr(0, username.indexOf("\\"));
+                            authInfo.username = username.substr(username.indexOf("\\") + 1);
+                            this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain=" + authInfo.domain);
+                        }
+                        else if (username.indexOf("@") > -1) {
+                            authInfo.username = username;
+                            authInfo.domain = "";
+                            this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain=" + authInfo.domain);
+                        }
+                        else {
+                            this.logInfo("asyncPromptAuthNotifyCallback: We do not have a domainname part in the username. Specifying empty one.");
+                            authInfo.username = username;
+                        }
+                    }
+                    else {
+                        authInfo.username = username;
+                    }
+                }
+                else {
+                    this.logInfo("asyncPromptAuthNotifyCallback: authInfo only wants a password.");
+                }
+                authInfo.password = password;
+                if (this.showPassword) {
+                    this.logInfo("asyncPromptAuthNotifyCallback: authInfo{ password:" + authInfo.password + ", username:" + authInfo.username + ", domain:" + authInfo.domain + "}");
+                }
+                else {
+                    this.logInfo("asyncPromptAuthNotifyCallback: authInfo{ password:*******, username:" + authInfo.username + ", domain:" + authInfo.domain + "}");
+                }
+                try {
+                    this.logInfo("asyncPromptAuthNotifyCallback: Sending authInfo to callback function.");
+                    if (canUseBasicAuth == true) {
+                        this.logInfo("asyncPromptAuthNotifyCallback: We can also use Basic authorization going to add header.");
+                        var tok = authInfo.username + ':' + authInfo.password;
+                        var basicAuthHash = btoa(tok);
+                        try {
+                            aChannel.setRequestHeader('Authorization', "Basic " + basicAuthHash, true);
+                        }
+                        catch (err) {
+                            this.logInfo("asyncPromptAuthNotifyCallback: Error adding Basic authorization header. err:" + err);
+                        }
+                    }
+                    aCallback.onAuthAvailable(aContext, authInfo);
+                }
+                catch (err) {
+                    this.logInfo("asyncPromptAuthNotifyCallback: Error on calling onAuthAvailable of provided callback. ERROR:" + err);
+                    aCallback.onAuthCancelled(aContext, false);
+                }
+            }
+        }
+        this.details[aURL].showing = false;
+    },
+
+    asyncPromptAuthCancelCallback: function _asyncPromptAuthCallBack(aReason, aURL, aUUID) {
+        // Try to find the canceled request and remove from queue.
+        var oldQueue = this.details[aURL].queue;
+        this.details[aURL].queue = new Array();
+        for (var index in oldQueue) {
+            if (oldQueue[index].uuid == aUUID) {
+                oldQueue[index].callback.onAuthCancelled(oldQueue[index].context, false);
+            }
+            else {
+                this.details[aURL].queue.push(oldQueue[index]);
+            }
+        }
+    },
+
+    //nsICancelable asyncPromptAuth(in nsIChannel aChannel, in nsIAuthPromptCallback aCallback, in nsISupports aContext, in PRUint32 level, in nsIAuthInformation authInfo);
+    asyncPromptAuth: function _asyncPromptAuth(aChannel, aCallback, aContext, level, authInfo) {
+        if (!aCallback) {
+            this.logInfo("asyncPromptAuth: callback is undefined. This is not allowed!!!");
+            return null;
+        }
+
+        var channel = aChannel.QueryInterface(Ci.nsIHttpChannel);
+        this.logInfo("asyncPromptAuth: level=" + level);
+        this.logInfo("asyncPromptAuth: channel.status=" + channel.status);
+
+        this.logInfo("asyncPromptAuth: channel.responseStatus=" + channel.responseStatus);
+        this.logInfo("asyncPromptAuth: channel.responseStatusText=" + channel.responseStatusText);
+
+        this.logInfo("asyncPromptAuth: authInfo.authenticationScheme=" + authInfo.authenticationScheme);
+        this.logInfo("asyncPromptAuth: authInfo.realm=" + authInfo.realm);
+        this.logInfo("asyncPromptAuth: authInfo.username=" + authInfo.username);
+
+        if (this.showPassword) {
+            this.logInfo("asyncPromptAuth: authInfo.password=" + authInfo.password);
+        }
+        else {
+            this.logInfo("asyncPromptAuth: authInfo.password=************");
+        }
+        this.logInfo("asyncPromptAuth: authInfo.domain=" + authInfo.domain);
+
+        var URL = decodeURIComponent(aChannel.URI.scheme + "://" + aChannel.URI.hostPort + aChannel.URI.path);
+        if (this.showPassword) {
+            this.logInfo("asyncPromptAuth: aChannel.URL=" + URL + ", username=" + decodeURIComponent(aChannel.URI.username) + ", password=" + decodeURIComponent(aChannel.URI.password));
+        }
+        else {
+            this.logInfo("asyncPromptAuth: aChannel.URL=" + URL + ", username=" + decodeURIComponent(aChannel.URI.username) + ", password=********");
+        }
+
+        var uuid = this.globalFunctions.getUUID();
+
+        if (!this.details[URL]) this.details[URL] = {
+            showing: false,
+            canceled: false,
+            queue: new Array(),
+            ntlmCount: 0,
+            previousFailedCount: 0,
+        };
+
+        if (authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD) this.logInfo("asyncPromptAuth: authInfo.flags & ONLY_PASSWORD");
+        if (authInfo.flags & Ci.nsIAuthInformation.AUTH_HOST) this.logInfo("asyncPromptAuth: authInfo.flags & AUTH_HOST");
+        if (authInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY) this.logInfo("asyncPromptAuth: authInfo.flags & AUTH_PROXY");
+        if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) this.logInfo("asyncPromptAuth: authInfo.flags & NEED_DOMAIN");
+        if (authInfo.flags & Ci.nsIAuthInformation.PREVIOUS_FAILED) {
+            this.logInfo("asyncPromptAuth: authInfo.flags & PREVIOUS_FAILED");
+            this.details[URL].previousFailedCount++;
+        }
+        else {
+            this.details[URL].previousFailedCount = 0;
+        }
+
+        try {
+            var offeredAuthentications = channel.getRequestHeader("Authorization");
+            this.logInfo("asyncPromptAuth: Authorization:" + offeredAuthentications);
+            if (offeredAuthentications.indexOf("NTLM ") > -1) {
+                this.details[URL].ntlmCount++;
+            }
+
+        }
+        catch (err) {
+            this.logInfo("asyncPromptAuth: NO Authorization in request header!?");
+        }
+
+
+        this.details[URL].queue.push({
+            uuid: uuid,
+            channel: aChannel,
+            callback: aCallback,
+            context: aContext,
+            level: level,
+            authInfo: authInfo
+        });
+        this.logInfo("asyncPromptAuth: Added request to queue[" + URL + "]. There are now '" + this.details[URL].queue.length + "' request in queue.");
+
+        var self = this;
+        var notifyCallback = {
+            notify: function asyncPromptAuth_notify() {
+                self.asyncPromptAuthNotifyCallback(URL);
+            }
+        };
+        this.timer.initWithCallback(notifyCallback, 0, Ci.nsITimer.TYPE_ONE_SHOT);
+
+        var cancelCallback = {
+            cancel: function asyncPromptAuth_cancel(aReason) {
+                self.asyncPromptAuthCancelCallback(aReason, URL, uuid);
+            }
+        };
+        return cancelCallback;
+    },
+
+    //boolean promptAuth(in nsIChannel aChannel, in PRUint32 level, in nsIAuthInformation authInfo);
+    promptAuth: function _promptAuth(aChannel, level, authInfo) {
+
+        var error = false;
+
+        var URL = decodeURIComponent(aChannel.URI.scheme + aChannel.URI.hostPort + aChannel.URI.path);
+        var password;
+        var username;
+
+        if (this.details[URL].canceled) {
+            this.logInfo("promptAuth: User canceled entering a password in the past so we going to cancel this request also.");
+            return false;
+        }
+        else {
+            username = decodeURIComponent(aChannel.URI.username);
+            if (username) {
+                username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
+            }
+
+            if (username == "") {
+                // We do not have a username. We need to prompt for one.
+                // This should always be filled in. So for now we error.
+                this.logInfo("promptAuth: username is empty. This is not allowed.");
+                return false;
+            }
+            this.logInfo("promptAuth: username=" + username);
+
+            // Trying to get realm from response header. This is used when basic authentication is available.
+            var realm = "exchange.server";
+            try {
+                var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
+                acceptedAuthentications = acceptedAuthentications.split("\n");
+                for (let authenticateHeader of acceptedAuthentications) {
+                    this.logInfo("promptAuth: WWW-Authenticate:" + authenticateHeader);
+                    if (authenticateHeader.indexOf("realm=") > -1) {
+                        realm = index.substr(authenticateHeader.indexOf("realm=") + 6);
+                        this.logInfo("promptAuth: Found a realm going to use it. realm=" + realm);
+                    }
+                }
+            }
+            catch (err) {
+                this.logInfo("promptAuth: NO WWW-Authenticate in response header!?");
+            }
+
+            password = this.getPassword(aChannel, username, URL, realm);
+            if ((!password) || (password == null)) {
+                this.logInfo("promptAuth: No password.");
+                return false;
+            }
+        }
+
+        if (!(authInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD)) {
+            if (authInfo.flags & Ci.nsIAuthInformation.NEED_DOMAIN) {
+                if (this.username.indexOf("\\") > -1) {
+                    authInfo.domain = username.substr(0, username.indexOf("\\"));
+                    authInfo.username = username.substr(username.indexOf("\\") + 1);
+                }
+                else {
+                    authInfo.domain = "";
+                    authInfo.username = username;
+                }
+            }
+            else {
+                authInfo.username = username;
+            }
+        }
+        authInfo.password = password;
+        return true;
+    },
+
+    /**
+     * Helper to retrieve an entry from the password manager.
+     *
+     * @param in  aUsername     The username to search
+     * @param aHostName         The corresponding hostname
+     * @param aRealm            The password realm (unused on branch)
+     * @return                  An object of form { result: boolean, [optional] password: <found password> }
+     *				result == false when password not found.
+     */
+    passwordManagerGet: function _passwordManagerGet(aUsername, aURL, aRealm) {
+        if ((!aUsername) || (this.globalFunctions.trim(aUsername) == "")) {
+            this.logInfo("passwordManagerGet: username is undefined or empty.")
+            return {
+                result: false
+            };
+        }
+
+        this.logInfo("passwordManagerGet: username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+
+        try {
+            var loginManager = Cc["@mozilla.org/login-manager;1"]
+                .getService(Ci.nsILoginManager);
+
+            var logins = loginManager.findLogins({}, aURL, null, aRealm);
+            for (let loginInfo of logins) {
+                if (loginInfo.username == aUsername) {
+                    this.logInfo("passwordManagerGet found password for: username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+                    return {
+                        result: true,
+                        password: loginInfo.password
+                    };
+                }
+            }
+        }
+        catch (exc) {
+            this.logInfo(exc);
+        }
+        return {
+            result: false
+        };
+    },
+
+    passwordManagerRemove: function _passwordManagerRemove(aUsername, aPassword, aURL, aRealm) {
+
+        if ((!aUsername) || (!aURL) || (!aRealm)) {
+            this.logInfo("passwordManagerRemove: username or hostname or realm is empty. Not allowed!!!");
+            return;
+        }
+
+        try {
+            var loginManager = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
+            var logins = loginManager.findLogins({}, aURL, null, aRealm);
+
+            var newLoginInfo = Cc["@mozilla.org/login-manager/loginInfo;1"].createInstance(Ci.nsILoginInfo);
+            newLoginInfo.init(aURL, null, aRealm, aUsername, aPassword, "", "");
+
+            if (logins.length > 0) {
+                var modified = false;
+                for (let loginInfo of logins) {
+                    if (loginInfo.username === aUsername) {
+                        this.logInfo("Login credentials updated:username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+                        loginManager.removeLogin(loginInfo);
+                        modified = true;
+                        break;
+                    }
+                }
+                if (!modified) {
+                    this.logInfo("Login credentials saved:username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+                }
+            }
+            else {
+                this.logInfo("Login credentials saved:username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+            }
+        }
+        catch (exc) {
+            this.logInfo(exc);
+        }
+    },
+
+    /**
+     * Helper to insert/update an entry to the password manager.
+     *
+     * @param aUserName     The username
+     * @param aPassword     The corresponding password
+     * @param aURL     The corresponding hostname
+     * @param aRealm        The password realm (unused on branch)
+     */
+
+    passwordManagerSave: function _passwordManagerSave(aUsername, aPassword, aURL, aRealm) {
+
+        if ((!aUsername) || (!aURL) || (!aRealm)) {
+            this.logInfo("passwordManagerSave: username or hostname or realm is empty. Not allowed!!!");
+            return;
+        }
+
+        try {
+            var loginManager = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
+            var logins = loginManager.findLogins({}, aURL, null, aRealm);
+
+            var newLoginInfo = Cc["@mozilla.org/login-manager/loginInfo;1"].createInstance(Ci.nsILoginInfo);
+            newLoginInfo.init(aURL, null, aRealm, aUsername, aPassword, "", "");
+
+            if (logins.length > 0) {
+                var modified = false;
+                for (let loginInfo of logins) {
+                    if (loginInfo.username == aUsername) {
+                        this.logInfo("Login credentials updated:username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+                        loginManager.modifyLogin(loginInfo, newLoginInfo);
+                        modified = true;
+                        break;
+                    }
+                }
+                if (!modified) {
+                    this.logInfo("Login credentials saved:username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+                    loginManager.addLogin(newLoginInfo);
+                }
+            }
+            else {
+                this.logInfo("Login credentials saved:username=" + aUsername + ", aURL=" + aURL + ", aRealm=" + aRealm);
+                loginManager.addLogin(newLoginInfo);
+            }
+        }
+        catch (exc) {
+            this.logInfo(exc);
+        }
+    },
+
+    /**
+     * Helper to retrieve a password from the usr via a prompt.
+     *
+     * @param in  aUsername     The username to search
+     * @param in aURL           The corresponding hostname
+     * @return                  An object of form { result: boolean, [optional] password: <found password>, save: boolean }
+     *				result == false when password not found.
+     */
+    getCredentials: function _getCredentials(aUsername, aURL) {
+
+        if ((!aUsername) || (!aURL)) {
+            this.logInfo("getCredentials: Username or URL is empty. Not allowed!");
+            return {
+                result: false
+            };
+        }
+
+        var watcher = Cc["@mozilla.org/embedcomp/window-watcher;1"].getService(Ci.nsIWindowWatcher);
+
+        var prompter = watcher.getNewPrompter(null);
+
+        // Only show the save password box if we are supposed to.
+        var savepasswordMsg = this.globalFunctions.getString("passwordmgr", "rememberPassword", null, "passwordmgr");
+
+        var aTitle = "Microsoft Exchange EWS: Password request.";
+
+        var aText = this.globalFunctions.getString("commonDialogs", "EnterPasswordFor", [aUsername, aURL], "global");
+
+        var aPassword = {
+            value: ""
+        };
+        var aSavePassword = {
+            value: false
+        };
+
+        var result = prompter.promptPassword(aTitle,
+            aText,
+            aPassword,
+            savepasswordMsg,
+            aSavePassword);
+        return {
+            result: result,
+            password: aPassword.value,
+            save: aSavePassword.value
+        };
+    },
+
+    logInfo: function _logInfo(aMsg, aDebugLevel) {
+        var prefB = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefBranch);
+
+        this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
+        if (this.debug) {
+            this.globalFunctions.LOG("mivExchangeAuthPrompt2: " + aMsg + " (" + this.globalFunctions.STACKshort() + ")");
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAuthPrompt2) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAuthPrompt2 = XPCOMUtils.generateNSGetFactory([mivExchangeAuthPrompt2]);
-			
-		}
+    try {
+        if (!NSGetFactory.mivExchangeAuthPrompt2) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAuthPrompt2 = XPCOMUtils.generateNSGetFactory([mivExchangeAuthPrompt2]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeAuthPrompt2(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAuthPrompt2(cid);
+}
diff --git a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js b/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
index e465b189..767fb945 100644
--- a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
+++ b/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
@@ -28,77 +28,76 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeAuthPromptProvider() {
-	//dump("\nmivExchangeAuthPromptProvider.init\n");
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    //dump("\nmivExchangeAuthPromptProvider.init\n");
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 }
 
 var mivExchangeAuthPromptProviderGUID = "1bf6e930-20fc-11e2-81c1-0800200c9a66";
 
 mivExchangeAuthPromptProvider.prototype = {
 
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAuthPromptProvider,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange Add-on AuthPromptProvider interface",
-	classID: components.ID("{"+mivExchangeAuthPromptProviderGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/authpromptprovider;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-
-	//void getAuthPrompt(in PRUint32 aPromptReason, in nsIIDRef iid, [iid_is(iid),retval] out nsQIResult result);
-	getAuthPrompt: function _nsIAuthPromptProvider_getAuthPrompt(aPromptReason, iid)
-	{
-		this.logInfo("  --- mivExchangeAuthPromptProvider.getAuthPrompt:aPromptReason:"+aPromptReason+", iid:"+iid);
-		if (iid.equals(Ci.nsIAuthPrompt2)) {    // id == 651395eb-8612-4876-8ac0-a88d4dce9e1e
-			this.logInfo("  --- ecnsIAuthPrompt2.getAuthPrompt: iid=nsIAuthPrompt2");
-			return Cc["@1st-setup.nl/exchange/authprompt2;1"].getService();
-		} 
-
-		this.logInfo("  --- mivExchangeAuthPromptProvider.getAuthPrompt:aPromptReason:"+aPromptReason+", iid:"+iid);
-		this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: ecnsIAuthPrompt2.getAuthPrompt("+iid+")");
-  
-		return Cr.NS_ERROR_NOT_AVAILABLE;
-	},
-
-	// Internal methods.
-
-	logInfo: function _logInfo(aMsg, aDebugLevel) 
-	{
-		var prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
-
-		this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
-		if (this.debug) {
-			this.globalFunctions.LOG("mivExchangeAuthPromptProvider: "+aMsg);
-		}
-	},
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAuthPromptProvider,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange Add-on AuthPromptProvider interface",
+    classID: components.ID("{" + mivExchangeAuthPromptProviderGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/authpromptprovider;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+
+    //void getAuthPrompt(in PRUint32 aPromptReason, in nsIIDRef iid, [iid_is(iid),retval] out nsQIResult result);
+    getAuthPrompt: function _nsIAuthPromptProvider_getAuthPrompt(aPromptReason, iid) {
+        this.logInfo("  --- mivExchangeAuthPromptProvider.getAuthPrompt:aPromptReason:" + aPromptReason + ", iid:" + iid);
+        if (iid.equals(Ci.nsIAuthPrompt2)) { // id == 651395eb-8612-4876-8ac0-a88d4dce9e1e
+            this.logInfo("  --- ecnsIAuthPrompt2.getAuthPrompt: iid=nsIAuthPrompt2");
+            return Cc["@1st-setup.nl/exchange/authprompt2;1"].getService();
+        }
+
+        this.logInfo("  --- mivExchangeAuthPromptProvider.getAuthPrompt:aPromptReason:" + aPromptReason + ", iid:" + iid);
+        this.globalFunctions.LOG("  >>>>>>>>>>> SUBMIT THIS LINE TO https://github.com/ExchangeCalendar/exchangecalendar/issues: ecnsIAuthPrompt2.getAuthPrompt(" + iid + ")");
+
+        return Cr.NS_ERROR_NOT_AVAILABLE;
+    },
+
+    // Internal methods.
+
+    logInfo: function _logInfo(aMsg, aDebugLevel) {
+        var prefB = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefBranch);
+
+        this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
+        if (this.debug) {
+            this.globalFunctions.LOG("mivExchangeAuthPromptProvider: " + aMsg);
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAuthPromptProvider) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAuthPromptProvider = XPCOMUtils.generateNSGetFactory([mivExchangeAuthPromptProvider]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeAuthPromptProvider) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAuthPromptProvider = XPCOMUtils.generateNSGetFactory([mivExchangeAuthPromptProvider]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeAuthPromptProvider(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAuthPromptProvider(cid);
+}
diff --git a/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js b/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
index 7da32189..7b0ba875 100644
--- a/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
+++ b/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
@@ -31,285 +31,268 @@ Cu.import("resource:///modules/mailServices.js");
 
 function mivExchangeAutoCompleteResult() {
 
-//dump("mivExchangeAutoCompleteResult init\n");
-	this._cards = new Array();
+    //dump("mivExchangeAutoCompleteResult init\n");
+    this._cards = new Array();
 }
 
 var mivExchangeAutoCompleteResultGUID = "64587912-6dc2-413c-93ad-f062e21feaeb";
 
 mivExchangeAutoCompleteResult.prototype = {
 
-	_searchString: "",
-	_searchResult: this.RESULT_NOMATCH_ONGOING,
-
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeAutoCompleteResult,
-				Ci.nsIAutoCompleteResult,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
-
-	classDescription : "Exchange Autocomplete Search Result",
-
-	classID : components.ID("{"+mivExchangeAutoCompleteResultGUID+"}"),
-	contractID : "@1st-setup.nl/exchange/autocompleteresult;1",
-	flags : Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeAutoCompleteResult,
-				Ci.nsIAutoCompleteResult,
-				Ci.nsIClassInfo,
-				Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-  /**
-   * Possible values for the searchResult attribute
-   */
-//  const unsigned short RESULT_IGNORED = 1; /* indicates invalid searchString */
-//  const unsigned short RESULT_FAILURE = 2; /* indicates failure */
-//  const unsigned short RESULT_NOMATCH = 3; /* indicates success with no matches
-//                                              and that the search is complete */
-//  const unsigned short RESULT_SUCCESS = 4; /* indicates success with matches
-//                                              and that the search is complete */
-//  const unsigned short RESULT_NOMATCH_ONGOING = 5; /* indicates success 
-//                                                      with no matches
-//                                                      and that the search 
-//                                                      is still ongoing */
-//  const unsigned short RESULT_SUCCESS_ONGOING = 6; /* indicates success 
-//                                                      with matches
-//                                                      and that the search 
-//                                                      is still ongoing */
-  /**
-   * The original search string
-   */
-  //readonly attribute AString searchString;
-	get searchString()
-	{
-//dump("searchString:"+this._searchString+"\n");
-		return this._searchString;
-	},
-
-	setSearchString: function _setSearchString(aString)
-	{
-		this._searchString = aString;
-	},
-
-  /**
-   * The result of the search
-   */
-  //readonly attribute unsigned short searchResult;
-	get searchResult()
-	{
-//dump("searchResult:"+this._searchResult+"\n");
-		return this._searchResult;
-	},
-
-	setSearchResult: function _setSearchResult(aValue)
-	{
-		this._searchResult = aValue;
-	},
-
-  /**
-   * Index of the default item that should be entered if none is selected
-   */
-  //readonly attribute long defaultIndex;
-	get defaultIndex()
-	{
-//dump("defaultIndex\n");
-		if (this._cards.length == 0) {
-			return -1;
-		}
-
-		return 0;
-	},
-
-  /**
-   * A string describing the cause of a search failure
-   */
-  //readonly attribute AString errorDescription;
-	get errorDescription()
-	{
-//dump("errorDescription\n");
-		return null;
-	},
-
-  /**
-   * The number of matches
-   */
-  //readonly attribute unsigned long matchCount;
-	get matchCount()
-	{
-//dump("matchCount:"+this._cards.length+"\n");
-		return this._cards.length;
-	},
-
-  /**
-   * If true, the results will not be displayed in the popup. However,
-   * if a default index is specified, the default item will still be
-   * completed in the input.
-   */
-  //readonly attribute boolean typeAheadResult;
-	get typeAheadResult()
-	{
-		return this._cards.length <= 1;
-	},
-
-  /**
-   * Get the value of the result at the given index
-   */
-  //AString getValueAt(in long index);
-	getValueAt: function _getValueAt(aIndex)
-	{
-//dump("getValueAt["+aIndex+"]:"+this._cards[aIndex].primaryEmail+"\n");
-		if ((this._cards[aIndex].isMailList) && (this._cards[aIndex].primaryEmail.indexOf("@") == -1)) {
-			//dump("  >> I am a mailingList:"+this._cards[aIndex].mailListURI+"\n");
-			var dir = MailServices.ab.getDirectory(this._cards[aIndex].mailListURI);
-			if (dir) {
-				var emailList = "";
-				var childNodes = dir.childCards;
-				while (childNodes.hasMoreElements()) {
-					if (emailList != "") {
-						emailList = emailList + ",";
-					}
-					var tmpCard = childNodes.getNext().QueryInterface(Ci.mivExchangeAbCard);
-//dump(" || "+tmpCard+"\n");
-//					emailList = emailList + tmpCard.displayName + " <" + tmpCard.primaryEmail + ">" ;
-					emailList = emailList + tmpCard.firstName + " " + tmpCard.lastName + " <" + tmpCard.primaryEmail + ">" ;
-				}
-			//dump("  ++ addr:"+emailList+"\n");
-				return emailList;
-			}
-			//dump("  -- mailListURI:"+this._cards[aIndex].mailListURI+"\n");
-		}
-//		return this._cards[aIndex].displayName + " <" + this._cards[aIndex].primaryEmail + ">";
-//dump("firstname:"+this._cards[aIndex].firstName+", lastname:"+this._cards[aIndex].lastName+", displayName:"+this._cards[aIndex].displayName+"\n");
-		if ((this._cards[aIndex].firstName != "") || (this._cards[aIndex].lastName != "")) {
-			return this._cards[aIndex].firstName + " " + this._cards[aIndex].lastName + " <" + this._cards[aIndex].primaryEmail + ">";
-		}
-		else {
-			if (this._cards[aIndex].displayName != "") {
-				return this._cards[aIndex].displayName + " <" + this._cards[aIndex].primaryEmail + ">";
-			}
-			else {
-				return this._cards[aIndex].primaryEmail;
-			}
-		}
-	},
-
-  /**
-   * This returns the string that is displayed in the dropdown
-   */
-  //AString getLabelAt(in long index);
-	getLabelAt: function _getLabelAt(aIndex)
-	{
-		//dump("getLabelAt: aIndex:"+aIndex+"\n");
-		return this.getValueAt(aIndex);
-	},
-
-  /**
-   * Get the comment of the result at the given index
-   */
-  //AString getCommentAt(in long index);
-	getCommentAt: function _getCommentAt(aIndex)
-	{
-		//dump("getCommentAt: aIndex:"+aIndex+"\n");
-		if ((this._cards[aIndex].isMailList) && (this._cards[aIndex].primaryEmail.indexOf("@") == -1)) {
-			return this._cards[aIndex].displayName;
-		}
-		return "Exchange Contact";
-	},
-
-  /**
-   * Get the style hint for the result at the given index
-   */
-  //AString getStyleAt(in long index);
-	getStyleAt: function _getStyleAt(aIndex)
-	{
-		//dump("getStyleAt: aIndex:"+aIndex+"\n");
-		return "exchange-abook";
-	},
-
-  /**
-   * Get the image of the result at the given index
-   */
-  //AString getImageAt(in long index);
-	getImageAt: function _getImageAt(aIndex)
-	{
-		//dump("getImageAt: aIndex:"+aIndex+"\n");
-		return "chrome://exchangecalendar/content/exchange-addrbook.png";
-	},
-
-  /**
-   * Get the final value that should be completed when the user confirms
-   * the match at the given index.
-   */
-  //AString getFinalCompleteValueAt(in long index);
-	getFinalCompleteValueAt: function _getFinalCompleteValueAt(aIndex)
-	{
-		return this.getValueAt(aIndex)
-	},
-
-  /**
-   * Remove the value at the given index from the autocomplete results.
-   * If removeFromDb is set to true, the value should be removed from
-   * persistent storage as well.
-   */
-  //void removeValueAt(in long rowIndex, in boolean removeFromDb);
-	removeValueAt: function _removeValueAt(aRowIndex, removeFromDb)
-	{
-	},
-
-	//void addResult(in mivExchangeAbCard aCard);
-	addResult: function _addResult(aCard)
-	{
-		// First check if this card is not already in the list
-		var cardExists = false;
-		for each(var card in this._cards) {
-			if (card.localId == aCard.localId) {
-
-				cardExists = true;
-				break;
-			}
-		}
-		if (!cardExists) {
-//dump("addResult:"+aCard.displayName+", primaryEmail:"+aCard.primaryEmail+", length:"+this._cards.length+"\n");
-//			if ((aCard.primaryEmail != "") && (aCard.primaryEmail.indexOf("@") > -1)) {
-			if (((aCard.primaryEmail != "")  && (aCard.primaryEmail.indexOf("@") > -1)) || (aCard.isMailList)) {
-				this._cards.push(aCard);
-			}
-		}
-	},
-
-	clearResults: function _clearResults()
-	{
-		this._cards = new Array();
-		this._searchResult = this.RESULT_NOMATCH_ONGOING;
-		this._searchString = "";
-	},
+    _searchString: "",
+    _searchResult: this.RESULT_NOMATCH_ONGOING,
+
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAutoCompleteResult,
+        Ci.nsIAutoCompleteResult,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    classDescription: "Exchange Autocomplete Search Result",
+
+    classID: components.ID("{" + mivExchangeAutoCompleteResultGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/autocompleteresult;1",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeAutoCompleteResult,
+            Ci.nsIAutoCompleteResult,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    /**
+     * Possible values for the searchResult attribute
+     */
+    //  const unsigned short RESULT_IGNORED = 1; /* indicates invalid searchString */
+    //  const unsigned short RESULT_FAILURE = 2; /* indicates failure */
+    //  const unsigned short RESULT_NOMATCH = 3; /* indicates success with no matches
+    //                                              and that the search is complete */
+    //  const unsigned short RESULT_SUCCESS = 4; /* indicates success with matches
+    //                                              and that the search is complete */
+    //  const unsigned short RESULT_NOMATCH_ONGOING = 5; /* indicates success 
+    //                                                      with no matches
+    //                                                      and that the search 
+    //                                                      is still ongoing */
+    //  const unsigned short RESULT_SUCCESS_ONGOING = 6; /* indicates success 
+    //                                                      with matches
+    //                                                      and that the search 
+    //                                                      is still ongoing */
+    /**
+     * The original search string
+     */
+    //readonly attribute AString searchString;
+    get searchString() {
+        //dump("searchString:"+this._searchString+"\n");
+        return this._searchString;
+    },
+
+    setSearchString: function _setSearchString(aString) {
+        this._searchString = aString;
+    },
+
+    /**
+     * The result of the search
+     */
+    //readonly attribute unsigned short searchResult;
+    get searchResult() {
+        //dump("searchResult:"+this._searchResult+"\n");
+        return this._searchResult;
+    },
+
+    setSearchResult: function _setSearchResult(aValue) {
+        this._searchResult = aValue;
+    },
+
+    /**
+     * Index of the default item that should be entered if none is selected
+     */
+    //readonly attribute long defaultIndex;
+    get defaultIndex() {
+        //dump("defaultIndex\n");
+        if (this._cards.length == 0) {
+            return -1;
+        }
+
+        return 0;
+    },
+
+    /**
+     * A string describing the cause of a search failure
+     */
+    //readonly attribute AString errorDescription;
+    get errorDescription() {
+        //dump("errorDescription\n");
+        return null;
+    },
+
+    /**
+     * The number of matches
+     */
+    //readonly attribute unsigned long matchCount;
+    get matchCount() {
+        //dump("matchCount:"+this._cards.length+"\n");
+        return this._cards.length;
+    },
+
+    /**
+     * If true, the results will not be displayed in the popup. However,
+     * if a default index is specified, the default item will still be
+     * completed in the input.
+     */
+    //readonly attribute boolean typeAheadResult;
+    get typeAheadResult() {
+        return this._cards.length <= 1;
+    },
+
+    /**
+     * Get the value of the result at the given index
+     */
+    //AString getValueAt(in long index);
+    getValueAt: function _getValueAt(aIndex) {
+        //dump("getValueAt["+aIndex+"]:"+this._cards[aIndex].primaryEmail+"\n");
+        if ((this._cards[aIndex].isMailList) && (this._cards[aIndex].primaryEmail.indexOf("@") == -1)) {
+            //dump("  >> I am a mailingList:"+this._cards[aIndex].mailListURI+"\n");
+            var dir = MailServices.ab.getDirectory(this._cards[aIndex].mailListURI);
+            if (dir) {
+                var emailList = "";
+                var childNodes = dir.childCards;
+                while (childNodes.hasMoreElements()) {
+                    if (emailList != "") {
+                        emailList = emailList + ",";
+                    }
+                    var tmpCard = childNodes.getNext().QueryInterface(Ci.mivExchangeAbCard);
+                    //dump(" || "+tmpCard+"\n");
+                    //					emailList = emailList + tmpCard.displayName + " <" + tmpCard.primaryEmail + ">" ;
+                    emailList = emailList + tmpCard.firstName + " " + tmpCard.lastName + " <" + tmpCard.primaryEmail + ">";
+                }
+                //dump("  ++ addr:"+emailList+"\n");
+                return emailList;
+            }
+            //dump("  -- mailListURI:"+this._cards[aIndex].mailListURI+"\n");
+        }
+        //		return this._cards[aIndex].displayName + " <" + this._cards[aIndex].primaryEmail + ">";
+        //dump("firstname:"+this._cards[aIndex].firstName+", lastname:"+this._cards[aIndex].lastName+", displayName:"+this._cards[aIndex].displayName+"\n");
+        if ((this._cards[aIndex].firstName != "") || (this._cards[aIndex].lastName != "")) {
+            return this._cards[aIndex].firstName + " " + this._cards[aIndex].lastName + " <" + this._cards[aIndex].primaryEmail + ">";
+        }
+        else {
+            if (this._cards[aIndex].displayName != "") {
+                return this._cards[aIndex].displayName + " <" + this._cards[aIndex].primaryEmail + ">";
+            }
+            else {
+                return this._cards[aIndex].primaryEmail;
+            }
+        }
+    },
+
+    /**
+     * This returns the string that is displayed in the dropdown
+     */
+    //AString getLabelAt(in long index);
+    getLabelAt: function _getLabelAt(aIndex) {
+        //dump("getLabelAt: aIndex:"+aIndex+"\n");
+        return this.getValueAt(aIndex);
+    },
+
+    /**
+     * Get the comment of the result at the given index
+     */
+    //AString getCommentAt(in long index);
+    getCommentAt: function _getCommentAt(aIndex) {
+        //dump("getCommentAt: aIndex:"+aIndex+"\n");
+        if ((this._cards[aIndex].isMailList) && (this._cards[aIndex].primaryEmail.indexOf("@") == -1)) {
+            return this._cards[aIndex].displayName;
+        }
+        return "Exchange Contact";
+    },
+
+    /**
+     * Get the style hint for the result at the given index
+     */
+    //AString getStyleAt(in long index);
+    getStyleAt: function _getStyleAt(aIndex) {
+        //dump("getStyleAt: aIndex:"+aIndex+"\n");
+        return "exchange-abook";
+    },
+
+    /**
+     * Get the image of the result at the given index
+     */
+    //AString getImageAt(in long index);
+    getImageAt: function _getImageAt(aIndex) {
+        //dump("getImageAt: aIndex:"+aIndex+"\n");
+        return "chrome://exchangecalendar/content/exchange-addrbook.png";
+    },
+
+    /**
+     * Get the final value that should be completed when the user confirms
+     * the match at the given index.
+     */
+    //AString getFinalCompleteValueAt(in long index);
+    getFinalCompleteValueAt: function _getFinalCompleteValueAt(aIndex) {
+        return this.getValueAt(aIndex)
+    },
+
+    /**
+     * Remove the value at the given index from the autocomplete results.
+     * If removeFromDb is set to true, the value should be removed from
+     * persistent storage as well.
+     */
+    //void removeValueAt(in long rowIndex, in boolean removeFromDb);
+    removeValueAt: function _removeValueAt(aRowIndex, removeFromDb) {},
+
+    //void addResult(in mivExchangeAbCard aCard);
+    addResult: function _addResult(aCard) {
+        // First check if this card is not already in the list
+        var cardExists = false;
+        for each(var card in this._cards) {
+            if (card.localId == aCard.localId) {
+
+                cardExists = true;
+                break;
+            }
+        }
+        if (!cardExists) {
+            //dump("addResult:"+aCard.displayName+", primaryEmail:"+aCard.primaryEmail+", length:"+this._cards.length+"\n");
+            //			if ((aCard.primaryEmail != "") && (aCard.primaryEmail.indexOf("@") > -1)) {
+            if (((aCard.primaryEmail != "") && (aCard.primaryEmail.indexOf("@") > -1)) || (aCard.isMailList)) {
+                this._cards.push(aCard);
+            }
+        }
+    },
+
+    clearResults: function _clearResults() {
+        this._cards = new Array();
+        this._searchResult = this.RESULT_NOMATCH_ONGOING;
+        this._searchString = "";
+    },
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAutoCompleteResult) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAutoCompleteResult = XPCOMUtils.generateNSGetFactory([mivExchangeAutoCompleteResult]);
+    try {
+        if (!NSGetFactory.mivExchangeAutoCompleteResult) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAutoCompleteResult = XPCOMUtils.generateNSGetFactory([mivExchangeAutoCompleteResult]);
 
-	}
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeAutoCompleteResult(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAutoCompleteResult(cid);
+}
diff --git a/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js b/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
index 3e36ccac..41b87916 100644
--- a/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
+++ b/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
@@ -33,207 +33,205 @@ Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
 
 function mivExchangeAutoCompleteSearch() {
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	MailServices.ab.addAddressBookListener(this, Ci.nsIAbListener.itemAdded);
+    MailServices.ab.addAddressBookListener(this, Ci.nsIAbListener.itemAdded);
 }
 
 var mivExchangeAutoCompleteSearchGUID = "c073f5cf-15d7-47d4-b30e-9498fd728544";
 
 mivExchangeAutoCompleteSearch.prototype = {
 
-	_searches: {},
-	_observer: null,
-	_galSearches: {},
-	_firstCall: true,
-
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeAutoCompleteSearch,
-				Ci.nsIAutoCompleteSearch,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
-
-	classDescription : "Exchange Autocomplete Search",
-
-	classID : components.ID("{"+mivExchangeAutoCompleteSearchGUID+"}"),
-	contractID : "@mozilla.org/autocomplete/search;1?name=exchangeAutoCompleteSearch",
-	flags : Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeAutoCompleteSearch,
-				Ci.nsIAutoCompleteSearch,
-				Ci.nsIClassInfo,
-				Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	observe: function(subject, topic, data) 
-	{  
-		// Do your stuff here.
-		var uuid;
-		for each(var search in this._searches) {
-			if (search.query == data) {
-				uuid = search.uuid;
-			}
-		}
-
-		if (!uuid) return;
-
-		switch (topic) {
-			case "onExchangeGALSearchStart":
-				if (!this._galSearches[uuid]) {
-					this._galSearches[uuid] = 0;
-				}
-				this._galSearches[uuid]++;
-				break;
-			case "onExchangeGALSearchEnd":
-				if (this._galSearches[uuid] > 0) {
-					this._galSearches[uuid]--;
-					if (this._galSearches[uuid] == 0) {
-						if (this._searches[uuid].listener) {
-							this._searches[uuid].autoCompleteResult.setSearchResult(this._searches[uuid].autoCompleteResult.matchCount > 0 ? this._searches[uuid].autoCompleteResult.RESULT_SUCCESS :
-													this._searches[uuid].autoCompleteResult.RESULT_NOMATCH);
-							this._searches[uuid].listener.onSearchResult(this, this._searches[uuid].autoCompleteResult);
-						}
-
-					}
-				}
-				else {
-					dump(" ???????? Going below zero (0)\n");
-				}
-				break;
-		} 
-	},  
-
-  /*
-   * Search for a given string and notify a listener (either synchronously
-   * or asynchronously) of the result
-   *
-   * @param searchString - The string to search for
-   * @param searchParam - An extra parameter
-   * @param previousResult - A previous result to use for faster searching
-   * @param listener - A listener to notify when the search is complete
-   */
-  //void startSearch(in AString searchString,
-  //                 in AString searchParam,
-  //                 in nsIAutoCompleteResult previousResult,
-  //                 in nsIAutoCompleteObserver listener);
-
-	startSearch: function _startSearch(searchString, searchParam, previousResult, listener)
-	{
-/*		dump("mivExchangeAutoCompleteSearch: startSearch\n");
-		dump("    searchString:"+searchString+"\n");
-		dump("     searchParam:"+searchParam+"\n");
-		dump("  previousResult:"+previousResult+"\n");
-		dump("        listener:"+listener+"\n\n");
-*/
-		searchString=encodeURI(searchString);
-		var uuid = this.globalFunctions.getUUID();
-		var query = "(or(PrimaryEmail,c,"+searchString+")(DisplayName,c,"+searchString+")(FirstName,c,"+searchString+")(LastName,c,"+searchString+"))";
-
-		this._searches[uuid] = {
-				"uuid": uuid,
-				"searchString": searchString,
-				"query": query,
-				"searchParam": searchParam,
-				"previousResult": previousResult,
-				"listener" : listener,
-				};
-
-		if (previousResult) {
-			previousResult.clearResults();
-			this._searches[uuid]["autoCompleteResult"] = previousResult;
-		}
-		else {
-			this._searches[uuid]["autoCompleteResult"] = Cc["@1st-setup.nl/exchange/autocompleteresult;1"].createInstance(Ci.mivExchangeAutoCompleteResult);
-		}
-
-
-		if (this._firstCall) {
-			var observerService = Cc["@mozilla.org/observer-service;1"]  
-				                  .getService(Ci.nsIObserverService);  
-			observerService.addObserver(this, "onExchangeGALSearchStart", false);  
-			observerService.addObserver(this, "onExchangeGALSearchEnd", false);  
-			this._firstCall = false;
-		}
-
-		this._searches[uuid].autoCompleteResult.setSearchString(searchString);
-		this._searches[uuid]["rootDir"] = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://?"+query);
-
-/*		if (this._searches[uuid]["rootDir"]) {
-			var childCards = this._searches[uuid]["rootDir"].childCards;
-			while (childCards.hasMoreElements()) {
-				this._searches[uuid].autoCompleteResult.addResult(childCards.getNext());
-			}
-		}
-*/			
-	},
-
-	onItemAdded: function _onItemAdded(parentDir, item) {
-		var rightDir = parentDir.QueryInterface(Ci.nsIAbDirectory);
-		if (!rightDir) {
-			return;
-		}
-
-		if (item.QueryInterface(Ci.mivExchangeAbCard)) {
-			// Check to which search it belongs
-			for each(var search in this._searches) {
-				if (rightDir.URI.indexOf(search.query) > -1) {
-dump(" 1.@@@ displayName:"+item.displayName+", localId:"+item.localId+"\n");
-					search.autoCompleteResult.addResult(item);
-				}
-			}
-		}
-	},
-
-  /*
-   * Stop all searches that are in progress
-   */
-  //void stopSearch();
-	stopSearch: function _stopSearch()
-	{
-		//dump("mivExchangeAutoCompleteSearch: stopSearch\n");
-		for each(var search in this._searches) {
-			// Clearing the results because it appears the are being reused.
-			search.autoCompleteResult.clearResults();
-		}
-
-		this._searches = {};
-
-		if (!this._firstCall) {
-			var observerService = Cc["@mozilla.org/observer-service;1"]  
-					          .getService(Ci.nsIObserverService);  
-			observerService.removeObserver(this, "onExchangeGALSearchStart");  
-			observerService.removeObserver(this, "onExchangeGALSearchEnd");  
-		}
-		this._firstCall = true;
-	},
+    _searches: {},
+    _observer: null,
+    _galSearches: {},
+    _firstCall: true,
+
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeAutoCompleteSearch,
+        Ci.nsIAutoCompleteSearch,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    classDescription: "Exchange Autocomplete Search",
+
+    classID: components.ID("{" + mivExchangeAutoCompleteSearchGUID + "}"),
+    contractID: "@mozilla.org/autocomplete/search;1?name=exchangeAutoCompleteSearch",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeAutoCompleteSearch,
+            Ci.nsIAutoCompleteSearch,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    observe: function (subject, topic, data) {
+        // Do your stuff here.
+        var uuid;
+        for each(var search in this._searches) {
+            if (search.query == data) {
+                uuid = search.uuid;
+            }
+        }
+
+        if (!uuid) return;
+
+        switch (topic) {
+        case "onExchangeGALSearchStart":
+            if (!this._galSearches[uuid]) {
+                this._galSearches[uuid] = 0;
+            }
+            this._galSearches[uuid]++;
+            break;
+        case "onExchangeGALSearchEnd":
+            if (this._galSearches[uuid] > 0) {
+                this._galSearches[uuid]--;
+                if (this._galSearches[uuid] == 0) {
+                    if (this._searches[uuid].listener) {
+                        this._searches[uuid].autoCompleteResult.setSearchResult(this._searches[uuid].autoCompleteResult.matchCount > 0 ? this._searches[uuid].autoCompleteResult.RESULT_SUCCESS
+                            : this._searches[uuid].autoCompleteResult.RESULT_NOMATCH);
+                        this._searches[uuid].listener.onSearchResult(this, this._searches[uuid].autoCompleteResult);
+                    }
+
+                }
+            }
+            else {
+                dump(" ???????? Going below zero (0)\n");
+            }
+            break;
+        }
+    },
+
+    /*
+     * Search for a given string and notify a listener (either synchronously
+     * or asynchronously) of the result
+     *
+     * @param searchString - The string to search for
+     * @param searchParam - An extra parameter
+     * @param previousResult - A previous result to use for faster searching
+     * @param listener - A listener to notify when the search is complete
+     */
+    //void startSearch(in AString searchString,
+    //                 in AString searchParam,
+    //                 in nsIAutoCompleteResult previousResult,
+    //                 in nsIAutoCompleteObserver listener);
+
+    startSearch: function _startSearch(searchString, searchParam, previousResult, listener) {
+        /*		dump("mivExchangeAutoCompleteSearch: startSearch\n");
+        		dump("    searchString:"+searchString+"\n");
+        		dump("     searchParam:"+searchParam+"\n");
+        		dump("  previousResult:"+previousResult+"\n");
+        		dump("        listener:"+listener+"\n\n");
+        */
+        searchString = encodeURI(searchString);
+        var uuid = this.globalFunctions.getUUID();
+        var query = "(or(PrimaryEmail,c," + searchString + ")(DisplayName,c," + searchString + ")(FirstName,c," + searchString + ")(LastName,c," + searchString + "))";
+
+        this._searches[uuid] = {
+            "uuid": uuid,
+            "searchString": searchString,
+            "query": query,
+            "searchParam": searchParam,
+            "previousResult": previousResult,
+            "listener": listener,
+        };
+
+        if (previousResult) {
+            previousResult.clearResults();
+            this._searches[uuid]["autoCompleteResult"] = previousResult;
+        }
+        else {
+            this._searches[uuid]["autoCompleteResult"] = Cc["@1st-setup.nl/exchange/autocompleteresult;1"].createInstance(Ci.mivExchangeAutoCompleteResult);
+        }
+
+
+        if (this._firstCall) {
+            var observerService = Cc["@mozilla.org/observer-service;1"]
+                .getService(Ci.nsIObserverService);
+            observerService.addObserver(this, "onExchangeGALSearchStart", false);
+            observerService.addObserver(this, "onExchangeGALSearchEnd", false);
+            this._firstCall = false;
+        }
+
+        this._searches[uuid].autoCompleteResult.setSearchString(searchString);
+        this._searches[uuid]["rootDir"] = MailServices.ab.getDirectory("exchWebService-contactRoot-directory://?" + query);
+
+        /*		if (this._searches[uuid]["rootDir"]) {
+        			var childCards = this._searches[uuid]["rootDir"].childCards;
+        			while (childCards.hasMoreElements()) {
+        				this._searches[uuid].autoCompleteResult.addResult(childCards.getNext());
+        			}
+        		}
+        */
+    },
+
+    onItemAdded: function _onItemAdded(parentDir, item) {
+        var rightDir = parentDir.QueryInterface(Ci.nsIAbDirectory);
+        if (!rightDir) {
+            return;
+        }
+
+        if (item.QueryInterface(Ci.mivExchangeAbCard)) {
+            // Check to which search it belongs
+            for each(var search in this._searches) {
+                if (rightDir.URI.indexOf(search.query) > -1) {
+                    dump(" 1.@@@ displayName:" + item.displayName + ", localId:" + item.localId + "\n");
+                    search.autoCompleteResult.addResult(item);
+                }
+            }
+        }
+    },
+
+    /*
+     * Stop all searches that are in progress
+     */
+    //void stopSearch();
+    stopSearch: function _stopSearch() {
+        //dump("mivExchangeAutoCompleteSearch: stopSearch\n");
+        for each(var search in this._searches) {
+            // Clearing the results because it appears the are being reused.
+            search.autoCompleteResult.clearResults();
+        }
+
+        this._searches = {};
+
+        if (!this._firstCall) {
+            var observerService = Cc["@mozilla.org/observer-service;1"]
+                .getService(Ci.nsIObserverService);
+            observerService.removeObserver(this, "onExchangeGALSearchStart");
+            observerService.removeObserver(this, "onExchangeGALSearchEnd");
+        }
+        this._firstCall = true;
+    },
 
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeAutoCompleteSearch) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeAutoCompleteSearch = XPCOMUtils.generateNSGetFactory([mivExchangeAutoCompleteSearch]);
+    try {
+        if (!NSGetFactory.mivExchangeAutoCompleteSearch) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeAutoCompleteSearch = XPCOMUtils.generateNSGetFactory([mivExchangeAutoCompleteSearch]);
 
-	}
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeAutoCompleteSearch(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeAutoCompleteSearch(cid);
+}
diff --git a/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.js b/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.js
index 188d3761..65b8d6b1 100644
--- a/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.js
+++ b/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.js
@@ -29,11 +29,11 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeBadCertListener2() {
 
-	this.targetSites = {};
-	this.userCanceled = {};
+    this.targetSites = {};
+    this.userCanceled = {};
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
 }
 
@@ -43,128 +43,134 @@ var mivExchangeBadCertListener2GUID = "33242776-0e06-4c30-afc1-bd68f3bb2417";
 
 mivExchangeBadCertListener2.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeBadCertListener2,
-			Ci.nsIBadCertListener2,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange BadCertListener2.",
-	classID: components.ID("{"+mivExchangeBadCertListener2GUID+"}"),
-	contractID: "@1st-setup.nl/exchange/badcertlistener2;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-	// nsIBadCertListener2
-	notifyCertProblem: function _notifyCertProblem(socketInfo, status, targetSite) 
-	{
-		this.logInfo("notifyCertProblem: targetSite:"+targetSite);
-
-		this.targetSites[targetSite] = true;
-
-		return true;
-	},
-
-	checkCertProblem: function _checkCertProblem(targetSite) 
-	{
-		if (!targetSite) return false;
-
-		var waitingProblem = false;
-		for (var index in this.targetSites) {
-			if (this.targetSites[index]) {
-				var index2 = index;
-				if (index2.indexOf(":") > -1) {
-					index2 = index2.substr(0,index2.indexOf(":"));
-				}
-				if ((targetSite.indexOf(index) > -1) || (targetSite.indexOf(index2) > -1)) {
-					waitingProblem = true;
-				}
-			}
-		}
-
-		return waitingProblem;
-	},
-
-	checkAndSolveCertProblem: function _checkAndSolveCertProblem(targetSite) 
-	{
-		var waitingProblem = this.checkCertProblem(targetSite);
-
-		this.logInfo("checkAndSolveCertProblem: waitingProblem:"+waitingProblem+", targetSite:"+targetSite);
-		if (waitingProblem) {
-			var params = { exceptionAdded: false,
-					prefetchCert: true,
-					location: targetSite };
-
-			var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-	      	                    .getService(Ci.nsIWindowMediator);
-			var calWindow = wm.getMostRecentWindow("mail:3pane") ;
-
-			calWindow.openDialog("chrome://pippki/content/exceptionDialog.xul",
-					"",
-					"chrome,centerscreen,modal",
-					params);
-
-			if (params.exceptionAdded) {
-				this.targetSites[targetSite] = false;
-				delete this.targetSites[targetSite];
-				this.userCanceled[targetSite] = false;
-				delete this.userCanceled[targetSite];
-				return { hadProblem: true, solved: true };
-			}
-			else {
-				this.userCanceled[targetSite] = true;
-				return { hadProblem: true, solved: false };
-			}
-		}
-		else {
-			return { hadProblem: false };
-		}
-	},
-
-	userCanceledCertProblem: function _userCanceledCertProblem(targetSite) 
-	{
-		if (this.userCanceled[targetSite]) {
-			return true;
-		}
-		return false;
-	},
-
-	// Internal methods.
-	logInfo: function _logInfo(aMsg, aDebugLevel) 
-	{
-		var prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
-
-		this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
-		if (this.debug) {
-			this.globalFunctions.LOG("mivExchangeAuthPrompt2: "+aMsg);
-		}
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeBadCertListener2,
+        Ci.nsIBadCertListener2,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange BadCertListener2.",
+    classID: components.ID("{" + mivExchangeBadCertListener2GUID + "}"),
+    contractID: "@1st-setup.nl/exchange/badcertlistener2;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+    // nsIBadCertListener2
+    notifyCertProblem: function _notifyCertProblem(socketInfo, status, targetSite) {
+        this.logInfo("notifyCertProblem: targetSite:" + targetSite);
+
+        this.targetSites[targetSite] = true;
+
+        return true;
+    },
+
+    checkCertProblem: function _checkCertProblem(targetSite) {
+        if (!targetSite) return false;
+
+        var waitingProblem = false;
+        for (var index in this.targetSites) {
+            if (this.targetSites[index]) {
+                var index2 = index;
+                if (index2.indexOf(":") > -1) {
+                    index2 = index2.substr(0, index2.indexOf(":"));
+                }
+                if ((targetSite.indexOf(index) > -1) || (targetSite.indexOf(index2) > -1)) {
+                    waitingProblem = true;
+                }
+            }
+        }
+
+        return waitingProblem;
+    },
+
+    checkAndSolveCertProblem: function _checkAndSolveCertProblem(targetSite) {
+        var waitingProblem = this.checkCertProblem(targetSite);
+
+        this.logInfo("checkAndSolveCertProblem: waitingProblem:" + waitingProblem + ", targetSite:" + targetSite);
+        if (waitingProblem) {
+            var params = {
+                exceptionAdded: false,
+                prefetchCert: true,
+                location: targetSite
+            };
+
+            var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
+                .getService(Ci.nsIWindowMediator);
+            var calWindow = wm.getMostRecentWindow("mail:3pane");
+
+            calWindow.openDialog("chrome://pippki/content/exceptionDialog.xul",
+                "",
+                "chrome,centerscreen,modal",
+                params);
+
+            if (params.exceptionAdded) {
+                this.targetSites[targetSite] = false;
+                delete this.targetSites[targetSite];
+                this.userCanceled[targetSite] = false;
+                delete this.userCanceled[targetSite];
+                return {
+                    hadProblem: true,
+                    solved: true
+                };
+            }
+            else {
+                this.userCanceled[targetSite] = true;
+                return {
+                    hadProblem: true,
+                    solved: false
+                };
+            }
+        }
+        else {
+            return {
+                hadProblem: false
+            };
+        }
+    },
+
+    userCanceledCertProblem: function _userCanceledCertProblem(targetSite) {
+        if (this.userCanceled[targetSite]) {
+            return true;
+        }
+        return false;
+    },
+
+    // Internal methods.
+    logInfo: function _logInfo(aMsg, aDebugLevel) {
+        var prefB = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefBranch);
+
+        this.debug = this.globalFunctions.safeGetBoolPref(prefB, "extensions.1st-setup.authentication.debug", false, true);
+        if (this.debug) {
+            this.globalFunctions.LOG("mivExchangeAuthPrompt2: " + aMsg);
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeBadCertListener2) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeBadCertListener2 = XPCOMUtils.generateNSGetFactory([mivExchangeBadCertListener2]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeBadCertListener2) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeBadCertListener2 = XPCOMUtils.generateNSGetFactory([mivExchangeBadCertListener2]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeBadCertListener2(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeBadCertListener2(cid);
+}
diff --git a/interfaces/exchangeBaseItem/mivExchangeBaseItem.js b/interfaces/exchangeBaseItem/mivExchangeBaseItem.js
index 3db479f3..922d567b 100644
--- a/interfaces/exchangeBaseItem/mivExchangeBaseItem.js
+++ b/interfaces/exchangeBaseItem/mivExchangeBaseItem.js
@@ -38,198 +38,199 @@ Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 const participationMap = {
-	"Unknown"	: "NEEDS-ACTION",
-	"NoResponseReceived" : "NEEDS-ACTION",
-	"Tentative"	: "TENTATIVE",
-	"Accept"	: "ACCEPTED",
-	"Decline"	: "DECLINED",
-	"Organizer"	: "ACCEPTED"
+    "Unknown": "NEEDS-ACTION",
+    "NoResponseReceived": "NEEDS-ACTION",
+    "Tentative": "TENTATIVE",
+    "Accept": "ACCEPTED",
+    "Decline": "DECLINED",
+    "Organizer": "ACCEPTED"
 };
 
 const fieldPathMap = {
-	'ActualWork'			: 'task',
-	'AdjacentMeetingCount'		: 'calendar',
-	'AdjacentMeetings'		: 'calendar',
-	'AllowNewTimeProposal'		: 'calendar',
-	'AppointmentReplyTime'		: 'calendar',
-	'AppointmentSequenceNumber'	: 'calendar',
-	'AppointmentState'		: 'calendar',
-	'AssignedTime'			: 'task',
-	'AssociatedCalendarItemId'	: 'meeting',
-	'Attachments'			: 'item',
-	'BillingInformation'		: 'task',
-	'Body'				: 'item',
-	'CalendarItemType'		: 'calendar',
-	'Categories'			: 'item',
-	'ChangeCount'			: 'task',
-	'Companies'			: 'task',
-	'CompleteDate'			: 'task',
-	'ConferenceType'		: 'calendar',
-	'ConflictingMeetingCount'	: 'calendar',
-	'ConflictingMeetings'		: 'calendar',
-	'Contacts'			: 'task',
-	'ConversationId'		: 'item',
-	'Culture'			: 'item',
-	'DateTimeCreated'		: 'item',
-	'DateTimeReceived'		: 'item',
-	'DateTimeSent'			: 'item',
-	'DateTimeStamp'			: 'calendar',
-	'DelegationState'		: 'task',
-	'Delegator'			: 'task',
-	'DeletedOccurrences'		: 'calendar',
-	'DisplayCc'			: 'item',
-	'DisplayTo'			: 'item',
-	'DueDate'			: 'task',
-	'Duration'			: 'calendar',
-	'EffectiveRights'		: 'item',
-	'End'				: 'calendar',
-	'EndTimeZone'			: 'calendar',
-	'FirstOccurrence'		: 'calendar',
-	'FolderClass'			: 'folder',
-	'FolderId'			: 'folder',
-	'HasAttachments'		: 'item',
-	'HasBeenProcessed'		: 'meeting',
-	'Importance'			: 'item',
-	'InReplyTo'			: 'item',
-	'IntendedFreeBusyStatus'	: 'meetingRequest',
-	'InternetMessageHeaders'	: 'item',
-	'IsAllDayEvent'			: 'calendar',
-	'IsAssignmentEditable'		: 'task',
-	'IsAssociated'			: 'item',
-	'IsCancelled'			: 'calendar',
-	'IsComplete'			: 'task',
-	'IsDelegated'			: 'meeting',
-	'IsDraft'			: 'item',
-	'IsFromMe'			: 'item',
-	'IsMeeting'			: 'calendar',
-	'IsOnlineMeeting'		: 'calendar',
-	'IsOutOfDate'			: 'meeting',
-	'IsRecurring'			: 'calendar',
-	'IsResend'			: 'item',
-	'IsResponseRequested'		: 'calendar',
-	'IsSubmitted'			: 'item',
-	'IsTeamTask'			: 'task',
-	'IsUnmodified'			: 'item',
-	'ItemClass'			: 'item',
-	'ItemId'			: 'item',
-	'LastModifiedName'		: 'item',
-	'LastModifiedTime'		: 'item',
-	'LastOccurrence'		: 'calendar',
-	'LegacyFreeBusyStatus'		: 'calendar',
-	'Location'			: 'calendar',
-	'MeetingRequestType'		: 'meetingRequest',
-	'MeetingRequestWasSent'		: 'calendar',
-	'MeetingTimeZone'		: 'calendar',
-	'MeetingWorkspaceUrl'		: 'calendar',
- 	'Mileage'			: 'task',
-	'MimeContent'			: 'item',
-	'ModifiedOccurrences'		: 'calendar',
-	'MyResponseType'		: 'calendar',
-	'NetShowUrl'			: 'calendar',
-	'OptionalAttendees'		: 'calendar',
-	'Organizer'			: 'calendar',
-	'OriginalStart'			: 'calendar',
-	'Owner'				: 'task',
-	'ParentFolderId'		: 'item',
-	'PercentComplete'		: 'task',
-	'Recurrence'			: 'calendar',
-	'RecurrenceId'			: 'calendar',
-	'ReminderDueBy'			: 'item',
-	'ReminderIsSet'			: 'item',
-	'ReminderMinutesBeforeStart'	: 'item',
-	'RequiredAttendees'		: 'calendar',
-	'Resources'			: 'calendar',
-	'ResponseObjects'		: 'item',
-	'ResponseType'			: 'meeting',
-	'SearchParameters'		: 'folder',
-	'Sensitivity'			: 'item',
-	'Size'				: 'item',
-	'Start'				: 'calendar',
-	'StartDate'			: 'task',
-	'StartTimeZone'			: 'calendar',
-	'StatusDescription'		: 'task',
-	'Status'			: 'task',
-	'Subject'			: 'item',
-	'TimeZone'			: 'calendar',
-	'TotalWork'			: 'task',
-	'UID'				: 'calendar',
-	'UniqueBody'			: 'item',
-	'WebClientEditFormQueryString'	: 'item',
-	'WebClientReadFormQueryString'	: 'item',
-	'When'				: 'calendar'
+    'ActualWork': 'task',
+    'AdjacentMeetingCount': 'calendar',
+    'AdjacentMeetings': 'calendar',
+    'AllowNewTimeProposal': 'calendar',
+    'AppointmentReplyTime': 'calendar',
+    'AppointmentSequenceNumber': 'calendar',
+    'AppointmentState': 'calendar',
+    'AssignedTime': 'task',
+    'AssociatedCalendarItemId': 'meeting',
+    'Attachments': 'item',
+    'BillingInformation': 'task',
+    'Body': 'item',
+    'CalendarItemType': 'calendar',
+    'Categories': 'item',
+    'ChangeCount': 'task',
+    'Companies': 'task',
+    'CompleteDate': 'task',
+    'ConferenceType': 'calendar',
+    'ConflictingMeetingCount': 'calendar',
+    'ConflictingMeetings': 'calendar',
+    'Contacts': 'task',
+    'ConversationId': 'item',
+    'Culture': 'item',
+    'DateTimeCreated': 'item',
+    'DateTimeReceived': 'item',
+    'DateTimeSent': 'item',
+    'DateTimeStamp': 'calendar',
+    'DelegationState': 'task',
+    'Delegator': 'task',
+    'DeletedOccurrences': 'calendar',
+    'DisplayCc': 'item',
+    'DisplayTo': 'item',
+    'DueDate': 'task',
+    'Duration': 'calendar',
+    'EffectiveRights': 'item',
+    'End': 'calendar',
+    'EndTimeZone': 'calendar',
+    'FirstOccurrence': 'calendar',
+    'FolderClass': 'folder',
+    'FolderId': 'folder',
+    'HasAttachments': 'item',
+    'HasBeenProcessed': 'meeting',
+    'Importance': 'item',
+    'InReplyTo': 'item',
+    'IntendedFreeBusyStatus': 'meetingRequest',
+    'InternetMessageHeaders': 'item',
+    'IsAllDayEvent': 'calendar',
+    'IsAssignmentEditable': 'task',
+    'IsAssociated': 'item',
+    'IsCancelled': 'calendar',
+    'IsComplete': 'task',
+    'IsDelegated': 'meeting',
+    'IsDraft': 'item',
+    'IsFromMe': 'item',
+    'IsMeeting': 'calendar',
+    'IsOnlineMeeting': 'calendar',
+    'IsOutOfDate': 'meeting',
+    'IsRecurring': 'calendar',
+    'IsResend': 'item',
+    'IsResponseRequested': 'calendar',
+    'IsSubmitted': 'item',
+    'IsTeamTask': 'task',
+    'IsUnmodified': 'item',
+    'ItemClass': 'item',
+    'ItemId': 'item',
+    'LastModifiedName': 'item',
+    'LastModifiedTime': 'item',
+    'LastOccurrence': 'calendar',
+    'LegacyFreeBusyStatus': 'calendar',
+    'Location': 'calendar',
+    'MeetingRequestType': 'meetingRequest',
+    'MeetingRequestWasSent': 'calendar',
+    'MeetingTimeZone': 'calendar',
+    'MeetingWorkspaceUrl': 'calendar',
+    'Mileage': 'task',
+    'MimeContent': 'item',
+    'ModifiedOccurrences': 'calendar',
+    'MyResponseType': 'calendar',
+    'NetShowUrl': 'calendar',
+    'OptionalAttendees': 'calendar',
+    'Organizer': 'calendar',
+    'OriginalStart': 'calendar',
+    'Owner': 'task',
+    'ParentFolderId': 'item',
+    'PercentComplete': 'task',
+    'Recurrence': 'calendar',
+    'RecurrenceId': 'calendar',
+    'ReminderDueBy': 'item',
+    'ReminderIsSet': 'item',
+    'ReminderMinutesBeforeStart': 'item',
+    'RequiredAttendees': 'calendar',
+    'Resources': 'calendar',
+    'ResponseObjects': 'item',
+    'ResponseType': 'meeting',
+    'SearchParameters': 'folder',
+    'Sensitivity': 'item',
+    'Size': 'item',
+    'Start': 'calendar',
+    'StartDate': 'task',
+    'StartTimeZone': 'calendar',
+    'StatusDescription': 'task',
+    'Status': 'task',
+    'Subject': 'item',
+    'TimeZone': 'calendar',
+    'TotalWork': 'task',
+    'UID': 'calendar',
+    'UniqueBody': 'item',
+    'WebClientEditFormQueryString': 'item',
+    'WebClientReadFormQueryString': 'item',
+    'When': 'calendar'
 };
 
 const dayRevMap = {
-	'MO' : 'Monday',
-	'TU' : 'Tuesday',
-	'WE' : 'Wednesday',
-	'TH' : 'Thursday',
-	'FR' : 'Friday',
-	'SA' : 'Saturday',
-	'SU' : 'Sunday'
+    'MO': 'Monday',
+    'TU': 'Tuesday',
+    'WE': 'Wednesday',
+    'TH': 'Thursday',
+    'FR': 'Friday',
+    'SA': 'Saturday',
+    'SU': 'Sunday'
 };
 
 const dayIdxMap = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'];
 
 const weekRevMap = {
-	'1' : 'First',
-	'2' : 'Second',
-	'3' : 'Third',
-	'4' : 'Fourth',
-	'-1': 'Last'
+    '1': 'First',
+    '2': 'Second',
+    '3': 'Third',
+    '4': 'Fourth',
+    '-1': 'Last'
 };
 
 const monthIdxMap = ['January', 'February', 'March', 'April', 'May', 'June',
-		     'July', 'August', 'September', 'October', 'November', 'December'];
+    'July', 'August', 'September', 'October', 'November', 'December'
+];
 
 const dayMap = {
-	'Monday'	: 'MO',
-	'Tuesday'	: 'TU',
-	'Wednesday'	: 'WE',
-	'Thursday'	: 'TH',
-	'Friday'	: 'FR',
-	'Saturday'	: 'SA',
-	'Sunday'	: 'SU',
-	'Weekday'	: ['MO', 'TU', 'WE', 'TH', 'FR'],
-	'WeekendDay'	: ['SA', 'SO'],
-	'Day'		: ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
+    'Monday': 'MO',
+    'Tuesday': 'TU',
+    'Wednesday': 'WE',
+    'Thursday': 'TH',
+    'Friday': 'FR',
+    'Saturday': 'SA',
+    'Sunday': 'SU',
+    'Weekday': ['MO', 'TU', 'WE', 'TH', 'FR'],
+    'WeekendDay': ['SA', 'SO'],
+    'Day': ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
 };
 
 const weekMap = {
-	'First'		: 1,
-	'Second'	: 2,
-	'Third'		: 3,
-	'Fourth'	: 4,
-	'Last'		: -1
+    'First': 1,
+    'Second': 2,
+    'Third': 3,
+    'Fourth': 4,
+    'Last': -1
 };
 
 const monthMap = {
-	'January'	: 1,
-	'February'	: 2,
-	'March'		: 3,
-	'April'		: 4,
-	'May'		: 5,
-	'June'		: 6,
-	'July'		: 7,
-	'August'	: 8,
-	'September'	: 9,
-	'October'	: 10,
-	'November'	: 11,
-	'December'	: 12
+    'January': 1,
+    'February': 2,
+    'March': 3,
+    'April': 4,
+    'May': 5,
+    'June': 6,
+    'July': 7,
+    'August': 8,
+    'September': 9,
+    'October': 10,
+    'November': 11,
+    'December': 12
 };
 
 var EXPORTED_SYMBOLS = ["mivExchangeBaseItem"];
 
 var exchGlobalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-					.getService(Ci.mivFunctions);
+    .getService(Ci.mivFunctions);
 
 function mivExchangeBaseItem() {
 
-	this.initialize();
+    this.initialize();
 
-	this.initExchangeBaseItem();
+    this.initExchangeBaseItem();
 
-	//dump("mivExchangeBaseItem: init\n");
+    //dump("mivExchangeBaseItem: init\n");
 
 }
 
@@ -237,3773 +238,3635 @@ var mivExchangeBaseItemGUID = "9bc0fca0-9465-11e2-9e96-0800200c9a66";
 
 mivExchangeBaseItem.prototype = {
 
-	_className: "mivExchangeBaseItem",
-	_mainTag: "BaseItem",
-
-	initExchangeBaseItem: function _initExchangeBaseItem()
-	{
-
-		this._exchangeData = null;
-		this.updatedItem = {};
-		this.newItem = {};
-		
-		this._changesAttendees = [];
-		this._changesAttachments = [];
-		this._changesAlarm = [];
-		this._changedProperties = [];
-		this.mailboxAliases = [];
-
-		this._newBody = undefined;
-		this._newLocation = undefined;
-		this._newLegacyFreeBusyStatus = undefined;
-		this._newMyResponseType = undefined; 
-		this._newIsInvitation = undefined;
-		this._reminderSignalTime = undefined;
-		this._newXMozSnoozeTime = undefined;
-		this._nonPersonalDataChanged = false;
-
-		this._occurrences = {};
-		this._exceptions = {};
-
-		this._isMutable = true;
-
-		this._cloneCount = 0;
-		
-//		this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-//					.getService(Ci.mivFunctions);
-
-//		this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-//					.getService(Ci.mivExchangeTimeZones);
-
-		//dump("initExchangeBaseItem: done.\n");
-
-	},
-
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeBaseItem,
-			Ci.calIInternalShallowCopy,
-			Ci.calIItemBase,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange calendar BaseItem.",
-	classID: components.ID("{"+mivExchangeBaseItemGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/calendarbaseitem;1",
-	flags: 0,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// methods from nsIClassInfo
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeBaseItem,
-			Ci.calIInternalShallowCopy,
-			Ci.calIItemBase,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	// External methods calIInternalShallowCopy
-	/**
-	* create a proxy for this item; the returned item
-	* proxy will have parentItem set to this instance.
-	*
-	* @param aRecurrenceId RECURRENCE-ID of the proxy to be created 
-	*/
-	//calIItemBase createProxy(in calIDateTime aRecurrenceId);
-	createProxy: function _createProxy(aRecurrenceId)
-	{
-		//dump("CreateProxy aRecurrenceId:"+aRecurrenceId);
-
-		var occurrence;
-		for each(var occurrence in this._occurrences) {
-			if (occurrence.recurrenceId.compare(aRecurrenceId) == 0) break;
-		}
-
-		if (! occurrence) {
-			for each(var occurrence in this._exceptions) {
-				if (occurrence.recurrenceId.compare(aRecurrenceId) == 0) break;
-			}
-		}
-
-		var newItem;
-		if (occurrence) {
-			newItem = occurrence.clone();
-			newItem.parentItem = this;
-		}
-
-		//dump("CreateProxy the end");
-		return newItem;
-	},
-
-	// used by recurrenceInfo when cloning proxy objects to
-	// avoid an infinite loop.  aNewParent is optional, and is
-	// used to set the parent of the new item; it should be null
-	// if no new parent is passed in.
-	//calIItemBase cloneShallow(in calIItemBase aNewParent);
-	cloneShallow: function _cloneShallow(aNewParent)
-	{
-		//dump("cloneShallow aNewParent:"+aNewParent);
-		var newItem = this.clone();
-		if (aNewParent) {
-			newItem.parentItem = aNewParent;
-		}
-		else {
-			newItem.parentItem = null;
-		}
-		return newItem;
-	},
-
-	// External methods calIItemBase
-
-	// returns true if this thing is able to be modified;
-	// if the item is not mutable, attempts to modify
-	// any data will throw CAL_ERROR_ITEM_IS_IMMUTABLE
-	//readonly attribute boolean isMutable;
-	get isMutable()
-	{
-		//dump("get isMutable: title:"+this.title+", value:"+this._calEvent.isMutable);
-		return this._isMutable;
-	},
-
-	// makes this item immutable
-	//void makeImmutable();
-	makeImmutable: function _makeImmutable()
-	{
-		//dump("makeImmutable: title:"+this.title);
-		this._isMutable = false;
-	},
-
-
-	typeString: function _typeString(o) {
-		if (typeof o != 'object')
-			return typeof o;
-
-		if (o === null)
-			return "null";
-	  //object, array, function, date, regexp, string, number, boolean, error
-		var internalClass = Object.prototype.toString.call(o)
-		                                       .match(/\[object\s(\w+)\]/)[1];
-		return internalClass.toLowerCase();
-	},
-
-	get cloneCount()
-	{
-		return this._cloneCount;
-	},
-
-	baseCloneFrom: function _baseCloneFrom(aItem)
-	{
-		//dump("mivExchangeBaseItem: baseCloneFrom 1: title:"+this.title+", contractId:"+this.contractID+"\n");
-try{
-		this._cloneCount = aItem._cloneCount + 1;
-		this._isMutable = aItem._isMutable;
-		this._calendar = aItem._calendar;
-		this._isAllDayEvent = aItem._isAllDayEvent;
-		this._startTimeZoneId = aItem._startTimeZoneId;
-		this._meetingTimeZone = aItem._meetingTimeZone;
-		this._timeZone = aItem._timeZone;
-		this._endTimeZoneId = aItem._endTimeZoneId;
-		this._effectiveRights = aItem._effectiveRights;
-		this._canDelete = aItem._canDelete;
-		this._canModify = aItem._canModify;
-		this._canRead = aItem._canRead;
-		if (aItem._lastModifiedTime) this._lastModifiedTime = aItem._lastModifiedTime.clone();
-		this._subject = aItem._subject;
-		this._title = aItem._title;
-		this._mimeContent = aItem._mimeContent;
-		this._id = aItem._id;
-		this._priority = aItem._priority;
-		this._sensitivity = aItem._sensitivity;
-		this._privacy = aItem._privacyl
-		this._reminderIsSet = aItem._reminderIsSet;
-		this._calendarItemType = aItem._calendarItemType;
-		if (aItem._reminderDueBy) this._reminderDueBy = aItem._reminderDueBy.clone();
-		this._reminderMinutesBeforeStart = aItem._reminderMinutesBeforeStart;
-		if (aItem._dateTimeReceived) this._dateTimeReceived = aItem._dateTimeReceived.clone();
-		if (aItem._dateTimeSent) this._dateTimeSent = aItem._dateTimeSent.clone();
-		this._size = aItem._size;
-		if (aItem._originalStart) this._originalStart = aItem._originalStart.clone();
-		this._location = aItem._location;
-		this._changeKey = aItem._changeKey;
-		this._uid = aItem._uid;
-		this._itemClass = aItem._itemClass;
-		this._messageId = aItem._messageId; 
-		this._isMeeting = aItem._isMeeting;
-		this._isRecurring = aItem._isRecurring;
-		this._meetingRequestWasSent = aItem._meetingRequestWasSent;
-		this._isResponseRequested = aItem._isResponseRequested;
-		this._myResponseType = aItem._myResponseType;
-		this._startTimeZoneName = aItem._startTimeZoneName;
-		this._endTimeZoneName = aItem._endTimeZoneName;
-		this._conferenceType = aItem._conferenceType;
-		this._allowNewTimeProposal = aItem._allowNewTimeProposal;
-		this._parentId = aItem._parentId;
-		this._parentChangeKey = aItem._parentChangeKey;
-		if (aItem._alarm) this._alarm = aItem._alarm.clone();
-		if (aItem._reminderSignalTime) this._reminderSignalTime = aItem._reminderSignalTime.clone();
-		this._xMozSnoozeTime = aItem._xMozSnoozeTime;
-		if (aItem._alarmLastAck) this._alarmLastAck = aItem._alarmLastAck.clone();
-		if (aItem._recurrenceInfo) {
-			this._recurrenceInfo = aItem._recurrenceInfo.clone();
-		}
-		else {
-			this._recurrenceInfo = aItem._recurrenceInfo;
-		}
-
-		this._occurrences = {};
-		if (aItem._occurrences) {
-			for each(var occurrence in aItem._occurrences) {
-//dump("baseClone: aItem._ocurrences 1");
-				//this.removeOccurrence(occurrence);
-				this.addOccurrence(occurrence.clone());
-			}
-		}
-
-		this._exceptions = {};
-		if (aItem._exceptions) {
-			for each(var exception in aItem._exceptions) {
-				//this.removeException(exception);
-				this.addException(exception.clone());
-			}
-		}
-
-		this._bodyType = aItem._bodyType;
-		this._body = aItem._body;
-		if (aItem._dateTimeCreated) this._dateTimeCreated = aItem._dateTimeCreated.clone();
-		if (aItem._created) this._created = aItem._created.clone();
-		this._legacyFreeBusyStatus = aItem._legacyFreeBusyStatus;
-		this._isCancelled = aItem._isCancelled;
-		this._responseObjects = {};
-		if (aItem._responseObjects) {
-			for (var index in aItem._responseObjects) {
-				this._responseObjects[index] = aItem._responseObjects[index];
-			}
-		}
-		this._type = aItem._type;
-		if (aItem._organizer) this._organizer = aItem._organizer.clone();
-		this._attendees = [];
-		if (aItem._attendees) {
-			for each(var attendee in aItem._attendees) {
-				this._attendees.push(attendee.clone());
-			}
-		}
-		this._hasAttachments = aItem._hasAttachments;
-		this._attachments = [];
-		if (aItem._attachments) {
-			for each(var attachment in aItem._attachments) {
-				this._attachments.push(attachment.clone());
-			}
-		}
-		this._categories = [];
-		if (aItem._categories) {
-			for each(var category in aItem._categories) {
-				this._categories.push(category);
-			}
-		}
-		this._recurrenceId = aItem._recurrenceId;
-
-		if (aItem._occurrenceIndex) {
-			this.occurrenceIndex = aItem._occurrenceIndex;
-		}
+    _className: "mivExchangeBaseItem",
+    _mainTag: "BaseItem",
+
+    initExchangeBaseItem: function _initExchangeBaseItem() {
+
+        this._exchangeData = null;
+        this.updatedItem = {};
+        this.newItem = {};
+
+        this._changesAttendees = [];
+        this._changesAttachments = [];
+        this._changesAlarm = [];
+        this._changedProperties = [];
+        this.mailboxAliases = [];
+
+        this._newBody = undefined;
+        this._newLocation = undefined;
+        this._newLegacyFreeBusyStatus = undefined;
+        this._newMyResponseType = undefined;
+        this._newIsInvitation = undefined;
+        this._reminderSignalTime = undefined;
+        this._newXMozSnoozeTime = undefined;
+        this._nonPersonalDataChanged = false;
+
+        this._occurrences = {};
+        this._exceptions = {};
+
+        this._isMutable = true;
+
+        this._cloneCount = 0;
+
+        //		this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        //					.getService(Ci.mivFunctions);
+
+        //		this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
+        //					.getService(Ci.mivExchangeTimeZones);
+
+        //dump("initExchangeBaseItem: done.\n");
+
+    },
+
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeBaseItem,
+        Ci.calIInternalShallowCopy,
+        Ci.calIItemBase,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange calendar BaseItem.",
+    classID: components.ID("{" + mivExchangeBaseItemGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/calendarbaseitem;1",
+    flags: 0,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // methods from nsIClassInfo
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeBaseItem,
+            Ci.calIInternalShallowCopy,
+            Ci.calIItemBase,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    // External methods calIInternalShallowCopy
+    /**
+     * create a proxy for this item; the returned item
+     * proxy will have parentItem set to this instance.
+     *
+     * @param aRecurrenceId RECURRENCE-ID of the proxy to be created 
+     */
+    //calIItemBase createProxy(in calIDateTime aRecurrenceId);
+    createProxy: function _createProxy(aRecurrenceId) {
+        //dump("CreateProxy aRecurrenceId:"+aRecurrenceId);
+
+        var occurrence;
+        for each(var occurrence in this._occurrences) {
+            if (occurrence.recurrenceId.compare(aRecurrenceId) == 0) break;
+        }
 
-}
-catch(err){
-	dump(" @@@@@@@@@@@@@ mivExchangeEvent: baseCloneFrom Error:"+err+"\n");
-}
-		//dump("mivExchangeBaseItem: baseCloneFrom 2: title:"+this.title+", contractId:"+this.contractID+"\n");
-	},
-
-	cloneFrom: function _cloneFrom(aItem)
-	{
-		/*for(var index in aItem) {
-			if ((this.typeString(aItem[index]) != "function") && (index.substr(0,1) == "_")) {
-				dump("aItem."+index+"="+aItem[index]+"\n");
-			}
-		}*/
-		//dump(" mivExchangeBaseItem: cloneFrom 1 \n");
-		//dump(" mivExchangeBaseItem: cloneFrom 2 \n");
-	},
-
-	// clone always returns a mutable event
-	//calIItemBase clone();
-	clone: function _clone()
-	{
-		//dump("mivExchangeBaseItem: clone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
-		var result = new mivExchangeBaseItem();
-		result.baseClone(this);
-		return result;
-		//dump("mivExchangeBaseItem: clone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
-	},
-
-	baseClone: function _baseClone(aItem)
-	{
-try {
-		//dump("mivExchangeBaseItem: baseClone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
-		for each(var alias in aItem.mailboxAliases) {
-			this.addMailboxAlias(alias);
-		}
-		this.cloneToCalEvent(aItem._calEvent);
-		this.cloneFrom(aItem);
-
-		if (aItem._newId !== undefined) result.id = aItem._newId;
-
-		// We are going to replay all changes to clone
-		if (aItem._newBody === null) this.deleteProperty("DESCRIPTION");
-		if (aItem._newLocation === null) this.deleteProperty("LOCATION");
-		if (aItem._newLegacyFreeBusyStatus === null) this.deleteProperty("TRANSP");
-		if (aItem._newMyResponseType === null) this.deleteProperty("STATUS"); 
-		if (aItem._newIsInvitation === null) this.deleteProperty("X-MOZ-SEND-INVITATIONS");
-
-		if (aItem._newTitle) this.title = aItem.title;
-		if (aItem._newPriority) this.priority = aItem.priority;
-		if (aItem._newPrivacy) this.privacy = aItem.privacy;
-
-		if (aItem._newAlarm !== undefined) {
-//dump("baseClone: We have alarm changes.\n");
-			if (aItem._newAlarm) {
-				this.addAlarm(aItem._newAlarm);
-			}
-			else {
-				this.clearAlarms();
-			}
-		}
-
-		if (aItem._newRecurrenceInfo !== undefined) {
-			if (aItem._newRecurrenceInfo == null) {
-				this.recurrenceInfo = aItem._newRecurrenceInfo;
-			}
-			else {
-				this.recurrenceInfo = aItem._newRecurrenceInfo.clone();
-			}
-		}
-/*		else {
-			if (((aItem._recurrenceInfo) && (aItem.recurrenceInfo) && (aItem._recurrenceInfo.toString() != aItem.recurrenceInfo.toString())) || (aItem._recurrenceInfo !== aItem.recurrenceInfo)) {
-				if (aItem.recurrenceInfo) {
-					this.recurrenceInfo = aItem.recurrenceInfo.clone();
-				}
-				else {
-					this.recurrenceInfo = aItem.recurrenceInfo;
-				}
-			}
-		}*/
-
-		if (aItem._newBodyType) this.bodyType = aItem.bodyType;
-
-		if (aItem._newBody !== undefined) this.setProperty("DESCRIPTION", aItem.getProperty("DESCRIPTION"));
-		if (aItem._newBody2 !== undefined) this.body = aItem.body;
-		if (aItem._newLocation) this.setProperty("LOCATION", aItem.getProperty("LOCATION"));
-		if (aItem._newLegacyFreeBusyStatus) this.setProperty("TRANSP", aItem.getProperty("TRANSP"));
-		if (aItem._newMyResponseType) this.setProperty("STATUS", aItem.getProperty("STATUS")); 
-		if (aItem._newIsInvitation) this.setProperty("X-MOZ-SEND-INVITATIONS", aItem.getProperty("X-MOZ-SEND-INVITATIONS"));
-
-		if (aItem._changedProperties) {
-			for each(var change in aItem._changedProperties) {
-				switch (change.action) {
-				case "set": 
-					this.setProperty(change.name, xml2json.getValue(change));
-					break;
-				case "remove":
-					this.deleteProperty(change.name);
-					break;
-				}
-			}
-		}
-		if (aItem._newOrganizer) this.organizer = aItem.organizer.clone();
-
-		if (aItem._changesAttendees) {
-			for each(var attendee in aItem._changesAttendees) {
-				switch (attendee.action) {
-				case "add": 
-					this.addAttendee(attendee.attendee);
-					break;
-				case "remove":
-					this.removeAttendee(attendee.attendee);
-					break;
-				}
-			}
-			var tmpattendees = this.getAttendees({});
-		}
-
-		if (aItem._changesAttachments) {
-			for each(var attachment in aItem._changesAttachments) {
-				switch (attachment.action) {
-				case "add": 
-					this.addAttachment(attachment.attachment);
-					break;
-				case "remove":
-					this.removeAttachment(attachment.attachment);
-					break;
-				}
-			}
-		}
-		if (aItem._changesCategories) {
-			var categories = aItem.getCategories({});
-			this.setCategories(categories.length, categories);
-		}
-
-		if (aItem._newParentItem) this.parentItem =aItem.parentItem;
-		if (aItem._newAlarmLastAck) this.alarmLastAck = aItem.alarmLastAck;
-
-		//dump("mivExchangeBaseItem: baseClone 99: title:"+aItem.title+", startDate:"+this.startDate, -1);
-}
-catch(err){
-  dump("mivExchangeBaseItem: baseClone: error:"+err+"\n");
-}
-		//dump("mivExchangeBaseItem: baseClone 2: title:"+this.title+", contractId:"+this.contractID+"\n");
-	},
-
-	/**
-	* Hash Id that incorporates the item's UID, RECURRENCE-ID and calendar.id
-	* to be used for lookup of items that come from different calendars.
-	* Setting either id, recurrenceId or the calendar attribute leads to
-	* a recomputation of hashId.
-	*
-	* @attention Individual implementors of calIItemBase must stick to the
-	*            same algorithm that base/src/calItemBase.js uses.
-	*/
-	//readonly attribute AUTF8String hashId;
-	get hashId()
-	{
-		//this.id;
-		//this.recurrenceId;
-		//this.calendar;
-		return this._calEvent.hashId;
-
-/*		 this._hashId = [encodeURIComponent(this.id),
-			this.recurrenceId ? this.recurrenceId.getInTimezone(exchGlobalFunctions.ecUTC()).icalString : "",
-			this.calendar ? encodeURIComponent(this.calendar.id) : ""].join("#");
-
-		//dump("get hashId: title:"+this.title+", value:"+this._hashId);
-		return this._hashId;*/
-	},
-
-	/**
-	* Checks whether the argument object refers the same calendar item as
-	* this one, by testing both the id and recurrenceId property.  This
-	*
-	* @arg aItem     the item to compare against this one
-	*
-	* @return        true if both ids match, false otherwise
-	*/
-	//boolean hasSameIds(in calIItemBase aItem);
-	hasSameIds: function _hasSameIds(aItem)
-	{
-		//dump("hasSameIds: title:"+this.title);
-		return this._calEvent.hasSameIds(aItem);
-	},
-
-	get canDelete()
-	{
-		if (this._canDelete !== undefined) {
-			return this._canDelete;
-		}
-		return true;
-	},
-
-	get canModify()
-	{
-		if (this._canModify !== undefined) {
-			return this._canModify;
-		}
-
-		return true;
-	},
-
-	get canRead()
-	{
-		if (this._canRead !== undefined) {
-			return this._canRead;
-		}
-		return true;
-	},
-
-	/**
-	* Returns the acl entry associated to the item.
-	*/
-	//readonly attribute calIItemACLEntry aclEntry;
-	get aclEntry()
-	{
-		var result = {
-					calendarEntry : this.calendar.aclEntry,
-					userCanModify : ((this._canModify) || (this._canDelete)),
-					userCanRespond : this._canModify,
-					userCanViewAll : this._canRead,
-					userCanViewDateAndTime: true,};
-		return result;
-	},
-
-	//
-	// the generation number of this item
-	//
-	//attribute PRUint32 generation;
-	get generation()
-	{
-		return this._calEvent.generation;
-	},
-
-	set generation(aValue)
-	{
-		//dump("set generation: title:"+this.title);
-		this._calEvent.generation = aValue;
-	},
-
-	// the time when this item was created
-	//readonly attribute calIDateTime creationDate;
-	get creationDate()
-	{
-		//dump("get creationDate: title:"+this.title+", value:"+this.dateTimeCreated);
-		return this.dateTimeCreated;
-	},
-
-	// last time any attribute was modified on this item, in UTC
-	//readonly attribute calIDateTime lastModifiedTime;
-	get lastModifiedTime()
-	{
-		//dump("get lastModifiedTime: title:"+this.title+", value:"+this._lastModifiedTime);
-		return this._lastModifiedTime;
-	},
-
-	// last time a "significant change" was made to this item
-	//readonly attribute calIDateTime stampTime;
-	get stampTime()
-	{
-		//dump("get stampTime: title:"+this.title+", value:"+this._calEvent.stampTime);
-		return this._calEvent.stampTime;
-	},
-
-	// the calICalendar to which this event belongs
-	//attribute calICalendar calendar;
-	get calendar()
-	{
-		return this._calEvent.calendar;
-	},
-
-	set calendar(aValue)
-	{
-		this._calendar = aValue;
-		this._calEvent.calendar = aValue;
-	},
-
-	// the ID of this event
-	//attribute AUTF8String id;
-	get id()
-	{
-		//dump("get id: title:"+this.title+", _id:"+this._id+", id:"+this._calEvent.id+"\n");
-		//return this._calEvent.id;
-		return this._id;
-	},
-
-	set id(aValue) 
-	{
-		//dump("set id: title:"+this.title);
-		return; // We do not allow this.
-	},
-
-	clearId: function _clearId(newId)
-	{
-		if (newId) {
-//dump("clearId newId:"+newId+"\n");
-			this._id = newId;
-			this._calEvent.id = newId;
-		}
-		else {
-//dump("clearId newId:undefined\n");
-			this._id = undefined;
-			this._calEvent.id = undefined;
-		}
-	},
-
-	// event title
-	//attribute AUTF8String title;
-	get title()
-	{
-		//dump("get title: title:"+this._calEvent.title);
-		if (this._newTitle) {
-			return this._newTitle;
-		}
-
-		if (this._title) {
-			return this._title;
-		}
-
-		return this._calEvent.title;
-	},
-
-	set title(aValue)
-	{
-		//dump("set title: oldTitle:"+this.title+", newTitle:"+aValue);
-		if (aValue != this._title) {
-			this._newTitle = aValue;
-			this._calEvent.title = aValue;
-		}
-	},
-
-	// event priority
-	//attribute short priority;
-	get priority()
-	{
-		//dump("get priority: title:"+this.title+", value:"+this._calEvent.priority);
-		return this._calEvent.priority;
-	},
-
-	set priority(aValue)
-	{
-		//dump("set priority: title:"+this.title+", aValue:"+aValue);
-		if (aValue != this.priority) {
-			if (aValue > 5) {
-				this._newPriority = "Low";
-			}
-			if (aValue == 5) {
-				this._newPriority = "Normal";
-			}
-			if (aValue < 5) {
-				this._newPriority = "High";
-			}
-			if (aValue == 0) {
-				this._newPriority = "Normal";
-			}
-			this._calEvent.priority = aValue;
-		}
-	},
-
-	//attribute AUTF8String privacy;
-	get privacy()
-	{
-		//dump("get privacy: title:"+this.title+", value:"+this._calEvent.privacy);
-		if (this._newPrivacy !== undefined) {
-			const privacies = { "Normal": "PUBLIC" ,
-					"Confidential": "CONFIDENTIAL" , 
-					"Private": "PRIVATE" ,
-					null: "PUBLIC" };
-
-			return privacies[this._newPrivacy];
-		}
-
-		return this._calEvent.privacy;
-	},
-
-	set privacy(aValue)
-	{
-		//dump("set privacy: title:"+this.title+", aValue:"+aValue);
-		if (aValue != this.privacy) {
-			const privacies = { "PUBLIC": "Normal",
-					"CONFIDENTIAL": "Confidential", 
-					"PRIVATE" : "Private",
-					null: "Normal" };
-			this._newPrivacy = privacies[aValue];
-			this._calEvent.privacy = aValue;
-		}
-	},
-
-	// status of the event
-	//attribute AUTF8String status;
-	get status()
-	{
-		//dump("get status: title:"+this.title+", value:"+this._calEvent.status+", this._status:"+this._status);
-		if (this._newStatus !== undefined) {
-			return this._newStatus;
-		}
-
-		return this._calEvent.status;
-	},
-
-	set status(aValue)
-	{
-		if (aValue != this.status) {
-			this._newStatus = aValue;
-			this._calEvent.status = aValue;
-		}
-	},
-
-	// ical interop; writing this means parsing
-	// the ical string into this event
-	//attribute AUTF8String icalString;
-	get icalString()
-	{
-		//dump("get icalString: title:"+this.title+", value:"+this._calEvent.icalString);
-		return this._calEvent.icalString;
-	},
-
-	set icalString(aValue)
-	{
-		//dump("set icalString: title:"+this.title+", aValue:"+aValue);
-		this._calEvent.icalString = aValue;
-	},
-
-	// an icalComponent for this item, suitable for serialization.
-	// the icalComponent returned is not live: changes in it or this
-	// item will not be reflected in the other.
-	//attribute calIIcalComponent icalComponent;
-	get icalComponent()
-	{
-		//dump("get icalComponent: title:"+this.title+", value:"+this._calEvent.icalComponent);
-		return this._calEvent.icalComponent;
-	},
-
-	set icalComponent(aValue)
-	{
-		//dump("set icalComponent: title:"+this.title+", aValue:"+aValue);
-		this._calEvent.icalComponent = aValue;
-	},
-
-	//
-	// alarms
-	//
-
-	alarmsAreEqual: function _alarmsAreEqual(aAlarm1, aAlarm2)
-	{
-		var result = false;
-
-		if ( ((!aAlarm1) && (aAlarm2)) ||
-		     ((!aAlarm2) && (aAlarm1)) ) {
-			return false;
-		}
-
-		if ((!aAlarm1) && (!aAlarm2)) {
-			return true;
-		}
-
-		if ( (((aAlarm1.alarmDate) && (aAlarm2.alarmDate) && (aAlarm1.alarmDate.compare(aAlarm2.alarmDate) == 0)) || ((!aAlarm1.alarmDate) && (!aAlarm2.alarmDate))) &&
-		     (aAlarm1.related == aAlarm2.related) &&
-		     (aAlarm1.offset == aAlarm2.offset) ) {
-			result = true;
-		}
-
-		return result;
-	},
-
-	/**
-	* Get all alarms assigned to this item
-	*
-	* @param count       The number of alarms
-	* @param aAlarms     The array of calIAlarms
-	*/
-	//void getAlarms(out PRUint32 count, [array, size_is(count), retval] out calIAlarm aAlarms);
-	getAlarms: function _getAlarms(count)
-	{
-
-		if (!this.canModify) {
-			count.value = 0;
-			return [];
-		}
-
-		return this._calEvent.getAlarms(count);
-	},
-
-	/**
-	* Add an alarm to the item
-	*
-	* @param aAlarm      The calIAlarm to add
-	*/
-	//void addAlarm(in calIAlarm aAlarm);
-	addAlarm: function _addAlarm(aAlarm)
-	{
-		if (!aAlarm) return;
- 		// As exchange can only handle one alarm. We make sure there is only one.
-
-		//dump("addAlarm 1: title:"+this.title+", aAlarm.alarmDate:"+aAlarm.alarmDate+", offset:"+aAlarm.offset+"("+this.calendarItemType+")\n");
-		var alarms = this.getAlarms({}); // Preload
-		this._calEvent.clearAlarms();
-
-		if (((this._alarm) && (!this.alarmsAreEqual(this._alarm, aAlarm))) || (!this._alarm)) {
-			//dump("addAlarm 2: title:"+this.title+", aAlarm.alarmDate:"+aAlarm.alarmDate+", offset:"+aAlarm.offset+"("+this.calendarItemType+")\n");
-			this._newAlarm = aAlarm.clone();
-		}
-		this._calEvent.addAlarm(aAlarm.clone());
-	},
-
-	/**
-	* Delete an alarm from the item
-	*
-	* @param aAlarm      The calIAlarm to delete
-	*/
-	//void deleteAlarm(in calIAlarm aAlarm);
-	deleteAlarm: function _deleteAlarm(aAlarm)
-	{
-		//dump("deleteAlarm: title:"+this.title+"("+this.calendarItemType+")\n");
-		this._newAlarm = null;
-		this._calEvent.clearAlarms();
-	},
-
-	/**
-	* Clear all alarms from the item
-	*/
-	//void clearAlarms();
-	clearAlarms: function _clearAlarms()
-	{
-		//dump("clearAlarms: title:"+this.title+"("+this.calendarItemType+")\n");
-		this._newAlarm = null;
-		this._calEvent.clearAlarms();
-	},
-
-	// The last time this alarm was fired and acknowledged by the user; coerced to UTC.
-	//attribute calIDateTime alarmLastAck;
-	get alarmLastAck()
-	{
-		//dump("get alarmLastAck. this._alarmLastAck:"+this._alarmLastAck+"\n");
-		//dump("get alarmLastAck: title:"+this.title+", alarmLastAck:"+this._calEvent.alarmLastAck+"\n");
-		return this._calEvent.alarmLastAck;
-	},
-
-	set alarmLastAck(aValue)
-	{
-//dump("set alarmLastAck 1:"+aValue+"\n");
-try {
-		if ((aValue) && ((!this.alarmLastAck) || (aValue.compare(this.alarmLastAck) != 0))) {
-
-			//dump("set alarmLastAck: User snoozed alarm. Title:"+this.title+", aValue:"+aValue.toString()+", alarmTime:"+this.getAlarmTime(), -1);
-//dump("set alarmLastAck 2:"+aValue+"\n");
-			this._newAlarmLastAck = aValue.clone();
-		}
-		else {
-//dump("set alarmLastAck 3:"+aValue+"\n");
-			if (aValue === null) {
-				//dump("set alarmLastAck: set to NULL. Title:"+this.title+", aValue:"+aValue+", alarmTime:"+this.getAlarmTime(), -1);
-				this._newAlarmLastAck = null;
-			}
-		}
-}catch(err){dump("alarmlastack err:"+err+"\n");}
-		this._calEvent.alarmLastAck = aValue;
-	},
-
-	//
-	// recurrence
-	//
-	//attribute calIRecurrenceInfo recurrenceInfo;
-	get recurrenceInfo()
-	{
-
-		if (this._newRecurrenceInfo !== undefined) {
-			return this._newRecurrenceInfo;
-		}
-
-		if (this._recurrenceInfo !== undefined) {
-			return this._recurrenceInfo;
-		}
-
-		return this._calEvent.recurrenceInfo;
-	},
-
-	set recurrenceInfo(aValue)
-	{
-		//dump("set recurrenceInfo 1: title:"+this.title+", this.recurrenceInfo:"+this.recurrenceInfo+", aValue:"+aValue+"\n");
-		if (aValue) {
-			// Lets see if something changed.
-			var infoChanged = false;
-			if (this.recurrenceInfo) {
-				if (this.recurrenceInfo.countRecurrenceItems() == aValue.countRecurrenceItems()) 
-				{
-					var oldRecurrenceItems = this.recurrenceInfo.getRecurrenceItems({});
-					var newRecurrenceItems = aValue.getRecurrenceItems({});
-					// See if the oldReccurrenceItems exists in the new
-					var allOldExist = true;
-					for each(var oldRecurrenceItem in oldRecurrenceItems) {
-						var oldExists = false;
-						for each(var newRecurrenceItem in newRecurrenceItems) {
-							if (newRecurrenceItem.icalString == oldRecurrenceItem.icalString) {
-								oldExists = true;
-								break;
-							}
-						}
-						if (!oldExists) {
-							allOldExist = false;
-							break;
-						}
-					}
-					if (!allOldExist) {
-						infoChanged = true;
-					}
-				}
-				else {
-					infoChanged = true;
-				}
-			}
-			else {
-				infoChanged = true;
-			}
-			if (infoChanged) {
-				//dump("set recurrenceInfo 2: recurrenceinfo changed.\n"); 
-				this._newRecurrenceInfo = aValue.clone();
-				this._calEvent.recurrenceInfo = aValue.clone();
-			}
-			else {
-				//dump("set recurrenceInfo 3: recurrenceinfo did not change.\n"); 
-			}
-		}
-		else {
-			//dump("set recurrenceInfo 4: recurrenceinfo changed.\n"); 
-			this._newRecurrenceInfo = aValue;
-			this._calEvent.recurrenceInfo = aValue;
-		}
-
-	},
-
-	//readonly attribute calIDateTime recurrenceStartDate;
-	get recurrenceStartDate()
-	{
-		if ((this.recurrenceInfo) && (!this._newRecurrenceInfo)) {
-			if (this._recurrenceStartDate) {
-				return this._recurrenceStartDate;
-			}
-		}
-		//dump("get recurrenceStartDate: title:"+this.title+", value:"+this._calEvent.recurrenceStartDate);
-		return this._calEvent.recurrenceStartDate;
-	},
-
-	//
-	// All event properties are stored in a property bag;
-	// some number of these are "promoted" to top-level
-	// accessor attributes.  For example, "SUMMARY" is
-	// promoted to the top-level "title" attribute.
-	//
-	// If you use the has/get/set/deleteProperty
-	// methods, property names are case-insensitive.
-	//
-	// For purposes of ICS serialization, all property names in
-	// the hashbag are in uppercase.
-	//
-	// The isPropertyPromoted() attribute can will indicate
-	// if a particular property is promoted or not, for
-	// serialization purposes.
-	//
-
-	// Note that if this item is a proxy, then any requests for
-	// non-existant properties will be forward to the parent item.
-
-	// some other properties that may exist:
-	//
-	// 'description' - description (string)
-	// 'location' - location (string)
-	// 'categories' - categories (string)
-	// 'syncId' - sync id (string)
-	// 'inviteEmailAddress' - string
-	// alarmLength/alarmUnits/alarmEmailAddress/lastAlarmAck
-	// recurInterval/recurCount/recurWeekdays/recurWeeknumber
-
-	// these forward to an internal property bag; implemented here, so we can
-	// do access control on set/delete to have control over mutability.
-	//readonly attribute nsISimpleEnumerator propertyEnumerator;
-	get propertyEnumerator()
-	{
-		this.getProperty("DESCRIPTION"); // To preload.
-		this.getProperty("LOCATION"); // To preload.
-		this.getProperty("TRANSP"); // To preload.
-		this.getProperty("STATUS"); // To preload.
-		this.getProperty("X-MOZ-SEND-INVITATIONS"); // To preload.
-		return this._calEvent.propertyEnumerator;
-	},
-
-	//boolean hasProperty(in AString name);
-	hasProperty: function _hasProperty(name)
-	{
-		//dump("hasProperty: title:"+this.title+", name:"+name);
-		this.getProperty(name); // To preload.
-		return this._calEvent.hasProperty(name);
-	},
-
-	/**
-	* Gets a particular property.
-	* Objects passed back are still owned by the item, e.g. if callers need to
-	* store or modify a calIDateTime they must clone it.
-	*/
-	//nsIVariant getProperty(in AString name);
-	getProperty: function _getProperty(name)
-	{
-		//dump("get property 1: title:"+this.title+", name:"+name+" == "+this._calEvent.getProperty(name)+"\n");
-		switch (name) {
-		case "X-MOZ-SNOOZE-TIME":
-				this.reminderSignalTime;
-			break;
-		case "PERCENT-COMPLETE":
-			this._calEvent.setProperty(name, this.percentComplete);
-			break;
-		case "DESCRIPTION": 
-			break;
-		case "CREATED": 
-			break;
-		case "LOCATION": 
-			if ((this.location) && (!this._newLocation)) this._calEvent.setProperty(name, this.location);
-			break;
-		case "TRANSP": 
-			break;
-		case "STATUS": 
-		        //dump("get property STATUS: title:"+this.title+", name:"+name+", value:"+this._calEvent.getProperty(name)+", startDate:"+this.startDate+"\n");
-			if (this._className == "mivExchangeEvent") {
-			}
-			else {
-		        	//dump("get property STATUS: title:"+this.title+", name:"+name+", isCompleted:"+this.isCompleted+", value:"+this._calEvent.getProperty(name)+", this.status:"+this.status+", entryDate:"+this.entryDate+"\n");
-				return this.status;
-			}
-			break;
-		case "X-MOZ-SEND-INVITATIONS": 
-			break;
-		case "CLASS":
-			this.privacy; // preload
-			break;
-		default:
-			if (name.indexOf("X-MOZ-SNOOZE-TIME-") > -1) {
-				//dump("setProperty: "+name+" is set to value:"+value);
-				//dump("getProperty:"+name+":"+this._calEvent.getProperty(name)+"\n");
-				//dump("getProperty: this.reminderSignalTime:"+this.reminderSignalTime+"\n");
-			}
-		}
-
-		//dump("get property 2: title:"+this.title+", name:"+name+", value:"+this._calEvent.getProperty(name)+", _newLocation:"+this._newLocation);
-		return this._calEvent.getProperty(name);
-	},
-
-	/**
-	* Sets a particular property.
-	* Ownership of objects gets passed to the item, e.g. callers must not
-	* modify a calIDateTime after it's been passed to an item.
-	*
-	* @warning this reflects the current implementation
-	*          xxx todo: rethink whether it's more sensible to store
-	*                    clones in calItemBase.
-	*/
-	//void setProperty(in AString name, in nsIVariant value);
-	setProperty: function _setProperty(name, value)
-	{
-		//dump("set property: title:"+this.title+", name:"+name+", aValue:"+value+"\n", -1);
-		switch (name) {
-		case "PERCENT-COMPLETE":
-			this.percentComplete = value;
-			break;
-		case "DESCRIPTION": 
-			if (value != this._newBody) {
-				this._newBody = value;
-			}
-			break;
-		case "CREATED": 
-			if (value != this._newCreated) {
-				this._newCreated = value;
-			}
-			break;
-		case "LOCATION": 
-			if (value != this._newLocation) {
-				this._newLocation = value;
-			}
-			break;
-		case "PRIORITY":
-			this.priority = value;
-			break;
-		case "CLASS":
-			this.privacy = value;
-			break;
-		case "TRANSP": 
-			if (value != this.getProperty(name)) {
-				switch (value) {
-				case "TRANSPARENT":
-					this._newLegacyFreeBusyStatus = "Free";
-					break;
-				case "OPAQUE":		
-					this._newLegacyFreeBusyStatus = "Busy";
-					break;
-				default	:	
-					this._newLegacyFreeBusyStatus = "Busy";
-					break;
-				}
-			}
-			break;
-		case "STATUS": 
-			//dump("set property: title:"+this.title+", name:"+name+", aValue:"+value+"\n", -1);
-			//dump("set property: title:"+this.title+", name:"+name+", aValue:"+value+"\n");
-			if (this.className == "mivExchangeEvent") {
-				if (value != this.getProperty(name)) {
-					switch (value) {
-					case "NONE":
-						this._newMyResponseType = "Unknown";
-						break;
-					case "CONFIRMED":
-						this._newMyResponseType = "Accept";
-						break;
-					case "TENTATIVE":
-						this._newMyResponseType = "Tentative";
-						break;
-					case "CANCELLED":
-						this._newMyResponseType = "Decline";
-						break;
-					default:
-						this._newMyResponseType = "Unknown";
-						break;
-					}
-				}
-			}
-			else {
-				this.status = value;
-				return;
-			}
-			break;
-		case "X-MOZ-SEND-INVITATIONS": 
-			if (value != this.getProperty(name)) {
-				this._newIsInvitation = value;
-			}
-			break;
-		case "X-MOZ-SNOOZE-TIME":
-//dump("setProperty: title:"+this.title+", X-MOZ-SNOOZE-TIME:"+value+"\n");
-				if (value != this._xMozSnoozetime) {
-					this._newXMozSnoozeTime = value;
-				}
-				else {
-					this._newXMozSnoozeTime = undefined;
-				}
-			break;
-		default:
-			if (name.indexOf("X-MOZ-SNOOZE-TIME-") > -1) {
-				//dump("setProperty: "+name+" is set to value:"+value);
-				if ((this._xMozSnoozetime === undefined) && (this._reminderSignalTime)) {
-	//dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", Going to set initial xMozSnoozeTime for master to:"+value+"\n");
-					this._xMozSnoozetime = value;
-				}
-				else {
-					if (value != this._xMozSnoozetime) {
-
-	//dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", this._reminderSignalTime:"+this._reminderSignalTime+"\n");
-	//dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", this._xMozSnoozetime:"+this._xMozSnoozetime+"\n");
-	//dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", "+name+":"+value+"\n");
-						this._newXMozSnoozeTime = value;
-						this._lastXMozSnoozeTimeNativeId = name.substr(18);
-	//dump("setProperty this._lastXMozSnoozeTimeNativeId:"+this._lastXMozSnoozeTimeNativeId+"\n");
-					}
-					else {
-	//dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", Not changed\n");
-						this._newXMozSnoozeTime = undefined;
-					}
-				}
-			}
-			else {
-				this._changedProperties.push({ action: "set", name: name, value: value});
-			}
-		}
-
-		this._calEvent.setProperty(name, value);
-	},
-
-	// will not throw an error if you delete a property that doesn't exist
-	//void deleteProperty(in AString name);
-	deleteProperty: function _deleteProperty(name)
-	{
-		//dump("deleteProperty: title:"+this.title+", name:"+name+"\n");
-		switch (name) {
-		case "DESCRIPTION": 
-			this._newBody = null;
-			break;
-		case "LOCATION": 
-			this._newLocation = null;
-			break;
-		case "TRANSP": 
-			this._newLegacyFreeBusyStatus = null;
-			break;
-		case "STATUS": 
-			if (this.className == "mivExchangeEvent") {
-				this._newMyResponseType = null;
-			}
-			else {
-				this._status = null;
-			}
-			break;
-		case "X-MOZ-SEND-INVITATIONS": 
-			this._newIsInvitation = null;
-			break;
-
-		case "X-MOZ-SNOOZE-TIME":
-//dump("deleteProperty: title:"+this.title+", "+name+", this._xMozSnoozeTime="+this._xMozSnoozeTime+", this._calEvent.getProperty(X-MOZ-SNOOZE-TIME)="+this._calEvent.getProperty("X-MOZ-SNOOZE-TIME")+", reminderSignalTime="+this.reminderSignalTime+"\n");
-				this._newXMozSnoozeTime = null;
-			break;
-		default:
-			if (name.indexOf("X-MOZ-SNOOZE-TIME-") > -1) {
-//dump("deleteProperty: title:"+this.title+", "+name+"\n");
-				//dump("setProperty: "+name+" is set to value:"+value);
-				this._newXMozSnoozeTime = null;
-				this._lastXMozSnoozeTimeNativeId = name.substr(18);
-//dump("deleteProperty this._lastXMozSnoozeTimeNativeId:"+this._lastXMozSnoozeTimeNativeId+"\n");
-			}
-			else {
-				this._changedProperties.push({ action: "remove", name: name, value: null});
-			}
-
-//		default:
-//			this._changedProperties.push({ action: "remove", name: name});
-		}
-
-		this._calEvent.deleteProperty(name);
-	},
-
-	// returns true if the given property is promoted to some
-	// top-level attribute (e.g. id or title)
-	//boolean isPropertyPromoted(in AString name);
-	isPropertyPromoted: function _isPropertyPromoted(name)
-	{
-		//dump("isPropertyPromoted: title:"+this.title+", name:"+name);
-		return this._calEvent.isPropertyPromoted(name);
-	},
-
-	/**
-	* Returns a particular parameter value for a property, or null if the
-	* parameter does not exist.  If the property does not exist, throws.
-	*
-	* @param aPropertyName  the name of the property
-	* @param aParameterName the name of the parameter on the property
-	*/
-	//AString getPropertyParameter(in AString aPropertyName,
-	//	               in AString aParameterName);
-	getPropertyParameter: function _getPropertyParameter(aPropertyName, aParameterName)
-	{
-		//dump("getPropertyParameter: title:"+this.title+", aPropertyName:"+aPropertyName+", aParameterName:"+aParameterName+", value:"+this._calEvent.getPropertyParameter(aPropertyName, aParameterName));
-		return this._calEvent.getPropertyParameter(aPropertyName, aParameterName);
-	},
-
-	/**
-	* Checks if the given property has the given parameter.
-	*
-	* @param aPropertyName   The name of the property.
-	* @param aParameterName  The name of the parameter on the property.
-	* @return                True, if the parameter exists on the property
-	*/
-	//boolean hasPropertyParameter(in AString aPropertyName,
-	//	              in AString aParameterName);
-	hasPropertyParameter: function _hasPropertyParameter(aPropertyName, aParameterName)
-	{
-		//dump("hasPropertyParameter: title:"+this.title+", aPropertyName:"+aPropertyName+", aParameterName:"+aParameterName+", value:"+this._calEvent.hasPropertyParameter(aPropertyName, aParameterName));
-		return this._calEvent.hasPropertyParameter(aPropertyName, aParameterName);
-	},
-
-	/**
-	* Sets a particular parameter value for a property, or unsets if null is
-	* passed. If the property does not exist, throws.
-	*
-	* @param aPropertyName   The name of the property
-	* @param aParameterName  The name of the parameter on the property
-	* @param aParameterValue The value of the parameter to set
-	*/
-	//void setPropertyParameter(in AString aPropertyName,
-	//	            in AString aParameterName,
-	//	            in AUTF8String aParameterValue);
-	setPropertyParameter: function _setPropertyParameter(aPropertyName, aParameterName, aParameterValue)
-	{
-		//dump("setPropertyParameter: title:"+this.title+", aPropertyName:"+aPropertyName+", aParameterName:"+aParameterName+", aParameterValue:"+aParameterValue);
-		return this._calEvent.setPropertyParameter(aPropertyName, aParameterName, aParameterValue);
-	},
-
-	/**
-	* Returns a property parameter enumerator for the given property name
-	*
-	* @param aPropertyName   The name of the property.
-	* @return                The parameter enumerator.
-	*/
-	//nsISimpleEnumerator getParameterEnumerator(in AString aPropertyName);
-	getParameterEnumerator: function _getParameterEnumerator(aPropertyName)
-	{
-		//dump("getParameterEnumerator: title:"+this.title+", aPropertyName:"+aPropertyName);
-		return this._calEvent.getParameterEnumerator(aPropertyName);
-	},
-
-	/**
-	* The organizer (originator) of the item.  We will likely not
-	* honour or preserve all fields in the calIAttendee passed around here.
-	* A base class like calIPerson might be more appropriate here, if we ever
-	* grow one.
-	*/
-	//attribute calIAttendee organizer;
-	get organizer()
-	{
-		//dump("get organizer: title:"+this.title+", value:"+this._calEvent.organizer);
-		return this._calEvent.organizer;
-	},
-
-	set organizer(aValue)
-	{
-		//dump("set organizer: title:"+this.title+", aValue:"+aValue);
-		this.organizer;
-		if (aValue) {
-			if ((!this.organizer) || (aValue.toString() != this.organizer.toString())) {
-				this._newOrganizer = aValue.clone();
-				this._calEvent.organizer = aValue;
-			}
-		}
-		else {
-			this._calEvent.organizer = aValue;
-		}
-	},
-
-	//
-	// Attendees
-	//
-
-	// The array returned here is not live; it will not reflect calls to
-	// removeAttendee/addAttendee that follow the call to getAttendees.
-	//void getAttendees(out PRUint32 count,
-	//	    [array,size_is(count),retval] out calIAttendee attendees);
-	getAttendees: function _getAttendees(count)
-	{
-		//dump("getAttendees: title:"+this.title);
-		return this._calEvent.getAttendees(count);
-	},
-
-	/**
-	* getAttendeeById's matching is done in a case-insensitive manner to handle
-	* places where "MAILTO:" or similar properties are capitalized arbitrarily
-	* by different calendar clients.
-	*/
-	//calIAttendee getAttendeeById(in AUTF8String id);
-	getAttendeeById: function _getAttendeeById(id)
-	{
-		//dump("getAttendeeById: title:"+this.title+", id:"+id);
-		if (!this._attendees) this.getAttendees({});
-
-		return this._calEvent.getAttendeeById(id);
-	},
-
-	attendeeIsInList: function _attendeeIsInList(attendee)
-	{
-		for each(var tmpAttendee in this.getAttendees({})) {
-			if ((tmpAttendee) && (tmpAttendee.id == attendee.id)) {
-				return tmpAttendee;
-			}
-		}
-		return null;
-	},
-
-	attendeeIsInChangesList: function _attendeeIsInChangesList(attendee)
-	{
-		for each(var tmpAttendee in this._changesAttendees) {
-			if ((tmpAttendee.attendee) && (tmpAttendee.attendee.id == attendee.id)) {
-				return tmpAttendee;
-			}
-		}
-		return null;
-	},
-
-	removeAttendeeFromChangesList: function _removeAttendeeFromChangesList(attendee)
-	{
-		var newChangesList = [];
-
-		for each(var tmpAttendee in this._changesAttendees) {
-			if ((tmpAttendee.attendee) && (tmpAttendee.attendee.id != attendee.id)) {
-				newChangesList.push(tmpAttendee);
-			}
-		}
-
-		this._changesAttendees = undefined;
-		this._changesAttendees = newChangesList;
-	},
-
-	//void addAttendee(in calIAttendee attendee);
-	addAttendee: function _addAttendee(attendee)
-	{
-		if(!attendee) return;
-		//dump("addAttendee1: title:"+this.title+", attendee.id:"+attendee.id+"\n");
-
-		if (!this._attendees) this.getAttendees({});
-
-		var attendeeExists = this.attendeeIsInList(attendee);
-		if (attendeeExists != null) {
-			// We are not going to add this attendee as it is already in the list
-			//dump("addAttendee1a: title:"+this.title+", attendee is already in list. not going to add change record.\n");
-			return;
-		}
-
-		attendeeExists = this.attendeeIsInChangesList(attendee);
-		if (attendeeExists != null) {
-			// We have a change for this attendee already in the changes list.
-			if (attendeeExists.action == "remove") {
-				// We have a remove change in the list and we now want to re-add it. We just remove the remove change.
-				this.removeAttendeeFromChangesList(attendee);
-				this._calEvent.addAttendee(attendee);
-				//dump("addAttendee1b: title:"+this.title+", attendee.id:"+attendee.id+", removed from changes list.\n");
-			}
-			else {
-				// If the action was "add" we do not do anything as we do not have to duplicate it.
-				//dump("addAttendee1c: title:"+this.title+", attendee.id:"+attendee.id+", action:"+attendeeExists.action+"\n");
-			}
-			return;
-		}
-		this._changesAttendees.push({ action: "add", attendee: attendee});
-		this._calEvent.addAttendee(attendee);
-		//dump("addAttendee2: title:"+this.title+", attendee.id:"+attendee.id+"\n");
-	},
-
-	//void removeAttendee(in calIAttendee attendee);
-	removeAttendee: function _removeAttendee(attendee)
-	{
-		if(!attendee) return;
-		//dump("removeAttendee: title:"+this.title+", attendee.id:"+attendee.id+"\n");
-
-		if (!this._attendees) this.getAttendees({});
-
-		var attendeeExists = this.attendeeIsInList(attendee);
-		if (attendeeExists == null) {
-			// We are not going to remove this attendee as it is not in the list
-			return;
-		}
-
-		var attendeeExists = this.attendeeIsInChangesList(attendee);
-		if (attendeeExists != null) {
-			if (attendeeExists.action == "add") {
-				// There was already a change for this attendee and it was an addition. We remove this addition
-				//dump("removeAttendee: title:"+this.title+", attendee.id:"+attendee.id+" |  There was already a change for this attendee and it was an addition. We remove this addition\n");
-				this.removeAttendeeFromChangesList(attendee);
-				this._calEvent.removeAttendee(attendee);
-			}
-
-			// If the action was "remove" we do not do anything as we do not have to duplicate it.
-			return;
-		}
-
-		this._changesAttendees.push({ action: "remove", attendee: attendee.clone()});
-		this._calEvent.removeAttendee(attendee);
-	},
-
-	//void removeAllAttendees();
-	removeAllAttendees: function _removeAllAttendees()
-	{
-		//dump("removeAllAttendees: title:"+this.title+"\n");
-		var allAttendees = this.getAttendees({});
-		for each(var attendee in allAttendees) {
-
-			var attendeeExists = this.attendeeIsInChangesList(attendee);
-			if (attendeeExists != null) {
-				if (attendeeExists.action == "add") {
-					// There was already a change for this attendee and it was an addition. We remove this addition
-					//dump("removeAllAttendees: title:"+this.title+", attendee.id:"+attendee.id+" |  There was already a change for this attendee and it was an addition. We remove this addition\n");
-					this.removeAttendeeFromChangesList(attendee);
-				}
-
-				// If the action was "remove" we do not do anything as we do not have to duplicate it.
-			}
-			else {
-				this._changesAttendees.push({ action: "remove", attendee: attendee.clone()});
-			}
-		}
-		allAttendees = null;			
-		this._calEvent.removeAllAttendees();
-	},
-
-	//
-	// Attachments
-	//
-	//void getAttachments(out PRUint32 count,
-	//	      [array,size_is(count),retval] out calIAttachment attachments);
-	getAttachments: function _getAttachments(count)
-	{
-		//dump("getAttachments: title:"+this.title);
-		return this._calEvent.getAttachments(count);
-	},
-
-	//void addAttachment(in calIAttachment attachment);
-	addAttachment: function _addAttachment(attachment)
-	{
-		//dump("addAttachment: title:"+this.title+"\n");
-		this.getAttachments({});
-		if (!this._changesAttachments) this._changesAttachments = [];
-		this._changesAttachments.push({ action: "add", attachment: attachment.clone()});
-		this._calEvent.addAttachment(attachment);
-	},
-
-	//void removeAttachment(in calIAttachment attachment);
-	removeAttachment: function _removeAttachment(attachment)
-	{
-		//dump("removeAttachment: title:"+this.title+"\n");
-		//dump("removeAttachment: title:"+this.title);
-		this.getAttachments({});
-		if (!this._changesAttachments) this._changesAttachments = [];
-		this._changesAttachments.push({ action: "remove", attachment: attachment.clone()});
-		this._calEvent.removeAttachment(attachment);
-	},
-
-	//void removeAllAttachments();
-	removeAllAttachments: function _removeAllAttachments()
-	{
-		//dump("removeAllAttachments: title:"+this.title+"\n");
-		//dump("removeAllAttachments: title:"+this.title);
-//		var allAttachments = this._calEvent.getAttachments({});
-		var allAttachments = this.getAttachments({});
-		for each(var attachment in allAttachments) {
-			if (!this._changesAttachments) this._changesAttachments = [];
-			this._changesAttachments.push({ action: "remove", attachment: attachment.clone()});
-		}
-		allAttachments = null;			
-		this._calEvent.removeAllAttachments();
-	},
-
-	//
-	// Categories
-	//
-
-	/**
-	* Gets the array of categories this item belongs to.
-	*/
-	//void getCategories(out PRUint32 aCount,
-	//	     [array, size_is(aCount), retval] out wstring aCategories);
-	getCategories: function _getCategories(aCount)
-	{
-		//dump("getCategories: title:"+this.title+"\n");
-		return this._calEvent.getCategories(aCount);
-	},
-
-	/**
-	* Sets the array of categories this item belongs to.
-	*/
-	//void setCategories(in PRUint32 aCount,
-	//	     [array, size_is(aCount)] in wstring aCategories);
-	setCategories: function _setCategories(aCount, aCategories)
-	{
-		//dump("set categories: title:"+this.title+", aCategories.length:"+aCategories.length+"\n");
-		this.getCategories({});
-		this._changesCategories = true;
-		this._calEvent.setCategories(aCount, aCategories);
-	},
-
-	//
-	// Relations
-	//
-
-	/**
-	* This gives back every relation where the item is neighter the owner of the
-	* relation nor the referred relation
-	*/
-	//void getRelations(out PRUint32 count,
-	//	    [array,size_is(count),retval] out calIRelation relations);
-	getRelations: function _getRelations(count)
-	{
-		//dump("getRelations: title:"+this.title);
-		return this._calEvent.getRelations(count);
-	},
-
-	/**
-	* Adds a relation to the item
-	*/
-	//void addRelation(in calIRelation relation);
-	addRelation: function _addRelation(relation)
-	{
-		//dump("addRelation: title:"+this.title);
-		this._calEvent.addRelation(relation);
-	},
-
-	/**
-	* Removes the relation for this item and the referred item
-	*/
-	//void removeRelation(in calIRelation relation);
-	removeRelation: function _removeRelation(relation)
-	{
-		//dump("removeRelation: title:"+this.title);
-		this._calEvent.removeRelation(relation);
-	},
-
-	/**
-	* Removes every relation for this item (in this items and also where it is referred
-	*/
-	//void removeAllRelations();
-	removeAllRelations: function _removeAllRelations()
-	{
-		//dump("removeAllRelations: title:"+this.title);
-		this._calEvent.removeAllRelations();
-	},
-
-	// Occurrence querying
-	//
-
-	/**
-	* Return a list of occurrences of this item between the given dates.  The items
-	* returned are the same type as this one, as proxies.
-	*/
-	//void getOccurrencesBetween (in calIDateTime aStartDate, in calIDateTime aEndDate,
-	//	              out PRUint32 aCount,
-	//	              [array,size_is(aCount),retval] out calIItemBase aOccurrences);
-	getOccurrencesBetween: function _getOccurrencesBetween(aStartDate, aEndDate, aCount)
-	{
-		if (aStartDate === null) {
-			if (this.startDate) {
-				aStartDate = this.startDate.clone();
-			}
-			else {
-				if (this.entryDate) aStartDate = this.entryDate.clone();
-			}
-		}
-		if (aEndDate === null) {
-			if (this.endDate) {
-				aEndDate = this.endDate.clone();
-			}
-			else {
-				if (this.dueDate) aEndDate = this.dueDate.clone();
-			}
-		}
-
-		var occurrences = [];
-		switch (this.calendarItemType) {
-		case "Task":
-		case "Single":
-		case "Occurrence":
-		case "Exception":
-			var tmpStartDate = this.startDate || this.entryDate;
-			var tmpEndDate = this.endDate || this.dueDate;
-			if ( ((aStartDate === null) || (!tmpStartDate) || (tmpStartDate.compare(aStartDate) >= 0)) && ((aEndDate === null) || (!tmpEndDate) || (tmpEndDate.compare(aEndDate) < 0)) ) {
-				//dump("getOccurrencesBetween 0a: inserting myself into list.");
-				occurrences.push(this);
-			}
-			break;
-		case "RecurringMaster":
-			for each(var exception in this._exceptions) {
-				var tmpStartDate = exception.startDate || exception.entryDate;
-				var tmpEndDate = exception.endDate || exception.entryDate;
-				if ( ((aStartDate === null) || (!tmpStartDate) || (tmpStartDate.compare(aStartDate) >= 0)) && ((aEndDate === null) || (!tmpEndDate) || (tmpEndDate.compare(aEndDate) < 0)) ) {
-					//dump("getOccurrencesBetween 0d: inserting myself into list.");
-					occurrences.push(exception);
-				}
-			}
-			for each(var occurrence in this._occurrences) {
-				var tmpStartDate = occurrence.startDate || occurrence.entryDate;
-				var tmpEndDate = occurrence.endDate || occurrence.entryDate;
-				if ( ((aStartDate === null) || (!tmpStartDate) || (tmpStartDate.compare(aStartDate) >= 0)) && ((aEndDate === null) || (!tmpEndDate) || (tmpEndDate.compare(aEndDate) < 0)) ) {
-					//dump("getOccurrencesBetween 0e: inserting myself into list.");
-					occurrences.push(occurrence);
-				}
-			}
-			break;
-		default:
-			if (this.recurrenceInfo) {
-				if (this.className == "mivExchangeTodo") {
-					//dump("  : getOccurrencesBetween mivExchangeTodo\n");
-					occurrences.push(this);
-				}
-				else {
-					//dump("  : getOccurrencesBetween mivExchangeEvent\n");
-					occurrences = this.recurrenceInfo.getOccurrences(aStartDate, aEndDate, 0, aCount);
-					//dump("getOccurrencesBetween 0b: title:"+this.title+", this.calendarItemType:"+this.calendarItemType+", aStartDate:"+aStartDate+", aEndDate:"+aEndDate+", occurrences.length:"+occurrences.length);
-					return this.recurrenceInfo.getOccurrences(aStartDate, aEndDate, 0, aCount);
-				}
-			}
-		}
-		//dump("getOccurrencesBetween 1: title:"+this.title+", aStartDate:"+aStartDate+", aEndDate:"+aEndDate+", occurrences.length:"+occurrences.length);
-
-		aCount.value = occurrences.length;
-		return occurrences;
-	},
-
-	/**
-	* If this item is a proxy or overridden item, parentItem will point upwards
-	* to our parent.  Otherwise, it will point to this.
-	* parentItem can thus always be used for modifyItem() calls
-	* to providers.
-	*/
-	//attribute calIItemBase parentItem;
-	get parentItem()
-	{
-		//dump("get parentItem: title:"+this.title);
-		if ((!this._parentItem) && (!this._newParentItem)) {
-			this._parenItem = this;
-			this._calEvent.parentItem = this;
-		}
-		return this._calEvent.parentItem;
-	},
-
-	set parentItem(aValue)
-	{
-		//dump("set parentItem: title:"+this.title);
-		if (aValue != this.parentItem) {
-			this._newParentItem = aValue;
-			this._calEvent.parentItem = aValue;
-		}
-	},
-
-	/**
-	* The recurrence ID, a.k.a. DTSTART-of-calculated-occurrence,
-	* or null if this isn't an occurrence.
-	* Be conservative about setting this. It isn't marked as such, but
-	* consider it as readonly.
-	*/
-	//attribute calIDateTime recurrenceId;
-	get recurrenceId()
-	{
-		//dump("get recurrenceId: title:"+this.title+", value:"+this._calEvent.recurrenceId);
-		return this._calEvent.recurrenceId;
-	},
-
-	set recurrenceId(aValue)
-	{
-		if (aValue != this.recurrenceId) {
-			this._newRecurrenceId = aValue;
-			//dump("set recurrenceId: User tries to set recurrenceId to:"+aValue.toString()+", title:"+this.title+", this.calendarItemType:"+this.calendarItemType);
-		}
-		else {
-			//dump("set recurrenceId: User tries to set recurrenceId to null, title:"+this.title);
-		}
-		this._calEvent.recurrenceId = aValue; 
-	},
-
-	// New external methods
-
-	cloneToCalEvent: function cloneToCalEvent(aCalEvent)
-	{
-		//dump("cloneToCalEvent: start: this.calendarItemType:"+this.calendarItemType);
-		this._calEvent = aCalEvent.clone();
-
-/*		var alarms = aCalEvent.getAlarms({});
-		if (alarms.length > 0) {
-			this._alarm = alarms[0].clone();
-			this._reminderIsSet = true;
-			var offset = 0;
-
-			var tmpStartDate;
-			var tmpEndDate;
-			if (this.className == "mivExchangeEvent") {
-				tmpStartDate = aCalEvent.startDate;
-				tmpEndDate = aCalEvent.endDate;
-			}
-			if (this.className == "mivExchangeTodo") {
-				tmpStartDate = aCalEvent.entryDate;
-				tmpEndDate = aCalEvent.dueDate;
-			}
-
-			// Exchange alarm is always an offset to the start.
-			switch (alarms[0].related) {
-			case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-//dump("cloneToCalEvent: Ci.calIAlarm.ALARM_RELATED_ABSOLUTE\n");
-				var newAlarmTime = alarms[0].alarmDate.clone();
-
-				// Calculate offset from start of item.
-				offset = newAlarmTime.subtractDate(tmpStartDate);
-				break;
-			case Ci.calIAlarm.ALARM_RELATED_START:
-//dump("cloneToCalEvent: Ci.calIAlarm.ALARM_RELATED_START\n");
-				var newAlarmTime = tmpStartDate.clone();
-				offset = alarms[0].offset.clone();
-				break;
-			case Ci.calIAlarm.ALARM_RELATED_END:
-//dump("cloneToCalEvent: Ci.calIAlarm.ALARM_RELATED_END\n");
-				var newAlarmTime = tmpEndDate.clone();
-				newAlarmTime.addDuration(alarms[0].offset);
-
-				offset = newAlarmTime.subtractDate(tmpStartDate);
-				break;
-			}
-//dump("cloneToCalEvent: offset="+offset.inSeconds+"\n");
-			this._reminderMinutesBeforeStart = (offset.inSeconds / 60) * -1;
-		}*/
-	},
-
-	//readonly attribute AUTF8String subject;
-	get subject()
-	{
-		return this._subject;
-	},
-
-	//readonly attribute AUTF8String sensitivity;
-	get sensitivity()
-	{
-		return this._sensitivity;
-	},
-
-	//readonly attribute calIDateTime dateTimeReceived;
-	get dateTimeReceived()
-	{
-		return this._dateTimeReceived;
-	},
-
-	//readonly attribute calIDateTime dateTimeSent;
-	get dateTimeSent()
-	{
-		return this._dateTimeSent;
-	},
-
-	//readonly attribute calIDateTime dateTimeCreated;
-	get dateTimeCreated()
-	{
-		return this._dateTimeCreated;
-	},
-
-	//readonly attribute calIDateTime reminderDueBy;
-	get reminderDueBy()
-	{
-		return this._reminderDueBy;
-	},
-
-	//readonly attribute calIDateTime reminderSignalTime;
-	get reminderSignalTime()
-	{
-		return this._reminderSignalTime;
-	},
-
-	//readonly attribute boolean reminderIsSet;
-	get reminderIsSet()
-	{
-		return this._reminderIsSet;
-	},
-
-	//readonly attribute long reminderMinutesBeforeStart;
-	get reminderMinutesBeforeStart()
-	{
-		return this._reminderMinutesBeforeStart;
-	},
-
-	//readonly attribute long size;
-	get size()
-	{
-		return this._size;
-	},
-
-	//readonly attribute calIDateTime originalStart;
-	get originalStart()
-	{
-		return this._originalStart;
-	},
-
-	//readonly attribute boolean isAllDayEvent;
-	get isAllDayEvent()
-	{
-		return this._isAllDayEvent;
-	},
-
-	//readonly attribute AUTF8String legacyFreeBusyStatus;
-	get legacyFreeBusyStatus()
-	{
-		return this._legacyFreeBusyStatus;
-	},
-
-	//readonly attribute AUTF8String location;
-	get location()
-	{
-		return this._location;
-	},
-
-	// the exchange changeKey of this event
-	//readonly attribute AUTF8String changeKey;
-	get changeKey()
-	{
-		return this._changeKey;
-	},
-
-	// the exchange UID of this event
-	//readonly attribute AUTF8String uid;
-	get uid()
-	{
-		return this._uid;
-	},
-
-	// the exchange calendarItemType of this event
-	//readonly attribute AUTF8String calendarItemType;
-	get calendarItemType()
-	{
-		//dump("get calendarItemType: title:"+this.title+", this._calendarItemType:"+this._calendarItemType+", startdate="+this.startDate.toString()+"\n");
-		return this._calendarItemType;
-	},
-
-	// the exchange ItemClass of this event
-	//readonly attribute AUTF8String itemClass;
-	get itemClass()
-	{
-		return this._itemClass;
-	},
-	
-	// the exchange messageId of this event
-	//readonly attribute AUTF8String messageId;
-	get messageId()
-	{
-		return this._messageId;
-	},
-	// the exchange isCancelled of this event
-	//readonly attribute boolean isCancelled;
-	get isCancelled()
-	{
-		return this._isCancelled;
-	},
-
-	// the exchange isMeeting of this event
-	//readonly attribute boolean isMeeting;
-	get isMeeting()
-	{
-		return this._isMeeting;
-	},
-
-	// the exchange hasAttachments of this event
-	//readonly attribute boolean hasAttachments;
-	get hasAttachments()
-	{
-		return this._hasAttachments;
-	},
-
-	//readonly attribute boolean isRecurring;
-	get isRecurring()
-	{
-		return this._isRecurring;
-	},
-
-	//readonly attribute boolean isInvitation;
-	get isInvitation()
-	{
-		if ( ( (this.responseObjects) && ((this.responseObjects.AcceptItem) ||
-		      (this.responseObjects.TentativelyAcceptItem) ||
-		      (this.responseObjects.DeclineItem)) ) ||
-		    (this.type == "MeetingRequest")) {
-			return true;
-		}
-		else {
-			if (this.getProperty("X-exchangeITIP2") === true) {
-				return true;
-			}
-			else {
-				return false;
-			}
-		}
-	},
-
-
-	//readonly attribute boolean meetingRequestWasSent;
-	get meetingRequestWasSent()
-	{
-		return this._meetingRequestWasSent;
-	},
-
-	//readonly attribute boolean isResponseRequested;
-	get isResponseRequested()
-	{
-		return this._isResponseRequested;
-	},
-
-	//readonly attribute AUTF8String myResponseType;
-	get myResponseType()
-	{
-		if (this._newMyResponseType) {
-			//dump(" 22 this._newMyResponseType:"+this._newMyResponseType+"\n");
-			return this._newMyResponseType;
-		}
-		
-		return this._myResponseType;
-	},
-
-	get participationStatus()
-	{
-		return participationMap[this.myResponseType];
-	},
-
-	//readonly attribute AUTF8String timeZone;
-	get timeZone()
-	{
-		return this._timeZone;
-	},
-
-	//readonly attribute AUTF8String MeetingTimeZone;
-	get meetingTimeZone()
-	{
-		return this._meetingTimeZone;
-	},
-
-	//readonly attribute AUTF8String startTimeZoneName;
-	get startTimeZoneName()
-	{
-		return this._startTimeZoneName;
-	},
-
-	//readonly attribute AUTF8String startTimeZoneId;
-	get startTimeZoneId()
-	{
-		return this._startTimeZoneId;
-	},
-
-	//readonly attribute AUTF8String endTimeZoneName;
-	get endTimeZoneName()
-	{
-		return this._endTimeZoneName;
-	},
-
-	//readonly attribute AUTF8String endTimeZoneId;
-	get endTimeZoneId()
-	{
-		return this._endTimeZoneId;
-	},
-
-	get mimeContent()
-	{
-		return this._mimeContent;
-	},
-
-	get mimeContentCharacterSet()
-	{
-		return this._mimeContentCharacterSet;
-	},
-
-	//readonly attribute AUTF8String conferenceType;
-	get conferenceType()
-	{
-		return this._conferenceType;
-	},
-
-	//readonly attribute boolean allowNewTimeProposal;
-	get allowNewTimeProposal()
-	{
-		return this._allowNewTimeProposal;
-	},
-
-
-	// the tagName of the object of this event
-	//readonly attribute AUTF8String type;
-	get type()
-	{
-		return this._type;
-	},
-
-	// New external methods
-	// the exchange ParentFolderId.Id of this event
-	//readonly attribute AUTF8String parentId;
-	get parentId()
-	{
-		return this._parentId;
-	},
-
-	// New external methods
-	// the exchange ParentFolderId.ChangeKey of this event
-	//readonly attribute AUTF8String parentChangeKey;
-	get parentChangeKey()
-	{
-		return this._parentChangeKey;
-	},
-
-	// the exchange responseObjects of this event
-	//readonly attribute jsval responseObjects;
-
-	/*
-	  <t:ResponseObjects>
-	    <t:AcceptItem/>
-	    <t:TentativelyAcceptItem/>
-	    <t:DeclineItem/>
-	    <t:ReplyToItem/>
-	    <t:ReplyAllToItem/>
-	    <t:ForwardItem/>
-	    <t:CancelCalendarItem/>  // part of my own items.
-	  </t:ResponseObjects>
-
-	*/
-	get responseObjects()
-	{
-		return this._responseObjects;
-	},
-
-	//void getExceptions(out uint32_t count,
-	//	      [array,size_is(count),retval] out mivExchangeBaseItem aException);
-	getExceptions: function _getExceptions(aCount)
-	{
-		var result = [];
-		for each(var exception in this._exceptions) {
-			result.push(exception);
-		}
-		aCount.value = result.length;
-		return result;
-	},
-
-	//void addException(in mivExchangeBaseItem aItem);
-	addException: function _addException(aItem)
-	{
-		if ((aItem.calendarItemType == "Exception") && (this.calendarItemType == "RecurringMaster") && (aItem.isMutable)) {
-			aItem.parentItem = this;
-
-			if (this._exceptions[aItem.id]) {
-				this._exceptions[aItem.id].deleteItem();
-				this._exceptions[aItem.id] = null;
-				delete this._exceptions[aItem.id];
-			}
-			this._exceptions[aItem.id] = aItem;
-//			this._exceptions[aItem.id] = aItem;
-
-			if (this.recurrenceInfo) {
-				this.recurrenceInfo.modifyException(aItem, true);
-			}
-			else {
-				//this._calEvent.addException(aItem. true);
-dump("What not recurrenceinfo for title:'"+this.title+"', aItem.title:"+aItem.title+"\n");
-dump(" ++    MASTER:"+xml2json.toString(this.exchangeData)+"\n");
-dump(" ++ Exception:"+xml2json.toString(aItem.exchangeData)+"\n");
-			}
-
-			var itemAlarms = aItem.getAlarms({});
-//dump("addException:"+this.title+"| itemAlarms.length:"+itemAlarms.length+", aItem.reminderSignalTime:"+aItem.reminderSignalTime+"\n");
-			var tmpStartDate = aItem.startDate || aItem.entryDate;
-			if ((itemAlarms.length > 0) && (aItem.reminderSignalTime) && ((!tmpStartDate) || (tmpStartDate.compare(aItem.reminderSignalTime) >= 0))) {
-				this.setProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime, aItem.reminderSignalTime.getInTimezone(cal.UTC()).icalString);
-			}
-		}
-	},
-
-	//void modifyException(in mivExchangeBaseItem aItem);
-	modifyException: function _modifyException(aItem)
-	{
-		if ((aItem.calendarItemType == "Exception") && (this.calendarItemType == "RecurringMaster") && (aItem.isMutable)) {
-
-			if ((this._exceptions[aItem.id]) && (this._exceptions[aItem.id].changeKey == aItem.changeKey)) {
-				// We already have this in the list. No need to change.
-				return;
-			}
-
-			// Remove any alarms we might have for this exception.
-			if (this._exceptions[aItem.id]) {
-				var itemAlarms = this._exceptions[aItem.id].getAlarms({});
-				if (itemAlarms.length > 0) {
-					this.deleteProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime);
-				}
-				this._exceptions[aItem.id].deleteItem();
-				this._exceptions[aItem.id] = null;
-				delete this._exceptions[aItem.id];
-			}
-
-//			this._exceptions[aItem.id] = aItem.clone();
-			this._exceptions[aItem.id] = aItem;
-
-			var itemAlarms = aItem.getAlarms({});
-			var tmpStartDate = aItem.startDate || aItem.entryDate;
-			if ((itemAlarms.length > 0) && (aItem.reminderSignalTime) && ((!tmpStartDate) || (tmpStartDate.compare(aItem.reminderSignalTime) >= 0))) {
-				this.setProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime, this.reminderSignalTime.getInTimezone(cal.UTC()).icalString);
-			}
-		}
-	},
-
-	//void removeException(in mivExchangeBaseItem aItem);
-	removeException: function _removeException(aItem)
-	{
-		if ((aItem.calendarItemType == "Exception") && (this.calendarItemType == "RecurringMaster")) {
-			if (this._exceptions[aItem.id]) {
-				this.recurrenceInfo.removeExceptionFor(aItem.recurrenceId);
-
-				if (this.hasProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime)) {
-					this.deleteProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime);
-				}
-				this._exceptions[aItem.id].deleteItem();
-				this._exceptions[aItem.id] = null;
-				delete this._exceptions[aItem.id];
-			}
-		}
-	},
-
-	//void removeExceptionAt(in calIDateTime aRecurrenceId);
-	removeExceptionAt: function _removeExceptionAt(aRecurrenceId)
-	{
-		// Find item.
-		var item = null;
-		for each(var exception in this._exceptions) {
-			if (exception.recurrenceId.compare(aRecurrenceId) == 0) {
-				item = exception;
-				break;
-			}
-		}
-		
-		if (item) {
-			this.removeException(item);
-		}
-
-	},
-
-	//void getOccurrences(out uint32_t count, [array,size_is(count),retval] out mivExchangeBaseItem aOccurrence);
-	getOccurrences: function _getOccurrences(aCount)
-	{
-		var result = [];
-		for each(var occurrence in this._occurrences) {
-		//dump("getOccurrences: occurrence.title:"+occurrence.title+", startDate:"+occurrence.startDate.toString()+"\n");
-			result.push(occurrence);
-		}
-		aCount.value = result.length;
-		return result;
-	},
-
-	//void addOccurrence(in mivExchangeBaseItem aItem);
-	addOccurrence: function _addOccurrence(aItem)
-	{
-		if ((aItem.calendarItemType == "Occurrence") && (this.calendarItemType == "RecurringMaster") && (aItem.isMutable)) {
-			aItem.parentItem = this;
-
-			if (this._occurrences[aItem.id]) {
-				this._occurrences[aItem.id].deleteItem();
-				this._occurrences[aItem.id] = null;
-				delete this._occurrences[aItem.id];
-			}
-			this._occurrences[aItem.id] = aItem;
-//			this._occurrences[aItem.id] = aItem.clone();
-
-			var itemAlarms = aItem.getAlarms({});
-			//dump("AddOccurrence: itemAlarms.length:"+itemAlarms.length+", X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime);
-			var tmpStartDate = aItem.startDate || aItem.entryDate;
-			if ((itemAlarms.length > 0) && ((!tmpStartDate) || ((this.reminderDueBy) && (tmpStartDate.compare(this.reminderDueBy) == 0)))) {
-				this.setProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime, this.reminderSignalTime.getInTimezone(cal.UTC()).icalString);
-			}
-		}
-	},
-
-	//void removeOccurrence(in mivExchangeBaseItem aItem);
-	removeOccurrence: function _removeOccurrence(aItem)
-	{
-		if (aItem) {
-			if ((aItem.calendarItemType == "Occurrence") && (this.calendarItemType == "RecurringMaster")) {
-				if (this._occurrences[aItem.id]) {
-					if (this.hasProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime)) {
-						this.deleteProperty("X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime);
-					}
-					this._occurrences[aItem.id].deleteItem();
-					this._occurrences[aItem.id] = null;
-					delete this._occurrences[aItem.id];
-				}
-			}
-		}
-	},
-
-	//void removeOccurrenceAt(in calIDateTime aRecurrenceId);
-	removeOccurrenceAt: function _removeOccurrenceAt(aRecurrenceId)
-	{
-		//dump("removeOccurrenceAt this._cloneCount:"+this._cloneCount+"\n");
-		// Find item.
-		var item = null;
-		for each(var occurrence in this._occurrences) {
-			if (occurrence.recurrenceId.compare(aRecurrenceId) == 0) {
-				item = occurrence;
-				break;
-			}
-		}
-		
-		if (item) {
-			this.removeOccurrence(item);
-		}
-		else {
-			// This recurrenceId is not an occurrence. Maybe an exception.
-			this.removeExceptionAt(aRecurrenceId);
-		}
-
-	},
-
-	//attribute mivIxml2jxon exchangeData;
-	get exchangeData()
-	{
-/*		if (this._exchangeData === null) {
-			dump("Who is requesting exchangedata when it is null:"+exchGlobalFunctions.STACK()+"\n");
-		}*/
-		return this._exchangeData;
-	},
-
-	set exchangeData(aValue)
-	{
-		//dump("exchangeData:"+aValue.toString());
-		//dump("exchangeData:"+aValue.toString()+"\n\n");
-
-		this.initialize();
-
-		if (this._calendar) {
-			this.calendar = this._calendar;
-		}
-
-/*		if (aValue === null) {
-			dump("Who is setting exchangeData to null:"+exchGlobalFunctions.STACK()+"\n");
-		}*/
-		this._exchangeData = aValue;
-
-		this._isAllDayEvent = (this.getTagValue("t:IsAllDayEvent", "false") == "true");
-
-		this._startTimeZoneId = this.getAttributeByTag("t:StartTimeZone", "Id", null);
-
-		this._meetingTimeZone = this.getAttributeByTag("t:MeetingTimeZone", "TimeZoneName", null);
-
-		this._timeZone = this.getTagValue("t:TimeZone", null);
-
-		this._endTimeZoneId = this.getAttributeByTag("t:EndTimeZone", "Id", null);
-
-		this._effectiveRights = this.getTag("t:EffectiveRights", null);
-
-		if (this._effectiveRights) {
-			this._canDelete = (xml2json.getTagValue(this._effectiveRights, "t:Delete", "false") == "true");
-			this._canModify = (xml2json.getTagValue(this._effectiveRights, "t:Modify", "false") == "true");
-			this._canRead = (xml2json.getTagValue(this._effectiveRights, "t:Read", "false") == "true");
-		}
-		else {
-			this._canDelete = this.calendar.canCreateContent;
-			this._canModify = this.calendar.canCreateContent;
-			this._canRead = this.calendar.canRead;
-		}
-
-		this._effectiveRights = null;
-		this._effectiveRights = true;
-
-		this._lastModifiedTime = this.tryToSetDateValueUTC(this.getTagValue("t:LastModifiedTime", null), null);
-
-		this._subject = this.getTagValue("t:Subject", null);
-
-		this._title = this.subject;
-		if (this._title) {
-			this._calEvent.title = this._title;
-		}
-
-		this._mimeContent = this.getTagValue("t:MimeContent", null);
-		if (this._mimeContent) {
-			this._mimeContentCharacterSet = xml2json.getAttribute(this.getTag("t:MimeContent"), "CharacterSet");
-		}
-
-		this._id = this.getAttributeByTag("t:ItemId", "Id", null);
-		if (this._id) {
-			this._calEvent.id = this._id;
-		}
-
-		this._priority = this.getTagValue("t:Importance", null);
-		switch(this._priority) {
-			case "Low" : 
-				this._calEvent.priority = 9;
-				break;
-			case "Normal" : 
-				this._calEvent.priority = 5;
-				break;
-			case "High" : 
-				this._calEvent.priority = 1;
-				break;
-		}
-
-		this._sensitivity = this.getTagValue("t:Sensitivity", null);
+        if (!occurrence) {
+            for each(var occurrence in this._exceptions) {
+                if (occurrence.recurrenceId.compare(aRecurrenceId) == 0) break;
+            }
+        }
+
+        var newItem;
+        if (occurrence) {
+            newItem = occurrence.clone();
+            newItem.parentItem = this;
+        }
+
+        //dump("CreateProxy the end");
+        return newItem;
+    },
+
+    // used by recurrenceInfo when cloning proxy objects to
+    // avoid an infinite loop.  aNewParent is optional, and is
+    // used to set the parent of the new item; it should be null
+    // if no new parent is passed in.
+    //calIItemBase cloneShallow(in calIItemBase aNewParent);
+    cloneShallow: function _cloneShallow(aNewParent) {
+        //dump("cloneShallow aNewParent:"+aNewParent);
+        var newItem = this.clone();
+        if (aNewParent) {
+            newItem.parentItem = aNewParent;
+        }
+        else {
+            newItem.parentItem = null;
+        }
+        return newItem;
+    },
+
+    // External methods calIItemBase
+
+    // returns true if this thing is able to be modified;
+    // if the item is not mutable, attempts to modify
+    // any data will throw CAL_ERROR_ITEM_IS_IMMUTABLE
+    //readonly attribute boolean isMutable;
+    get isMutable() {
+        //dump("get isMutable: title:"+this.title+", value:"+this._calEvent.isMutable);
+        return this._isMutable;
+    },
+
+    // makes this item immutable
+    //void makeImmutable();
+    makeImmutable: function _makeImmutable() {
+        //dump("makeImmutable: title:"+this.title);
+        this._isMutable = false;
+    },
+
+
+    typeString: function _typeString(o) {
+        if (typeof o != 'object')
+            return typeof o;
+
+        if (o === null)
+            return "null";
+        //object, array, function, date, regexp, string, number, boolean, error
+        var internalClass = Object.prototype.toString.call(o)
+            .match(/\[object\s(\w+)\]/)[1];
+        return internalClass.toLowerCase();
+    },
+
+    get cloneCount() {
+        return this._cloneCount;
+    },
+
+    baseCloneFrom: function _baseCloneFrom(aItem) {
+        //dump("mivExchangeBaseItem: baseCloneFrom 1: title:"+this.title+", contractId:"+this.contractID+"\n");
+        try {
+            this._cloneCount = aItem._cloneCount + 1;
+            this._isMutable = aItem._isMutable;
+            this._calendar = aItem._calendar;
+            this._isAllDayEvent = aItem._isAllDayEvent;
+            this._startTimeZoneId = aItem._startTimeZoneId;
+            this._meetingTimeZone = aItem._meetingTimeZone;
+            this._timeZone = aItem._timeZone;
+            this._endTimeZoneId = aItem._endTimeZoneId;
+            this._effectiveRights = aItem._effectiveRights;
+            this._canDelete = aItem._canDelete;
+            this._canModify = aItem._canModify;
+            this._canRead = aItem._canRead;
+            if (aItem._lastModifiedTime) this._lastModifiedTime = aItem._lastModifiedTime.clone();
+            this._subject = aItem._subject;
+            this._title = aItem._title;
+            this._mimeContent = aItem._mimeContent;
+            this._id = aItem._id;
+            this._priority = aItem._priority;
+            this._sensitivity = aItem._sensitivity;
+            this._privacy = aItem._privacyl
+            this._reminderIsSet = aItem._reminderIsSet;
+            this._calendarItemType = aItem._calendarItemType;
+            if (aItem._reminderDueBy) this._reminderDueBy = aItem._reminderDueBy.clone();
+            this._reminderMinutesBeforeStart = aItem._reminderMinutesBeforeStart;
+            if (aItem._dateTimeReceived) this._dateTimeReceived = aItem._dateTimeReceived.clone();
+            if (aItem._dateTimeSent) this._dateTimeSent = aItem._dateTimeSent.clone();
+            this._size = aItem._size;
+            if (aItem._originalStart) this._originalStart = aItem._originalStart.clone();
+            this._location = aItem._location;
+            this._changeKey = aItem._changeKey;
+            this._uid = aItem._uid;
+            this._itemClass = aItem._itemClass;
+            this._messageId = aItem._messageId;
+            this._isMeeting = aItem._isMeeting;
+            this._isRecurring = aItem._isRecurring;
+            this._meetingRequestWasSent = aItem._meetingRequestWasSent;
+            this._isResponseRequested = aItem._isResponseRequested;
+            this._myResponseType = aItem._myResponseType;
+            this._startTimeZoneName = aItem._startTimeZoneName;
+            this._endTimeZoneName = aItem._endTimeZoneName;
+            this._conferenceType = aItem._conferenceType;
+            this._allowNewTimeProposal = aItem._allowNewTimeProposal;
+            this._parentId = aItem._parentId;
+            this._parentChangeKey = aItem._parentChangeKey;
+            if (aItem._alarm) this._alarm = aItem._alarm.clone();
+            if (aItem._reminderSignalTime) this._reminderSignalTime = aItem._reminderSignalTime.clone();
+            this._xMozSnoozeTime = aItem._xMozSnoozeTime;
+            if (aItem._alarmLastAck) this._alarmLastAck = aItem._alarmLastAck.clone();
+            if (aItem._recurrenceInfo) {
+                this._recurrenceInfo = aItem._recurrenceInfo.clone();
+            }
+            else {
+                this._recurrenceInfo = aItem._recurrenceInfo;
+            }
+
+            this._occurrences = {};
+            if (aItem._occurrences) {
+                for each(var occurrence in aItem._occurrences) {
+                    //dump("baseClone: aItem._ocurrences 1");
+                    //this.removeOccurrence(occurrence);
+                    this.addOccurrence(occurrence.clone());
+                }
+            }
+
+            this._exceptions = {};
+            if (aItem._exceptions) {
+                for each(var exception in aItem._exceptions) {
+                    //this.removeException(exception);
+                    this.addException(exception.clone());
+                }
+            }
+
+            this._bodyType = aItem._bodyType;
+            this._body = aItem._body;
+            if (aItem._dateTimeCreated) this._dateTimeCreated = aItem._dateTimeCreated.clone();
+            if (aItem._created) this._created = aItem._created.clone();
+            this._legacyFreeBusyStatus = aItem._legacyFreeBusyStatus;
+            this._isCancelled = aItem._isCancelled;
+            this._responseObjects = {};
+            if (aItem._responseObjects) {
+                for (var index in aItem._responseObjects) {
+                    this._responseObjects[index] = aItem._responseObjects[index];
+                }
+            }
+            this._type = aItem._type;
+            if (aItem._organizer) this._organizer = aItem._organizer.clone();
+            this._attendees = [];
+            if (aItem._attendees) {
+                for each(var attendee in aItem._attendees) {
+                    this._attendees.push(attendee.clone());
+                }
+            }
+            this._hasAttachments = aItem._hasAttachments;
+            this._attachments = [];
+            if (aItem._attachments) {
+                for each(var attachment in aItem._attachments) {
+                    this._attachments.push(attachment.clone());
+                }
+            }
+            this._categories = [];
+            if (aItem._categories) {
+                for each(var category in aItem._categories) {
+                    this._categories.push(category);
+                }
+            }
+            this._recurrenceId = aItem._recurrenceId;
+
+            if (aItem._occurrenceIndex) {
+                this.occurrenceIndex = aItem._occurrenceIndex;
+            }
+
+        }
+        catch (err) {
+            dump(" @@@@@@@@@@@@@ mivExchangeEvent: baseCloneFrom Error:" + err + "\n");
+        }
+        //dump("mivExchangeBaseItem: baseCloneFrom 2: title:"+this.title+", contractId:"+this.contractID+"\n");
+    },
+
+    cloneFrom: function _cloneFrom(aItem) {
+        /*for(var index in aItem) {
+        	if ((this.typeString(aItem[index]) != "function") && (index.substr(0,1) == "_")) {
+        		dump("aItem."+index+"="+aItem[index]+"\n");
+        	}
+        }*/
+        //dump(" mivExchangeBaseItem: cloneFrom 1 \n");
+        //dump(" mivExchangeBaseItem: cloneFrom 2 \n");
+    },
+
+    // clone always returns a mutable event
+    //calIItemBase clone();
+    clone: function _clone() {
+        //dump("mivExchangeBaseItem: clone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
+        var result = new mivExchangeBaseItem();
+        result.baseClone(this);
+        return result;
+        //dump("mivExchangeBaseItem: clone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
+    },
+
+    baseClone: function _baseClone(aItem) {
+        try {
+            //dump("mivExchangeBaseItem: baseClone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
+            for each(var alias in aItem.mailboxAliases) {
+                this.addMailboxAlias(alias);
+            }
+            this.cloneToCalEvent(aItem._calEvent);
+            this.cloneFrom(aItem);
+
+            if (aItem._newId !== undefined) result.id = aItem._newId;
+
+            // We are going to replay all changes to clone
+            if (aItem._newBody === null) this.deleteProperty("DESCRIPTION");
+            if (aItem._newLocation === null) this.deleteProperty("LOCATION");
+            if (aItem._newLegacyFreeBusyStatus === null) this.deleteProperty("TRANSP");
+            if (aItem._newMyResponseType === null) this.deleteProperty("STATUS");
+            if (aItem._newIsInvitation === null) this.deleteProperty("X-MOZ-SEND-INVITATIONS");
+
+            if (aItem._newTitle) this.title = aItem.title;
+            if (aItem._newPriority) this.priority = aItem.priority;
+            if (aItem._newPrivacy) this.privacy = aItem.privacy;
+
+            if (aItem._newAlarm !== undefined) {
+                //dump("baseClone: We have alarm changes.\n");
+                if (aItem._newAlarm) {
+                    this.addAlarm(aItem._newAlarm);
+                }
+                else {
+                    this.clearAlarms();
+                }
+            }
+
+            if (aItem._newRecurrenceInfo !== undefined) {
+                if (aItem._newRecurrenceInfo == null) {
+                    this.recurrenceInfo = aItem._newRecurrenceInfo;
+                }
+                else {
+                    this.recurrenceInfo = aItem._newRecurrenceInfo.clone();
+                }
+            }
+            /*		else {
+            			if (((aItem._recurrenceInfo) && (aItem.recurrenceInfo) && (aItem._recurrenceInfo.toString() != aItem.recurrenceInfo.toString())) || (aItem._recurrenceInfo !== aItem.recurrenceInfo)) {
+            				if (aItem.recurrenceInfo) {
+            					this.recurrenceInfo = aItem.recurrenceInfo.clone();
+            				}
+            				else {
+            					this.recurrenceInfo = aItem.recurrenceInfo;
+            				}
+            			}
+            		}*/
+
+            if (aItem._newBodyType) this.bodyType = aItem.bodyType;
+
+            if (aItem._newBody !== undefined) this.setProperty("DESCRIPTION", aItem.getProperty("DESCRIPTION"));
+            if (aItem._newBody2 !== undefined) this.body = aItem.body;
+            if (aItem._newLocation) this.setProperty("LOCATION", aItem.getProperty("LOCATION"));
+            if (aItem._newLegacyFreeBusyStatus) this.setProperty("TRANSP", aItem.getProperty("TRANSP"));
+            if (aItem._newMyResponseType) this.setProperty("STATUS", aItem.getProperty("STATUS"));
+            if (aItem._newIsInvitation) this.setProperty("X-MOZ-SEND-INVITATIONS", aItem.getProperty("X-MOZ-SEND-INVITATIONS"));
+
+            if (aItem._changedProperties) {
+                for each(var change in aItem._changedProperties) {
+                    switch (change.action) {
+                    case "set":
+                        this.setProperty(change.name, xml2json.getValue(change));
+                        break;
+                    case "remove":
+                        this.deleteProperty(change.name);
+                        break;
+                    }
+                }
+            }
+            if (aItem._newOrganizer) this.organizer = aItem.organizer.clone();
+
+            if (aItem._changesAttendees) {
+                for each(var attendee in aItem._changesAttendees) {
+                    switch (attendee.action) {
+                    case "add":
+                        this.addAttendee(attendee.attendee);
+                        break;
+                    case "remove":
+                        this.removeAttendee(attendee.attendee);
+                        break;
+                    }
+                }
+                var tmpattendees = this.getAttendees({});
+            }
+
+            if (aItem._changesAttachments) {
+                for each(var attachment in aItem._changesAttachments) {
+                    switch (attachment.action) {
+                    case "add":
+                        this.addAttachment(attachment.attachment);
+                        break;
+                    case "remove":
+                        this.removeAttachment(attachment.attachment);
+                        break;
+                    }
+                }
+            }
+            if (aItem._changesCategories) {
+                var categories = aItem.getCategories({});
+                this.setCategories(categories.length, categories);
+            }
+
+            if (aItem._newParentItem) this.parentItem = aItem.parentItem;
+            if (aItem._newAlarmLastAck) this.alarmLastAck = aItem.alarmLastAck;
+
+            //dump("mivExchangeBaseItem: baseClone 99: title:"+aItem.title+", startDate:"+this.startDate, -1);
+        }
+        catch (err) {
+            dump("mivExchangeBaseItem: baseClone: error:" + err + "\n");
+        }
+        //dump("mivExchangeBaseItem: baseClone 2: title:"+this.title+", contractId:"+this.contractID+"\n");
+    },
+
+    /**
+     * Hash Id that incorporates the item's UID, RECURRENCE-ID and calendar.id
+     * to be used for lookup of items that come from different calendars.
+     * Setting either id, recurrenceId or the calendar attribute leads to
+     * a recomputation of hashId.
+     *
+     * @attention Individual implementors of calIItemBase must stick to the
+     *            same algorithm that base/src/calItemBase.js uses.
+     */
+    //readonly attribute AUTF8String hashId;
+    get hashId() {
+        //this.id;
+        //this.recurrenceId;
+        //this.calendar;
+        return this._calEvent.hashId;
+
+        /*		 this._hashId = [encodeURIComponent(this.id),
+        			this.recurrenceId ? this.recurrenceId.getInTimezone(exchGlobalFunctions.ecUTC()).icalString : "",
+        			this.calendar ? encodeURIComponent(this.calendar.id) : ""].join("#");
+
+        		//dump("get hashId: title:"+this.title+", value:"+this._hashId);
+        		return this._hashId;*/
+    },
+
+    /**
+     * Checks whether the argument object refers the same calendar item as
+     * this one, by testing both the id and recurrenceId property.  This
+     *
+     * @arg aItem     the item to compare against this one
+     *
+     * @return        true if both ids match, false otherwise
+     */
+    //boolean hasSameIds(in calIItemBase aItem);
+    hasSameIds: function _hasSameIds(aItem) {
+        //dump("hasSameIds: title:"+this.title);
+        return this._calEvent.hasSameIds(aItem);
+    },
+
+    get canDelete() {
+        if (this._canDelete !== undefined) {
+            return this._canDelete;
+        }
+        return true;
+    },
+
+    get canModify() {
+        if (this._canModify !== undefined) {
+            return this._canModify;
+        }
+
+        return true;
+    },
+
+    get canRead() {
+        if (this._canRead !== undefined) {
+            return this._canRead;
+        }
+        return true;
+    },
+
+    /**
+     * Returns the acl entry associated to the item.
+     */
+    //readonly attribute calIItemACLEntry aclEntry;
+    get aclEntry() {
+        var result = {
+            calendarEntry: this.calendar.aclEntry,
+            userCanModify: ((this._canModify) || (this._canDelete)),
+            userCanRespond: this._canModify,
+            userCanViewAll: this._canRead,
+            userCanViewDateAndTime: true,
+        };
+        return result;
+    },
+
+    //
+    // the generation number of this item
+    //
+    //attribute PRUint32 generation;
+    get generation() {
+        return this._calEvent.generation;
+    },
+
+    set generation(aValue) {
+        //dump("set generation: title:"+this.title);
+        this._calEvent.generation = aValue;
+    },
+
+    // the time when this item was created
+    //readonly attribute calIDateTime creationDate;
+    get creationDate() {
+        //dump("get creationDate: title:"+this.title+", value:"+this.dateTimeCreated);
+        return this.dateTimeCreated;
+    },
+
+    // last time any attribute was modified on this item, in UTC
+    //readonly attribute calIDateTime lastModifiedTime;
+    get lastModifiedTime() {
+        //dump("get lastModifiedTime: title:"+this.title+", value:"+this._lastModifiedTime);
+        return this._lastModifiedTime;
+    },
+
+    // last time a "significant change" was made to this item
+    //readonly attribute calIDateTime stampTime;
+    get stampTime() {
+        //dump("get stampTime: title:"+this.title+", value:"+this._calEvent.stampTime);
+        return this._calEvent.stampTime;
+    },
+
+    // the calICalendar to which this event belongs
+    //attribute calICalendar calendar;
+    get calendar() {
+        return this._calEvent.calendar;
+    },
+
+    set calendar(aValue) {
+        this._calendar = aValue;
+        this._calEvent.calendar = aValue;
+    },
+
+    // the ID of this event
+    //attribute AUTF8String id;
+    get id() {
+        //dump("get id: title:"+this.title+", _id:"+this._id+", id:"+this._calEvent.id+"\n");
+        //return this._calEvent.id;
+        return this._id;
+    },
+
+    set id(aValue) {
+        //dump("set id: title:"+this.title);
+        return; // We do not allow this.
+    },
+
+    clearId: function _clearId(newId) {
+        if (newId) {
+            //dump("clearId newId:"+newId+"\n");
+            this._id = newId;
+            this._calEvent.id = newId;
+        }
+        else {
+            //dump("clearId newId:undefined\n");
+            this._id = undefined;
+            this._calEvent.id = undefined;
+        }
+    },
+
+    // event title
+    //attribute AUTF8String title;
+    get title() {
+        //dump("get title: title:"+this._calEvent.title);
+        if (this._newTitle) {
+            return this._newTitle;
+        }
+
+        if (this._title) {
+            return this._title;
+        }
+
+        return this._calEvent.title;
+    },
+
+    set title(aValue) {
+        //dump("set title: oldTitle:"+this.title+", newTitle:"+aValue);
+        if (aValue != this._title) {
+            this._newTitle = aValue;
+            this._calEvent.title = aValue;
+        }
+    },
+
+    // event priority
+    //attribute short priority;
+    get priority() {
+        //dump("get priority: title:"+this.title+", value:"+this._calEvent.priority);
+        return this._calEvent.priority;
+    },
+
+    set priority(aValue) {
+        //dump("set priority: title:"+this.title+", aValue:"+aValue);
+        if (aValue != this.priority) {
+            if (aValue > 5) {
+                this._newPriority = "Low";
+            }
+            if (aValue == 5) {
+                this._newPriority = "Normal";
+            }
+            if (aValue < 5) {
+                this._newPriority = "High";
+            }
+            if (aValue == 0) {
+                this._newPriority = "Normal";
+            }
+            this._calEvent.priority = aValue;
+        }
+    },
+
+    //attribute AUTF8String privacy;
+    get privacy() {
+        //dump("get privacy: title:"+this.title+", value:"+this._calEvent.privacy);
+        if (this._newPrivacy !== undefined) {
+            const privacies = {
+                "Normal": "PUBLIC",
+                "Confidential": "CONFIDENTIAL",
+                "Private": "PRIVATE",
+                null: "PUBLIC"
+            };
+
+            return privacies[this._newPrivacy];
+        }
+
+        return this._calEvent.privacy;
+    },
+
+    set privacy(aValue) {
+        //dump("set privacy: title:"+this.title+", aValue:"+aValue);
+        if (aValue != this.privacy) {
+            const privacies = {
+                "PUBLIC": "Normal",
+                "CONFIDENTIAL": "Confidential",
+                "PRIVATE": "Private",
+                null: "Normal"
+            };
+            this._newPrivacy = privacies[aValue];
+            this._calEvent.privacy = aValue;
+        }
+    },
+
+    // status of the event
+    //attribute AUTF8String status;
+    get status() {
+        //dump("get status: title:"+this.title+", value:"+this._calEvent.status+", this._status:"+this._status);
+        if (this._newStatus !== undefined) {
+            return this._newStatus;
+        }
+
+        return this._calEvent.status;
+    },
+
+    set status(aValue) {
+        if (aValue != this.status) {
+            this._newStatus = aValue;
+            this._calEvent.status = aValue;
+        }
+    },
+
+    // ical interop; writing this means parsing
+    // the ical string into this event
+    //attribute AUTF8String icalString;
+    get icalString() {
+        //dump("get icalString: title:"+this.title+", value:"+this._calEvent.icalString);
+        return this._calEvent.icalString;
+    },
+
+    set icalString(aValue) {
+        //dump("set icalString: title:"+this.title+", aValue:"+aValue);
+        this._calEvent.icalString = aValue;
+    },
+
+    // an icalComponent for this item, suitable for serialization.
+    // the icalComponent returned is not live: changes in it or this
+    // item will not be reflected in the other.
+    //attribute calIIcalComponent icalComponent;
+    get icalComponent() {
+        //dump("get icalComponent: title:"+this.title+", value:"+this._calEvent.icalComponent);
+        return this._calEvent.icalComponent;
+    },
+
+    set icalComponent(aValue) {
+        //dump("set icalComponent: title:"+this.title+", aValue:"+aValue);
+        this._calEvent.icalComponent = aValue;
+    },
+
+    //
+    // alarms
+    //
+
+    alarmsAreEqual: function _alarmsAreEqual(aAlarm1, aAlarm2) {
+        var result = false;
+
+        if (((!aAlarm1) && (aAlarm2))
+            || ((!aAlarm2) && (aAlarm1))) {
+            return false;
+        }
+
+        if ((!aAlarm1) && (!aAlarm2)) {
+            return true;
+        }
+
+        if ((((aAlarm1.alarmDate) && (aAlarm2.alarmDate) && (aAlarm1.alarmDate.compare(aAlarm2.alarmDate) == 0)) || ((!aAlarm1.alarmDate) && (!aAlarm2.alarmDate)))
+            && (aAlarm1.related == aAlarm2.related)
+            && (aAlarm1.offset == aAlarm2.offset)) {
+            result = true;
+        }
+
+        return result;
+    },
+
+    /**
+     * Get all alarms assigned to this item
+     *
+     * @param count       The number of alarms
+     * @param aAlarms     The array of calIAlarms
+     */
+    //void getAlarms(out PRUint32 count, [array, size_is(count), retval] out calIAlarm aAlarms);
+    getAlarms: function _getAlarms(count) {
+
+        if (!this.canModify) {
+            count.value = 0;
+            return [];
+        }
+
+        return this._calEvent.getAlarms(count);
+    },
+
+    /**
+     * Add an alarm to the item
+     *
+     * @param aAlarm      The calIAlarm to add
+     */
+    //void addAlarm(in calIAlarm aAlarm);
+    addAlarm: function _addAlarm(aAlarm) {
+        if (!aAlarm) return;
+        // As exchange can only handle one alarm. We make sure there is only one.
+
+        //dump("addAlarm 1: title:"+this.title+", aAlarm.alarmDate:"+aAlarm.alarmDate+", offset:"+aAlarm.offset+"("+this.calendarItemType+")\n");
+        var alarms = this.getAlarms({}); // Preload
+        this._calEvent.clearAlarms();
+
+        if (((this._alarm) && (!this.alarmsAreEqual(this._alarm, aAlarm))) || (!this._alarm)) {
+            //dump("addAlarm 2: title:"+this.title+", aAlarm.alarmDate:"+aAlarm.alarmDate+", offset:"+aAlarm.offset+"("+this.calendarItemType+")\n");
+            this._newAlarm = aAlarm.clone();
+        }
+        this._calEvent.addAlarm(aAlarm.clone());
+    },
+
+    /**
+     * Delete an alarm from the item
+     *
+     * @param aAlarm      The calIAlarm to delete
+     */
+    //void deleteAlarm(in calIAlarm aAlarm);
+    deleteAlarm: function _deleteAlarm(aAlarm) {
+        //dump("deleteAlarm: title:"+this.title+"("+this.calendarItemType+")\n");
+        this._newAlarm = null;
+        this._calEvent.clearAlarms();
+    },
+
+    /**
+     * Clear all alarms from the item
+     */
+    //void clearAlarms();
+    clearAlarms: function _clearAlarms() {
+        //dump("clearAlarms: title:"+this.title+"("+this.calendarItemType+")\n");
+        this._newAlarm = null;
+        this._calEvent.clearAlarms();
+    },
+
+    // The last time this alarm was fired and acknowledged by the user; coerced to UTC.
+    //attribute calIDateTime alarmLastAck;
+    get alarmLastAck() {
+        //dump("get alarmLastAck. this._alarmLastAck:"+this._alarmLastAck+"\n");
+        //dump("get alarmLastAck: title:"+this.title+", alarmLastAck:"+this._calEvent.alarmLastAck+"\n");
+        return this._calEvent.alarmLastAck;
+    },
+
+    set alarmLastAck(aValue) {
+        //dump("set alarmLastAck 1:"+aValue+"\n");
+        try {
+            if ((aValue) && ((!this.alarmLastAck) || (aValue.compare(this.alarmLastAck) != 0))) {
+
+                //dump("set alarmLastAck: User snoozed alarm. Title:"+this.title+", aValue:"+aValue.toString()+", alarmTime:"+this.getAlarmTime(), -1);
+                //dump("set alarmLastAck 2:"+aValue+"\n");
+                this._newAlarmLastAck = aValue.clone();
+            }
+            else {
+                //dump("set alarmLastAck 3:"+aValue+"\n");
+                if (aValue === null) {
+                    //dump("set alarmLastAck: set to NULL. Title:"+this.title+", aValue:"+aValue+", alarmTime:"+this.getAlarmTime(), -1);
+                    this._newAlarmLastAck = null;
+                }
+            }
+        }
+        catch (err) {
+            dump("alarmlastack err:" + err + "\n");
+        }
+        this._calEvent.alarmLastAck = aValue;
+    },
+
+    //
+    // recurrence
+    //
+    //attribute calIRecurrenceInfo recurrenceInfo;
+    get recurrenceInfo() {
+
+        if (this._newRecurrenceInfo !== undefined) {
+            return this._newRecurrenceInfo;
+        }
+
+        if (this._recurrenceInfo !== undefined) {
+            return this._recurrenceInfo;
+        }
+
+        return this._calEvent.recurrenceInfo;
+    },
+
+    set recurrenceInfo(aValue) {
+        //dump("set recurrenceInfo 1: title:"+this.title+", this.recurrenceInfo:"+this.recurrenceInfo+", aValue:"+aValue+"\n");
+        if (aValue) {
+            // Lets see if something changed.
+            var infoChanged = false;
+            if (this.recurrenceInfo) {
+                if (this.recurrenceInfo.countRecurrenceItems() == aValue.countRecurrenceItems()) {
+                    var oldRecurrenceItems = this.recurrenceInfo.getRecurrenceItems({});
+                    var newRecurrenceItems = aValue.getRecurrenceItems({});
+                    // See if the oldReccurrenceItems exists in the new
+                    var allOldExist = true;
+                    for each(var oldRecurrenceItem in oldRecurrenceItems) {
+                        var oldExists = false;
+                        for each(var newRecurrenceItem in newRecurrenceItems) {
+                            if (newRecurrenceItem.icalString == oldRecurrenceItem.icalString) {
+                                oldExists = true;
+                                break;
+                            }
+                        }
+                        if (!oldExists) {
+                            allOldExist = false;
+                            break;
+                        }
+                    }
+                    if (!allOldExist) {
+                        infoChanged = true;
+                    }
+                }
+                else {
+                    infoChanged = true;
+                }
+            }
+            else {
+                infoChanged = true;
+            }
+            if (infoChanged) {
+                //dump("set recurrenceInfo 2: recurrenceinfo changed.\n"); 
+                this._newRecurrenceInfo = aValue.clone();
+                this._calEvent.recurrenceInfo = aValue.clone();
+            }
+            else {
+                //dump("set recurrenceInfo 3: recurrenceinfo did not change.\n"); 
+            }
+        }
+        else {
+            //dump("set recurrenceInfo 4: recurrenceinfo changed.\n"); 
+            this._newRecurrenceInfo = aValue;
+            this._calEvent.recurrenceInfo = aValue;
+        }
+
+    },
+
+    //readonly attribute calIDateTime recurrenceStartDate;
+    get recurrenceStartDate() {
+        if ((this.recurrenceInfo) && (!this._newRecurrenceInfo)) {
+            if (this._recurrenceStartDate) {
+                return this._recurrenceStartDate;
+            }
+        }
+        //dump("get recurrenceStartDate: title:"+this.title+", value:"+this._calEvent.recurrenceStartDate);
+        return this._calEvent.recurrenceStartDate;
+    },
+
+    //
+    // All event properties are stored in a property bag;
+    // some number of these are "promoted" to top-level
+    // accessor attributes.  For example, "SUMMARY" is
+    // promoted to the top-level "title" attribute.
+    //
+    // If you use the has/get/set/deleteProperty
+    // methods, property names are case-insensitive.
+    //
+    // For purposes of ICS serialization, all property names in
+    // the hashbag are in uppercase.
+    //
+    // The isPropertyPromoted() attribute can will indicate
+    // if a particular property is promoted or not, for
+    // serialization purposes.
+    //
+
+    // Note that if this item is a proxy, then any requests for
+    // non-existant properties will be forward to the parent item.
+
+    // some other properties that may exist:
+    //
+    // 'description' - description (string)
+    // 'location' - location (string)
+    // 'categories' - categories (string)
+    // 'syncId' - sync id (string)
+    // 'inviteEmailAddress' - string
+    // alarmLength/alarmUnits/alarmEmailAddress/lastAlarmAck
+    // recurInterval/recurCount/recurWeekdays/recurWeeknumber
+
+    // these forward to an internal property bag; implemented here, so we can
+    // do access control on set/delete to have control over mutability.
+    //readonly attribute nsISimpleEnumerator propertyEnumerator;
+    get propertyEnumerator() {
+        this.getProperty("DESCRIPTION"); // To preload.
+        this.getProperty("LOCATION"); // To preload.
+        this.getProperty("TRANSP"); // To preload.
+        this.getProperty("STATUS"); // To preload.
+        this.getProperty("X-MOZ-SEND-INVITATIONS"); // To preload.
+        return this._calEvent.propertyEnumerator;
+    },
+
+    //boolean hasProperty(in AString name);
+    hasProperty: function _hasProperty(name) {
+        //dump("hasProperty: title:"+this.title+", name:"+name);
+        this.getProperty(name); // To preload.
+        return this._calEvent.hasProperty(name);
+    },
+
+    /**
+     * Gets a particular property.
+     * Objects passed back are still owned by the item, e.g. if callers need to
+     * store or modify a calIDateTime they must clone it.
+     */
+    //nsIVariant getProperty(in AString name);
+    getProperty: function _getProperty(name) {
+        //dump("get property 1: title:"+this.title+", name:"+name+" == "+this._calEvent.getProperty(name)+"\n");
+        switch (name) {
+        case "X-MOZ-SNOOZE-TIME":
+            this.reminderSignalTime;
+            break;
+        case "PERCENT-COMPLETE":
+            this._calEvent.setProperty(name, this.percentComplete);
+            break;
+        case "DESCRIPTION":
+            break;
+        case "CREATED":
+            break;
+        case "LOCATION":
+            if ((this.location) && (!this._newLocation)) this._calEvent.setProperty(name, this.location);
+            break;
+        case "TRANSP":
+            break;
+        case "STATUS":
+            //dump("get property STATUS: title:"+this.title+", name:"+name+", value:"+this._calEvent.getProperty(name)+", startDate:"+this.startDate+"\n");
+            if (this._className == "mivExchangeEvent") {}
+            else {
+                //dump("get property STATUS: title:"+this.title+", name:"+name+", isCompleted:"+this.isCompleted+", value:"+this._calEvent.getProperty(name)+", this.status:"+this.status+", entryDate:"+this.entryDate+"\n");
+                return this.status;
+            }
+            break;
+        case "X-MOZ-SEND-INVITATIONS":
+            break;
+        case "CLASS":
+            this.privacy; // preload
+            break;
+        default:
+            if (name.indexOf("X-MOZ-SNOOZE-TIME-") > -1) {
+                //dump("setProperty: "+name+" is set to value:"+value);
+                //dump("getProperty:"+name+":"+this._calEvent.getProperty(name)+"\n");
+                //dump("getProperty: this.reminderSignalTime:"+this.reminderSignalTime+"\n");
+            }
+        }
+
+        //dump("get property 2: title:"+this.title+", name:"+name+", value:"+this._calEvent.getProperty(name)+", _newLocation:"+this._newLocation);
+        return this._calEvent.getProperty(name);
+    },
+
+    /**
+     * Sets a particular property.
+     * Ownership of objects gets passed to the item, e.g. callers must not
+     * modify a calIDateTime after it's been passed to an item.
+     *
+     * @warning this reflects the current implementation
+     *          xxx todo: rethink whether it's more sensible to store
+     *                    clones in calItemBase.
+     */
+    //void setProperty(in AString name, in nsIVariant value);
+    setProperty: function _setProperty(name, value) {
+        //dump("set property: title:"+this.title+", name:"+name+", aValue:"+value+"\n", -1);
+        switch (name) {
+        case "PERCENT-COMPLETE":
+            this.percentComplete = value;
+            break;
+        case "DESCRIPTION":
+            if (value != this._newBody) {
+                this._newBody = value;
+            }
+            break;
+        case "CREATED":
+            if (value != this._newCreated) {
+                this._newCreated = value;
+            }
+            break;
+        case "LOCATION":
+            if (value != this._newLocation) {
+                this._newLocation = value;
+            }
+            break;
+        case "PRIORITY":
+            this.priority = value;
+            break;
+        case "CLASS":
+            this.privacy = value;
+            break;
+        case "TRANSP":
+            if (value != this.getProperty(name)) {
+                switch (value) {
+                case "TRANSPARENT":
+                    this._newLegacyFreeBusyStatus = "Free";
+                    break;
+                case "OPAQUE":
+                    this._newLegacyFreeBusyStatus = "Busy";
+                    break;
+                default:
+                    this._newLegacyFreeBusyStatus = "Busy";
+                    break;
+                }
+            }
+            break;
+        case "STATUS":
+            //dump("set property: title:"+this.title+", name:"+name+", aValue:"+value+"\n", -1);
+            //dump("set property: title:"+this.title+", name:"+name+", aValue:"+value+"\n");
+            if (this.className == "mivExchangeEvent") {
+                if (value != this.getProperty(name)) {
+                    switch (value) {
+                    case "NONE":
+                        this._newMyResponseType = "Unknown";
+                        break;
+                    case "CONFIRMED":
+                        this._newMyResponseType = "Accept";
+                        break;
+                    case "TENTATIVE":
+                        this._newMyResponseType = "Tentative";
+                        break;
+                    case "CANCELLED":
+                        this._newMyResponseType = "Decline";
+                        break;
+                    default:
+                        this._newMyResponseType = "Unknown";
+                        break;
+                    }
+                }
+            }
+            else {
+                this.status = value;
+                return;
+            }
+            break;
+        case "X-MOZ-SEND-INVITATIONS":
+            if (value != this.getProperty(name)) {
+                this._newIsInvitation = value;
+            }
+            break;
+        case "X-MOZ-SNOOZE-TIME":
+            //dump("setProperty: title:"+this.title+", X-MOZ-SNOOZE-TIME:"+value+"\n");
+            if (value != this._xMozSnoozetime) {
+                this._newXMozSnoozeTime = value;
+            }
+            else {
+                this._newXMozSnoozeTime = undefined;
+            }
+            break;
+        default:
+            if (name.indexOf("X-MOZ-SNOOZE-TIME-") > -1) {
+                //dump("setProperty: "+name+" is set to value:"+value);
+                if ((this._xMozSnoozetime === undefined) && (this._reminderSignalTime)) {
+                    //dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", Going to set initial xMozSnoozeTime for master to:"+value+"\n");
+                    this._xMozSnoozetime = value;
+                }
+                else {
+                    if (value != this._xMozSnoozetime) {
+
+                        //dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", this._reminderSignalTime:"+this._reminderSignalTime+"\n");
+                        //dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", this._xMozSnoozetime:"+this._xMozSnoozetime+"\n");
+                        //dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", "+name+":"+value+"\n");
+                        this._newXMozSnoozeTime = value;
+                        this._lastXMozSnoozeTimeNativeId = name.substr(18);
+                        //dump("setProperty this._lastXMozSnoozeTimeNativeId:"+this._lastXMozSnoozeTimeNativeId+"\n");
+                    }
+                    else {
+                        //dump("setProperty: X-MOZ-SNOOZE-TIME-:"+this.title+", Not changed\n");
+                        this._newXMozSnoozeTime = undefined;
+                    }
+                }
+            }
+            else {
+                this._changedProperties.push({
+                    action: "set",
+                    name: name,
+                    value: value
+                });
+            }
+        }
+
+        this._calEvent.setProperty(name, value);
+    },
+
+    // will not throw an error if you delete a property that doesn't exist
+    //void deleteProperty(in AString name);
+    deleteProperty: function _deleteProperty(name) {
+        //dump("deleteProperty: title:"+this.title+", name:"+name+"\n");
+        switch (name) {
+        case "DESCRIPTION":
+            this._newBody = null;
+            break;
+        case "LOCATION":
+            this._newLocation = null;
+            break;
+        case "TRANSP":
+            this._newLegacyFreeBusyStatus = null;
+            break;
+        case "STATUS":
+            if (this.className == "mivExchangeEvent") {
+                this._newMyResponseType = null;
+            }
+            else {
+                this._status = null;
+            }
+            break;
+        case "X-MOZ-SEND-INVITATIONS":
+            this._newIsInvitation = null;
+            break;
+
+        case "X-MOZ-SNOOZE-TIME":
+            //dump("deleteProperty: title:"+this.title+", "+name+", this._xMozSnoozeTime="+this._xMozSnoozeTime+", this._calEvent.getProperty(X-MOZ-SNOOZE-TIME)="+this._calEvent.getProperty("X-MOZ-SNOOZE-TIME")+", reminderSignalTime="+this.reminderSignalTime+"\n");
+            this._newXMozSnoozeTime = null;
+            break;
+        default:
+            if (name.indexOf("X-MOZ-SNOOZE-TIME-") > -1) {
+                //dump("deleteProperty: title:"+this.title+", "+name+"\n");
+                //dump("setProperty: "+name+" is set to value:"+value);
+                this._newXMozSnoozeTime = null;
+                this._lastXMozSnoozeTimeNativeId = name.substr(18);
+                //dump("deleteProperty this._lastXMozSnoozeTimeNativeId:"+this._lastXMozSnoozeTimeNativeId+"\n");
+            }
+            else {
+                this._changedProperties.push({
+                    action: "remove",
+                    name: name,
+                    value: null
+                });
+            }
+
+            //		default:
+            //			this._changedProperties.push({ action: "remove", name: name});
+        }
+
+        this._calEvent.deleteProperty(name);
+    },
+
+    // returns true if the given property is promoted to some
+    // top-level attribute (e.g. id or title)
+    //boolean isPropertyPromoted(in AString name);
+    isPropertyPromoted: function _isPropertyPromoted(name) {
+        //dump("isPropertyPromoted: title:"+this.title+", name:"+name);
+        return this._calEvent.isPropertyPromoted(name);
+    },
+
+    /**
+     * Returns a particular parameter value for a property, or null if the
+     * parameter does not exist.  If the property does not exist, throws.
+     *
+     * @param aPropertyName  the name of the property
+     * @param aParameterName the name of the parameter on the property
+     */
+    //AString getPropertyParameter(in AString aPropertyName,
+    //	               in AString aParameterName);
+    getPropertyParameter: function _getPropertyParameter(aPropertyName, aParameterName) {
+        //dump("getPropertyParameter: title:"+this.title+", aPropertyName:"+aPropertyName+", aParameterName:"+aParameterName+", value:"+this._calEvent.getPropertyParameter(aPropertyName, aParameterName));
+        return this._calEvent.getPropertyParameter(aPropertyName, aParameterName);
+    },
+
+    /**
+     * Checks if the given property has the given parameter.
+     *
+     * @param aPropertyName   The name of the property.
+     * @param aParameterName  The name of the parameter on the property.
+     * @return                True, if the parameter exists on the property
+     */
+    //boolean hasPropertyParameter(in AString aPropertyName,
+    //	              in AString aParameterName);
+    hasPropertyParameter: function _hasPropertyParameter(aPropertyName, aParameterName) {
+        //dump("hasPropertyParameter: title:"+this.title+", aPropertyName:"+aPropertyName+", aParameterName:"+aParameterName+", value:"+this._calEvent.hasPropertyParameter(aPropertyName, aParameterName));
+        return this._calEvent.hasPropertyParameter(aPropertyName, aParameterName);
+    },
+
+    /**
+     * Sets a particular parameter value for a property, or unsets if null is
+     * passed. If the property does not exist, throws.
+     *
+     * @param aPropertyName   The name of the property
+     * @param aParameterName  The name of the parameter on the property
+     * @param aParameterValue The value of the parameter to set
+     */
+    //void setPropertyParameter(in AString aPropertyName,
+    //	            in AString aParameterName,
+    //	            in AUTF8String aParameterValue);
+    setPropertyParameter: function _setPropertyParameter(aPropertyName, aParameterName, aParameterValue) {
+        //dump("setPropertyParameter: title:"+this.title+", aPropertyName:"+aPropertyName+", aParameterName:"+aParameterName+", aParameterValue:"+aParameterValue);
+        return this._calEvent.setPropertyParameter(aPropertyName, aParameterName, aParameterValue);
+    },
+
+    /**
+     * Returns a property parameter enumerator for the given property name
+     *
+     * @param aPropertyName   The name of the property.
+     * @return                The parameter enumerator.
+     */
+    //nsISimpleEnumerator getParameterEnumerator(in AString aPropertyName);
+    getParameterEnumerator: function _getParameterEnumerator(aPropertyName) {
+        //dump("getParameterEnumerator: title:"+this.title+", aPropertyName:"+aPropertyName);
+        return this._calEvent.getParameterEnumerator(aPropertyName);
+    },
+
+    /**
+     * The organizer (originator) of the item.  We will likely not
+     * honour or preserve all fields in the calIAttendee passed around here.
+     * A base class like calIPerson might be more appropriate here, if we ever
+     * grow one.
+     */
+    //attribute calIAttendee organizer;
+    get organizer() {
+        //dump("get organizer: title:"+this.title+", value:"+this._calEvent.organizer);
+        return this._calEvent.organizer;
+    },
+
+    set organizer(aValue) {
+        //dump("set organizer: title:"+this.title+", aValue:"+aValue);
+        this.organizer;
+        if (aValue) {
+            if ((!this.organizer) || (aValue.toString() != this.organizer.toString())) {
+                this._newOrganizer = aValue.clone();
+                this._calEvent.organizer = aValue;
+            }
+        }
+        else {
+            this._calEvent.organizer = aValue;
+        }
+    },
+
+    //
+    // Attendees
+    //
+
+    // The array returned here is not live; it will not reflect calls to
+    // removeAttendee/addAttendee that follow the call to getAttendees.
+    //void getAttendees(out PRUint32 count,
+    //	    [array,size_is(count),retval] out calIAttendee attendees);
+    getAttendees: function _getAttendees(count) {
+        //dump("getAttendees: title:"+this.title);
+        return this._calEvent.getAttendees(count);
+    },
+
+    /**
+     * getAttendeeById's matching is done in a case-insensitive manner to handle
+     * places where "MAILTO:" or similar properties are capitalized arbitrarily
+     * by different calendar clients.
+     */
+    //calIAttendee getAttendeeById(in AUTF8String id);
+    getAttendeeById: function _getAttendeeById(id) {
+        //dump("getAttendeeById: title:"+this.title+", id:"+id);
+        if (!this._attendees) this.getAttendees({});
+
+        return this._calEvent.getAttendeeById(id);
+    },
+
+    attendeeIsInList: function _attendeeIsInList(attendee) {
+        for each(var tmpAttendee in this.getAttendees({})) {
+            if ((tmpAttendee) && (tmpAttendee.id == attendee.id)) {
+                return tmpAttendee;
+            }
+        }
+        return null;
+    },
+
+    attendeeIsInChangesList: function _attendeeIsInChangesList(attendee) {
+        for each(var tmpAttendee in this._changesAttendees) {
+            if ((tmpAttendee.attendee) && (tmpAttendee.attendee.id == attendee.id)) {
+                return tmpAttendee;
+            }
+        }
+        return null;
+    },
+
+    removeAttendeeFromChangesList: function _removeAttendeeFromChangesList(attendee) {
+        var newChangesList = [];
+
+        for each(var tmpAttendee in this._changesAttendees) {
+            if ((tmpAttendee.attendee) && (tmpAttendee.attendee.id != attendee.id)) {
+                newChangesList.push(tmpAttendee);
+            }
+        }
+
+        this._changesAttendees = undefined;
+        this._changesAttendees = newChangesList;
+    },
+
+    //void addAttendee(in calIAttendee attendee);
+    addAttendee: function _addAttendee(attendee) {
+        if (!attendee) return;
+        //dump("addAttendee1: title:"+this.title+", attendee.id:"+attendee.id+"\n");
+
+        if (!this._attendees) this.getAttendees({});
+
+        var attendeeExists = this.attendeeIsInList(attendee);
+        if (attendeeExists != null) {
+            // We are not going to add this attendee as it is already in the list
+            //dump("addAttendee1a: title:"+this.title+", attendee is already in list. not going to add change record.\n");
+            return;
+        }
 
-		this._privacy = this.sensitivity;
-		if (this._privacy != null) {
-			switch(this._privacy) {
-				case "Normal" : 
-					this._calEvent.privacy = "PUBLIC";
-					break;
-				case "Confidential" : 
-					this._calEvent.privacy = "CONFIDENTIAL";
-					break;
-				case "Personal" : 
-					this._calEvent.privacy = "PRIVATE";
-					break;
-				case "Private" : 
-					this._calEvent.privacy = "PRIVATE";
-					break;
-				default :
-					this._calEvent.privacy = "PUBLIC";
-			}
-			this.setProperty("CLASS", this._calEvent.privacy);
-		}
+        attendeeExists = this.attendeeIsInChangesList(attendee);
+        if (attendeeExists != null) {
+            // We have a change for this attendee already in the changes list.
+            if (attendeeExists.action == "remove") {
+                // We have a remove change in the list and we now want to re-add it. We just remove the remove change.
+                this.removeAttendeeFromChangesList(attendee);
+                this._calEvent.addAttendee(attendee);
+                //dump("addAttendee1b: title:"+this.title+", attendee.id:"+attendee.id+", removed from changes list.\n");
+            }
+            else {
+                // If the action was "add" we do not do anything as we do not have to duplicate it.
+                //dump("addAttendee1c: title:"+this.title+", attendee.id:"+attendee.id+", action:"+attendeeExists.action+"\n");
+            }
+            return;
+        }
+        this._changesAttendees.push({
+            action: "add",
+            attendee: attendee
+        });
+        this._calEvent.addAttendee(attendee);
+        //dump("addAttendee2: title:"+this.title+", attendee.id:"+attendee.id+"\n");
+    },
+
+    //void removeAttendee(in calIAttendee attendee);
+    removeAttendee: function _removeAttendee(attendee) {
+        if (!attendee) return;
+        //dump("removeAttendee: title:"+this.title+", attendee.id:"+attendee.id+"\n");
+
+        if (!this._attendees) this.getAttendees({});
+
+        var attendeeExists = this.attendeeIsInList(attendee);
+        if (attendeeExists == null) {
+            // We are not going to remove this attendee as it is not in the list
+            return;
+        }
 
-		this._reminderIsSet = (this.getTagValue("t:ReminderIsSet", "false") == "true");
+        var attendeeExists = this.attendeeIsInChangesList(attendee);
+        if (attendeeExists != null) {
+            if (attendeeExists.action == "add") {
+                // There was already a change for this attendee and it was an addition. We remove this addition
+                //dump("removeAttendee: title:"+this.title+", attendee.id:"+attendee.id+" |  There was already a change for this attendee and it was an addition. We remove this addition\n");
+                this.removeAttendeeFromChangesList(attendee);
+                this._calEvent.removeAttendee(attendee);
+            }
+
+            // If the action was "remove" we do not do anything as we do not have to duplicate it.
+            return;
+        }
 
-		if (this.className == "mivExchangeEvent") {
-			this._calendarItemType = this.getTagValue("t:CalendarItemType", undefined);
-		}
-		else {
-			this._calendarItemType = "Task";
-		}
+        this._changesAttendees.push({
+            action: "remove",
+            attendee: attendee.clone()
+        });
+        this._calEvent.removeAttendee(attendee);
+    },
+
+    //void removeAllAttendees();
+    removeAllAttendees: function _removeAllAttendees() {
+        //dump("removeAllAttendees: title:"+this.title+"\n");
+        var allAttendees = this.getAttendees({});
+        for each(var attendee in allAttendees) {
+
+            var attendeeExists = this.attendeeIsInChangesList(attendee);
+            if (attendeeExists != null) {
+                if (attendeeExists.action == "add") {
+                    // There was already a change for this attendee and it was an addition. We remove this addition
+                    //dump("removeAllAttendees: title:"+this.title+", attendee.id:"+attendee.id+" |  There was already a change for this attendee and it was an addition. We remove this addition\n");
+                    this.removeAttendeeFromChangesList(attendee);
+                }
+
+                // If the action was "remove" we do not do anything as we do not have to duplicate it.
+            }
+            else {
+                this._changesAttendees.push({
+                    action: "remove",
+                    attendee: attendee.clone()
+                });
+            }
+        }
+        allAttendees = null;
+        this._calEvent.removeAllAttendees();
+    },
+
+    //
+    // Attachments
+    //
+    //void getAttachments(out PRUint32 count,
+    //	      [array,size_is(count),retval] out calIAttachment attachments);
+    getAttachments: function _getAttachments(count) {
+        //dump("getAttachments: title:"+this.title);
+        return this._calEvent.getAttachments(count);
+    },
+
+    //void addAttachment(in calIAttachment attachment);
+    addAttachment: function _addAttachment(attachment) {
+        //dump("addAttachment: title:"+this.title+"\n");
+        this.getAttachments({});
+        if (!this._changesAttachments) this._changesAttachments = [];
+        this._changesAttachments.push({
+            action: "add",
+            attachment: attachment.clone()
+        });
+        this._calEvent.addAttachment(attachment);
+    },
+
+    //void removeAttachment(in calIAttachment attachment);
+    removeAttachment: function _removeAttachment(attachment) {
+        //dump("removeAttachment: title:"+this.title+"\n");
+        //dump("removeAttachment: title:"+this.title);
+        this.getAttachments({});
+        if (!this._changesAttachments) this._changesAttachments = [];
+        this._changesAttachments.push({
+            action: "remove",
+            attachment: attachment.clone()
+        });
+        this._calEvent.removeAttachment(attachment);
+    },
+
+    //void removeAllAttachments();
+    removeAllAttachments: function _removeAllAttachments() {
+        //dump("removeAllAttachments: title:"+this.title+"\n");
+        //dump("removeAllAttachments: title:"+this.title);
+        //		var allAttachments = this._calEvent.getAttachments({});
+        var allAttachments = this.getAttachments({});
+        for each(var attachment in allAttachments) {
+            if (!this._changesAttachments) this._changesAttachments = [];
+            this._changesAttachments.push({
+                action: "remove",
+                attachment: attachment.clone()
+            });
+        }
+        allAttachments = null;
+        this._calEvent.removeAllAttachments();
+    },
+
+    //
+    // Categories
+    //
+
+    /**
+     * Gets the array of categories this item belongs to.
+     */
+    //void getCategories(out PRUint32 aCount,
+    //	     [array, size_is(aCount), retval] out wstring aCategories);
+    getCategories: function _getCategories(aCount) {
+        //dump("getCategories: title:"+this.title+"\n");
+        return this._calEvent.getCategories(aCount);
+    },
+
+    /**
+     * Sets the array of categories this item belongs to.
+     */
+    //void setCategories(in PRUint32 aCount,
+    //	     [array, size_is(aCount)] in wstring aCategories);
+    setCategories: function _setCategories(aCount, aCategories) {
+        //dump("set categories: title:"+this.title+", aCategories.length:"+aCategories.length+"\n");
+        this.getCategories({});
+        this._changesCategories = true;
+        this._calEvent.setCategories(aCount, aCategories);
+    },
+
+    //
+    // Relations
+    //
+
+    /**
+     * This gives back every relation where the item is neighter the owner of the
+     * relation nor the referred relation
+     */
+    //void getRelations(out PRUint32 count,
+    //	    [array,size_is(count),retval] out calIRelation relations);
+    getRelations: function _getRelations(count) {
+        //dump("getRelations: title:"+this.title);
+        return this._calEvent.getRelations(count);
+    },
+
+    /**
+     * Adds a relation to the item
+     */
+    //void addRelation(in calIRelation relation);
+    addRelation: function _addRelation(relation) {
+        //dump("addRelation: title:"+this.title);
+        this._calEvent.addRelation(relation);
+    },
+
+    /**
+     * Removes the relation for this item and the referred item
+     */
+    //void removeRelation(in calIRelation relation);
+    removeRelation: function _removeRelation(relation) {
+        //dump("removeRelation: title:"+this.title);
+        this._calEvent.removeRelation(relation);
+    },
+
+    /**
+     * Removes every relation for this item (in this items and also where it is referred
+     */
+    //void removeAllRelations();
+    removeAllRelations: function _removeAllRelations() {
+        //dump("removeAllRelations: title:"+this.title);
+        this._calEvent.removeAllRelations();
+    },
+
+    // Occurrence querying
+    //
+
+    /**
+     * Return a list of occurrences of this item between the given dates.  The items
+     * returned are the same type as this one, as proxies.
+     */
+    //void getOccurrencesBetween (in calIDateTime aStartDate, in calIDateTime aEndDate,
+    //	              out PRUint32 aCount,
+    //	              [array,size_is(aCount),retval] out calIItemBase aOccurrences);
+    getOccurrencesBetween: function _getOccurrencesBetween(aStartDate, aEndDate, aCount) {
+        if (aStartDate === null) {
+            if (this.startDate) {
+                aStartDate = this.startDate.clone();
+            }
+            else {
+                if (this.entryDate) aStartDate = this.entryDate.clone();
+            }
+        }
+        if (aEndDate === null) {
+            if (this.endDate) {
+                aEndDate = this.endDate.clone();
+            }
+            else {
+                if (this.dueDate) aEndDate = this.dueDate.clone();
+            }
+        }
 
-		this._reminderDueBy = this.tryToSetDateValueUTC(this.getTagValue("t:ReminderDueBy", null), null);
+        var occurrences = [];
+        switch (this.calendarItemType) {
+        case "Task":
+        case "Single":
+        case "Occurrence":
+        case "Exception":
+            var tmpStartDate = this.startDate || this.entryDate;
+            var tmpEndDate = this.endDate || this.dueDate;
+            if (((aStartDate === null) || (!tmpStartDate) || (tmpStartDate.compare(aStartDate) >= 0)) && ((aEndDate === null) || (!tmpEndDate) || (tmpEndDate.compare(aEndDate) < 0))) {
+                //dump("getOccurrencesBetween 0a: inserting myself into list.");
+                occurrences.push(this);
+            }
+            break;
+        case "RecurringMaster":
+            for each(var exception in this._exceptions) {
+                var tmpStartDate = exception.startDate || exception.entryDate;
+                var tmpEndDate = exception.endDate || exception.entryDate;
+                if (((aStartDate === null) || (!tmpStartDate) || (tmpStartDate.compare(aStartDate) >= 0)) && ((aEndDate === null) || (!tmpEndDate) || (tmpEndDate.compare(aEndDate) < 0))) {
+                    //dump("getOccurrencesBetween 0d: inserting myself into list.");
+                    occurrences.push(exception);
+                }
+            }
+            for each(var occurrence in this._occurrences) {
+                var tmpStartDate = occurrence.startDate || occurrence.entryDate;
+                var tmpEndDate = occurrence.endDate || occurrence.entryDate;
+                if (((aStartDate === null) || (!tmpStartDate) || (tmpStartDate.compare(aStartDate) >= 0)) && ((aEndDate === null) || (!tmpEndDate) || (tmpEndDate.compare(aEndDate) < 0))) {
+                    //dump("getOccurrencesBetween 0e: inserting myself into list.");
+                    occurrences.push(occurrence);
+                }
+            }
+            break;
+        default:
+            if (this.recurrenceInfo) {
+                if (this.className == "mivExchangeTodo") {
+                    //dump("  : getOccurrencesBetween mivExchangeTodo\n");
+                    occurrences.push(this);
+                }
+                else {
+                    //dump("  : getOccurrencesBetween mivExchangeEvent\n");
+                    occurrences = this.recurrenceInfo.getOccurrences(aStartDate, aEndDate, 0, aCount);
+                    //dump("getOccurrencesBetween 0b: title:"+this.title+", this.calendarItemType:"+this.calendarItemType+", aStartDate:"+aStartDate+", aEndDate:"+aEndDate+", occurrences.length:"+occurrences.length);
+                    return this.recurrenceInfo.getOccurrences(aStartDate, aEndDate, 0, aCount);
+                }
+            }
+        }
+        //dump("getOccurrencesBetween 1: title:"+this.title+", aStartDate:"+aStartDate+", aEndDate:"+aEndDate+", occurrences.length:"+occurrences.length);
+
+        aCount.value = occurrences.length;
+        return occurrences;
+    },
+
+    /**
+     * If this item is a proxy or overridden item, parentItem will point upwards
+     * to our parent.  Otherwise, it will point to this.
+     * parentItem can thus always be used for modifyItem() calls
+     * to providers.
+     */
+    //attribute calIItemBase parentItem;
+    get parentItem() {
+        //dump("get parentItem: title:"+this.title);
+        if ((!this._parentItem) && (!this._newParentItem)) {
+            this._parenItem = this;
+            this._calEvent.parentItem = this;
+        }
+        return this._calEvent.parentItem;
+    },
+
+    set parentItem(aValue) {
+        //dump("set parentItem: title:"+this.title);
+        if (aValue != this.parentItem) {
+            this._newParentItem = aValue;
+            this._calEvent.parentItem = aValue;
+        }
+    },
+
+    /**
+     * The recurrence ID, a.k.a. DTSTART-of-calculated-occurrence,
+     * or null if this isn't an occurrence.
+     * Be conservative about setting this. It isn't marked as such, but
+     * consider it as readonly.
+     */
+    //attribute calIDateTime recurrenceId;
+    get recurrenceId() {
+        //dump("get recurrenceId: title:"+this.title+", value:"+this._calEvent.recurrenceId);
+        return this._calEvent.recurrenceId;
+    },
+
+    set recurrenceId(aValue) {
+        if (aValue != this.recurrenceId) {
+            this._newRecurrenceId = aValue;
+            //dump("set recurrenceId: User tries to set recurrenceId to:"+aValue.toString()+", title:"+this.title+", this.calendarItemType:"+this.calendarItemType);
+        }
+        else {
+            //dump("set recurrenceId: User tries to set recurrenceId to null, title:"+this.title);
+        }
+        this._calEvent.recurrenceId = aValue;
+    },
+
+    // New external methods
+
+    cloneToCalEvent: function cloneToCalEvent(aCalEvent) {
+        //dump("cloneToCalEvent: start: this.calendarItemType:"+this.calendarItemType);
+        this._calEvent = aCalEvent.clone();
+
+        /*		var alarms = aCalEvent.getAlarms({});
+        		if (alarms.length > 0) {
+        			this._alarm = alarms[0].clone();
+        			this._reminderIsSet = true;
+        			var offset = 0;
+
+        			var tmpStartDate;
+        			var tmpEndDate;
+        			if (this.className == "mivExchangeEvent") {
+        				tmpStartDate = aCalEvent.startDate;
+        				tmpEndDate = aCalEvent.endDate;
+        			}
+        			if (this.className == "mivExchangeTodo") {
+        				tmpStartDate = aCalEvent.entryDate;
+        				tmpEndDate = aCalEvent.dueDate;
+        			}
+
+        			// Exchange alarm is always an offset to the start.
+        			switch (alarms[0].related) {
+        			case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+        //dump("cloneToCalEvent: Ci.calIAlarm.ALARM_RELATED_ABSOLUTE\n");
+        				var newAlarmTime = alarms[0].alarmDate.clone();
+
+        				// Calculate offset from start of item.
+        				offset = newAlarmTime.subtractDate(tmpStartDate);
+        				break;
+        			case Ci.calIAlarm.ALARM_RELATED_START:
+        //dump("cloneToCalEvent: Ci.calIAlarm.ALARM_RELATED_START\n");
+        				var newAlarmTime = tmpStartDate.clone();
+        				offset = alarms[0].offset.clone();
+        				break;
+        			case Ci.calIAlarm.ALARM_RELATED_END:
+        //dump("cloneToCalEvent: Ci.calIAlarm.ALARM_RELATED_END\n");
+        				var newAlarmTime = tmpEndDate.clone();
+        				newAlarmTime.addDuration(alarms[0].offset);
+
+        				offset = newAlarmTime.subtractDate(tmpStartDate);
+        				break;
+        			}
+        //dump("cloneToCalEvent: offset="+offset.inSeconds+"\n");
+        			this._reminderMinutesBeforeStart = (offset.inSeconds / 60) * -1;
+        		}*/
+    },
+
+    //readonly attribute AUTF8String subject;
+    get subject() {
+        return this._subject;
+    },
+
+    //readonly attribute AUTF8String sensitivity;
+    get sensitivity() {
+        return this._sensitivity;
+    },
+
+    //readonly attribute calIDateTime dateTimeReceived;
+    get dateTimeReceived() {
+        return this._dateTimeReceived;
+    },
+
+    //readonly attribute calIDateTime dateTimeSent;
+    get dateTimeSent() {
+        return this._dateTimeSent;
+    },
+
+    //readonly attribute calIDateTime dateTimeCreated;
+    get dateTimeCreated() {
+        return this._dateTimeCreated;
+    },
+
+    //readonly attribute calIDateTime reminderDueBy;
+    get reminderDueBy() {
+        return this._reminderDueBy;
+    },
+
+    //readonly attribute calIDateTime reminderSignalTime;
+    get reminderSignalTime() {
+        return this._reminderSignalTime;
+    },
+
+    //readonly attribute boolean reminderIsSet;
+    get reminderIsSet() {
+        return this._reminderIsSet;
+    },
+
+    //readonly attribute long reminderMinutesBeforeStart;
+    get reminderMinutesBeforeStart() {
+        return this._reminderMinutesBeforeStart;
+    },
+
+    //readonly attribute long size;
+    get size() {
+        return this._size;
+    },
+
+    //readonly attribute calIDateTime originalStart;
+    get originalStart() {
+        return this._originalStart;
+    },
+
+    //readonly attribute boolean isAllDayEvent;
+    get isAllDayEvent() {
+        return this._isAllDayEvent;
+    },
+
+    //readonly attribute AUTF8String legacyFreeBusyStatus;
+    get legacyFreeBusyStatus() {
+        return this._legacyFreeBusyStatus;
+    },
+
+    //readonly attribute AUTF8String location;
+    get location() {
+        return this._location;
+    },
+
+    // the exchange changeKey of this event
+    //readonly attribute AUTF8String changeKey;
+    get changeKey() {
+        return this._changeKey;
+    },
+
+    // the exchange UID of this event
+    //readonly attribute AUTF8String uid;
+    get uid() {
+        return this._uid;
+    },
+
+    // the exchange calendarItemType of this event
+    //readonly attribute AUTF8String calendarItemType;
+    get calendarItemType() {
+        //dump("get calendarItemType: title:"+this.title+", this._calendarItemType:"+this._calendarItemType+", startdate="+this.startDate.toString()+"\n");
+        return this._calendarItemType;
+    },
+
+    // the exchange ItemClass of this event
+    //readonly attribute AUTF8String itemClass;
+    get itemClass() {
+        return this._itemClass;
+    },
+
+    // the exchange messageId of this event
+    //readonly attribute AUTF8String messageId;
+    get messageId() {
+        return this._messageId;
+    },
+    // the exchange isCancelled of this event
+    //readonly attribute boolean isCancelled;
+    get isCancelled() {
+        return this._isCancelled;
+    },
+
+    // the exchange isMeeting of this event
+    //readonly attribute boolean isMeeting;
+    get isMeeting() {
+        return this._isMeeting;
+    },
+
+    // the exchange hasAttachments of this event
+    //readonly attribute boolean hasAttachments;
+    get hasAttachments() {
+        return this._hasAttachments;
+    },
+
+    //readonly attribute boolean isRecurring;
+    get isRecurring() {
+        return this._isRecurring;
+    },
+
+    //readonly attribute boolean isInvitation;
+    get isInvitation() {
+        if (((this.responseObjects) && ((this.responseObjects.AcceptItem)
+                || (this.responseObjects.TentativelyAcceptItem)
+                || (this.responseObjects.DeclineItem)))
+            || (this.type == "MeetingRequest")) {
+            return true;
+        }
+        else {
+            if (this.getProperty("X-exchangeITIP2") === true) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+    },
 
-		this._reminderMinutesBeforeStart = this.getTagValue("t:ReminderMinutesBeforeStart", 0); 
- 
-		this._dateTimeReceived = this.tryToSetDateValueUTC(this.getTagValue("t:DateTimeReceived", null), null);
 
-		this._dateTimeSent = this.tryToSetDateValueUTC(this.getTagValue("t:DateTimeSent", null), null);
+    //readonly attribute boolean meetingRequestWasSent;
+    get meetingRequestWasSent() {
+        return this._meetingRequestWasSent;
+    },
 
-		this._size = this.getTagValue("t:Size", 0);
+    //readonly attribute boolean isResponseRequested;
+    get isResponseRequested() {
+        return this._isResponseRequested;
+    },
 
-		this._originalStart = this.tryToSetDateValueUTC(this.getTagValue("t:OriginalStart", null), null);
+    //readonly attribute AUTF8String myResponseType;
+    get myResponseType() {
+        if (this._newMyResponseType) {
+            //dump(" 22 this._newMyResponseType:"+this._newMyResponseType+"\n");
+            return this._newMyResponseType;
+        }
 
-		this._location = this.getTagValue("t:Location", null);
+        return this._myResponseType;
+    },
+
+    get participationStatus() {
+        return participationMap[this.myResponseType];
+    },
+
+    //readonly attribute AUTF8String timeZone;
+    get timeZone() {
+        return this._timeZone;
+    },
+
+    //readonly attribute AUTF8String MeetingTimeZone;
+    get meetingTimeZone() {
+        return this._meetingTimeZone;
+    },
+
+    //readonly attribute AUTF8String startTimeZoneName;
+    get startTimeZoneName() {
+        return this._startTimeZoneName;
+    },
+
+    //readonly attribute AUTF8String startTimeZoneId;
+    get startTimeZoneId() {
+        return this._startTimeZoneId;
+    },
+
+    //readonly attribute AUTF8String endTimeZoneName;
+    get endTimeZoneName() {
+        return this._endTimeZoneName;
+    },
+
+    //readonly attribute AUTF8String endTimeZoneId;
+    get endTimeZoneId() {
+        return this._endTimeZoneId;
+    },
+
+    get mimeContent() {
+        return this._mimeContent;
+    },
+
+    get mimeContentCharacterSet() {
+        return this._mimeContentCharacterSet;
+    },
+
+    //readonly attribute AUTF8String conferenceType;
+    get conferenceType() {
+        return this._conferenceType;
+    },
+
+    //readonly attribute boolean allowNewTimeProposal;
+    get allowNewTimeProposal() {
+        return this._allowNewTimeProposal;
+    },
+
+
+    // the tagName of the object of this event
+    //readonly attribute AUTF8String type;
+    get type() {
+        return this._type;
+    },
+
+    // New external methods
+    // the exchange ParentFolderId.Id of this event
+    //readonly attribute AUTF8String parentId;
+    get parentId() {
+        return this._parentId;
+    },
+
+    // New external methods
+    // the exchange ParentFolderId.ChangeKey of this event
+    //readonly attribute AUTF8String parentChangeKey;
+    get parentChangeKey() {
+        return this._parentChangeKey;
+    },
+
+    // the exchange responseObjects of this event
+    //readonly attribute jsval responseObjects;
+
+    /*
+      <t:ResponseObjects>
+        <t:AcceptItem/>
+        <t:TentativelyAcceptItem/>
+        <t:DeclineItem/>
+        <t:ReplyToItem/>
+        <t:ReplyAllToItem/>
+        <t:ForwardItem/>
+        <t:CancelCalendarItem/>  // part of my own items.
+      </t:ResponseObjects>
+
+    */
+    get responseObjects() {
+        return this._responseObjects;
+    },
+
+    //void getExceptions(out uint32_t count,
+    //	      [array,size_is(count),retval] out mivExchangeBaseItem aException);
+    getExceptions: function _getExceptions(aCount) {
+        var result = [];
+        for each(var exception in this._exceptions) {
+            result.push(exception);
+        }
+        aCount.value = result.length;
+        return result;
+    },
+
+    //void addException(in mivExchangeBaseItem aItem);
+    addException: function _addException(aItem) {
+        if ((aItem.calendarItemType == "Exception") && (this.calendarItemType == "RecurringMaster") && (aItem.isMutable)) {
+            aItem.parentItem = this;
+
+            if (this._exceptions[aItem.id]) {
+                this._exceptions[aItem.id].deleteItem();
+                this._exceptions[aItem.id] = null;
+                delete this._exceptions[aItem.id];
+            }
+            this._exceptions[aItem.id] = aItem;
+            //			this._exceptions[aItem.id] = aItem;
+
+            if (this.recurrenceInfo) {
+                this.recurrenceInfo.modifyException(aItem, true);
+            }
+            else {
+                //this._calEvent.addException(aItem. true);
+                dump("What not recurrenceinfo for title:'" + this.title + "', aItem.title:" + aItem.title + "\n");
+                dump(" ++    MASTER:" + xml2json.toString(this.exchangeData) + "\n");
+                dump(" ++ Exception:" + xml2json.toString(aItem.exchangeData) + "\n");
+            }
+
+            var itemAlarms = aItem.getAlarms({});
+            //dump("addException:"+this.title+"| itemAlarms.length:"+itemAlarms.length+", aItem.reminderSignalTime:"+aItem.reminderSignalTime+"\n");
+            var tmpStartDate = aItem.startDate || aItem.entryDate;
+            if ((itemAlarms.length > 0) && (aItem.reminderSignalTime) && ((!tmpStartDate) || (tmpStartDate.compare(aItem.reminderSignalTime) >= 0))) {
+                this.setProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime, aItem.reminderSignalTime.getInTimezone(cal.UTC()).icalString);
+            }
+        }
+    },
+
+    //void modifyException(in mivExchangeBaseItem aItem);
+    modifyException: function _modifyException(aItem) {
+        if ((aItem.calendarItemType == "Exception") && (this.calendarItemType == "RecurringMaster") && (aItem.isMutable)) {
+
+            if ((this._exceptions[aItem.id]) && (this._exceptions[aItem.id].changeKey == aItem.changeKey)) {
+                // We already have this in the list. No need to change.
+                return;
+            }
+
+            // Remove any alarms we might have for this exception.
+            if (this._exceptions[aItem.id]) {
+                var itemAlarms = this._exceptions[aItem.id].getAlarms({});
+                if (itemAlarms.length > 0) {
+                    this.deleteProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime);
+                }
+                this._exceptions[aItem.id].deleteItem();
+                this._exceptions[aItem.id] = null;
+                delete this._exceptions[aItem.id];
+            }
+
+            //			this._exceptions[aItem.id] = aItem.clone();
+            this._exceptions[aItem.id] = aItem;
+
+            var itemAlarms = aItem.getAlarms({});
+            var tmpStartDate = aItem.startDate || aItem.entryDate;
+            if ((itemAlarms.length > 0) && (aItem.reminderSignalTime) && ((!tmpStartDate) || (tmpStartDate.compare(aItem.reminderSignalTime) >= 0))) {
+                this.setProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime, this.reminderSignalTime.getInTimezone(cal.UTC()).icalString);
+            }
+        }
+    },
+
+    //void removeException(in mivExchangeBaseItem aItem);
+    removeException: function _removeException(aItem) {
+        if ((aItem.calendarItemType == "Exception") && (this.calendarItemType == "RecurringMaster")) {
+            if (this._exceptions[aItem.id]) {
+                this.recurrenceInfo.removeExceptionFor(aItem.recurrenceId);
+
+                if (this.hasProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime)) {
+                    this.deleteProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime);
+                }
+                this._exceptions[aItem.id].deleteItem();
+                this._exceptions[aItem.id] = null;
+                delete this._exceptions[aItem.id];
+            }
+        }
+    },
+
+    //void removeExceptionAt(in calIDateTime aRecurrenceId);
+    removeExceptionAt: function _removeExceptionAt(aRecurrenceId) {
+        // Find item.
+        var item = null;
+        for each(var exception in this._exceptions) {
+            if (exception.recurrenceId.compare(aRecurrenceId) == 0) {
+                item = exception;
+                break;
+            }
+        }
+
+        if (item) {
+            this.removeException(item);
+        }
 
-		this._changeKey = this.getAttributeByTag("t:ItemId", "ChangeKey", null);
+    },
 
-		this._uid = this.getTagValue("t:UID", undefined);
+    //void getOccurrences(out uint32_t count, [array,size_is(count),retval] out mivExchangeBaseItem aOccurrence);
+    getOccurrences: function _getOccurrences(aCount) {
+        var result = [];
+        for each(var occurrence in this._occurrences) {
+            //dump("getOccurrences: occurrence.title:"+occurrence.title+", startDate:"+occurrence.startDate.toString()+"\n");
+            result.push(occurrence);
+        }
+        aCount.value = result.length;
+        return result;
+    },
+
+    //void addOccurrence(in mivExchangeBaseItem aItem);
+    addOccurrence: function _addOccurrence(aItem) {
+        if ((aItem.calendarItemType == "Occurrence") && (this.calendarItemType == "RecurringMaster") && (aItem.isMutable)) {
+            aItem.parentItem = this;
+
+            if (this._occurrences[aItem.id]) {
+                this._occurrences[aItem.id].deleteItem();
+                this._occurrences[aItem.id] = null;
+                delete this._occurrences[aItem.id];
+            }
+            this._occurrences[aItem.id] = aItem;
+            //			this._occurrences[aItem.id] = aItem.clone();
+
+            var itemAlarms = aItem.getAlarms({});
+            //dump("AddOccurrence: itemAlarms.length:"+itemAlarms.length+", X-MOZ-SNOOZE-TIME-"+aItem.recurrenceId.nativeTime);
+            var tmpStartDate = aItem.startDate || aItem.entryDate;
+            if ((itemAlarms.length > 0) && ((!tmpStartDate) || ((this.reminderDueBy) && (tmpStartDate.compare(this.reminderDueBy) == 0)))) {
+                this.setProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime, this.reminderSignalTime.getInTimezone(cal.UTC()).icalString);
+            }
+        }
+    },
+
+    //void removeOccurrence(in mivExchangeBaseItem aItem);
+    removeOccurrence: function _removeOccurrence(aItem) {
+        if (aItem) {
+            if ((aItem.calendarItemType == "Occurrence") && (this.calendarItemType == "RecurringMaster")) {
+                if (this._occurrences[aItem.id]) {
+                    if (this.hasProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime)) {
+                        this.deleteProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime);
+                    }
+                    this._occurrences[aItem.id].deleteItem();
+                    this._occurrences[aItem.id] = null;
+                    delete this._occurrences[aItem.id];
+                }
+            }
+        }
+    },
+
+    //void removeOccurrenceAt(in calIDateTime aRecurrenceId);
+    removeOccurrenceAt: function _removeOccurrenceAt(aRecurrenceId) {
+        //dump("removeOccurrenceAt this._cloneCount:"+this._cloneCount+"\n");
+        // Find item.
+        var item = null;
+        for each(var occurrence in this._occurrences) {
+            if (occurrence.recurrenceId.compare(aRecurrenceId) == 0) {
+                item = occurrence;
+                break;
+            }
+        }
 
-		this._itemClass = this.getTagValue("t:ItemClass", null); 
-		
-		this._isMeeting = (this.getTagValue("t:IsMeeting", "false") == "true");
+        if (item) {
+            this.removeOccurrence(item);
+        }
+        else {
+            // This recurrenceId is not an occurrence. Maybe an exception.
+            this.removeExceptionAt(aRecurrenceId);
+        }
 
-		this._isRecurring = (this.getTagValue("t:IsRecurring", "false") == "true");
+    },
 
-		this._meetingRequestWasSent = (this.getTagValue("t:MeetingRequestWasSent", "false") == "true");
+    //attribute mivIxml2jxon exchangeData;
+    get exchangeData() {
+        /*		if (this._exchangeData === null) {
+        			dump("Who is requesting exchangedata when it is null:"+exchGlobalFunctions.STACK()+"\n");
+        		}*/
+        return this._exchangeData;
+    },
 
-		this._isResponseRequested = (this.getTagValue("t:IsResponseRequested", "false") == "true");
+    set exchangeData(aValue) {
+        //dump("exchangeData:"+aValue.toString());
+        //dump("exchangeData:"+aValue.toString()+"\n\n");
 
-		this._myResponseType = this.getTagValue("t:MyResponseType", "NoResponseReceived");
+        this.initialize();
 
-		this._startTimeZoneName = this.getAttributeByTag("t:StartTimeZone", "Name", null);
+        if (this._calendar) {
+            this.calendar = this._calendar;
+        }
 
-		this._endTimeZoneName = this.getAttributeByTag("t:EndTimeZone", "Name", null);
+        /*		if (aValue === null) {
+        			dump("Who is setting exchangeData to null:"+exchGlobalFunctions.STACK()+"\n");
+        		}*/
+        this._exchangeData = aValue;
+
+        this._isAllDayEvent = (this.getTagValue("t:IsAllDayEvent", "false") == "true");
+
+        this._startTimeZoneId = this.getAttributeByTag("t:StartTimeZone", "Id", null);
+
+        this._meetingTimeZone = this.getAttributeByTag("t:MeetingTimeZone", "TimeZoneName", null);
+
+        this._timeZone = this.getTagValue("t:TimeZone", null);
+
+        this._endTimeZoneId = this.getAttributeByTag("t:EndTimeZone", "Id", null);
+
+        this._effectiveRights = this.getTag("t:EffectiveRights", null);
+
+        if (this._effectiveRights) {
+            this._canDelete = (xml2json.getTagValue(this._effectiveRights, "t:Delete", "false") == "true");
+            this._canModify = (xml2json.getTagValue(this._effectiveRights, "t:Modify", "false") == "true");
+            this._canRead = (xml2json.getTagValue(this._effectiveRights, "t:Read", "false") == "true");
+        }
+        else {
+            this._canDelete = this.calendar.canCreateContent;
+            this._canModify = this.calendar.canCreateContent;
+            this._canRead = this.calendar.canRead;
+        }
 
-		this._conferenceType = this.getTagValue("t:ConferenceType", null);
+        this._effectiveRights = null;
+        this._effectiveRights = true;
 
-		this._allowNewTimeProposal = (this.getTagValue("t:AllowNewTimeProposal", "false") == "true");
+        this._lastModifiedTime = this.tryToSetDateValueUTC(this.getTagValue("t:LastModifiedTime", null), null);
 
-		this._parentId = this.getAttributeByTag("t:ParentFolderId", "Id", null);
+        this._subject = this.getTagValue("t:Subject", null);
 
-		this._parentChangeKey = this.getAttributeByTag("t:ParentFolderId", "ChangeKey", null); 
-		
-		//MessageId of item used to locate mail item.
+        this._title = this.subject;
+        if (this._title) {
+            this._calEvent.title = this._title;
+        }
+
+        this._mimeContent = this.getTagValue("t:MimeContent", null);
+        if (this._mimeContent) {
+            this._mimeContentCharacterSet = xml2json.getAttribute(this.getTag("t:MimeContent"), "CharacterSet");
+        }
+
+        this._id = this.getAttributeByTag("t:ItemId", "Id", null);
+        if (this._id) {
+            this._calEvent.id = this._id;
+        }
+
+        this._priority = this.getTagValue("t:Importance", null);
+        switch (this._priority) {
+        case "Low":
+            this._calEvent.priority = 9;
+            break;
+        case "Normal":
+            this._calEvent.priority = 5;
+            break;
+        case "High":
+            this._calEvent.priority = 1;
+            break;
+        }
+
+        this._sensitivity = this.getTagValue("t:Sensitivity", null);
+
+        this._privacy = this.sensitivity;
+        if (this._privacy != null) {
+            switch (this._privacy) {
+            case "Normal":
+                this._calEvent.privacy = "PUBLIC";
+                break;
+            case "Confidential":
+                this._calEvent.privacy = "CONFIDENTIAL";
+                break;
+            case "Personal":
+                this._calEvent.privacy = "PRIVATE";
+                break;
+            case "Private":
+                this._calEvent.privacy = "PRIVATE";
+                break;
+            default:
+                this._calEvent.privacy = "PUBLIC";
+            }
+            this.setProperty("CLASS", this._calEvent.privacy);
+        }
+
+        this._reminderIsSet = (this.getTagValue("t:ReminderIsSet", "false") == "true");
+
+        if (this.className == "mivExchangeEvent") {
+            this._calendarItemType = this.getTagValue("t:CalendarItemType", undefined);
+        }
+        else {
+            this._calendarItemType = "Task";
+        }
+
+        this._reminderDueBy = this.tryToSetDateValueUTC(this.getTagValue("t:ReminderDueBy", null), null);
+
+        this._reminderMinutesBeforeStart = this.getTagValue("t:ReminderMinutesBeforeStart", 0);
+
+        this._dateTimeReceived = this.tryToSetDateValueUTC(this.getTagValue("t:DateTimeReceived", null), null);
+
+        this._dateTimeSent = this.tryToSetDateValueUTC(this.getTagValue("t:DateTimeSent", null), null);
+
+        this._size = this.getTagValue("t:Size", 0);
+
+        this._originalStart = this.tryToSetDateValueUTC(this.getTagValue("t:OriginalStart", null), null);
+
+        this._location = this.getTagValue("t:Location", null);
+
+        this._changeKey = this.getAttributeByTag("t:ItemId", "ChangeKey", null);
+
+        this._uid = this.getTagValue("t:UID", undefined);
+
+        this._itemClass = this.getTagValue("t:ItemClass", null);
+
+        this._isMeeting = (this.getTagValue("t:IsMeeting", "false") == "true");
+
+        this._isRecurring = (this.getTagValue("t:IsRecurring", "false") == "true");
+
+        this._meetingRequestWasSent = (this.getTagValue("t:MeetingRequestWasSent", "false") == "true");
+
+        this._isResponseRequested = (this.getTagValue("t:IsResponseRequested", "false") == "true");
+
+        this._myResponseType = this.getTagValue("t:MyResponseType", "NoResponseReceived");
+
+        this._startTimeZoneName = this.getAttributeByTag("t:StartTimeZone", "Name", null);
+
+        this._endTimeZoneName = this.getAttributeByTag("t:EndTimeZone", "Name", null);
+
+        this._conferenceType = this.getTagValue("t:ConferenceType", null);
+
+        this._allowNewTimeProposal = (this.getTagValue("t:AllowNewTimeProposal", "false") == "true");
+
+        this._parentId = this.getAttributeByTag("t:ParentFolderId", "Id", null);
+
+        this._parentChangeKey = this.getAttributeByTag("t:ParentFolderId", "ChangeKey", null);
+
+        //MessageId of item used to locate mail item.
         var messageIdElm = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1035']");
         if (messageIdElm.length > 0) {
-        	this._messageId =  xml2json.getTagValue(messageIdElm[0], "t:Value", null);
-		}  
-        else{
-        	this._messageId = null;
-        }
-        messageIdElm = null; 
-        
-		// Do the initializaton of this one.
-		this.preLoad(); 
-
-		this._alarm = null;
-		this._calEvent.clearAlarms();
-		switch (this.className) {
-		case "mivExchangeTodo":
-			if ((this.reminderIsSet) && (this.calendarItemType != "RecurringMaster")) {
-				//dump("Creating alarm in getAlarms: title:"+this.title+", this.reminderDueBy:"+this.reminderDueBy+"\n");
-				var alarm = cal.createAlarm();
-				alarm.action = "DISPLAY";
-				alarm.repeat = 0;
-				if (this.reminderDueBy) {
-					alarm.alarmDate = this.reminderDueBy.clone().getInTimezone(exchGlobalFunctions.ecDefaultTimeZone());
-					alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
-
-				}
-				else {
-					var alarmOffset = cal.createDuration();
-					alarmOffset.minutes = -1 * this.reminderMinutesBeforeStart;
-
-					// This is a bug fix for when the offset is more than a year)
-					if (alarmOffset.minutes < (-60*24*365)) {
-						alarmOffset.minutes = -5;
-					}
-					alarmOffset.normalize();
-
-					alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
-					alarm.offset = alarmOffset;
-
-				}
-
-				this._alarm = alarm.clone();
-				this._calEvent.addAlarm(alarm);
-			}
-			break;
-		case "mivExchangeEvent":
-		//	if ((this.reminderIsSet) && (this.reminderDueBy.compare(this.startDate) < 1) && (this.calendarItemType != "RecurringMaster")) {
-			if (this.reminderIsSet) {
-				var alarm = cal.createAlarm();
-				alarm.action = "DISPLAY";
-				alarm.repeat = 0;
-
-				var alarmOffset = cal.createDuration();
-				alarmOffset.minutes = -1 * this.reminderMinutesBeforeStart;
-
-				// This is a bug fix for when the offset is more than a year)
-				if (alarmOffset.minutes < (-60*24*365)) {
-					alarmOffset.minutes = -5;
-				}
-				alarmOffset.normalize();
-
-				alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
-				alarm.offset = alarmOffset;
-
-				//dump("getAlarms: Creating alarm in getAlarms: this.calendarItemType:"+this.calendarItemType+", alarm.offset="+alarmOffset.minutes+"\n");
-				this._alarm = alarm.clone();
-				this._calEvent.addAlarm(alarm);
-			}
-			else {
-				//dump("getAlarms: no alarm info in exchangeData.\n");
-			}
-			break;
-		}
-	
-		var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34144']");
-		if (tmpObject.length > 0) {
-//dump(this.title+"| /t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34144']:"+tmpObject[0].getTagValue("t:Value", null)+"\n");
-			this._reminderSignalTime = this.tryToSetDateValueUTC(xml2json.getTagValue(tmpObject[0], "t:Value", null), null);
-//dump(this.title+"| this._reminderSignalTime:"+this._reminderSignalTime+"\n");
-//dump(this.title+"| this._reminderSignalTime.icalString:"+this._reminderSignalTime.icalString+"\n");
-//dump(this.title+"| this.calendarItemType:"+this.calendarItemType+"\n");
-
-			//dump("Setting X-MOZ-SNOOZE-TIME by data in exchangedata", -1);
-			if (this.className == "mivExchangeEvent") {
-				switch (this.calendarItemType) {
-				case "RecurringMaster":
-					this._xMozSnoozeTime = this._reminderSignalTime.icalString;
-					break;
-				case "Single":
-
-					this._calEvent.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
-					//this.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
-					this._xMozSnoozeTime = this._reminderSignalTime.icalString;
-					break;
-				default:
-					//dump("Would like to set X-MOZ-SNOOZE-TIME for this.calendarItemType:"+this.calendarItemType);
-				}
-			}
-
-			if (this.className == "mivExchangeTodo") {
-				//dump("reminderSignalTime: title:"+this.title+", this.reminderSignalTime:"+this._reminderSignalTime+"\n");
-				this._calEvent.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
-				//this.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
-				this._xMozSnoozeTime = this._reminderSignalTime.icalString;
-			}
-		}
-		tmpObject = null;
-
-		try {
-			this._alarmLastAck = this.reminderSignalTime.clone();
-		}
-		catch(err){
-			this._alarmLastAck = this.tryToSetDateValueUTC("2030-01-01T00:00:00Z", null);
-		}
-		if (!this._alarmLastAck) {
-			this._alarmLastAck = this.tryToSetDateValueUTC("2030-01-01T00:00:00Z", null);
-		}
-
-		switch (this.calendarItemType) {
-		case "Exception":
-		case "Occurrence":
-			if (this.startDate) {
-				if (this.reminderDueBy) {
-					switch (this.reminderDueBy.compare(this.startDate)) {
-					case -1:
-						this._alarmLastAck = null;
-						break;					
-					case 0:
-						this._alarmLastAck.addDuration(cal.createDuration('-PT1S'));
-						break;					
-					case 1:
-						this._alarmLastAck = this.startDate.clone();
-						break;					
-					}
-				}
-				else {
-					this._alarmLastAck = null;
-				}
-			}
-			break;
-		case "Single":
-			this._alarmLastAck.addDuration(cal.createDuration('-PT1S'));
-			break;
-		default:
-			//dump("get alarmLastAck: this.calendarItemType:"+this.calendarItemType+"\n");
-		}
-		this._calEvent.alarmLastAck = this._alarmLastAck;
-
-		var recurrence = this.XPath("/t:Recurrence/*");
-		if (recurrence.length > 0) {
-			//dump("Recurrence::"+recurrence);
-			var recrule = this.readRecurrenceRule(recurrence);
-			recurrence = null;
-
-			if (recrule) {
-				//var recurrenceInfo = cal.createRecurrenceInfo(this);
-				this._recurrenceInfo = Cc["@1st-setup.nl/exchange/recurrenceinfo;1"]
-							.createInstance(Ci.mivExchangeRecurrenceInfo);
-
-				this._recurrenceInfo.item = this;
-
-				this._recurrenceInfo.setRecurrenceItems(1, [recrule]);
-
-				this._calEvent.recurrenceInfo = Cc["@1st-setup.nl/exchange/recurrenceinfo;1"]
-							.createInstance(Ci.mivExchangeRecurrenceInfo);
-
-				this._calEvent.recurrenceInfo.item = this;
-
-				this._calEvent.recurrenceInfo.setRecurrenceItems(1, [recrule]);
-
-				//this.parentItem = this;
-
-			}
-			else {
-				this._recurrenceInfo = null;
-//if( this.title == "SE overleg") {
-//					dump("get recurrenceInfo 2: title:"+this.title+", recurrence.length="+recurrence.length+", recrule:null, recurrence="+this.exchangeData.toString()+"\n");
-//}
-			}
-		}
-		else {
-			//dump("No Recurrence tag. this.title:"+this.title+"\n -- "+xml2json.toString(this.exchangeData)+"\n\n");
-			this._recurrenceInfo = null;
-		}
-
-		this._bodyType = this.getAttributeByTag("t:Body", "BodyType", "HTML");
-
-		this._body = this.getTagValue("t:Body", null);
-		//dump("get property 1a: title:"+this.title+", name:"+name+", this._body:"+this._body);
-		if (this._body) {
-			if (this._bodyType == "HTML") {
-				this._calEvent.setProperty("DESCRIPTION", exchGlobalFunctions.fromHTML2Text(this._body));
-			}
-			else {
-				this._calEvent.setProperty("DESCRIPTION", this._body);
-				this._body = exchGlobalFunctions.fromText2HTML(this._body);
-			}
-		}
-		this._bodyType = "HTML";
-
-		this._dateTimeCreated = this.tryToSetDateValueUTC(this.getTagValue("t:DateTimeCreated", null), null);
-
-		this._created = this.dateTimeCreated;
-		//dump("get property 1a: title:"+this.title+", name:"+name+", this._body:"+this._body);
-		if (this._created) {
-			this._calEvent.setProperty("CREATED", this._created);
-		}
-
-		this._legacyFreeBusyStatus = this.getTagValue("t:LegacyFreeBusyStatus", null);
-
-		switch (this.legacyFreeBusyStatus) {
-		case "Free" : 
-			this._calEvent.setProperty("TRANSP", "TRANSPARENT");
-			break;
-		case "Busy" : 
-		case "Tentative" : 
-		case "OOF" : 
-			this._calEvent.setProperty("TRANSP", "OPAQUE");
-			break;
-		}
-
-		this._isCancelled = (this.getTagValue("t:IsCancelled", "false") == "true");
-
-		if (this._className == "mivExchangeEvent") {
-			if (!this._myResponseType) {
-				if (this.isCancelled) {
-					this._calEvent.setProperty("STATUS", "CANCELLED");
-				}
-				else {
-					switch (this.myResponseType) {
-					case "Unknown" : 
-						this._calEvent.setProperty("STATUS", "NONE");
-						break;
-					case "Organizer" : 
-						this._calEvent.setProperty("STATUS", "CONFIRMED");
-						break;
-					case "Tentative" : 
-						this._calEvent.setProperty("STATUS", "TENTATIVE");
-						break;
-					case "Accept" : 
-						this._calEvent.setProperty("STATUS", "CONFIRMED");
-						break;
-					case "Decline" : 
-						this._calEvent.setProperty("STATUS", "CANCELLED");
-						break;
-					case "NoResponseReceived" : 
-						this._calEvent.setProperty("STATUS", "NONE");
-						break;
-					default:
-						//this._calEvent.setProperty("STATUS", "NONE");
-						break;
-					}
-				}
-			}
-		}
-
-
-		this._responseObjects = {};
-
-		var responseObjects = this.XPath("/t:ResponseObjects/*");
-		for each (var prop in responseObjects) {
-			this._responseObjects[prop.tagName] = true;
-		}
-		responseObjects = null;
-
-		this._type = this._exchangeData.tagName;
-
-		if ( ((this.responseObjects) && ((this.responseObjects.AcceptItem) ||
-		    (this.responseObjects.TentativelyAcceptItem) ||
-		    (this.responseObjects.DeclineItem)) ) ||
-		    (this.type == "MeetingRequest")) {
-			this._calEvent.setProperty("X-MOZ-SEND-INVITATIONS", true);
-		}
-		else {
-			this._calEvent.setProperty("X-MOZ-SEND-INVITATIONS", false);
-		}
-
-//		this._organizer = this.createAttendee(this.getTag("t:Organizer"), "CHAIR");
-		this._organizer = this.createAttendee(this.getTag("t:Organizer"), null);
-		if (this._organizer) {
-			this._organizer.isOrganizer = true;
-			this._calEvent.organizer = this._organizer;
-		}
-
-		this._attendees = [];
-		var tmpAttendee;
-
-		this._calEvent.removeAllAttendees();
-
-		var attendees = this.XPath("/t:RequiredAttendees/t:Attendee")
-		for each (var at in attendees) {
-			tmpAttendee = this.createAttendee(at, "REQ-PARTICIPANT");
-			this._calEvent.addAttendee(tmpAttendee);
-			//dump("getAttendees: title:"+this.title+", adding required attendee.id:"+tmpAttendee.id+"\n");
-			this._attendees.push(tmpAttendee.clone());
-			this._reqParticipants = true;
-		}
-		attendees = null;
-		attendees = this.XPath("/t:OptionalAttendees/t:Attendee")
-		for each (var at in attendees) {
-			tmpAttendee = this.createAttendee(at, "OPT-PARTICIPANT");
-			this._calEvent.addAttendee(tmpAttendee);
-			//dump("getAttendees: title:"+this.title+", adding optional attendee.id:"+tmpAttendee.id+"\n");
-			this._attendees.push(tmpAttendee.clone());
-			this._optParticipants = true;
-		}
-		attendees = null;
-
-		this._hasAttachments = (this.getTagValue("t:HasAttachments", "false") == "true");
-
-		this._attachments = [];
-		if (this.hasAttachments) {
-			var fileAttachments = this.XPath("/t:Attachments/t:FileAttachment");
-			for each(var fileAttachment in fileAttachments) {
-				var newAttachment = cal.createAttachment();
-				newAttachment.setParameter("X-AttachmentId",xml2json.getAttributeByTag(fileAttachment, "t:AttachmentId","Id")); 
-				newAttachment.uri = cal.makeURL("http://somewhere/?id="+encodeURIComponent(xml2json.getAttributeByTag(fileAttachment, "t:AttachmentId","Id"))+"&name="+encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:Name"))+"&size="+encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:Size", ""))+"&calendarid="+encodeURIComponent(this.calendar.id)+"&isinline="+encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:IsInline", "false"))+"&contentid="+encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:ContentId", "<NOPE>")));
-
-				this._attachments.push(newAttachment.clone());
-				this._calEvent.addAttachment(newAttachment);
-			}
-			fileAttachments = null;
-		} 
-
-		this._categories = [];
-		var strings = this.XPath("/t:Categories/t:String");
-		for each (var cat in strings) {
-			this._categories.push(xml2json.getValue(cat));
-		}
-		strings = null;
-		this._calEvent.setCategories(this._categories.length, this._categories);
-
-		this._recurrenceId = this.tryToSetDateValueUTC(this.getTagValue("t:RecurrenceId", null), this._calEvent.recurrenceId);
-		if (this._recurrenceId) {
-			this._recurrenceId.isDate = true;
-			this._calEvent.recurrenceId = this._recurrenceId;
-		}
-
-		// End of afterPre initialization
-
-		this.postLoad();
-
-		this._exchangeXML = true;
-		this._exchangeData = null;
-		
-	},
-
-	get exchangeXML()
-	{
-		return this._exchangeXML;
-	},
-
-	preLoad: function _preLoad() 
-	{
-	},
-
-	postLoad: function _postLoad()
-	{
-	},
-
-	convertToExchange: function _convertToExchange() 
-	{
-	},
-
-	set body(aValue)
-	{
-		//dump("set body aValue:"+aValue+"\n");
-		this._newBody2 = aValue;
-		if (this.bodyType == "HTML") {
-			this._calEvent.setProperty("DESCRIPTION", exchGlobalFunctions.fromHTML2Text(aValue));
-		}
-		else {
-			this._calEvent.setProperty("DESCRIPTION", aValue);
-			this._newBody2 = exchGlobalFunctions.fromText2HTML(aValue);
-		}
-	},
-
-	get body()
-	{
-		if (this._newBody2) {
-			return this._newBody2;
-		}
-
-		if (!this._body) {
-			return "<HTML><BODY></BODY></HTML>";
-		}
-
-		return this._body;
-	},
-
-	set bodyType(aValue)
-	{
-		if ((aValue != "HTML") && (aValue != "Text")) {
-			return;
-		}
-		this._newBodyType = aValue;
-	},
-
-	get bodyType()
-	{
-		if (this._newBodyType) {
-			return this._newBodyType;
-		}
-		return this._bodyType;
-	},
-
-	//attribute long occurrenceIndex;
-	get occurrenceIndex()
-	{
-		if (this._occurrenceIndex) {
-			return this._occurrenceIndex;
-		}
-
-		return -1;
-	},
-
-	set occurrenceIndex(aValue)
-	{
-		if (aValue != this._occurrenceIndex) {
-			this._occurrenceIndex = aValue;
-		}
-	},
-
-	addUpdateXMLField: function _addUpdateXMLField(updateType, parentItem, aField, aValue, aAttributes, aValueIsComplete)
-	{
-		var setItemField = parentItem.addChildTag(updateType, "t", null);
-		if (aField != "ExtendedFieldURI") {
-			var fieldURI = setItemField.addChildTag("FieldURI", "t", null);
-
-			if ((this.className == "mivExchangeTodo") && (aField == "Recurrence")) {
-				fieldURI.setAttribute("FieldURI", "task:"+aField);
-			}
-			else {
-				fieldURI.setAttribute("FieldURI", fieldPathMap[aField]+":"+aField);
-			}
-
-			if ((aValue !== null) && (aValue !== undefined)) {
-				try {
-					if (aValue.QueryInterface(Ci.mivIxml2jxon)) {
-						if (aValueIsComplete) {
-							var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTagObject(aValue);
-						}
-						else {
-							var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", null).addChildTagObject(aValue);
-						}
-					}
-					else {
-						var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", aValue);
-					}
-				}
-				catch(err) {
-					var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", aValue);
-				}
-
-				if (aAttributes) {
-					for (var attribute in aAttributes) {
-						fieldValue.setAttribute(attribute, aAttributes[attribute]);
-					}
-				}
-			}
-			else {
-				if (updateType == "SetItemField") {
-					var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", aValue);
-
-					if (aAttributes) {
-						for (var attribute in aAttributes) {
-							fieldValue.setAttribute(attribute, aAttributes[attribute]);
-						}
-					}
-				}
-			}
-		}
-		else {
-
-			var extFieldURI = setItemField.addChildTag("ExtendedFieldURI", "t", null);
-			if (aAttributes) {
-				for (var attribute in aAttributes) {
-					extFieldURI.setAttribute(attribute, aAttributes[attribute]);
-				}
-			}
-
-			var extProp = setItemField.addChildTag(this._mainTag, "t", null).addChildTag("ExtendedProperty", "t", null);
-			extProp.addChildTagObject(extFieldURI);
-			extProp.addChildTag("Value", "t", aValue);
-		}
-
-	},
-
-	addSetItemField: function _addSetItemField(parentItem, aField, aValue, aAttributes, aValueIsComplete)
-	{
-		this.addUpdateXMLField("SetItemField", parentItem, aField, aValue, aAttributes, aValueIsComplete);
-	},
-
-	addDeleteItemField: function _addDeleteItemField(parentItem, aField)
-	{
-		this.addUpdateXMLField("DeleteItemField", parentItem, aField);
-	},
-
-	getAlarmTime: function _getAlarmTime()
-	{
-		var alarms = this.getAlarms({});		
-
-		var alarm;
-		if (alarms.length > 0) {
-			alarm = alarms[0];
-		}
-		if (!alarm) {
-			return null;
-		}
-
-		switch (alarm.related) {
-		case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-			var alarmTime = alarm.alarmDate;
-			break;
-		case Ci.calIAlarm.ALARM_RELATED_START:
-			var alarmTime = this.startDate.clone();
-			alarmTime.addDuration(alarm.offset);
-			break;
-		case Ci.calIAlarm.ALARM_RELATED_END:
-			var alarmTime = this.endDate.clone();
-			alarmTime.addDuration(alarm.offset);
-			break;
-		}
-
-		alarmTime = alarmTime.getInTimezone(cal.UTC());
-
-		return alarmTime;
-	},
-
-	makeRecurrenceRule: function _makeRecurrenceRule()
-	{
-		if (!this.parentItem) {
-			return;
-		}
-try{
-		if (!this.recurrenceInfo || this.parentItem.id != this.id) {
-			if (!this.recurrenceInfo) {
-			}
-			if (this.parentItem.id != this.id) {
-			}
-			return;
-		}
-
-		var recurrenceItems = this.recurrenceInfo.getRecurrenceItems({});
-		var rrule = null;
-		for each (var ritem in recurrenceItems) {
-			if (ritem instanceof Ci.calIRecurrenceRule) {
-				rrule = ritem;
-				break;
-			}
-		}
-
-		if (!rrule) {
-			// XXX exception?
-			//dump("makeRecurrenceRule: We have no rrule");
-			return;
-		}
-
-		var r = exchGlobalFunctions.xmlToJxon('<t:Recurrence xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-
-		//var r = updates.addChildTag("Recurrence", "t", null);
-
-		/* can't get parameters of RRULEs... have to do it manually :/ */
-		var prop = {};
-		for each (let ps in rrule.icalProperty.value.split(';')) {
-			let m = ps.split('=');
-			prop[m[0]] = m[1];
-		}
-
-		var startDate;
-		var originalDate;
-		if (cal.isEvent(this)) {
-//dump(" GoGo 2\n");
-			startDate = this.startDate.clone();
-			originalDate = this.startDate.clone();
-		}
-		else {
-			if (this.entryDate) {
-				startDate = this.entryDate.clone();
-				startDate.isDate = false;
-				originalDate = this.entryDate.clone();
-			}
-		}
-
-		if (startDate) {
-			startDate = startDate.clone();
-		}
-		else {
-			startDate = cal.now();
-			originalDate = cal.now();
-		}
-		startDate.isDate = true;
-	
-		prop["BYMONTHDAY"] = prop["BYMONTHDAY"] || startDate.day;
-		prop["BYMONTH"] = prop["BYMONTH"] || (startDate.month + 1);
-
-		switch (rrule.type) {
-		case 'YEARLY':
-			if (prop["BYDAY"]) {
-				var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
-				var ryr = r.addChildTag("RelativeYearlyRecurrence", "t", null);
-				ryr.addChildTag("DaysOfWeek", "t", dayRevMap[m[2]]);
-				ryr.addChildTag("DayOfWeekIndex", "t", dayRevMap[m[1]]);
-				ryr.addChildTag("Month", "t", monthIdxMap[prop["BYMONTH"] - 1]);
-			} else {
-				var ayr = r.addChildTag("AbsoluteYearlyRecurrence", "t", null);
-				ayr.addChildTag("DayOfMonth", "t", prop["BYMONTHDAY"]);
-				ayr.addChildTag("Month", "t", monthIdxMap[prop["BYMONTH"] - 1]);
-			}
-			break;
-		case 'MONTHLY':
-			if (prop["BYDAY"]) {
-				var rmr = r.addChildTag("RelativeMonthlyRecurrence", "t", null);				
-				rmr.addChildTag("Interval", "t", rrule.interval);
-				var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
-				rmr.addChildTag("DaysOfWeek", "t", dayRevMap[m[2]]);
-				rmr.addChildTag("DayOfWeekIndex", "t", weekRevMap[m[1]]);
-			} else {
-				var amr = r.addChildTag("AbsoluteMonthlyRecurrence", "t", null);
-				amr.addChildTag("Interval", "t", rrule.interval);
-				amr.addChildTag("DayOfMonth", "t", prop["BYMONTHDAY"]);
-			}
-			break;
-		case 'WEEKLY':
-			var wr = r.addChildTag("WeeklyRecurrence", "t", null);
-			wr.addChildTag("Interval", "t", rrule.interval);
-			var days = [];
-			var daystr = prop["BYDAY"] || dayIdxMap[startDate.weekday];
-			for each (let day in daystr.split(",")) {
-				days.push(dayRevMap[day]);
-			}
-			wr.addChildTag("DaysOfWeek", "t", days.join(' '));
-			break;
-		case 'DAILY':
-			var dr = r.addChildTag("DailyRecurrence", "t", null);
-			dr.addChildTag("Interval", "t", rrule.interval);
-			break;
-		}
-
-		if (cal.isEvent(this)) {
-//			var startDateStr = cal.toRFC3339(startDate.getInTimezone(exchGlobalFunctions.ecUTC()))+"Z";
-			var startDateStr = cal.toRFC3339(startDate.getInTimezone(exchGlobalFunctions.ecUTC()));
-			//var startDateStr = cal.toRFC3339(originalDate.getInTimezone(exchGlobalFunctions.ecUTC()));
-		}
-		else {
-			// We make a non-UTC datetime value for exchGlobalFunctions.
-			// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-			//LOG("  ==== tmpStart:"+cal.toRFC3339(tmpStart));
-			var startDateStr = cal.toRFC3339(startDate).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
-		}
-
-		if (rrule.isByCount && rrule.count != -1) {
-			var nr = r.addChildTag("NumberedRecurrence", "t", null);
-			nr.addChildTag("StartDate", "t", startDateStr);
-			nr.addChildTag("NumberOfOccurrences", "t", rrule.count);
-		} else if (!rrule.isByCount && rrule.untilDate) {
-
-			var endDate = rrule.untilDate.clone();
-			if (cal.isEvent(this)) {
-				endDate.isDate = true;
-				var endDateStr = cal.toRFC3339(endDate.getInTimezone(exchGlobalFunctions.ecUTC()));
-			}
-			else {
-				if (!endDate.isDate) {
-					endDate.isDate = true;
-					endDate.isDate = false;
-					var tmpDuration = cal.createDuration();
-					tmpDuration.days = 1;
-					endDate.addDuration(tmpDuration);
-
-					endDate.isDate = true;
-				}
-				var endDateStr = cal.toRFC3339(endDate).substr(0, 19); //cal.toRFC3339(tmpEnd).length-6);
-			}
-			var edr = r.addChildTag("EndDateRecurrence", "t", null);
-			edr.addChildTag("StartDate", "t", startDateStr);
-			edr.addChildTag("EndDate", "t", endDateStr);
-		} else {
-			var ner = r.addChildTag("NoEndRecurrence", "t", null);
-			ner.addChildTag("StartDate", "t", startDateStr);
-		}
-
-		return r;
-}
-catch(err){
-dump("Error2:"+err+" | "+exchGlobalFunctions.STACK()+"\n");
-}
+            this._messageId = xml2json.getTagValue(messageIdElm[0], "t:Value", null);
+        }
+        else {
+            this._messageId = null;
+        }
+        messageIdElm = null;
+
+        // Do the initializaton of this one.
+        this.preLoad();
+
+        this._alarm = null;
+        this._calEvent.clearAlarms();
+        switch (this.className) {
+        case "mivExchangeTodo":
+            if ((this.reminderIsSet) && (this.calendarItemType != "RecurringMaster")) {
+                //dump("Creating alarm in getAlarms: title:"+this.title+", this.reminderDueBy:"+this.reminderDueBy+"\n");
+                var alarm = cal.createAlarm();
+                alarm.action = "DISPLAY";
+                alarm.repeat = 0;
+                if (this.reminderDueBy) {
+                    alarm.alarmDate = this.reminderDueBy.clone().getInTimezone(exchGlobalFunctions.ecDefaultTimeZone());
+                    alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
+
+                }
+                else {
+                    var alarmOffset = cal.createDuration();
+                    alarmOffset.minutes = -1 * this.reminderMinutesBeforeStart;
+
+                    // This is a bug fix for when the offset is more than a year)
+                    if (alarmOffset.minutes < (-60 * 24 * 365)) {
+                        alarmOffset.minutes = -5;
+                    }
+                    alarmOffset.normalize();
+
+                    alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
+                    alarm.offset = alarmOffset;
+
+                }
+
+                this._alarm = alarm.clone();
+                this._calEvent.addAlarm(alarm);
+            }
+            break;
+        case "mivExchangeEvent":
+            //	if ((this.reminderIsSet) && (this.reminderDueBy.compare(this.startDate) < 1) && (this.calendarItemType != "RecurringMaster")) {
+            if (this.reminderIsSet) {
+                var alarm = cal.createAlarm();
+                alarm.action = "DISPLAY";
+                alarm.repeat = 0;
+
+                var alarmOffset = cal.createDuration();
+                alarmOffset.minutes = -1 * this.reminderMinutesBeforeStart;
+
+                // This is a bug fix for when the offset is more than a year)
+                if (alarmOffset.minutes < (-60 * 24 * 365)) {
+                    alarmOffset.minutes = -5;
+                }
+                alarmOffset.normalize();
+
+                alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
+                alarm.offset = alarmOffset;
+
+                //dump("getAlarms: Creating alarm in getAlarms: this.calendarItemType:"+this.calendarItemType+", alarm.offset="+alarmOffset.minutes+"\n");
+                this._alarm = alarm.clone();
+                this._calEvent.addAlarm(alarm);
+            }
+            else {
+                //dump("getAlarms: no alarm info in exchangeData.\n");
+            }
+            break;
+        }
+
+        var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34144']");
+        if (tmpObject.length > 0) {
+            //dump(this.title+"| /t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34144']:"+tmpObject[0].getTagValue("t:Value", null)+"\n");
+            this._reminderSignalTime = this.tryToSetDateValueUTC(xml2json.getTagValue(tmpObject[0], "t:Value", null), null);
+            //dump(this.title+"| this._reminderSignalTime:"+this._reminderSignalTime+"\n");
+            //dump(this.title+"| this._reminderSignalTime.icalString:"+this._reminderSignalTime.icalString+"\n");
+            //dump(this.title+"| this.calendarItemType:"+this.calendarItemType+"\n");
+
+            //dump("Setting X-MOZ-SNOOZE-TIME by data in exchangedata", -1);
+            if (this.className == "mivExchangeEvent") {
+                switch (this.calendarItemType) {
+                case "RecurringMaster":
+                    this._xMozSnoozeTime = this._reminderSignalTime.icalString;
+                    break;
+                case "Single":
+
+                    this._calEvent.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
+                    //this.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
+                    this._xMozSnoozeTime = this._reminderSignalTime.icalString;
+                    break;
+                default:
+                    //dump("Would like to set X-MOZ-SNOOZE-TIME for this.calendarItemType:"+this.calendarItemType);
+                }
+            }
+
+            if (this.className == "mivExchangeTodo") {
+                //dump("reminderSignalTime: title:"+this.title+", this.reminderSignalTime:"+this._reminderSignalTime+"\n");
+                this._calEvent.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
+                //this.setProperty("X-MOZ-SNOOZE-TIME", this._reminderSignalTime.icalString);
+                this._xMozSnoozeTime = this._reminderSignalTime.icalString;
+            }
+        }
+        tmpObject = null;
+
+        try {
+            this._alarmLastAck = this.reminderSignalTime.clone();
+        }
+        catch (err) {
+            this._alarmLastAck = this.tryToSetDateValueUTC("2030-01-01T00:00:00Z", null);
+        }
+        if (!this._alarmLastAck) {
+            this._alarmLastAck = this.tryToSetDateValueUTC("2030-01-01T00:00:00Z", null);
+        }
+
+        switch (this.calendarItemType) {
+        case "Exception":
+        case "Occurrence":
+            if (this.startDate) {
+                if (this.reminderDueBy) {
+                    switch (this.reminderDueBy.compare(this.startDate)) {
+                    case -1:
+                        this._alarmLastAck = null;
+                        break;
+                    case 0:
+                        this._alarmLastAck.addDuration(cal.createDuration('-PT1S'));
+                        break;
+                    case 1:
+                        this._alarmLastAck = this.startDate.clone();
+                        break;
+                    }
+                }
+                else {
+                    this._alarmLastAck = null;
+                }
+            }
+            break;
+        case "Single":
+            this._alarmLastAck.addDuration(cal.createDuration('-PT1S'));
+            break;
+        default:
+            //dump("get alarmLastAck: this.calendarItemType:"+this.calendarItemType+"\n");
+        }
+        this._calEvent.alarmLastAck = this._alarmLastAck;
+
+        var recurrence = this.XPath("/t:Recurrence/*");
+        if (recurrence.length > 0) {
+            //dump("Recurrence::"+recurrence);
+            var recrule = this.readRecurrenceRule(recurrence);
+            recurrence = null;
+
+            if (recrule) {
+                //var recurrenceInfo = cal.createRecurrenceInfo(this);
+                this._recurrenceInfo = Cc["@1st-setup.nl/exchange/recurrenceinfo;1"]
+                    .createInstance(Ci.mivExchangeRecurrenceInfo);
+
+                this._recurrenceInfo.item = this;
+
+                this._recurrenceInfo.setRecurrenceItems(1, [recrule]);
+
+                this._calEvent.recurrenceInfo = Cc["@1st-setup.nl/exchange/recurrenceinfo;1"]
+                    .createInstance(Ci.mivExchangeRecurrenceInfo);
+
+                this._calEvent.recurrenceInfo.item = this;
+
+                this._calEvent.recurrenceInfo.setRecurrenceItems(1, [recrule]);
+
+                //this.parentItem = this;
+
+            }
+            else {
+                this._recurrenceInfo = null;
+                //if( this.title == "SE overleg") {
+                //					dump("get recurrenceInfo 2: title:"+this.title+", recurrence.length="+recurrence.length+", recrule:null, recurrence="+this.exchangeData.toString()+"\n");
+                //}
+            }
+        }
+        else {
+            //dump("No Recurrence tag. this.title:"+this.title+"\n -- "+xml2json.toString(this.exchangeData)+"\n\n");
+            this._recurrenceInfo = null;
+        }
+
+        this._bodyType = this.getAttributeByTag("t:Body", "BodyType", "HTML");
+
+        this._body = this.getTagValue("t:Body", null);
+        //dump("get property 1a: title:"+this.title+", name:"+name+", this._body:"+this._body);
+        if (this._body) {
+            if (this._bodyType == "HTML") {
+                this._calEvent.setProperty("DESCRIPTION", exchGlobalFunctions.fromHTML2Text(this._body));
+            }
+            else {
+                this._calEvent.setProperty("DESCRIPTION", this._body);
+                this._body = exchGlobalFunctions.fromText2HTML(this._body);
+            }
+        }
+        this._bodyType = "HTML";
+
+        this._dateTimeCreated = this.tryToSetDateValueUTC(this.getTagValue("t:DateTimeCreated", null), null);
+
+        this._created = this.dateTimeCreated;
+        //dump("get property 1a: title:"+this.title+", name:"+name+", this._body:"+this._body);
+        if (this._created) {
+            this._calEvent.setProperty("CREATED", this._created);
+        }
+
+        this._legacyFreeBusyStatus = this.getTagValue("t:LegacyFreeBusyStatus", null);
+
+        switch (this.legacyFreeBusyStatus) {
+        case "Free":
+            this._calEvent.setProperty("TRANSP", "TRANSPARENT");
+            break;
+        case "Busy":
+        case "Tentative":
+        case "OOF":
+            this._calEvent.setProperty("TRANSP", "OPAQUE");
+            break;
+        }
+
+        this._isCancelled = (this.getTagValue("t:IsCancelled", "false") == "true");
+
+        if (this._className == "mivExchangeEvent") {
+            if (!this._myResponseType) {
+                if (this.isCancelled) {
+                    this._calEvent.setProperty("STATUS", "CANCELLED");
+                }
+                else {
+                    switch (this.myResponseType) {
+                    case "Unknown":
+                        this._calEvent.setProperty("STATUS", "NONE");
+                        break;
+                    case "Organizer":
+                        this._calEvent.setProperty("STATUS", "CONFIRMED");
+                        break;
+                    case "Tentative":
+                        this._calEvent.setProperty("STATUS", "TENTATIVE");
+                        break;
+                    case "Accept":
+                        this._calEvent.setProperty("STATUS", "CONFIRMED");
+                        break;
+                    case "Decline":
+                        this._calEvent.setProperty("STATUS", "CANCELLED");
+                        break;
+                    case "NoResponseReceived":
+                        this._calEvent.setProperty("STATUS", "NONE");
+                        break;
+                    default:
+                        //this._calEvent.setProperty("STATUS", "NONE");
+                        break;
+                    }
+                }
+            }
+        }
+
+
+        this._responseObjects = {};
+
+        var responseObjects = this.XPath("/t:ResponseObjects/*");
+        for each(var prop in responseObjects) {
+            this._responseObjects[prop.tagName] = true;
+        }
+        responseObjects = null;
+
+        this._type = this._exchangeData.tagName;
+
+        if (((this.responseObjects) && ((this.responseObjects.AcceptItem)
+                || (this.responseObjects.TentativelyAcceptItem)
+                || (this.responseObjects.DeclineItem)))
+            || (this.type == "MeetingRequest")) {
+            this._calEvent.setProperty("X-MOZ-SEND-INVITATIONS", true);
+        }
+        else {
+            this._calEvent.setProperty("X-MOZ-SEND-INVITATIONS", false);
+        }
+
+        //		this._organizer = this.createAttendee(this.getTag("t:Organizer"), "CHAIR");
+        this._organizer = this.createAttendee(this.getTag("t:Organizer"), null);
+        if (this._organizer) {
+            this._organizer.isOrganizer = true;
+            this._calEvent.organizer = this._organizer;
+        }
+
+        this._attendees = [];
+        var tmpAttendee;
+
+        this._calEvent.removeAllAttendees();
+
+        var attendees = this.XPath("/t:RequiredAttendees/t:Attendee")
+        for each(var at in attendees) {
+            tmpAttendee = this.createAttendee(at, "REQ-PARTICIPANT");
+            this._calEvent.addAttendee(tmpAttendee);
+            //dump("getAttendees: title:"+this.title+", adding required attendee.id:"+tmpAttendee.id+"\n");
+            this._attendees.push(tmpAttendee.clone());
+            this._reqParticipants = true;
+        }
+        attendees = null;
+        attendees = this.XPath("/t:OptionalAttendees/t:Attendee")
+        for each(var at in attendees) {
+            tmpAttendee = this.createAttendee(at, "OPT-PARTICIPANT");
+            this._calEvent.addAttendee(tmpAttendee);
+            //dump("getAttendees: title:"+this.title+", adding optional attendee.id:"+tmpAttendee.id+"\n");
+            this._attendees.push(tmpAttendee.clone());
+            this._optParticipants = true;
+        }
+        attendees = null;
+
+        this._hasAttachments = (this.getTagValue("t:HasAttachments", "false") == "true");
+
+        this._attachments = [];
+        if (this.hasAttachments) {
+            var fileAttachments = this.XPath("/t:Attachments/t:FileAttachment");
+            for each(var fileAttachment in fileAttachments) {
+                var newAttachment = cal.createAttachment();
+                newAttachment.setParameter("X-AttachmentId", xml2json.getAttributeByTag(fileAttachment, "t:AttachmentId", "Id"));
+                newAttachment.uri = cal.makeURL("http://somewhere/?id=" + encodeURIComponent(xml2json.getAttributeByTag(fileAttachment, "t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:Name")) + "&size=" + encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:Size", "")) + "&calendarid=" + encodeURIComponent(this.calendar.id) + "&isinline=" + encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:IsInline", "false")) + "&contentid=" + encodeURIComponent(xml2json.getTagValue(fileAttachment, "t:ContentId", "<NOPE>")));
+
+                this._attachments.push(newAttachment.clone());
+                this._calEvent.addAttachment(newAttachment);
+            }
+            fileAttachments = null;
+        }
+
+        this._categories = [];
+        var strings = this.XPath("/t:Categories/t:String");
+        for each(var cat in strings) {
+            this._categories.push(xml2json.getValue(cat));
+        }
+        strings = null;
+        this._calEvent.setCategories(this._categories.length, this._categories);
+
+        this._recurrenceId = this.tryToSetDateValueUTC(this.getTagValue("t:RecurrenceId", null), this._calEvent.recurrenceId);
+        if (this._recurrenceId) {
+            this._recurrenceId.isDate = true;
+            this._calEvent.recurrenceId = this._recurrenceId;
+        }
+
+        // End of afterPre initialization
+
+        this.postLoad();
+
+        this._exchangeXML = true;
+        this._exchangeData = null;
+
+    },
+
+    get exchangeXML() {
+        return this._exchangeXML;
+    },
+
+    preLoad: function _preLoad() {},
+
+    postLoad: function _postLoad() {},
+
+    convertToExchange: function _convertToExchange() {},
+
+    set body(aValue) {
+        //dump("set body aValue:"+aValue+"\n");
+        this._newBody2 = aValue;
+        if (this.bodyType == "HTML") {
+            this._calEvent.setProperty("DESCRIPTION", exchGlobalFunctions.fromHTML2Text(aValue));
+        }
+        else {
+            this._calEvent.setProperty("DESCRIPTION", aValue);
+            this._newBody2 = exchGlobalFunctions.fromText2HTML(aValue);
+        }
+    },
+
+    get body() {
+        if (this._newBody2) {
+            return this._newBody2;
+        }
+
+        if (!this._body) {
+            return "<HTML><BODY></BODY></HTML>";
+        }
+
+        return this._body;
+    },
+
+    set bodyType(aValue) {
+        if ((aValue != "HTML") && (aValue != "Text")) {
+            return;
+        }
+        this._newBodyType = aValue;
+    },
+
+    get bodyType() {
+        if (this._newBodyType) {
+            return this._newBodyType;
+        }
+        return this._bodyType;
+    },
+
+    //attribute long occurrenceIndex;
+    get occurrenceIndex() {
+        if (this._occurrenceIndex) {
+            return this._occurrenceIndex;
+        }
+
+        return -1;
+    },
+
+    set occurrenceIndex(aValue) {
+        if (aValue != this._occurrenceIndex) {
+            this._occurrenceIndex = aValue;
+        }
+    },
+
+    addUpdateXMLField: function _addUpdateXMLField(updateType, parentItem, aField, aValue, aAttributes, aValueIsComplete) {
+        var setItemField = parentItem.addChildTag(updateType, "t", null);
+        if (aField != "ExtendedFieldURI") {
+            var fieldURI = setItemField.addChildTag("FieldURI", "t", null);
+
+            if ((this.className == "mivExchangeTodo") && (aField == "Recurrence")) {
+                fieldURI.setAttribute("FieldURI", "task:" + aField);
+            }
+            else {
+                fieldURI.setAttribute("FieldURI", fieldPathMap[aField] + ":" + aField);
+            }
+
+            if ((aValue !== null) && (aValue !== undefined)) {
+                try {
+                    if (aValue.QueryInterface(Ci.mivIxml2jxon)) {
+                        if (aValueIsComplete) {
+                            var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTagObject(aValue);
+                        }
+                        else {
+                            var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", null).addChildTagObject(aValue);
+                        }
+                    }
+                    else {
+                        var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", aValue);
+                    }
+                }
+                catch (err) {
+                    var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", aValue);
+                }
+
+                if (aAttributes) {
+                    for (var attribute in aAttributes) {
+                        fieldValue.setAttribute(attribute, aAttributes[attribute]);
+                    }
+                }
+            }
+            else {
+                if (updateType == "SetItemField") {
+                    var fieldValue = setItemField.addChildTag(this._mainTag, "t", null).addChildTag(aField, "t", aValue);
+
+                    if (aAttributes) {
+                        for (var attribute in aAttributes) {
+                            fieldValue.setAttribute(attribute, aAttributes[attribute]);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+
+            var extFieldURI = setItemField.addChildTag("ExtendedFieldURI", "t", null);
+            if (aAttributes) {
+                for (var attribute in aAttributes) {
+                    extFieldURI.setAttribute(attribute, aAttributes[attribute]);
+                }
+            }
+
+            var extProp = setItemField.addChildTag(this._mainTag, "t", null).addChildTag("ExtendedProperty", "t", null);
+            extProp.addChildTagObject(extFieldURI);
+            extProp.addChildTag("Value", "t", aValue);
+        }
 
-		/* We won't write WKST/FirstDayOfWeek for now because it is Exchange 2010 and up */
-	},
-
-	get updateXML()
-	{
-		this._nonPersonalDataChanged = false;
-
-		var updates = exchGlobalFunctions.xmlToJxon('<t:Updates xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-		//dump("updates:"+updates.toString()+"\n");
-		return updates;
-	},
-
-	get nonPersonalDataChanged()
-	{
-		return this._nonPersonalDataChanged;
-	},
-
-	getOccurrenceByNativeId: function _getOccurrenceByNativeId(aNativeId)
-	{
-		var result = null;
-		for (var index in this._exceptions) {
-			if (this._exceptions[index].recurrenceId.nativeTime == aNativeId) {
-				// found the exception for which the alarm was snoozed.
-				result = this._exceptions[index];
-				break;
-			}
-		}
-
-		if (!result) {
-			for (var index in this._occurrences) {
-				if (this._occurrences[index].recurrenceId.nativeTime == aNativeId) {
-					// found the occurrence for which the alarm was snoozed.
-					result = this._occurrences[index];
-					break;
-				}
-			}
-		}
-
-		return result;					
-	},
-
-	checkAlarmChange: function _checkAlarmChange(updates)
-	{
-		var reminderIsSetChanged = undefined;
-		var newReminderMinutesBeforeStart = undefined;
-		this.reminderMinutesBeforeStart; // To have is initialized.
-		// Alarm
-		if (this._newAlarm !== undefined) {
-			dump("checkAlarmChange:"+this.title+ ",  Alarm was changed: " + this._newAlarm+ ".\n");
-			// Alarm was changed.
-			if (this._newAlarm === null) {
-				// Alarm was removed.
-				//dump("checkAlarmChange: alarm is removed. this._newAlarm !== undefined and this._newAlarm === null.\n");
-				reminderIsSetChanged = "false";
-			}
-			else {
-				// New alarm setting.
-				var alarms = this.getAlarms({});
-				if (alarms.length > 0) {
-					//this.addSetItemField(updates, "ReminderIsSet", "true");
-					reminderIsSetChanged = "true";
-					// Calculate the alarm.
-
-					var alarm = alarms[0];
-
-					if ((!this._alarm) || (this._alarm.offset != alarm.offset) || (this.className == "mivExchangeTodo")) {
-//dump(" We have alarms."+alarms[0].alarmDate+", alarm:"+alarm+", alarm.offset:"+alarm.offset+", X-MOZ-SNOOZE-TIME:"+this.getProperty("X-MOZ-SNOOZE-TIME")+"\n");
-						// Exchange alarm is always an offset to the start.
-						// A Todo always has an alarm.related of ALARM_RELATED_ABSOLUTE
-						// So referenceDate is set there.
-						if (this.className == "mivExchangeEvent") {
-							var referenceDate = this.startDate.getInTimezone(cal.UTC());
-							referenceDate.isDate = false;
-						}
-
-						switch (alarm.related) {
-						case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-							//dump("ALARM_RELATED_ABSOLUTE we are going to calculate a offset from the start.");
-							var newAlarmTime = alarm.alarmDate.clone();
-
-							// Calculate offset from start of item.
-							if (this.className == "mivExchangeEvent") {
-								var offset = newAlarmTime.subtractDate(this.startDate);
-							}
-							else {
-								//var offset = 0;
-								referenceDate = newAlarmTime.getInTimezone(cal.UTC());
-							}
-							break;
-						case Ci.calIAlarm.ALARM_RELATED_START:
-							//dump("ALARM_RELATED_START this is easy exchange does the same.");
-							//var newAlarmTime = this.startDate.clone();
-							var offset = alarm.offset.clone();
-							break;
-						case Ci.calIAlarm.ALARM_RELATED_END:
-							//dump("ALARM_RELATED_END we are going to calculate the offset from the start.");
-							var newAlarmTime = this.endDate.clone();
-							newAlarmTime.isDate = false;
-							newAlarmTime.addDuration(alarm.offset);
-
-							var offset = newAlarmTime.subtractDate(referenceDate);
-							break;
-						}
-						this.addSetItemField(updates, "ReminderDueBy", cal.toRFC3339(referenceDate));
-					
-						if ((offset) && (offset.inSeconds != 0)) {
-							this.addSetItemField(updates, "ReminderMinutesBeforeStart", String((offset.inSeconds / 60) * -1));
-							if (this._reminderMinutesBeforeStart) {
-								if (this._reminderMinutesBeforeStart != String((offset.inSeconds / 60) * -1)) {
-									newReminderMinutesBeforeStart = true;
-								}
-								else {
-									newReminderMinutesBeforeStart = false;
-								}
-							}
-						}
-						else {
-							this.addSetItemField(updates, "ReminderMinutesBeforeStart", "0");
-							if (this._reminderMinutesBeforeStart) {
-								if (this._reminderMinutesBeforeStart != "0") {
-									newReminderMinutesBeforeStart = true;
-								}
-								else {
-									newReminderMinutesBeforeStart = false;
-								}
-							}
-						}
-					}
-				}
-				else {
-					// This should never happen.
-					dump("mivExchangeBaseItem: updateXML: Weird error. We have a history of an alarm added but no alarms exist. This should never happen. please report to info@1st-setup.nl\n");
-				}
-			}
-
-		}
-		else {
-			// Check if an exisiting alarm setting changed.
-			//dump("checkAlarmChange: checking is an existing alarm changed.\n");
-			var alarms = this.getAlarms({});
-			if (alarms.length > 0) {
-				//dump("checkAlarmChange: We have an alarm.\n");
-				var alarm = alarms[0];
-
-				// Exchange alarm is always an offset to the start.
-				// A Todo always has an alarm.related of ALARM_RELATED_ABSOLUTE
-				// So referenceDate is set there.
-				if (this.className == "mivExchangeEvent") {
-					var referenceDate = this.startDate.getInTimezone(cal.UTC());
-					referenceDate.isDate = false;
-				}
-
-				switch (alarm.related) {
-				case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-					//dump("ALARM_RELATED_ABSOLUTE we are going to calculate a offset from the start.");
-					var newAlarmTime = alarm.alarmDate.clone();
-
-					// Calculate offset from start of item.
-					if (this.className == "mivExchangeEvent") {
-						var offset = newAlarmTime.subtractDate(this.startDate);
-					}
-					else {
-						//var offset = 0;
-						referenceDate = newAlarmTime.getInTimezone(cal.UTC());
-					}
-					break;
-				case Ci.calIAlarm.ALARM_RELATED_START:
-					//dump("ALARM_RELATED_START this is easy exchange does the same.");
-					var offset = alarm.offset.clone();
-					break;
-				case Ci.calIAlarm.ALARM_RELATED_END:
-					//dump("ALARM_RELATED_END we are going to calculate the offset from the start.");
-					var newAlarmTime = this.endDate.clone();
-					newAlarmTime.isDate = false;
-					newAlarmTime.addDuration(alarm.offset);
-
-					var offset = newAlarmTime.subtractDate(referenceDate);
-					break;
-				}
-			
-				if ((offset) && (offset.inSeconds != 0)) {
-					if (this._reminderMinutesBeforeStart) {
-						if (this._reminderMinutesBeforeStart != String((offset.inSeconds / 60) * -1)) {
-							newReminderMinutesBeforeStart = true;
-						}
-						else {
-							newReminderMinutesBeforeStart = false;
-						}
-					}
-				}
-				else {
-					if (this._reminderMinutesBeforeStart) {
-						if (this._reminderMinutesBeforeStart != "0") {
-							newReminderMinutesBeforeStart = true;
-						}
-						else {
-							newReminderMinutesBeforeStart = false;
-						}
-					}
-				}
-			}
-		}
-
-		var newSnoozeTime = null;
-		// Alarm snooze or dismiss
-		if (typeof this._newXMozSnoozeTime !==  undefined ) {
-//dump("checkAlarmChange: this._newXMozSnoozeTime was set to:"+this._newXMozSnoozeTime+", newReminderMinutesBeforeStart="+newReminderMinutesBeforeStart+"\n");
-			dump("\ncheckAlarmChange: snoozetime " + this._newXMozSnoozeTime ); 
-			if ((this._newXMozSnoozeTime === null ) && (newReminderMinutesBeforeStart !== true)) {
-				dump("\ncheckAlarmChange: dismissed " + newReminderMinutesBeforeStart+ ".\n"); 
-//dump("checkAlarmChange: We have a change\n");
-				if (this.calendarItemType == "RecurringMaster") {
-					// Find out which occurrence or exception was dismissed
-					var dismissedItem = this.getOccurrenceByNativeId(this._lastXMozSnoozeTimeNativeId);
-					if (!dismissedItem) {
-						//dump("This is weird. We did not find the dismissedItem.\n");
-					}
-					else {
-						if (dismissedItem.calendarItemType == "Exception") {
-							//dump("Dismissed an exception with startDate:"+dismissedItem.startDate+"\n");
-							var newException = dismissedItem.clone();
-							newException.deleteProperty("X-MOZ-SNOOZE-TIME-"+this._lastXMozSnoozeTimeNativeId);
-							this.calendar.modifyItem(newException, dismissedItem, null);
-						}
-						else {
-							
-//							Recurring Events reminder fix for occurence  ** Wed Jun 24 10:04:44 IST 2015
-							var aNewItem = dismissedItem.clone(); 
-							aNewItem._reminderIsSet=false;
-							aNewItem._newAlarm=null;		
-							this.calendar.modifyItem(aNewItem, dismissedItem, null); 
-							//dump("Dismissed an occurrence with startDate:"+dismissedItem.startDate+"\n");
-						}
-
-						var tmpDate = dismissedItem.endDate || dismissedItem.dueDate;
-						if (tmpDate) {
-							var nextOccurrence = this.recurrenceInfo.getNextOccurrence(tmpDate);
-						}
-						else {
-							var nextOccurrence = null;
-						}
-						do {
-							if (nextOccurrence) {
-								// We have a next occurrence. Set newSnoozeTime.
-								//dump("We have a next occurrence.\n");
-								if (nextOccurrence.reminderIsSet) {
-									//newSnoozeTime = cal.createDateTime(this._newXMozSnoozeTime);
-									if (nextOccurrence.calendarItemType == "Exception") {
-										// Next occurrence is an exception
-										//dump("Next occurrence is an exception\n");
-										var alarmOffset = cal.createDuration();
-										alarmOffset.minutes = -1 * nextOccurrence.reminderMinutesBeforeStart;
-
-										newSnoozeTime = nextOccurrence.startDate.clone();
-										newSnoozeTime.addDuration(alarmOffset);
-									}
-									else {
-										//dump("Next occurrence is NOT an exception\n");
-										var alarmOffset = cal.createDuration();
-										alarmOffset.minutes = -1 * this.reminderMinutesBeforeStart;
-
-										newSnoozeTime = nextOccurrence.startDate.clone();
-										newSnoozeTime.addDuration(alarmOffset);
-									}
-								}
-								else {
-									//dump("Reminder not active on item:"+nextOccurrence.startDate+". Going to look for next.\n");
-									var tmpDate = dismissedItem.endDate || dismissedItem.dueDate;
-									if (tmpDate) {
-										  nextOccurrence = this.recurrenceInfo.getNextOccurrence(nextOccurrence.endDate);
-									}
-									else {
-									     nextOccurrence =  null;
-									}
-								}
-							}
-
-							if (!nextOccurrence) { 
-								// No next occurrence.
-								//dump("No next occurrence so turning alarm of on master.\n");
-								reminderIsSetChanged = "false";
-							}
-						} 
-						while ((nextOccurrence) && (newSnoozeTime === null));
-
-					}
-				}
-				else {
-					// Single dismiss. We turn it off.
-					//dump("dismiss Single:"+this.title+", startDate:"+this.startDate+"\n");
-					if(this.className == "mivExchangeEvent") reminderIsSetChanged = "false";
-				}
-			}
-			else {
-				// We have a snooze
-				if (this.calendarItemType == "RecurringMaster") {
-					// Master snooze. set new alarm time.
-					// Find out which occurrence or exception was snoozed
-					var snoozedItem = this.getOccurrenceByNativeId(this._lastXMozSnoozeTimeNativeId);
-					if (!snoozedItem) {
-						//dump("This is weird. We did not find the snoozedItem.\n");
-					}
-					else {
-						if (snoozedItem.calendarItemType == "Exception") {
-							//dump("Snoozed an exception with startDate:"+snoozedItem.startDate+"\n");
-							var newException = snoozedItem.clone();
-							newException.setProperty("X-MOZ-SNOOZE-TIME-"+this._lastXMozSnoozeTimeNativeId, this._newXMozSnoozeTime);
-							this.calendar.modifyItem(newException, snoozedItem, null);
-						}
-						else {
-							//dump("Snoozed an occurrence with startDate:"+snoozedItem.startDate+"\n");
-						}
-
-						newSnoozeTime = cal.createDateTime(this._newXMozSnoozeTime);
-					}
-				}
-				else {
-					// Single snooze. set new alarm time.
-					//dump("Snooze Single:"+this.title+", startDate:"+this.startDate+", newAlarmTime:"+this._newXMozSnoozeTime+"\n");
-					newSnoozeTime = cal.createDateTime(this._newXMozSnoozeTime);
-				}
-			}
-
-		}
- 
-		if (newSnoozeTime) {
-			newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
-			const MAPI_PidLidReminderSignalTime = "34144";
-
-			this.addSetItemField(updates, "ExtendedFieldURI", cal.toRFC3339(newSnoozeTime), 
-					{ DistinguishedPropertySetId: "Common",
-					  PropertyId: MAPI_PidLidReminderSignalTime,
-					  PropertyType: "SystemTime"} );
-		}
- 
-		if (reminderIsSetChanged !== undefined) {
-			this.addSetItemField(updates, "ReminderIsSet", reminderIsSetChanged);
-		}
-	},
-
-	// Internal methods.
-	readRecurrenceRule: function _readRecurrenceRule(aElement)
-	{
-		/*
-		 * The Mozilla recurrence API is bothersome and dictated by libical.
-		 *
-		 * We need to obey and build an iCalendar string which we feed in
-		 * to get the proper recurrence info.
-		 */
-		const dayMap = {
-			'Monday'	: 'MO',
-			'Tuesday'	: 'TU',
-			'Wednesday'	: 'WE',
-			'Thursday'	: 'TH',
-			'Friday'	: 'FR',
-			'Saturday'	: 'SA',
-			'Sunday'	: 'SU',
-			'Weekday'	: ['MO', 'TU', 'WE', 'TH', 'FR'],
-			'WeekendDay'	: ['SA', 'SO'],
-			'Day'		: ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
-		};
-
-		const monthMap = {
-			'January'	: 1,
-			'February'	: 2,
-			'March'		: 3,
-			'April'		: 4,
-			'May'		: 5,
-			'June'		: 6,
-			'July'		: 7,
-			'August'	: 8,
-			'September'	: 9,
-			'October'	: 10,
-			'November'	: 11,
-			'December'	: 12
-		};
-
-		var comps = {};
-	
-		for each (var rec in aElement) {
-			switch (rec.tagName) {
-			case "RelativeYearlyRecurrence":
-			case "AbsoluteYearlyRecurrence":
-				comps['FREQ'] = "YEARLY";
-				break;
-			case "RelativeMonthlyRecurrence":
-			case "AbsoluteMonthlyRecurrence":
-				comps['FREQ'] = "MONTHLY";
-				break;
-			case "WeeklyRecurrence":
-				comps['FREQ'] = "WEEKLY";
-				break;
-			case "DailyRecurrence":
-			case "DailyRegeneration":
-				comps['FREQ'] = "DAILY";
-				break;
-			case "NoEndRecurrence":
-			case "NumberedRecurrence":
-				break;
-			case "EndDateRecurrence":
-				break;
-			default:
-				//dump("skipping " + rec.tagName);
-				continue;
-			}
-	
-			var weekdays = [];
-			var week = [];
-			var comps2 = xml2json.XPath(rec,"/*");
-			for each (var comp in comps2) {
-				switch (comp.tagName) {
-				case 'DaysOfWeek':
-					for each (let day in xml2json.getValue(comp).split(" ")) {
-						weekdays = weekdays.concat(dayMap[day]);
-					}
-					break;
-				case 'DayOfWeekIndex':
-					week = weekMap[xml2json.getValue(comp)];
-					break;
-				case 'Month':
-					comps['BYMONTH'] = monthMap[xml2json.getValue(comp)];
-					break;
-				case 'DayOfMonth':
-					comps['BYMONTHDAY'] = xml2json.getValue(comp);
-					break;
-				case 'FirstDayOfWeek':
-					comps['WKST'] = dayMap[xml2json.getValue(comp)];
-					break;
-				case 'Interval':
-					comps['INTERVAL'] = xml2json.getValue(comp);
-					break;
-				case 'StartDate':
-					/* Dunno what to do with this for iCal; no place to set */
-					this._recurrenceStartDate = cal.fromRFC3339(xml2json.getValue(comp).substr(0,10)+"T00:00:00Z", exchGlobalFunctions.ecTZService().UTC);
-					this._recurrenceStartDate.isDate = true;
-					break;
-				case 'EndDate':
-//					comps['UNTIL'] = comp.value.replace(/Z$/, '');
-					// As we only get the date + timezonediff we make a nice date+time from it.
-					comps['UNTIL'] = xml2json.getValue(comp).substr(0,10)+"T00:00:00Z";
-					break;
-				case 'NumberOfOccurrences':
-					comps['COUNT'] = xml2json.getValue(comp);
-					break;
-				}
-			}
-			comps2 = null;
-
-			let wdtemp = weekdays;
-			weekdays = [];
-			for each (let day in wdtemp) {
-				weekdays.push(week + day);
-			}
-			if (weekdays.length > 0) {
-				comps['BYDAY'] = weekdays.join(',');
-			}
-		}
-
-		var compstrs = [];
-		for (var k in comps) {
-			compstrs.push(k + "=" + comps[k]);
-		}
-	
-		if (compstrs.length == 0) {
-			return null;
-		}
-	
-		var recrule = cal.createRecurrenceRule();
-	
-		/* need to do this re-assign game so that the string gets parsed */
-		var prop = recrule.icalProperty;
-		prop.value = compstrs.join(';');
-		recrule.icalProperty = prop;
-		return recrule;
-	},
-
-	addMailboxAlias: function _addMailboxAlias(aAlias)
-	{
-		this.mailboxAliases.push(aAlias);
-	},
-
-	createAttendee: function _createAttendee(aElement, aType) 
-	{
-		if (!aElement) return null;
-
-		if (!Ci.mivExchangeAttendee) {
-			dump(" !!!!!!!!!!!!!!!! no Ci.mivExchangeAttendee\n");
-			return null;
-		}
-		//var attendee = Cc["@1st-setup.nl/exchange/attendee;1"]
-		//			.createInstance(Ci.mivExchangeAttendee); // This one currently creates an error. Why ??!!
-		var attendee = new mivExchangeAttendee();
-		attendee.convertFromExchange(this, aElement, aType);
-		//dump("  -- CreateAttendee:"+attendee+", attendee.id:"+attendee.id+", title:"+this.title+"\n");
-		return attendee;
-/* 
-		let mbox = aElement.getTag("t:Mailbox");
-		var attendee = cal.createAttendee();
-
-		if (!aType) {
-			aType = "REQ-PARTICIPANT";
-		}
-
-		var me = false;
-		for each(var alias in this.mailboxAliases) {
-			if (xml2json.getTagValue(mbox, "t:EmailAddress","unknown").toLowerCase() == alias.toLowerCase()) {
-				me = true;
-				//dump("createAttendee: Title:"+this.title+", email:"+xml2json.getTagValue(mbox, "t:EmailAddress","unknown")+". This address is mine ("+alias+").\n");
-				break;
-			}
-		}
-
-		// We also need to check aliases but these do not get stored yet.
-
-		switch (xml2json.getTagValue(mbox, "t:RoutingType","unknown")) {
-			case "SMTP" :
-				attendee.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
-				break;
-			case "EX" :
-				attendee.id = 'ldap:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
-				break;
-			default:
-				//dump("createAttendee: Unknown RoutingType:'"+xml2json.getTagValue(mbox, "t:RoutingType")+"'");
-				attendee.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
-				break;
-		}
-		attendee.commonName = xml2json.getTagValue(mbox, "t:Name");
-		attendee.rsvp = "FALSE";
-		attendee.userType = "INDIVIDUAL";
-		attendee.role = aType;
-
-		if (me) {
-			attendee.participationStatus = participationMap[this.myResponseType];
-				//dump("createAttendee A: Title:"+this.title+", attendee:"+attendee.id+", myResponseType:"+this.myResponseType+", attendee.participationStatus:"+attendee.participationStatus+"\n");
-		}
-		else {
-			if (xml2json.getTagValue(aElement, "t:ResponseType", "") != "") {
-				attendee.participationStatus = participationMap[xml2json.getTagValue(aElement, "t:ResponseType")];
-				//dump("createAttendee B: Title:"+this.title+", attendee:"+attendee.id+", ResponseType:"+aElement.getTagValue("t:ResponseType")+", attendee.participationStatus:"+attendee.participationStatus+"\n");
-			}
-		}
-
-		mbox = null;
-		aElement = null;
-		return attendee; */
-	},
-
-	tryToSetDateValueUTC: function _tryToSetDateValueUTC(ewsvalue, aDefault)
-	{
-		if ((ewsvalue) && (ewsvalue.toString().length)) {
-			if (ewsvalue.indexOf("Z") > -1) {
-				return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecTZService().UTC);
-			}
-			else {
-				return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecDefaultTimeZone()).getInTimezone(exchGlobalFunctions.ecTZService().UTC);
-			}
-		}
-
-		return aDefault;
-	},
-
-	tryToSetDateValueDefaultTZ: function _tryToSetDateValueDefaultTZ(ewsvalue, aDefault)
-	{
-		if ((ewsvalue) && (ewsvalue.toString().length)) {
-			return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecDefaultTimeZone());
-		}
-
-		return aDefault;
-	},
-
-	tryToSetDateValue: function _TryToSetDateValue(ewsvalue, aDefault)
-	{
-		if ((ewsvalue) && (ewsvalue.toString().length)) {
-			return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecTZService().UTC).getInTimezone(exchGlobalFunctions.ecDefaultTimeZone());
-		}
-
-		return aDefault;
-	},
-
-	XPath: function _XPath(aString)
-	{
-		if (this._exchangeData) {
-			return xml2json.XPath(this._exchangeData, aString);
-		}
-
-		return [];
-	},
-
-	getTag: function _getTag(aTagName)
-	{
-		if (this._exchangeData) {
-			return xml2json.getTag(this._exchangeData, aTagName);
-		}
-
-		return null;
-	},
-
-	getTags: function _getTags(aTagName)
-	{
-		if (this._exchangeData) {
-			return xml2json.getTags(this._exchangeData, aTagName);
-		}
-
-		return [];
-	},
-
-	getTagValue: function _getTagValue(aTagName, aDefaultValue)
-	{
-		if (this._exchangeData) {
-			return xml2json.getTagValue(this._exchangeData, aTagName, aDefaultValue);
-		}
-
-		return aDefaultValue;
-	},
-
-	getAttributeByTag: function _getAttributeByTag(aTagName, aAttribute, aDefaultValue)
-	{
-		//dump("getAttributeByTag 1: title:"+this.title+", aTagName:"+aTagName+", aAttribute:"+aAttribute+"\n");
-		if (this._exchangeData) {
-			return xml2json.getAttributeByTag(this._exchangeData, aTagName, aAttribute, aDefaultValue);
-		}
-		//dump("getAttributeByTag 3: title:"+this.title+", aTagName:"+aTagName+", aAttribute:"+aAttribute);
-
-		return aDefaultValue;
-	},
-
-	get className()
-	{
-		return this._className;
-	},
-
-	initialize: function _initialize()
-	{
-		this._calEvent = null;
-		if (this.className == "mivExchangeTodo") {
-			this._calEvent = Cc["@mozilla.org/calendar/todo;1"]
-						.createInstance(Ci.calITodo);
-		}
-		else {
-			this._calEvent = Cc["@mozilla.org/calendar/event;1"]
-						.createInstance(Ci.calIEvent);
-		}
-	},
-
-	deleteItem: function _deleteItem()
-	{
-		for (var index in this._occurrences) {
-			this._occurrences[index].deleteItem();
-			this._occurrences[index] = null;
-			delete this._occurrences[index];
-		}
-
-		for (var index in this._exceptions) {
-			this._exceptions[index].deleteItem();
-			this._exceptions[index] = null;
-			delete this._exceptions[index];
-		}
-
-		this._exchangeData = null;
-	},
+    },
+
+    addSetItemField: function _addSetItemField(parentItem, aField, aValue, aAttributes, aValueIsComplete) {
+        this.addUpdateXMLField("SetItemField", parentItem, aField, aValue, aAttributes, aValueIsComplete);
+    },
+
+    addDeleteItemField: function _addDeleteItemField(parentItem, aField) {
+        this.addUpdateXMLField("DeleteItemField", parentItem, aField);
+    },
+
+    getAlarmTime: function _getAlarmTime() {
+        var alarms = this.getAlarms({});
+
+        var alarm;
+        if (alarms.length > 0) {
+            alarm = alarms[0];
+        }
+        if (!alarm) {
+            return null;
+        }
+
+        switch (alarm.related) {
+        case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+            var alarmTime = alarm.alarmDate;
+            break;
+        case Ci.calIAlarm.ALARM_RELATED_START:
+            var alarmTime = this.startDate.clone();
+            alarmTime.addDuration(alarm.offset);
+            break;
+        case Ci.calIAlarm.ALARM_RELATED_END:
+            var alarmTime = this.endDate.clone();
+            alarmTime.addDuration(alarm.offset);
+            break;
+        }
+
+        alarmTime = alarmTime.getInTimezone(cal.UTC());
+
+        return alarmTime;
+    },
+
+    makeRecurrenceRule: function _makeRecurrenceRule() {
+        if (!this.parentItem) {
+            return;
+        }
+        try {
+            if (!this.recurrenceInfo || this.parentItem.id != this.id) {
+                if (!this.recurrenceInfo) {}
+                if (this.parentItem.id != this.id) {}
+                return;
+            }
+
+            var recurrenceItems = this.recurrenceInfo.getRecurrenceItems({});
+            var rrule = null;
+            for each(var ritem in recurrenceItems) {
+                if (ritem instanceof Ci.calIRecurrenceRule) {
+                    rrule = ritem;
+                    break;
+                }
+            }
+
+            if (!rrule) {
+                // XXX exception?
+                //dump("makeRecurrenceRule: We have no rrule");
+                return;
+            }
+
+            var r = exchGlobalFunctions.xmlToJxon('<t:Recurrence xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+
+            //var r = updates.addChildTag("Recurrence", "t", null);
+
+            /* can't get parameters of RRULEs... have to do it manually :/ */
+            var prop = {};
+            for each(let ps in rrule.icalProperty.value.split(';')) {
+                let m = ps.split('=');
+                prop[m[0]] = m[1];
+            }
+
+            var startDate;
+            var originalDate;
+            if (cal.isEvent(this)) {
+                //dump(" GoGo 2\n");
+                startDate = this.startDate.clone();
+                originalDate = this.startDate.clone();
+            }
+            else {
+                if (this.entryDate) {
+                    startDate = this.entryDate.clone();
+                    startDate.isDate = false;
+                    originalDate = this.entryDate.clone();
+                }
+            }
+
+            if (startDate) {
+                startDate = startDate.clone();
+            }
+            else {
+                startDate = cal.now();
+                originalDate = cal.now();
+            }
+            startDate.isDate = true;
+
+            prop["BYMONTHDAY"] = prop["BYMONTHDAY"] || startDate.day;
+            prop["BYMONTH"] = prop["BYMONTH"] || (startDate.month + 1);
+
+            switch (rrule.type) {
+            case 'YEARLY':
+                if (prop["BYDAY"]) {
+                    var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
+                    var ryr = r.addChildTag("RelativeYearlyRecurrence", "t", null);
+                    ryr.addChildTag("DaysOfWeek", "t", dayRevMap[m[2]]);
+                    ryr.addChildTag("DayOfWeekIndex", "t", dayRevMap[m[1]]);
+                    ryr.addChildTag("Month", "t", monthIdxMap[prop["BYMONTH"] - 1]);
+                }
+                else {
+                    var ayr = r.addChildTag("AbsoluteYearlyRecurrence", "t", null);
+                    ayr.addChildTag("DayOfMonth", "t", prop["BYMONTHDAY"]);
+                    ayr.addChildTag("Month", "t", monthIdxMap[prop["BYMONTH"] - 1]);
+                }
+                break;
+            case 'MONTHLY':
+                if (prop["BYDAY"]) {
+                    var rmr = r.addChildTag("RelativeMonthlyRecurrence", "t", null);
+                    rmr.addChildTag("Interval", "t", rrule.interval);
+                    var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
+                    rmr.addChildTag("DaysOfWeek", "t", dayRevMap[m[2]]);
+                    rmr.addChildTag("DayOfWeekIndex", "t", weekRevMap[m[1]]);
+                }
+                else {
+                    var amr = r.addChildTag("AbsoluteMonthlyRecurrence", "t", null);
+                    amr.addChildTag("Interval", "t", rrule.interval);
+                    amr.addChildTag("DayOfMonth", "t", prop["BYMONTHDAY"]);
+                }
+                break;
+            case 'WEEKLY':
+                var wr = r.addChildTag("WeeklyRecurrence", "t", null);
+                wr.addChildTag("Interval", "t", rrule.interval);
+                var days = [];
+                var daystr = prop["BYDAY"] || dayIdxMap[startDate.weekday];
+                for each(let day in daystr.split(",")) {
+                    days.push(dayRevMap[day]);
+                }
+                wr.addChildTag("DaysOfWeek", "t", days.join(' '));
+                break;
+            case 'DAILY':
+                var dr = r.addChildTag("DailyRecurrence", "t", null);
+                dr.addChildTag("Interval", "t", rrule.interval);
+                break;
+            }
+
+            if (cal.isEvent(this)) {
+                //			var startDateStr = cal.toRFC3339(startDate.getInTimezone(exchGlobalFunctions.ecUTC()))+"Z";
+                var startDateStr = cal.toRFC3339(startDate.getInTimezone(exchGlobalFunctions.ecUTC()));
+                //var startDateStr = cal.toRFC3339(originalDate.getInTimezone(exchGlobalFunctions.ecUTC()));
+            }
+            else {
+                // We make a non-UTC datetime value for exchGlobalFunctions.
+                // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+                //LOG("  ==== tmpStart:"+cal.toRFC3339(tmpStart));
+                var startDateStr = cal.toRFC3339(startDate).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
+            }
+
+            if (rrule.isByCount && rrule.count != -1) {
+                var nr = r.addChildTag("NumberedRecurrence", "t", null);
+                nr.addChildTag("StartDate", "t", startDateStr);
+                nr.addChildTag("NumberOfOccurrences", "t", rrule.count);
+            }
+            else if (!rrule.isByCount && rrule.untilDate) {
+
+                var endDate = rrule.untilDate.clone();
+                if (cal.isEvent(this)) {
+                    endDate.isDate = true;
+                    var endDateStr = cal.toRFC3339(endDate.getInTimezone(exchGlobalFunctions.ecUTC()));
+                }
+                else {
+                    if (!endDate.isDate) {
+                        endDate.isDate = true;
+                        endDate.isDate = false;
+                        var tmpDuration = cal.createDuration();
+                        tmpDuration.days = 1;
+                        endDate.addDuration(tmpDuration);
+
+                        endDate.isDate = true;
+                    }
+                    var endDateStr = cal.toRFC3339(endDate).substr(0, 19); //cal.toRFC3339(tmpEnd).length-6);
+                }
+                var edr = r.addChildTag("EndDateRecurrence", "t", null);
+                edr.addChildTag("StartDate", "t", startDateStr);
+                edr.addChildTag("EndDate", "t", endDateStr);
+            }
+            else {
+                var ner = r.addChildTag("NoEndRecurrence", "t", null);
+                ner.addChildTag("StartDate", "t", startDateStr);
+            }
+
+            return r;
+        }
+        catch (err) {
+            dump("Error2:" + err + " | " + exchGlobalFunctions.STACK() + "\n");
+        }
+
+        /* We won't write WKST/FirstDayOfWeek for now because it is Exchange 2010 and up */
+    },
+
+    get updateXML() {
+        this._nonPersonalDataChanged = false;
+
+        var updates = exchGlobalFunctions.xmlToJxon('<t:Updates xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+        //dump("updates:"+updates.toString()+"\n");
+        return updates;
+    },
+
+    get nonPersonalDataChanged() {
+        return this._nonPersonalDataChanged;
+    },
+
+    getOccurrenceByNativeId: function _getOccurrenceByNativeId(aNativeId) {
+        var result = null;
+        for (var index in this._exceptions) {
+            if (this._exceptions[index].recurrenceId.nativeTime == aNativeId) {
+                // found the exception for which the alarm was snoozed.
+                result = this._exceptions[index];
+                break;
+            }
+        }
+
+        if (!result) {
+            for (var index in this._occurrences) {
+                if (this._occurrences[index].recurrenceId.nativeTime == aNativeId) {
+                    // found the occurrence for which the alarm was snoozed.
+                    result = this._occurrences[index];
+                    break;
+                }
+            }
+        }
+
+        return result;
+    },
+
+    checkAlarmChange: function _checkAlarmChange(updates) {
+        var reminderIsSetChanged = undefined;
+        var newReminderMinutesBeforeStart = undefined;
+        this.reminderMinutesBeforeStart; // To have is initialized.
+        // Alarm
+        if (this._newAlarm !== undefined) {
+            dump("checkAlarmChange:" + this.title + ",  Alarm was changed: " + this._newAlarm + ".\n");
+            // Alarm was changed.
+            if (this._newAlarm === null) {
+                // Alarm was removed.
+                //dump("checkAlarmChange: alarm is removed. this._newAlarm !== undefined and this._newAlarm === null.\n");
+                reminderIsSetChanged = "false";
+            }
+            else {
+                // New alarm setting.
+                var alarms = this.getAlarms({});
+                if (alarms.length > 0) {
+                    //this.addSetItemField(updates, "ReminderIsSet", "true");
+                    reminderIsSetChanged = "true";
+                    // Calculate the alarm.
+
+                    var alarm = alarms[0];
+
+                    if ((!this._alarm) || (this._alarm.offset != alarm.offset) || (this.className == "mivExchangeTodo")) {
+                        //dump(" We have alarms."+alarms[0].alarmDate+", alarm:"+alarm+", alarm.offset:"+alarm.offset+", X-MOZ-SNOOZE-TIME:"+this.getProperty("X-MOZ-SNOOZE-TIME")+"\n");
+                        // Exchange alarm is always an offset to the start.
+                        // A Todo always has an alarm.related of ALARM_RELATED_ABSOLUTE
+                        // So referenceDate is set there.
+                        if (this.className == "mivExchangeEvent") {
+                            var referenceDate = this.startDate.getInTimezone(cal.UTC());
+                            referenceDate.isDate = false;
+                        }
+
+                        switch (alarm.related) {
+                        case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+                            //dump("ALARM_RELATED_ABSOLUTE we are going to calculate a offset from the start.");
+                            var newAlarmTime = alarm.alarmDate.clone();
+
+                            // Calculate offset from start of item.
+                            if (this.className == "mivExchangeEvent") {
+                                var offset = newAlarmTime.subtractDate(this.startDate);
+                            }
+                            else {
+                                //var offset = 0;
+                                referenceDate = newAlarmTime.getInTimezone(cal.UTC());
+                            }
+                            break;
+                        case Ci.calIAlarm.ALARM_RELATED_START:
+                            //dump("ALARM_RELATED_START this is easy exchange does the same.");
+                            //var newAlarmTime = this.startDate.clone();
+                            var offset = alarm.offset.clone();
+                            break;
+                        case Ci.calIAlarm.ALARM_RELATED_END:
+                            //dump("ALARM_RELATED_END we are going to calculate the offset from the start.");
+                            var newAlarmTime = this.endDate.clone();
+                            newAlarmTime.isDate = false;
+                            newAlarmTime.addDuration(alarm.offset);
+
+                            var offset = newAlarmTime.subtractDate(referenceDate);
+                            break;
+                        }
+                        this.addSetItemField(updates, "ReminderDueBy", cal.toRFC3339(referenceDate));
+
+                        if ((offset) && (offset.inSeconds != 0)) {
+                            this.addSetItemField(updates, "ReminderMinutesBeforeStart", String((offset.inSeconds / 60) * -1));
+                            if (this._reminderMinutesBeforeStart) {
+                                if (this._reminderMinutesBeforeStart != String((offset.inSeconds / 60) * -1)) {
+                                    newReminderMinutesBeforeStart = true;
+                                }
+                                else {
+                                    newReminderMinutesBeforeStart = false;
+                                }
+                            }
+                        }
+                        else {
+                            this.addSetItemField(updates, "ReminderMinutesBeforeStart", "0");
+                            if (this._reminderMinutesBeforeStart) {
+                                if (this._reminderMinutesBeforeStart != "0") {
+                                    newReminderMinutesBeforeStart = true;
+                                }
+                                else {
+                                    newReminderMinutesBeforeStart = false;
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    // This should never happen.
+                    dump("mivExchangeBaseItem: updateXML: Weird error. We have a history of an alarm added but no alarms exist. This should never happen. please report to info@1st-setup.nl\n");
+                }
+            }
+
+        }
+        else {
+            // Check if an exisiting alarm setting changed.
+            //dump("checkAlarmChange: checking is an existing alarm changed.\n");
+            var alarms = this.getAlarms({});
+            if (alarms.length > 0) {
+                //dump("checkAlarmChange: We have an alarm.\n");
+                var alarm = alarms[0];
+
+                // Exchange alarm is always an offset to the start.
+                // A Todo always has an alarm.related of ALARM_RELATED_ABSOLUTE
+                // So referenceDate is set there.
+                if (this.className == "mivExchangeEvent") {
+                    var referenceDate = this.startDate.getInTimezone(cal.UTC());
+                    referenceDate.isDate = false;
+                }
+
+                switch (alarm.related) {
+                case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+                    //dump("ALARM_RELATED_ABSOLUTE we are going to calculate a offset from the start.");
+                    var newAlarmTime = alarm.alarmDate.clone();
+
+                    // Calculate offset from start of item.
+                    if (this.className == "mivExchangeEvent") {
+                        var offset = newAlarmTime.subtractDate(this.startDate);
+                    }
+                    else {
+                        //var offset = 0;
+                        referenceDate = newAlarmTime.getInTimezone(cal.UTC());
+                    }
+                    break;
+                case Ci.calIAlarm.ALARM_RELATED_START:
+                    //dump("ALARM_RELATED_START this is easy exchange does the same.");
+                    var offset = alarm.offset.clone();
+                    break;
+                case Ci.calIAlarm.ALARM_RELATED_END:
+                    //dump("ALARM_RELATED_END we are going to calculate the offset from the start.");
+                    var newAlarmTime = this.endDate.clone();
+                    newAlarmTime.isDate = false;
+                    newAlarmTime.addDuration(alarm.offset);
+
+                    var offset = newAlarmTime.subtractDate(referenceDate);
+                    break;
+                }
+
+                if ((offset) && (offset.inSeconds != 0)) {
+                    if (this._reminderMinutesBeforeStart) {
+                        if (this._reminderMinutesBeforeStart != String((offset.inSeconds / 60) * -1)) {
+                            newReminderMinutesBeforeStart = true;
+                        }
+                        else {
+                            newReminderMinutesBeforeStart = false;
+                        }
+                    }
+                }
+                else {
+                    if (this._reminderMinutesBeforeStart) {
+                        if (this._reminderMinutesBeforeStart != "0") {
+                            newReminderMinutesBeforeStart = true;
+                        }
+                        else {
+                            newReminderMinutesBeforeStart = false;
+                        }
+                    }
+                }
+            }
+        }
+
+        var newSnoozeTime = null;
+        // Alarm snooze or dismiss
+        if (typeof this._newXMozSnoozeTime !== undefined) {
+            //dump("checkAlarmChange: this._newXMozSnoozeTime was set to:"+this._newXMozSnoozeTime+", newReminderMinutesBeforeStart="+newReminderMinutesBeforeStart+"\n");
+            dump("\ncheckAlarmChange: snoozetime " + this._newXMozSnoozeTime);
+            if ((this._newXMozSnoozeTime === null) && (newReminderMinutesBeforeStart !== true)) {
+                dump("\ncheckAlarmChange: dismissed " + newReminderMinutesBeforeStart + ".\n");
+                //dump("checkAlarmChange: We have a change\n");
+                if (this.calendarItemType == "RecurringMaster") {
+                    // Find out which occurrence or exception was dismissed
+                    var dismissedItem = this.getOccurrenceByNativeId(this._lastXMozSnoozeTimeNativeId);
+                    if (!dismissedItem) {
+                        //dump("This is weird. We did not find the dismissedItem.\n");
+                    }
+                    else {
+                        if (dismissedItem.calendarItemType == "Exception") {
+                            //dump("Dismissed an exception with startDate:"+dismissedItem.startDate+"\n");
+                            var newException = dismissedItem.clone();
+                            newException.deleteProperty("X-MOZ-SNOOZE-TIME-" + this._lastXMozSnoozeTimeNativeId);
+                            this.calendar.modifyItem(newException, dismissedItem, null);
+                        }
+                        else {
+
+                            //							Recurring Events reminder fix for occurence  ** Wed Jun 24 10:04:44 IST 2015
+                            var aNewItem = dismissedItem.clone();
+                            aNewItem._reminderIsSet = false;
+                            aNewItem._newAlarm = null;
+                            this.calendar.modifyItem(aNewItem, dismissedItem, null);
+                            //dump("Dismissed an occurrence with startDate:"+dismissedItem.startDate+"\n");
+                        }
+
+                        var tmpDate = dismissedItem.endDate || dismissedItem.dueDate;
+                        if (tmpDate) {
+                            var nextOccurrence = this.recurrenceInfo.getNextOccurrence(tmpDate);
+                        }
+                        else {
+                            var nextOccurrence = null;
+                        }
+                        do {
+                            if (nextOccurrence) {
+                                // We have a next occurrence. Set newSnoozeTime.
+                                //dump("We have a next occurrence.\n");
+                                if (nextOccurrence.reminderIsSet) {
+                                    //newSnoozeTime = cal.createDateTime(this._newXMozSnoozeTime);
+                                    if (nextOccurrence.calendarItemType == "Exception") {
+                                        // Next occurrence is an exception
+                                        //dump("Next occurrence is an exception\n");
+                                        var alarmOffset = cal.createDuration();
+                                        alarmOffset.minutes = -1 * nextOccurrence.reminderMinutesBeforeStart;
+
+                                        newSnoozeTime = nextOccurrence.startDate.clone();
+                                        newSnoozeTime.addDuration(alarmOffset);
+                                    }
+                                    else {
+                                        //dump("Next occurrence is NOT an exception\n");
+                                        var alarmOffset = cal.createDuration();
+                                        alarmOffset.minutes = -1 * this.reminderMinutesBeforeStart;
+
+                                        newSnoozeTime = nextOccurrence.startDate.clone();
+                                        newSnoozeTime.addDuration(alarmOffset);
+                                    }
+                                }
+                                else {
+                                    //dump("Reminder not active on item:"+nextOccurrence.startDate+". Going to look for next.\n");
+                                    var tmpDate = dismissedItem.endDate || dismissedItem.dueDate;
+                                    if (tmpDate) {
+                                        nextOccurrence = this.recurrenceInfo.getNextOccurrence(nextOccurrence.endDate);
+                                    }
+                                    else {
+                                        nextOccurrence = null;
+                                    }
+                                }
+                            }
+
+                            if (!nextOccurrence) {
+                                // No next occurrence.
+                                //dump("No next occurrence so turning alarm of on master.\n");
+                                reminderIsSetChanged = "false";
+                            }
+                        }
+                        while ((nextOccurrence) && (newSnoozeTime === null));
+
+                    }
+                }
+                else {
+                    // Single dismiss. We turn it off.
+                    //dump("dismiss Single:"+this.title+", startDate:"+this.startDate+"\n");
+                    if (this.className == "mivExchangeEvent") reminderIsSetChanged = "false";
+                }
+            }
+            else {
+                // We have a snooze
+                if (this.calendarItemType == "RecurringMaster") {
+                    // Master snooze. set new alarm time.
+                    // Find out which occurrence or exception was snoozed
+                    var snoozedItem = this.getOccurrenceByNativeId(this._lastXMozSnoozeTimeNativeId);
+                    if (!snoozedItem) {
+                        //dump("This is weird. We did not find the snoozedItem.\n");
+                    }
+                    else {
+                        if (snoozedItem.calendarItemType == "Exception") {
+                            //dump("Snoozed an exception with startDate:"+snoozedItem.startDate+"\n");
+                            var newException = snoozedItem.clone();
+                            newException.setProperty("X-MOZ-SNOOZE-TIME-" + this._lastXMozSnoozeTimeNativeId, this._newXMozSnoozeTime);
+                            this.calendar.modifyItem(newException, snoozedItem, null);
+                        }
+                        else {
+                            //dump("Snoozed an occurrence with startDate:"+snoozedItem.startDate+"\n");
+                        }
+
+                        newSnoozeTime = cal.createDateTime(this._newXMozSnoozeTime);
+                    }
+                }
+                else {
+                    // Single snooze. set new alarm time.
+                    //dump("Snooze Single:"+this.title+", startDate:"+this.startDate+", newAlarmTime:"+this._newXMozSnoozeTime+"\n");
+                    newSnoozeTime = cal.createDateTime(this._newXMozSnoozeTime);
+                }
+            }
+
+        }
+
+        if (newSnoozeTime) {
+            newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
+            const MAPI_PidLidReminderSignalTime = "34144";
+
+            this.addSetItemField(updates, "ExtendedFieldURI", cal.toRFC3339(newSnoozeTime), {
+                DistinguishedPropertySetId: "Common",
+                PropertyId: MAPI_PidLidReminderSignalTime,
+                PropertyType: "SystemTime"
+            });
+        }
+
+        if (reminderIsSetChanged !== undefined) {
+            this.addSetItemField(updates, "ReminderIsSet", reminderIsSetChanged);
+        }
+    },
+
+    // Internal methods.
+    readRecurrenceRule: function _readRecurrenceRule(aElement) {
+        /*
+         * The Mozilla recurrence API is bothersome and dictated by libical.
+         *
+         * We need to obey and build an iCalendar string which we feed in
+         * to get the proper recurrence info.
+         */
+        const dayMap = {
+            'Monday': 'MO',
+            'Tuesday': 'TU',
+            'Wednesday': 'WE',
+            'Thursday': 'TH',
+            'Friday': 'FR',
+            'Saturday': 'SA',
+            'Sunday': 'SU',
+            'Weekday': ['MO', 'TU', 'WE', 'TH', 'FR'],
+            'WeekendDay': ['SA', 'SO'],
+            'Day': ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
+        };
+
+        const monthMap = {
+            'January': 1,
+            'February': 2,
+            'March': 3,
+            'April': 4,
+            'May': 5,
+            'June': 6,
+            'July': 7,
+            'August': 8,
+            'September': 9,
+            'October': 10,
+            'November': 11,
+            'December': 12
+        };
+
+        var comps = {};
+
+        for each(var rec in aElement) {
+            switch (rec.tagName) {
+            case "RelativeYearlyRecurrence":
+            case "AbsoluteYearlyRecurrence":
+                comps['FREQ'] = "YEARLY";
+                break;
+            case "RelativeMonthlyRecurrence":
+            case "AbsoluteMonthlyRecurrence":
+                comps['FREQ'] = "MONTHLY";
+                break;
+            case "WeeklyRecurrence":
+                comps['FREQ'] = "WEEKLY";
+                break;
+            case "DailyRecurrence":
+            case "DailyRegeneration":
+                comps['FREQ'] = "DAILY";
+                break;
+            case "NoEndRecurrence":
+            case "NumberedRecurrence":
+                break;
+            case "EndDateRecurrence":
+                break;
+            default:
+                //dump("skipping " + rec.tagName);
+                continue;
+            }
+
+            var weekdays = [];
+            var week = [];
+            var comps2 = xml2json.XPath(rec, "/*");
+            for each(var comp in comps2) {
+                switch (comp.tagName) {
+                case 'DaysOfWeek':
+                    for each(let day in xml2json.getValue(comp).split(" ")) {
+                        weekdays = weekdays.concat(dayMap[day]);
+                    }
+                    break;
+                case 'DayOfWeekIndex':
+                    week = weekMap[xml2json.getValue(comp)];
+                    break;
+                case 'Month':
+                    comps['BYMONTH'] = monthMap[xml2json.getValue(comp)];
+                    break;
+                case 'DayOfMonth':
+                    comps['BYMONTHDAY'] = xml2json.getValue(comp);
+                    break;
+                case 'FirstDayOfWeek':
+                    comps['WKST'] = dayMap[xml2json.getValue(comp)];
+                    break;
+                case 'Interval':
+                    comps['INTERVAL'] = xml2json.getValue(comp);
+                    break;
+                case 'StartDate':
+                    /* Dunno what to do with this for iCal; no place to set */
+                    this._recurrenceStartDate = cal.fromRFC3339(xml2json.getValue(comp).substr(0, 10) + "T00:00:00Z", exchGlobalFunctions.ecTZService().UTC);
+                    this._recurrenceStartDate.isDate = true;
+                    break;
+                case 'EndDate':
+                    //					comps['UNTIL'] = comp.value.replace(/Z$/, '');
+                    // As we only get the date + timezonediff we make a nice date+time from it.
+                    comps['UNTIL'] = xml2json.getValue(comp).substr(0, 10) + "T00:00:00Z";
+                    break;
+                case 'NumberOfOccurrences':
+                    comps['COUNT'] = xml2json.getValue(comp);
+                    break;
+                }
+            }
+            comps2 = null;
+
+            let wdtemp = weekdays;
+            weekdays = [];
+            for each(let day in wdtemp) {
+                weekdays.push(week + day);
+            }
+            if (weekdays.length > 0) {
+                comps['BYDAY'] = weekdays.join(',');
+            }
+        }
+
+        var compstrs = [];
+        for (var k in comps) {
+            compstrs.push(k + "=" + comps[k]);
+        }
+
+        if (compstrs.length == 0) {
+            return null;
+        }
+
+        var recrule = cal.createRecurrenceRule();
+
+        /* need to do this re-assign game so that the string gets parsed */
+        var prop = recrule.icalProperty;
+        prop.value = compstrs.join(';');
+        recrule.icalProperty = prop;
+        return recrule;
+    },
+
+    addMailboxAlias: function _addMailboxAlias(aAlias) {
+        this.mailboxAliases.push(aAlias);
+    },
+
+    createAttendee: function _createAttendee(aElement, aType) {
+        if (!aElement) return null;
+
+        if (!Ci.mivExchangeAttendee) {
+            dump(" !!!!!!!!!!!!!!!! no Ci.mivExchangeAttendee\n");
+            return null;
+        }
+        //var attendee = Cc["@1st-setup.nl/exchange/attendee;1"]
+        //			.createInstance(Ci.mivExchangeAttendee); // This one currently creates an error. Why ??!!
+        var attendee = new mivExchangeAttendee();
+        attendee.convertFromExchange(this, aElement, aType);
+        //dump("  -- CreateAttendee:"+attendee+", attendee.id:"+attendee.id+", title:"+this.title+"\n");
+        return attendee;
+        /* 
+        		let mbox = aElement.getTag("t:Mailbox");
+        		var attendee = cal.createAttendee();
+
+        		if (!aType) {
+        			aType = "REQ-PARTICIPANT";
+        		}
+
+        		var me = false;
+        		for each(var alias in this.mailboxAliases) {
+        			if (xml2json.getTagValue(mbox, "t:EmailAddress","unknown").toLowerCase() == alias.toLowerCase()) {
+        				me = true;
+        				//dump("createAttendee: Title:"+this.title+", email:"+xml2json.getTagValue(mbox, "t:EmailAddress","unknown")+". This address is mine ("+alias+").\n");
+        				break;
+        			}
+        		}
+
+        		// We also need to check aliases but these do not get stored yet.
+
+        		switch (xml2json.getTagValue(mbox, "t:RoutingType","unknown")) {
+        			case "SMTP" :
+        				attendee.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
+        				break;
+        			case "EX" :
+        				attendee.id = 'ldap:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
+        				break;
+        			default:
+        				//dump("createAttendee: Unknown RoutingType:'"+xml2json.getTagValue(mbox, "t:RoutingType")+"'");
+        				attendee.id = 'mailto:' + xml2json.getTagValue(mbox, "t:EmailAddress","unknown");
+        				break;
+        		}
+        		attendee.commonName = xml2json.getTagValue(mbox, "t:Name");
+        		attendee.rsvp = "FALSE";
+        		attendee.userType = "INDIVIDUAL";
+        		attendee.role = aType;
+
+        		if (me) {
+        			attendee.participationStatus = participationMap[this.myResponseType];
+        				//dump("createAttendee A: Title:"+this.title+", attendee:"+attendee.id+", myResponseType:"+this.myResponseType+", attendee.participationStatus:"+attendee.participationStatus+"\n");
+        		}
+        		else {
+        			if (xml2json.getTagValue(aElement, "t:ResponseType", "") != "") {
+        				attendee.participationStatus = participationMap[xml2json.getTagValue(aElement, "t:ResponseType")];
+        				//dump("createAttendee B: Title:"+this.title+", attendee:"+attendee.id+", ResponseType:"+aElement.getTagValue("t:ResponseType")+", attendee.participationStatus:"+attendee.participationStatus+"\n");
+        			}
+        		}
+
+        		mbox = null;
+        		aElement = null;
+        		return attendee; */
+    },
+
+    tryToSetDateValueUTC: function _tryToSetDateValueUTC(ewsvalue, aDefault) {
+        if ((ewsvalue) && (ewsvalue.toString().length)) {
+            if (ewsvalue.indexOf("Z") > -1) {
+                return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecTZService().UTC);
+            }
+            else {
+                return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecDefaultTimeZone()).getInTimezone(exchGlobalFunctions.ecTZService().UTC);
+            }
+        }
+
+        return aDefault;
+    },
+
+    tryToSetDateValueDefaultTZ: function _tryToSetDateValueDefaultTZ(ewsvalue, aDefault) {
+        if ((ewsvalue) && (ewsvalue.toString().length)) {
+            return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecDefaultTimeZone());
+        }
+
+        return aDefault;
+    },
+
+    tryToSetDateValue: function _TryToSetDateValue(ewsvalue, aDefault) {
+        if ((ewsvalue) && (ewsvalue.toString().length)) {
+            return cal.fromRFC3339(ewsvalue, exchGlobalFunctions.ecTZService().UTC).getInTimezone(exchGlobalFunctions.ecDefaultTimeZone());
+        }
+
+        return aDefault;
+    },
+
+    XPath: function _XPath(aString) {
+        if (this._exchangeData) {
+            return xml2json.XPath(this._exchangeData, aString);
+        }
+
+        return [];
+    },
+
+    getTag: function _getTag(aTagName) {
+        if (this._exchangeData) {
+            return xml2json.getTag(this._exchangeData, aTagName);
+        }
+
+        return null;
+    },
+
+    getTags: function _getTags(aTagName) {
+        if (this._exchangeData) {
+            return xml2json.getTags(this._exchangeData, aTagName);
+        }
+
+        return [];
+    },
+
+    getTagValue: function _getTagValue(aTagName, aDefaultValue) {
+        if (this._exchangeData) {
+            return xml2json.getTagValue(this._exchangeData, aTagName, aDefaultValue);
+        }
+
+        return aDefaultValue;
+    },
+
+    getAttributeByTag: function _getAttributeByTag(aTagName, aAttribute, aDefaultValue) {
+        //dump("getAttributeByTag 1: title:"+this.title+", aTagName:"+aTagName+", aAttribute:"+aAttribute+"\n");
+        if (this._exchangeData) {
+            return xml2json.getAttributeByTag(this._exchangeData, aTagName, aAttribute, aDefaultValue);
+        }
+        //dump("getAttributeByTag 3: title:"+this.title+", aTagName:"+aTagName+", aAttribute:"+aAttribute);
+
+        return aDefaultValue;
+    },
+
+    get className() {
+        return this._className;
+    },
+
+    initialize: function _initialize() {
+        this._calEvent = null;
+        if (this.className == "mivExchangeTodo") {
+            this._calEvent = Cc["@mozilla.org/calendar/todo;1"]
+                .createInstance(Ci.calITodo);
+        }
+        else {
+            this._calEvent = Cc["@mozilla.org/calendar/event;1"]
+                .createInstance(Ci.calIEvent);
+        }
+    },
+
+    deleteItem: function _deleteItem() {
+        for (var index in this._occurrences) {
+            this._occurrences[index].deleteItem();
+            this._occurrences[index] = null;
+            delete this._occurrences[index];
+        }
+
+        for (var index in this._exceptions) {
+            this._exceptions[index].deleteItem();
+            this._exceptions[index] = null;
+            delete this._exceptions[index];
+        }
+
+        this._exchangeData = null;
+    },
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeBaseItem) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeBaseItem = XPCOMUtils.generateNSGetFactory([mivExchangeBaseItem]);
-			
-	}
-
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+    try {
+        if (!NSGetFactory.mivExchangeBaseItem) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeBaseItem = XPCOMUtils.generateNSGetFactory([mivExchangeBaseItem]);
 
-	return NSGetFactory.mivExchangeBaseItem(cid);
-} 
+        }
 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeBaseItem(cid);
+}
diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
index 975c1c65..8cbc3d05 100644
--- a/interfaces/exchangeCalendar/mivExchangeCalendar.js
+++ b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -88,195 +88,195 @@ const nsIAM = Ci.nsIActivityManager;
 var gActivityManager;
 
 if (Cc["@mozilla.org/activity-manager;1"]) {
-	gActivityManager = Cc["@mozilla.org/activity-manager;1"].getService(nsIAM);
-	Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager available. Enabling it.");
+    gActivityManager = Cc["@mozilla.org/activity-manager;1"].getService(nsIAM);
+    Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager available. Enabling it.");
 }
 else {
-	Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager not available.");
+    Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions).LOG("-- ActivityManager not available.");
 }
 
 
 const fieldPathMap = {
-	'ActualWork': 'task',
-	'AdjacentMeetingCount': 'calendar',
-	'AdjacentMeetings': 'calendar',
-	'AllowNewTimeProposal': 'calendar',
-	'AppointmentReplyTime': 'calendar',
-	'AppointmentSequenceNumber': 'calendar',
-	'AppointmentState': 'calendar',
-	'AssignedTime': 'task',
-	'AssociatedCalendarItemId': 'meeting',
-	'Attachments': 'item',
-	'BillingInformation': 'task',
-	'Body': 'item',
-	'CalendarItemType': 'calendar',
-	'Categories': 'item',
-	'ChangeCount': 'task',
-	'Companies': 'task',
-	'CompleteDate': 'task',
-	'ConferenceType': 'calendar',
-	'ConflictingMeetingCount': 'calendar',
-	'ConflictingMeetings': 'calendar',
-	'Contacts': 'task',
-	'ConversationId': 'item',
-	'Culture': 'item',
-	'DateTimeCreated': 'item',
-	'DateTimeReceived': 'item',
-	'DateTimeSent': 'item',
-	'DateTimeStamp': 'calendar',
-	'DelegationState': 'task',
-	'Delegator': 'task',
-	'DeletedOccurrences': 'calendar',
-	'DisplayCc': 'item',
-	'DisplayTo': 'item',
-	'DueDate': 'task',
-	'Duration': 'calendar',
-	'EffectiveRights': 'item',
-	'End': 'calendar',
-	'EndTimeZone': 'calendar',
-	'FirstOccurrence': 'calendar',
-	'FolderClass': 'folder',
-	'FolderId': 'folder',
-	'HasAttachments': 'item',
-	'HasBeenProcessed': 'meeting',
-	'Importance': 'item',
-	'InReplyTo': 'item',
-	'IntendedFreeBusyStatus': 'meetingRequest',
-	'InternetMessageHeaders': 'item',
-	'IsAllDayEvent': 'calendar',
-	'IsAssignmentEditable': 'task',
-	'IsAssociated': 'item',
-	'IsCancelled': 'calendar',
-	'IsComplete': 'task',
-	'IsDelegated': 'meeting',
-	'IsDraft': 'item',
-	'IsFromMe': 'item',
-	'IsMeeting': 'calendar',
-	'IsOnlineMeeting': 'calendar',
-	'IsOutOfDate': 'meeting',
-	'IsRecurring': 'calendar',
-	'IsResend': 'item',
-	'IsResponseRequested': 'calendar',
-	'IsSubmitted': 'item',
-	'IsTeamTask': 'task',
-	'IsUnmodified': 'item',
-	'ItemClass': 'item',
-	'messageId': 'item',
-	'ItemId': 'item',
-	'LastModifiedName': 'item',
-	'LastModifiedTime': 'item',
-	'LastOccurrence': 'calendar',
-	'LegacyFreeBusyStatus': 'calendar',
-	'Location': 'calendar',
-	'MeetingRequestType': 'meetingRequest',
-	'MeetingRequestWasSent': 'calendar',
-	'MeetingTimeZone': 'calendar',
-	'MeetingWorkspaceUrl': 'calendar',
-	'Mileage': 'task',
-	'MimeContent': 'item',
-	'ModifiedOccurrences': 'calendar',
-	'MyResponseType': 'calendar',
-	'NetShowUrl': 'calendar',
-	'OptionalAttendees': 'calendar',
-	'Organizer': 'calendar',
-	'OriginalStart': 'calendar',
-	'Owner': 'task',
-	'ParentFolderId': 'item',
-	'PercentComplete': 'task',
-	'Recurrence': 'calendar',
-	'RecurrenceId': 'calendar',
-	'ReminderDueBy': 'item',
-	'ReminderIsSet': 'item',
-	'ReminderMinutesBeforeStart': 'item',
-	'RequiredAttendees': 'calendar',
-	'Resources': 'calendar',
-	'ResponseObjects': 'item',
-	'ResponseType': 'meeting',
-	'SearchParameters': 'folder',
-	'Sensitivity': 'item',
-	'Size': 'item',
-	'Start': 'calendar',
-	'StartDate': 'task',
-	'StartTimeZone': 'calendar',
-	'StatusDescription': 'task',
-	'Status': 'task',
-	'Subject': 'item',
-	'TimeZone': 'calendar',
-	'TotalWork': 'task',
-	'UID': 'calendar',
-	'UniqueBody': 'item',
-	'WebClientEditFormQueryString': 'item',
-	'WebClientReadFormQueryString': 'item',
-	'When': 'calendar'
+    'ActualWork': 'task',
+    'AdjacentMeetingCount': 'calendar',
+    'AdjacentMeetings': 'calendar',
+    'AllowNewTimeProposal': 'calendar',
+    'AppointmentReplyTime': 'calendar',
+    'AppointmentSequenceNumber': 'calendar',
+    'AppointmentState': 'calendar',
+    'AssignedTime': 'task',
+    'AssociatedCalendarItemId': 'meeting',
+    'Attachments': 'item',
+    'BillingInformation': 'task',
+    'Body': 'item',
+    'CalendarItemType': 'calendar',
+    'Categories': 'item',
+    'ChangeCount': 'task',
+    'Companies': 'task',
+    'CompleteDate': 'task',
+    'ConferenceType': 'calendar',
+    'ConflictingMeetingCount': 'calendar',
+    'ConflictingMeetings': 'calendar',
+    'Contacts': 'task',
+    'ConversationId': 'item',
+    'Culture': 'item',
+    'DateTimeCreated': 'item',
+    'DateTimeReceived': 'item',
+    'DateTimeSent': 'item',
+    'DateTimeStamp': 'calendar',
+    'DelegationState': 'task',
+    'Delegator': 'task',
+    'DeletedOccurrences': 'calendar',
+    'DisplayCc': 'item',
+    'DisplayTo': 'item',
+    'DueDate': 'task',
+    'Duration': 'calendar',
+    'EffectiveRights': 'item',
+    'End': 'calendar',
+    'EndTimeZone': 'calendar',
+    'FirstOccurrence': 'calendar',
+    'FolderClass': 'folder',
+    'FolderId': 'folder',
+    'HasAttachments': 'item',
+    'HasBeenProcessed': 'meeting',
+    'Importance': 'item',
+    'InReplyTo': 'item',
+    'IntendedFreeBusyStatus': 'meetingRequest',
+    'InternetMessageHeaders': 'item',
+    'IsAllDayEvent': 'calendar',
+    'IsAssignmentEditable': 'task',
+    'IsAssociated': 'item',
+    'IsCancelled': 'calendar',
+    'IsComplete': 'task',
+    'IsDelegated': 'meeting',
+    'IsDraft': 'item',
+    'IsFromMe': 'item',
+    'IsMeeting': 'calendar',
+    'IsOnlineMeeting': 'calendar',
+    'IsOutOfDate': 'meeting',
+    'IsRecurring': 'calendar',
+    'IsResend': 'item',
+    'IsResponseRequested': 'calendar',
+    'IsSubmitted': 'item',
+    'IsTeamTask': 'task',
+    'IsUnmodified': 'item',
+    'ItemClass': 'item',
+    'messageId': 'item',
+    'ItemId': 'item',
+    'LastModifiedName': 'item',
+    'LastModifiedTime': 'item',
+    'LastOccurrence': 'calendar',
+    'LegacyFreeBusyStatus': 'calendar',
+    'Location': 'calendar',
+    'MeetingRequestType': 'meetingRequest',
+    'MeetingRequestWasSent': 'calendar',
+    'MeetingTimeZone': 'calendar',
+    'MeetingWorkspaceUrl': 'calendar',
+    'Mileage': 'task',
+    'MimeContent': 'item',
+    'ModifiedOccurrences': 'calendar',
+    'MyResponseType': 'calendar',
+    'NetShowUrl': 'calendar',
+    'OptionalAttendees': 'calendar',
+    'Organizer': 'calendar',
+    'OriginalStart': 'calendar',
+    'Owner': 'task',
+    'ParentFolderId': 'item',
+    'PercentComplete': 'task',
+    'Recurrence': 'calendar',
+    'RecurrenceId': 'calendar',
+    'ReminderDueBy': 'item',
+    'ReminderIsSet': 'item',
+    'ReminderMinutesBeforeStart': 'item',
+    'RequiredAttendees': 'calendar',
+    'Resources': 'calendar',
+    'ResponseObjects': 'item',
+    'ResponseType': 'meeting',
+    'SearchParameters': 'folder',
+    'Sensitivity': 'item',
+    'Size': 'item',
+    'Start': 'calendar',
+    'StartDate': 'task',
+    'StartTimeZone': 'calendar',
+    'StatusDescription': 'task',
+    'Status': 'task',
+    'Subject': 'item',
+    'TimeZone': 'calendar',
+    'TotalWork': 'task',
+    'UID': 'calendar',
+    'UniqueBody': 'item',
+    'WebClientEditFormQueryString': 'item',
+    'WebClientReadFormQueryString': 'item',
+    'When': 'calendar'
 };
 
 const dayRevMap = {
-	'MO': 'Monday',
-	'TU': 'Tuesday',
-	'WE': 'Wednesday',
-	'TH': 'Thursday',
-	'FR': 'Friday',
-	'SA': 'Saturday',
-	'SU': 'Sunday'
+    'MO': 'Monday',
+    'TU': 'Tuesday',
+    'WE': 'Wednesday',
+    'TH': 'Thursday',
+    'FR': 'Friday',
+    'SA': 'Saturday',
+    'SU': 'Sunday'
 };
 
 const dayIdxMap = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'];
 
 const weekRevMap = {
-	'1': 'First',
-	'2': 'Second',
-	'3': 'Third',
-	'4': 'Fourth',
-	'-1': 'Last'
+    '1': 'First',
+    '2': 'Second',
+    '3': 'Third',
+    '4': 'Fourth',
+    '-1': 'Last'
 };
 
 const monthIdxMap = ['January', 'February', 'March', 'April', 'May', 'June',
-	'July', 'August', 'September', 'October', 'November', 'December'
+    'July', 'August', 'September', 'October', 'November', 'December'
 ];
 
 const participationMap = {
-	"Unknown": "NEEDS-ACTION",
-	"NoResponseReceived": "NEEDS-ACTION",
-	"Tentative": "TENTATIVE",
-	"Accept": "ACCEPTED",
-	"Decline": "DECLINED",
-	"Organizer": "ACCEPTED"
+    "Unknown": "NEEDS-ACTION",
+    "NoResponseReceived": "NEEDS-ACTION",
+    "Tentative": "TENTATIVE",
+    "Accept": "ACCEPTED",
+    "Decline": "DECLINED",
+    "Organizer": "ACCEPTED"
 };
 
 const dayMap = {
-	'Monday': 'MO',
-	'Tuesday': 'TU',
-	'Wednesday': 'WE',
-	'Thursday': 'TH',
-	'Friday': 'FR',
-	'Saturday': 'SA',
-	'Sunday': 'SU',
-	'Weekday': ['MO', 'TU', 'WE', 'TH', 'FR'],
-	'WeekendDay': ['SA', 'SO'],
-	'Day': ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
+    'Monday': 'MO',
+    'Tuesday': 'TU',
+    'Wednesday': 'WE',
+    'Thursday': 'TH',
+    'Friday': 'FR',
+    'Saturday': 'SA',
+    'Sunday': 'SU',
+    'Weekday': ['MO', 'TU', 'WE', 'TH', 'FR'],
+    'WeekendDay': ['SA', 'SO'],
+    'Day': ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SO']
 };
 
 const weekMap = {
-	'First': 1,
-	'Second': 2,
-	'Third': 3,
-	'Fourth': 4,
-	'Last': -1
+    'First': 1,
+    'Second': 2,
+    'Third': 3,
+    'Fourth': 4,
+    'Last': -1
 };
 
 const monthMap = {
-	'January': 1,
-	'February': 2,
-	'March': 3,
-	'April': 4,
-	'May': 5,
-	'June': 6,
-	'July': 7,
-	'August': 8,
-	'September': 9,
-	'October': 10,
-	'November': 11,
-	'December': 12
+    'January': 1,
+    'February': 2,
+    'March': 3,
+    'April': 4,
+    'May': 5,
+    'June': 6,
+    'July': 7,
+    'August': 8,
+    'September': 9,
+    'October': 10,
+    'November': 11,
+    'December': 12
 };
 
 const MAPI_PidLidTaskAccepted = "33032";
@@ -295,10719 +295,10719 @@ const MAPI_PidLidReminderSet = "34051";
 
 function calExchangeCalendar() {
 
-	try {
-		this.myId = null;
+    try {
+        this.myId = null;
 
-		this.initProviderBase();
+        this.initProviderBase();
 
-		this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-			.getService(Ci.mivFunctions);
+        this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+            .getService(Ci.mivFunctions);
 
-		this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-			.getService(Ci.mivExchangeTimeZones);
+        this.timeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
+            .getService(Ci.mivExchangeTimeZones);
 
-		this.setDoDebug();
+        this.setDoDebug();
 
-		this.noDB = true;
-		this.dbInit = false;
+        this.noDB = true;
+        this.dbInit = false;
 
-		this.folderPathStatus = 1;
-		this.firstrun = true;
-		this.mUri = "";
-		this.mid = null;
+        this.folderPathStatus = 1;
+        this.firstrun = true;
+        this.mUri = "";
+        this.mid = null;
 
-		//	this.initialized = false;
+        //	this.initialized = false;
 
-		//	this.prefs = null;
-		this.mUseOfflineCache = null;
-		this.mNotConnected = true;
+        //	this.prefs = null;
+        this.mUseOfflineCache = null;
+        this.mNotConnected = true;
 
-		this.myAvailable = false;
+        this.myAvailable = false;
 
-		this.mPrefs = null;
+        this.mPrefs = null;
 
-		this.itemCacheById = {};
-		this.itemCancelQueue = {};
+        this.itemCacheById = {};
+        this.itemCancelQueue = {};
 
-		this.itemCacheByStartDate = {};
-		this.itemCacheByEndDate = {};
-		this.recurringMasterCache = {};
-		this.recurringMasterCacheById = {};
-		this.newMasters = {};
-		this.parentLessItems = {};
+        this.itemCacheByStartDate = {};
+        this.itemCacheByEndDate = {};
+        this.recurringMasterCache = {};
+        this.recurringMasterCacheById = {};
+        this.newMasters = {};
+        this.parentLessItems = {};
 
-		this.startDate = null;
-		this.endDate = null;
+        this.startDate = null;
+        this.endDate = null;
 
-		this.syncState = null;
-		this.syncStateInbox = null;
-		this.syncInboxState = null;
-		this._weAreSyncing = false;
-		this.firstSyncDone = false;
+        this.syncState = null;
+        this.syncStateInbox = null;
+        this.syncInboxState = null;
+        this._weAreSyncing = false;
+        this.firstSyncDone = false;
 
-		this.meetingRequestsCache = [];
-		this.meetingCancelationsCache = [];
-		this.meetingrequestAnswered = [];
-		this.meetingResponsesCache = [];
+        this.meetingRequestsCache = [];
+        this.meetingCancelationsCache = [];
+        this.meetingrequestAnswered = [];
+        this.meetingResponsesCache = [];
 
-		this.getItemSyncQueue = [];
-		this.getItemsSyncQueue = [];
-		this.processItemSyncQueueBusy = false;
+        this.getItemSyncQueue = [];
+        this.getItemsSyncQueue = [];
+        this.processItemSyncQueueBusy = false;
 
-		this.offlineTimer = null;
-		this.offlineQueue = [];
+        this.offlineTimer = null;
+        this.offlineQueue = [];
 
-		this.doReset = false;
+        this.doReset = false;
 
-		this.shutdown = false;
+        this.shutdown = false;
 
-		this.inboxPoller = Cc["@mozilla.org/timer;1"]
-			.createInstance(Ci.nsITimer);
+        this.inboxPoller = Cc["@mozilla.org/timer;1"]
+            .createInstance(Ci.nsITimer);
 
-		this.cacheLoader = Cc["@mozilla.org/timer;1"]
-			.createInstance(Ci.nsITimer);
-		this.loadingFromCache = false;
+        this.cacheLoader = Cc["@mozilla.org/timer;1"]
+            .createInstance(Ci.nsITimer);
+        this.loadingFromCache = false;
 
-		this.observerService = Cc["@mozilla.org/observer-service;1"]
-			.getService(Ci.nsIObserverService);
+        this.observerService = Cc["@mozilla.org/observer-service;1"]
+            .getService(Ci.nsIObserverService);
 
-		this.lightningNotifier = Cc["@1st-setup.nl/exchange/lightningnotifier;1"]
-			.getService(Ci.mivExchangeLightningNotifier);
+        this.lightningNotifier = Cc["@1st-setup.nl/exchange/lightningnotifier;1"]
+            .getService(Ci.mivExchangeLightningNotifier);
 
-		this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
-			.getService(Ci.mivExchangeLoadBalancer);
+        this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+            .getService(Ci.mivExchangeLoadBalancer);
 
-		this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-			.getService(Ci.mivExchangeStatistics);
+        this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+            .getService(Ci.mivExchangeStatistics);
 
-		this.calendarPoller = null;
+        this.calendarPoller = null;
 
-		this.mObserver = new ecObserver(this);
+        this.mObserver = new ecObserver(this);
 
-		this.supportsTasks = false;
-		this.supportsEvents = false;
+        this.supportsTasks = false;
+        this.supportsEvents = false;
 
-		this.folderProperties = null;
-		this._readOnly = true;
-		this.folderIsNotAvailable = true;
+        this.folderProperties = null;
+        this._readOnly = true;
+        this.folderIsNotAvailable = true;
 
-		this.exporting = false;
-		this.OnlyShowAvailability = false;
+        this.exporting = false;
+        this.OnlyShowAvailability = false;
 
-		this.updateCalendarItems = [];
-		this.updateCalendarTimer = Cc["@mozilla.org/timer;1"]
-			.createInstance(Ci.nsITimer);
-		this.updateCalendarTimerRunning = false;
+        this.updateCalendarItems = [];
+        this.updateCalendarTimer = Cc["@mozilla.org/timer;1"]
+            .createInstance(Ci.nsITimer);
+        this.updateCalendarTimerRunning = false;
 
-		this._canDelete = false;
-		this._canModify = false;
-		this._canCreateContent = false;
+        this._canDelete = false;
+        this._canModify = false;
+        this._canCreateContent = false;
 
-		this.mIsOffline = Components.classes["@mozilla.org/network/io-service;1"]
-			.getService(Components.interfaces.nsIIOService).offline;
+        this.mIsOffline = Components.classes["@mozilla.org/network/io-service;1"]
+            .getService(Components.interfaces.nsIIOService).offline;
 
-		this._exchangeCurrentStatus = Cr.NS_OK; //Cr.NS_ERROR_FAILURE; //Cr.NS_OK;
+        this._exchangeCurrentStatus = Cr.NS_OK; //Cr.NS_ERROR_FAILURE; //Cr.NS_OK;
 
-		this._connectionStateDescription = "";
-		//this.globalFunctions.LOG("Our offline status is:"+this.mIsOffline+".");
+        this._connectionStateDescription = "";
+        //this.globalFunctions.LOG("Our offline status is:"+this.mIsOffline+".");
 
-		this.itemCount = 0;
-		this.itemUpdates = 0;
-		this.itemsFromExchange = 0;
-		this.masterCount = 0;
-	}
-	catch (err) {
-		dump("mivExchangeCalendar.new Err:" + err + "\n");
-	}
+        this.itemCount = 0;
+        this.itemUpdates = 0;
+        this.itemsFromExchange = 0;
+        this.masterCount = 0;
+    }
+    catch (err) {
+        dump("mivExchangeCalendar.new Err:" + err + "\n");
+    }
 }
 
 var calExchangeCalendarGUID = "720a458e-b6cd-4883-8a4d-5be27ec454d8";
 
 calExchangeCalendar.prototype = {
 
-	get timeStamp() {
-		var elapsed = new Date().getTime() - globalStart;
-		//dump("elapsed:"+elapsed);
-		return elapsed;
-	},
-
-	__proto__: cal.ProviderBase.prototype,
-
-	// Begin nsIClassInfo
-	classID: components.ID("{" + calExchangeCalendarGUID + "}"),
-	contractID: "@mozilla.org/calendar/calendar;1?type=exchangecalendar",
-	classDescription: "Exchange 2007/2010 Calendar and Tasks Provider",
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) {
-		var ifaces = [Ci.mivExchangeCalendar,
-			Ci.calICalendarACLManager,
-			Ci.calICalendar,
-			Ci.calICalendarProvider,
-			Ci.calIFreeBusyService,
-			Ci.calIItipTransport,
-			Ci.calISchedulingSupport,
-			Ci.calICalendarProvider,
-			Ci.nsIClassInfo,
-			Ci.nsISupports
-		];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	// nsISupports getHelperForLanguage(in PRUint32 language);
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-	flags: 0,
-	// End nsIClassInfo
-
-	// Begin nsISupports
-	// void QueryInterface(in nsIIDRef uuid, [iid_is(uuid),retval] out nsQIResult result);
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeCalendar,
-		Ci.calICalendarACLManager,
-		Ci.calICalendar,
-		Ci.calICalendarProvider,
-		Ci.calIFreeBusyService,
-		Ci.calIItipTransport,
-		Ci.calISchedulingSupport,
-		Ci.calICalendarProvider,
-		Ci.nsIClassInfo,
-		Ci.nsISupports
-	]),
-	// End nsISupports
-
-	// Begin calICalendarProvider
-	// readonly attribute nsIURI prefChromeOverlay;
-	get prefChromeOverlay() {
-		if (this.debug) this.logInfo("get prefChromeOverlay()");
-		return null;
-	},
-
-	get displayName() {
-		if (this.debug) this.logInfo("get displayName()");
-		return calGetString("calExchangeCalendar", "displayName", null, "exchangecalendar");
-	},
-
-	//  void createCalendar(in AUTF8String aName, in nsIURI aURL,
-	//	            in calIProviderListener aListener);
-	createCalendar: function calWcapCalendar_createCalendar(name, url, listener) {
-		if (this.debug) this.logInfo("createCalendar");
-		throw NS_ERROR_NOT_IMPLEMENTED;
-	},
-
-	//  void deleteCalendar(in calICalendar aCalendar,
-	//  	            in calIProviderListener aListener);
-	deleteCalendar: function calWcapCalendar_deleteCalendar(calendar, listener) {
-		if (this.debug) this.logInfo("deleteCalendar");
-		throw NS_ERROR_NOT_IMPLEMENTED;
-	},
-
-	//  calICalendar getCalendar(in nsIURI aURL);
-	getCalendar: function calWcapCalendar_getCalendar(url) {
-		if (this.debug) this.logInfo("getCalendar");
-		throw NS_ERROR_NOT_IMPLEMENTED;
-	},
-	// End calICalendarProvider
-
-	// Begin calICalendarACLManager
-	/* Gets the calICalendarACLEntry of the current user for the specified
-	calendar. */
-	//void getCalendarEntry(in calICalendar aCalendar,
-	//	          in calIOperationListener aListener);
-	getCalendarEntry: function _getCalendarEntry(aCalendar, aListener) {
-		//dump("getCalendarEntry: aCalendar.name:"+aCalendar.name+", aLsitener:"+aListener+"\n");
-	},
-
-	/* Gets the calIItemACLEntry of the current user for the specified
-	calendar item. Depending on the implementation, each item can have
-	different permissions based on specific attributes.
-	(TODO: should be made asynchronous one day) */
-	//calIItemACLEntry getItemEntry(in calIItemBase aItem);
-	getItemEntry: function _getItemEntry(aItem) {
-		//dump("getItemEntry: aCalendar.name:"+this.name+", aItem:"+aItem.title+"\n");
-		if (this.itemCacheById[aItem.id]) {
-			return this.itemCacheById[aItem.id].aclEntry;
-		}
-	},
-
-	// End calICalendarACLManager
-
-	// Begin calICalendar
-
-	//  attribute AUTF8String id;
-
-	//   attribute AUTF8String name;
-
-	//  readonly attribute AUTF8String type;
-	get type() {
-		//		if (this.debug) this.logInfo("get type()");
-		return "exchangecalendar";
-	},
-
-	//  readonly attribute AString providerID;
-	get providerID() {
-		return "exchangecalendar@extensions.1st-setup.nl";
-	},
-
-	//  attribute calICalendar superCalendar;
-
-	get id() {
-		return this.myId;
-	},
-
-	set id(aValue) {
-		// We ignore this.
-		//dump("Someone is setting the id to '"+aValue+"' for calendar:"+this.name+"\n");
-	},
-
-	//  attribute nsIURI uri;
-	get uri() {
-		return this.mUri;
-	},
-
-	set uri(aUri) {
-		//if (this.debug) this.logInfo("set uri:"+aUri.path);
-		this.myId = aUri.path.substr(1);
-		this.mUri = aUri;
-
-		this.mPrefs = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefService)
-			.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + this.myId + ".");
-		if (this.exchangePrefVersion < 1) {
-			this.mPrefs = null;
-			this.myId = null;
-		}
-
-		if (this.name) {
-			this.newCalendar = false;
-			this.performStartup();
-		}
-		else {
-			if (this.debug) this.logInfo("We are not going to perform a startup because we do not have a name yet and the calendar is probably still created.");
-			this.newCalendar = true;
-		}
-
-		return this.uri;
-	},
-
-	startupLoadFromOfflineCache: function _startupLoadFromOfflineCache() {
-		if (this.debug) this.logInfo("startupLoadFromOfflineCache: Starting load from offline cache.");
-
-		if (this.loadingFromCache) return;
-
-		this.loadingFromCache = true;
-
-		var startTime = cal.createDateTime();
-
-		if (!this.startDate) {
-			this.startDate = this.offlineStartDate;
-		}
-		if (!this.endDate) {
-			this.endDate = this.offlineEndDate;
-		}
-		var itemsFromCache = this.getItemsFromOfflineCache(this.startDate, this.endDate);
-		if (itemsFromCache) {
-			var endTime = cal.createDateTime();
-			var duration = endTime.subtractDate(startTime);
-			if (this.debug) this.logInfo("We got '" + itemsFromCache.length + "' items from offline cache.(took " + duration.inSeconds + " seconds)");
-		}
-
-		this.loadingFromCache = false;
-
-	},
-
-	performStartup: function _performStartup() {
-		if (this.debug) this.logInfo("Performing startup.");
-
-		if (this.getProperty("disabled")) {
-			if (this.debug) this.logInfo("This calendar is disabled so not doing the startup.");
-			return;
-		}
-
-		// Load from offline Cache into memory cache.
-		/*		if (this.useOfflineCache) {
-					if (this.debug) this.logInfo("Getting items from offlineCache.");
-
-					let self = this;
-					this.cacheLoader.cancel();
-					this.cacheLoader.initWithCallback({ notify: function setTimeout_notify() {self.startupLoadFromOfflineCache();	}}, 0, this.cacheLoader.TYPE_ONE_SHOT);
-
-				}
-		*/
-		if (!this.isOffline) {
-			// Start online processes.
-			// 1. Check folder.
-			// 2. Get timezone settings.
-			// 3. Start pollers.
-			if (this.debug) this.logInfo("Initialized:" + this.isInitialized);
-
-			/*			if (this.useOfflineCache) {
-							this.syncExchangeToOfflineCache();
-						}*/ // Not necessary anymore as it will follow the cache by default.
-		}
-
-		//Enable cache on startup :)
-		this.prefs.setBoolPref("useOfflineCache", true);
-	},
-
-	set readOnly(aValue) {
-		//dump("set readOnly:"+this.name+"|"+this.globalFunctions.STACK(10)+"\n");
-		this.prefs.setBoolPref("UserReadOnly", aValue);
-		this.readOnlyInternal = aValue;
-	},
-
-	get readOnly() {
-		var userPref = this.globalFunctions.safeGetBoolPref(this.prefs, "UserReadOnly", false);
-		if (userPref === true) return true;
-		return this.readOnlyInternal;
-	},
-
-	set readOnlyInternal(aValue) {
-		//dump("set readOnlyInternal:"+this.name+"\n");
-		if (this.folderProperties) {
-			var effectiveRights = this.folderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:CalendarFolder/t:EffectiveRights");
-			if (effectiveRights.length > 0) {
-				if (((effectiveRights[0].getTagValue("t:Delete") == "false") || (effectiveRights[0].getTagValue("t:Modify") == "false"))
-					&& (effectiveRights[0].getTagValue("t:CreateContents") == "false")) {
-					aValue = true;
-				}
-			}
-			effectiveRights = null;
-
-		}
-
-		var changed = false;
-		if (aValue != this._readOnly) {
-			if (this.debug) this.logInfo("readOnly property changed from " + this._readOnly + " to " + aValue);
-			changed = true;
-		}
-
-		if (this.debug) this.logInfo("set readOnly to '" + aValue + "'");
-		this._readOnly = aValue;
-
-		if (changed) {
-			var userPref = this.globalFunctions.safeGetBoolPref(this.prefs, "UserReadOnly", false);
-			if ((userPref === true) && (aValue === false)) return; // Do not change icon when use wants it readonly.
-
-			this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", aValue, !aValue]);
-			this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
-		}
-	},
-
-	//  attribute boolean readOnly;
-	get readOnlyInternal() {
-		//dump("get readOnly: name:"+this.name+", this._readOnly:"+this._readOnly+", this.notConnected:"+this.notConnected+"\n");
-		return ((this._readOnly) || (this.notConnected));
-	},
-
-	set notConnected(aValue) {
-		if (aValue != this.mNotConnected) {
-			this.mNotConnected = aValue;
-			if (aValue) {
-				this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", true, false]);
-				this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
-			}
-			else {
-				this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", false, true]);
-				this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
-			}
-		}
-
-	},
-
-	get notConnected() {
-		return this.mNotConnected;
-	},
-
-	//  readonly attribute boolean canRefresh;
-	get canRefresh() {
-		return true;
-	},
-
-	//  attribute boolean transientProperties;
-
-	//  nsIVariant getProperty(in AUTF8String aName);
-	getProperty: function _getProperty(aName) {
-		//	if (!this.isInitialized) {
-		//		return;
-		//	}
-
-		//dump("2 getProperty("+aName+")\n");
-		switch (aName) {
-		case "exchWebService.offlineCacheDBHandle":
-			return this.offlineCacheDB;
-
-		case "exchWebService.offlineOrNotConnected":
-			return ((this.notConnected) || (this.isOffline));
-
-		case "exchWebService.useOfflineCache":
-			return this.useOfflineCache;
-		case "exchWebService.getFolderProperties":
-			this.globalFunctions.LOG("Requesting exchWebService.getFolderProperties property.");
-			if (this.folderProperties) {
-				return this.folderProperties.toString();
-			}
-			return null;
-			break;
-		case "exchWebService.checkFolderPath":
-			this.globalFunctions.LOG("Requesting exchWebService.checkFolderPath property.");
-			this.checkFolderPath();
-			return "ok";
-			break;
-		case "capabilities.tasks.supported":
-			return this.supportsTasks;
-			break;
-		case "capabilities.events.supported":
-			return this.supportsEvents;
-			break;
-		case "auto-enabled":
-			return true;
-		case "organizerId":
-			//if (this.debug) this.logInfo("getProperty: organizerId");
-			//return "exchangecalendar:" + this.mailbox;
-			return "mailto:" + this.mailbox;
-			break;
-		case "organizerCN":
-			return this.userDisplayName;
-			break;
-		case "cache.supported":
-			return false;
-		case "requiresNetwork":
-			return false;
-		case "disabled":
-			if (this.prefs) {
-				this._disabled = this.globalFunctions.safeGetBoolPref(this.prefs, "disabled", false);
-				if (this._disabled) return this._disabled;
-			}
-
-			return ((!this.isInitialized) && (this.folderPathStatus == 0));
-		case "itip.notify-replies":
-			return true;
-		case "itip.transport":
-			if (this.debug) this.logInfo("getProperty: itip.transport");
-			return this.QueryInterface(Ci.calIItipTransport);
-			break;
-			//return true;
-		case "capabilities.autoschedule.supported":
-			if (this.debug) this.logInfo("capabilities.autoschedule.supported");
-			return true;
-		case "exchangeCurrentStatus":
-			return this._exchangeCurrentStatus;
-		}
-		// itip.disableRevisionChecks
-
-		// capabilities.events.supported
-		// capabilities.tasks.supported
-
-		//dump("1 getProperty("+aName+")="+this.__proto__.__proto__.getProperty.apply(this, arguments)+"\n");
-		return this.__proto__.__proto__.getProperty.apply(this, arguments);
-	},
-
-	//  void setProperty(in AUTF8String aName, in nsIVariant aValue);
-	setProperty: function setProperty(aName, aValue) {
-
-		if (this.debug) this.logInfo("setProperty. aName:" + aName + ", aValue:" + aValue);
-		switch (aName) {
-		case "exchangeCurrentStatus":
-			//dump("name1:"+this.name+", exchangeCurrentStatus:"+this._exchangeCurrentStatus+", newStatus:"+aValue+"\n");
-			var oldStatus = this._exchangeCurrentStatus;
-			this._exchangeCurrentStatus = aValue;
-			if (aValue != oldStatus) {
-				//dump("name2:"+this.name+", exchangeCurrentStatus:"+aValue+"\n");
-				this.observers.notify("onPropertyChanged", [this.superCalendar, "exchangeCurrentStatus", aValue, oldStatus]);
-			}
-			return;
-		case "disabled":
-			var oldDisabledState = this._disabled;
-			this._disabled = aValue;
-			this.prefs.setBoolPref("disabled", aValue);
-			if ((aValue) && (oldDisabledState != this._disabled)) {
-				//dump("Calendar is set to disabled\n");
-				this.resetCalendar();
-			}
-			if ((!this._disabled) && (oldDisabledState != this._disabled)) {
-				this.doReset = true;
-				this.resetCalendar();
-			}
-			return;
-		case "exchWebService.useOfflineCache":
-
-			this.useOfflineCache = aValue;
-			if (this.debug) this.logInfo("setProperty: useOfflineCache = " + this.useOfflineCache + "  offlineCacheDB  " + this.offlineCacheDB);
-
-			if (!aValue) {
-				if (this.offlineCacheDB) {
-					try {
-						if (this.offlineCacheDB) this.offlineCacheDB.close();
-						this.offlineCacheDB = null;
-					}
-					catch (exc) {}
-				}
-
-				// Remove the offline cache database when we delete the calendar.
-				if (this.dbFile) {
-					this.dbFile.remove(true);
-					this.offlineCacheDB = null;
-				}
-			}
-			return;
-		}
-
-		this.__proto__.__proto__.setProperty.apply(this, arguments);
-
-	},
-
-	//  void deleteProperty(in AUTF8String aName);
-
-	//  void addObserver( in calIObserver observer );
-	//  void removeObserver( in calIObserver observer );
-
-	//  calIOperation addItem(in calIItemBase aItem,
-	//                in calIOperationListener aListener);
-	addItem: function _addItem(aItem, aListener) {
-		if (this.debug) this.logInfo("addItem id=" + aItem.id + ", aItem.calendar:" + aItem.calendar);
-
-		var itemEnum = aItem.propertyEnumerator;
-		/*		dump("Properties of:"+aItem.title+"\n");
-				while (itemEnum.hasMoreElements()) {
-					var property = itemEnum.getNext().QueryInterface(Components.interfaces.nsIProperty);
-					dump(property.name+":"+property.value+"\n");
-				}*/
-		var invite = aItem.getAttendees({});
-		//dump("a. Attendee count:"+invite.length+"\n");
-
-		// if aItem.id == null then it is a newly created item in Lightning.
-		// if aItem.id == "040000008200E00074C5B7101A82E008000000005D721F845633CD0100000000000000001000000006CC9AC20EA39441B863D6E454306174" it is from iTIP
-		// if aItem.id == "31d9835f-1c29-4d18-ab39-7587c56e3982" paste in lightning after a copy in lightning.
-		// if aItem.id == "AAMkAGFkNzVhOGVlLTYxMDktNGU0MC05YWZjLWIzMWY1YmNmOTAzNQBGAAAAAAD9bSPYK6piTIbhfZ5n6SOXBwAfSIGbKdCWQbNg+oqR8EJMAAAA9OKyAAAfSIGbKdCWQbNg+oqR8EJMAAB8S1QtAAA=" copy back and forth between exchange to other type and exchange.
-
-		if (this.OnlyShowAvailability) {
-			this.readOnlyInternal = true;
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				Ci.calIOperationListener.ADD,
-				aItem.id,
-				aItem);
-
-			/*	            this.notifyOperationComplete(aListener,
-				                                         Ci.calIErrors.CAL_IS_READONLY,
-				                                         Ci.calIOperationListener.ADD,
-				                                         null,
-				                                         "Calendar is readonly");*/
-			return null;
-		}
-
-		var newItem = aItem;
-
-		// Make sure we have one of our own object types
-		if ((cal.isEvent(aItem)) && (!aItem.className)) {
-			var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-				.createInstance(Ci.mivExchangeEvent);
-			newItem.cloneToCalEvent(aItem);
-		}
-
-		if ((!cal.isEvent(aItem)) && (!aItem.className)) {
-			var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
-				.createInstance(Ci.mivExchangeTodo);
-			newItem.cloneToCalEvent(aItem);
-		}
-
-		if (aItem.calendar === null) {
-			if (this.debug) this.logInfo("addItem Calendar is null for item going add me '" + this.name + "' as calendar.\n");
-			newItem.calendar = this.superCalendar;
-		}
-
-		var invite = newItem.getAttendees({});
-		//dump("b. Attendee count:"+invite.length+"\n");
-		//let newItem = aItem.clone();
-
-		// We check if we not allready have this item in Cache. If so we modify.
-		// This will happen when someone pressed the accept,decline or tentative buttons
-		// in the itip status bar on the header of an email message.
-		if (this.itemCacheById[newItem.id]) {
-			if (newItem.calendar === null) {
-				// This is an import from an export and item still exists
-				newItem.calendar = this;
-			}
-			if (this.itemCacheById[newItem.id].isInvitation) {
-				return this.modifyItem(newItem, this.itemCacheById[newItem.id], aListener); // We do this when we receive an update for an invitation.
-			}
-			else {
-				this.deleteItem(this.itemCacheById[newItem.id], null); // we do this on import of item which was exported earlier.
-			}
-		}
-
-		if ((newItem.id) && ((newItem.id.indexOf("-") > 2) || (newItem.id.length == 152))) {
-			// This is added from a copy/paste procedure.
-			newItem.id = null;
-			newItem.clearId(null);
-			if (this.debug) this.logInfo("addItem Copy/pasted item. item.id:" + newItem.id);
-			//newItem.deleteProperty("X-UID");
-
-			// If I am invited. Remove myself.
-			var attendees = newItem.getAttendees({});
-			newItem.removeAllAttendees(); // Need to have this. When we add attendees when we create a new calendaritem we become organizer.
-			for each(var attendee in attendees) {
-				if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase())
-					|| (attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase())) {
-					if (this.debug) this.logInfo("addItem: FOUND myself as an attendee and we are going to remove myself:" + newItem.title);
-					newItem.removeAttendee(attendee);
-				}
-			}
-		}
-
-		var invite = newItem.getAttendees({});
-		//dump("c. Attendee count:"+invite.length+"\n");
-		return this.adoptItem(newItem, aListener);
-	},
-
-
-	//  calIOperation adoptItem(in calIItemBase aItem,
-	//                  in calIOperationListener aListener);
-	adoptItem: function _adoptItem(aItem, aListener) {
-		if (this.debug) this.logInfo("adoptItem()");
-
-		if ((this.readOnly) || (this.OnlyShowAvailability)) {
-			this.readOnlyInternal = true;
-			if (this.OnlyShowAvailability) {
-				this.notifyOperationComplete(aListener,
-					Ci.calIErrors.OPERATION_CANCELLED,
-					Ci.calIOperationListener.ADD,
-					aItem.id,
-					aItem);
-			}
-			else {
-				this.notifyOperationComplete(aListener,
-					Ci.calIErrors.CAL_IS_READONLY,
-					Ci.calIOperationListener.ADD,
-					null,
-					"Calendar is readonly");
-			}
-			return;
-		}
-
-		if (isEvent(aItem)) {
-			// michel123
-
-			if (aItem.exchangeXML) {
-				var tmpItem = aItem.clone();
-				if (this.debug) this.logInfo("adoptItem 1 Copy/pasted item. item.id:" + tmpItem.id);
-			}
-			else {
-				if (!aItem.className) {
-					var tmpItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-						.createInstance(Ci.mivExchangeEvent);
-					tmpItem.addMailboxAlias(this.mailbox);
-					tmpItem.cloneToCalEvent(aItem);
-				}
-				else {
-					var tmpItem = aItem.clone();
-					tmpItem.addMailboxAlias(this.mailbox);
-				}
-				if (this.debug) this.logInfo("adoptItem 2 Copy/pasted item. item.id:" + tmpItem.id);
-			}
-
-			var invite = tmpItem.getAttendees({});
-			//dump("d. Attendee count:"+invite.length+"\n");
-
-			//			if ((tmpItem.id) && (tmpItem.id != "not a valid id")) {
-			if ((tmpItem.hasProperty("UID")) && (!aItem.id)) {
-				// This is and item create through an iTIP response.
-
-				var cachedItem = null;
-				for (var index in this.meetingRequestsCache) {
-					if (this.meetingRequestsCache[index]) {
-						//						if (this.meetingRequestsCache[index].uid == tmpItem.id) {
-						if (this.meetingRequestsCache[index].uid == tmpItem.getProperty("UID")) {
-							cachedItem = this.meetingRequestsCache[index];
-							break;
-						}
-					}
-				}
-
-				if (cachedItem) {
-					// We have meeting request in our cache.
-					// Send meetingrespons base on status and remove message in inbox.
-					if (this.debug) this.logInfo("BOA: iTIP action item with STATUS:" + tmpItem.getProperty("STATUS"));
-
-					var aNewItem = this.cloneItem(tmpItem);
-					//aNewItem.setProperty("X-UID", cachedItem.uid);
-					//aNewItem.setProperty("X-ChangeKey", cachedItem.changeKey);
-					aNewItem.setProperty("X-MEETINGREQUEST", cachedItem.getProperty("X-MEETINGREQUEST"));
-					//aNewItem.setProperty("X-IsInvitation" , cachedItem.isInvitation);
-					aNewItem.id = cachedItem.id;
-
-
-					if ((aNewItem) && (this.sendMeetingRespons(aNewItem, null, "new"))) {
-						this.notifyOperationComplete(aListener,
-							Cr.NS_OK,
-							Ci.calIOperationListener.ADD,
-							tmpItem.getProperty("UID"),
-							aNewItem);
-					}
-					else {
-						// User cancel.. How to respond!!
-						this.notifyOperationComplete(aListener,
-							Ci.calIErrors.OPERATION_CANCELLED,
-							Ci.calIOperationListener.ADD,
-							tmpItem.getProperty("UID"),
-							aNewItem);
-					}
-					return;
-				}
-				else {
-					if (this.debug) this.logInfo("getMeetingRequestFromServer:" + tmpItem.title);
-					//					this.getMeetingRequestFromServer(tmpItem, tmpItem.id, Ci.calIOperationListener.ADD, aListener);
-					this.getMeetingRequestFromServer(tmpItem, tmpItem.getProperty("UID"), Ci.calIOperationListener.ADD, aListener);
-					return;
-
-				}
-			}
-			var ewsItem = this.convertCalAppointmentToExchangeAppointment(tmpItem, "create", true);
-		}
-		if (isToDo(aItem)) {
-			var ewsItem = this.convertCalTaskToExchangeTask(aItem, "create");
-		}
-
-		if (ewsItem) {
-
-			// Create attachment create and delete object
-			var attachmentsUpdates = null;
-
-			var attachments = aItem.getAttachments({});
-			if (attachments.length > 0) {
-				if (this.debug) this.logInfo("  -- We have attachments:" + attachments.length);
-				var attachmentsUpdates = {
-					create: [],
-					delete: []
-				};
-				for (var index in attachments) {
-					attachmentsUpdates.create.push(attachments[index]);
-				}
-			}
-
-			var self = this;
-			this.addToQueue(erCreateItemRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					item: aItem,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					createReq: ewsItem,
-					newItem: aItem,
-					attachmentsUpdates: attachmentsUpdates,
-					actionStart: Date.now(),
-					sendto: "sendtoall"
-				},
-				function (erCreateItemRequest, aId, aChangeKey) {
-					self.createItemOk(erCreateItemRequest, aId, aChangeKey);
-				},
-				function (erCreateItemRequest, aCode, aMsg) {
-					self.whichOccurrencegetOccurrenceIndexError(erCreateItemRequest, aCode, aMsg);
-				},
-				aListener);
-		}
-		else {
-			// notify the listener
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.MODIFICATION_FAILED,
-				Ci.calIOperationListener.ADD,
-				aItem.id,
-				aItem);
-		}
-
-	},
-
-	getMeetingRequestByUIDOk: function _getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests) {
-		this.notConnected = false;
-		this.saveCredentials(erGetMeetingRequestByUIDRequest.argument);
-		if (this.debug) this.logInfo("getMeetingRequestByUIDOk: itemcount=" + aMeetingRequests.length);
-
-		if (erGetMeetingRequestByUIDRequest.argument.item.organizer) {
-			if (this.debug) this.logInfo(" >>>>>>> 1 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
-		}
-		else {
-			if (this.debug) this.logInfo("item has no oranizer!!!!!!!!!!!!");
-		}
-
-		if (aMeetingRequests.length > 0) {
-			// Convert list to CalAppointment and try to find the matching one
-			var tmpList = [];
-			for (var i = 0; i < aMeetingRequests.length; i++) {
-				var tmpItem = this.convertExchangeAppointmentToCalAppointment(aMeetingRequests[i], true);
-				if (tmpItem) {
-					tmpList.push(tmpItem);
-				}
-			}
-			var ewsItem = this.findItemInListByDatesAndID(tmpList, erGetMeetingRequestByUIDRequest.argument.item);
-
-			//var ewsItem = this.convertExchangeAppointmentToCalAppointment(aMeetingRequests[aMeetingRequests.length-1], true);
-
-			if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with STATUS:" + erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS"));
-
-			var me = this.getInvitedAttendee(erGetMeetingRequestByUIDRequest.argument.item);
-			if (me) {
-				if (this.debug) this.logInfo("getMeetingRequestByUIDOk: me.participationStatus:" + me.participationStatus);
-				var tmpMe = this.getInvitedAttendee(ewsItem);
-				if (tmpMe) {
-					if (this.debug) this.logInfo("getMeetingRequestByUIDOk: tmpMe.participationStatus:" + tmpMe.participationStatus);
-					tmpMe.participationStatus = me.participationStatus;
-
-					switch (tmpMe.participationStatus) {
-					case "ACCEPTED":
-						ewsItem.setProperty("STATUS", "CONFIRMED");
-						break;
-					case null:
-					case "TENTATIVE":
-						ewsItem.setProperty("STATUS", "TENTATIVE");
-						break;
-					case "DECLINED":
-						ewsItem.setProperty("STATUS", "CANCELLED");
-						break;
-					}
-				}
-			}
-			if (!me) {
-				// I'm not directly invited. Just through distributionlist or mailgroup.
-				if (this.debug) this.logInfo("getMeetingRequestByUIDOk: I'm not directly invited so we are going to create a dummy attendee for now.");
-				me = cal.createAttendee();
-				me.id = "mailto:" + this.mailbox;
-				me.commonName = this.userDisplayName;
-				me.rsvp = "FALSE";
-				me.userType = "INDIVIDUAL";
-				me.role = "NON-PARTICIPANT";
-				switch (erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS")) {
-				case "CONFIRMED":
-					me.participationStatus = "ACCEPTED";
-					break;
-				case "TENTATIVE":
-					me.participationStatus = "TENTATIVE";
-					break;
-				case "CANCELLED":
-					me.participationStatus = "DECLINED";
-					break;
-				}
-
-			}
-
-			if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with ewsItem.STATUS:" + ewsItem.getProperty("STATUS"));
-
-			ewsItem.setProperty("X-MEETINGREQUEST", true);
-			if ((ewsItem) && (this.sendMeetingRespons(ewsItem, null, "new", me.participationStatus))) {
-				if (erGetMeetingRequestByUIDRequest.listener) {
-					this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
-						Cr.NS_OK,
-						erGetMeetingRequestByUIDRequest.argument.operation,
-						erGetMeetingRequestByUIDRequest.argument.item.id,
-						ewsItem);
-				}
-				return;
-			}
-			// User cancel or other problem.
-		}
-		else {
-			// inbox item has been removed between pressing iTIP button and requesting the info from the server.
-			// Or it is an ICS import or a invitation from another mailbox... BUG 59
-			if (this.debug) this.logInfo("Meeting request was removed from inbox after iTIP button was pressed and before Exchange server could be checked.");
-			if (this.debug) this.logInfo("Someone else working in the same inbox?");
-			if (this.debug) this.logInfo("OR We see this when someone imports an ICS file or imports a meeting request into another calendar.");
-			// If it is an ICS we would like it to be added to the calendar as new item
-			// If is a meeting request then we want it accepted and not added. This must produce an error
-			// Problem is we cannot identify it as a ICS import or a acceptation of a meeting request.
-			var doStop = false;
-
-			if (erGetMeetingRequestByUIDRequest.argument.item.organizer) {
-				if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
-				if (erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT") == "CLIENT") {
-					// looks like iTIP because SCHEDULE-AGENT is set. 
-					if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
-					if (this.debug) this.logInfo(" !!!!!!!!!!!!!! THIS SHOULD NEVER HAPPEN ON AN iTIP. DO WE HAVE AN iTIP");
-					if (this.debug) this.logInfo("iCalString:" + erGetMeetingRequestByUIDRequest.argument.item.icalString);
-					//if (this.debug) this.logInfo(" Stopping processing.. Report this problem to exchangecalendar@extensions.1st-setup.nl");
-					//doStop = true;  // For now we going to clean out the UID and me as an attendee
-					// We fake that we do a paste and that it is an invitation.
-
-					if (this.debug) this.logInfo(" !!!>>  We are going to treat this as a copy/paste for a new event.");
-					var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
-					tmpItem.clearId("xxxx-xxxx-xxx-xxxx");
-					//tmpItem.setProperty("X-IsInvitation", "true");
-					tmpItem.setProperty("X-exchangeITIP1", "true");
-					tmpItem.setProperty("X-IsMeeting", true);
-					this.addItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
-					return;
-
-				}
-
-				if (erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT")) {
-					if (this.debug) this.logInfo("Unknown SCHEDULE-AGENT property for item. SCHEDULE-AGENT:" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
-					if (this.debug) this.logInfo("Please mail the previous line to exchangecalendar@extensions.1st-setup.nl");
-					return;
-				}
-				else {
-					if (this.debug) this.logInfo("SCHEDULE-AGENT not set. We are going add the item. At a later stage we will want to have a proper restore.");
-					var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
-					tmpItem.clearId("xxxx-xxxx-xxx-xxxx");
-					tmpItem.setProperty("X-exchangeITIP2", "true");
-					tmpItem.removeAllAttendees();
-					this.addItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
-					return;
-				}
-			}
-
-			if (!doStop) {
-				if (erGetMeetingRequestByUIDRequest.argument.item.isMutable) {
-					if (this.debug) this.logInfo("item is Mutable.");
-					erGetMeetingRequestByUIDRequest.argument.item.clearId("not a valid id");
-					if (this.debug) this.logInfo("item is Mutable. item.id set to '" + erGetMeetingRequestByUIDRequest.argument.item.id + "'");
-					this.adoptItem(erGetMeetingRequestByUIDRequest.argument.item, erGetMeetingRequestByUIDRequest.listener);
-				}
-				else {
-					if (this.debug) this.logInfo("item is NOT Mutable. Going to create clone.");
-					var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
-					tmpItem.clearId("not a valid id");
-					this.adoptItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
-				}
-				return;
-			}
-		}
-
-		// User cancel.. How to respond!!
-		if (erGetMeetingRequestByUIDRequest.listener) {
-			this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				erGetMeetingRequestByUIDRequest.argument.operation,
-				erGetMeetingRequestByUIDRequest.argument.item.id,
-				erGetMeetingRequestByUIDRequest.argument.item);
-		}
-	},
-
-	getMeetingRequestByUIDError: function _getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg) {
-		this.saveCredentials(erGetMeetingRequestByUIDRequest.argument);
-		this.notConnected = true;
-		if (this.debug) this.logInfo("getMeetingRequestByUIDError: aCode:" + aCode + ", aMsg:" + aMsg);
-
-		this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
-			Ci.calIErrors.OPERATION_CANCELLED,
-			Ci.calIOperationListener.ADD,
-			erGetMeetingRequestByUIDRequest.argument.item.id,
-			erGetMeetingRequestByUIDRequest.argument.item);
-
-		var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-			.getService(Components.interfaces.nsIPromptService);
-		promptService.alert(null, "Error", aMsg + " (" + aCode + ")");
-	},
-
-	singleModified: function _singleModified(aModifiedSingle, doNotify, aFastNotify) {
-		if (this.itemCacheById[aModifiedSingle.id]) {
-			this.itemUpdates++;
-			//dump(" ==Cal:"+this.name+", item updated:"+this.itemUpdates+", title:"+aModifiedSingle.title+", startDate:"+aModifiedSingle.startDate+"\n");
-
-			if (doNotify) {
-				if (this.debug) this.logInfo("singleModified doNotify");
-				this.notifyTheObservers("onModifyItem", [aModifiedSingle, this.itemCacheById[aModifiedSingle.id]], aFastNotify);
-			}
-			/*if (this.itemCacheById[aModifiedSingle.id].className) {
-				this.itemCacheById[aModifiedSingle.id].deleteItem();
-			}
-			this.itemCacheById[aModifiedSingle.id] = null;
-			delete this.itemCacheById[aModifiedSingle.id];*/
-			this.removeItemFromCache(aModifiedSingle);
-
-			//this.itemCacheById[aModifiedSingle.id] = aModifiedSingle;
-			this.addItemToCache(aModifiedSingle);
-		}
-	},
-
-	masterModified: function _masterModified(aModifiedMaster) {
-		//if (this.debug) this.logInfo("masterModified:"+aModifiedMaster.title);
-		if (!this.recurringMasterCache[aModifiedMaster.uid]) {
-			return null;
-		}
-
-		// Master was modified so tell the chidlren they have a new parent.
-		for each(var item in this.itemCacheById) {
-			//			if ((item) && (item.parentItem.id != item.id) && (item.uid == aModifiedMaster.uid)) {
-			if ((item) && (item.uid == aModifiedMaster.uid)) {
-				//var newItem = item.clone();
-				var newItem = this.cloneItem(item);
-				newItem.parentItem = aModifiedMaster;
-				this.singleModified(newItem, true);
-				//this.notifyTheObservers("onModifyItem", [newItem, item]);
-				//this.itemCacheById[newItem.id] = newItem;
-			}
-		}
-
-		// We send a modify for the master. But we do not show the masters in the calendar 
-		//miv		this.notifyTheObservers("onModifyItem", [aModifiedMaster, this.recurringMasterCache[aModifiedMaster.uid]]);
-		// Because we do not want it to be visible and the previous modify made it visible.
-		//miv		this.notifyTheObservers("onDeleteItem", [aModifiedMaster]);
-		this.recurringMasterCache[aModifiedMaster.uid] = aModifiedMaster;
-		this.recurringMasterCacheById[aModifiedMaster.id] = aModifiedMaster;
-	},
-
-	/**
-	 * Returns the acl entry associated to the calendar.
-	 */
-	//readonly attribute calICalendarACLEntry aclEntry;
-	get aclEntry() {
-		var accountMgr = Cc["@mozilla.org/messenger/account-manager;1"].getService(Ci.nsIMsgAccountManager);
-		var identities = accountMgr.allIdentities;
-		var idList = [];
-		if ((identities["Count"]) && (identities["QueryElementAt"])) {
-			for (var index = 0; index < identities.Count; index++) {
-				var identity = identities.QueryElementAt(index, Ci.nsIMsgIdentity);
-				idList.push(identity);
-				/*if (!this.name) {
-					dump("aclEntry: index:"+index+", identitie:"+identity+"\n");
-				}*/
-			}
-		}
-		else {
-			for (var index = 0; index < identities.length; index++) {
-				var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
-				idList.push(identity);
-				/*if (!this.name) {
-					dump("aclEntry: index:"+index+", identitie:"+identity+"\n");
-				}*/
-			}
-		}
-		var self = this;
-		return {
-			aclManager: this,
-			hasAccessControl: true,
-			userIsOwner: (this.canDelete || this.canModify),
-			userCanAddItems: this._canCreateContent,
-			userCanDeleteItems: this._canDelete,
-			getUserAddresses: function (aCount) {
-				dump("calICalendarACLEntry getUserAddresses:" + self.name + "\n");
-				aCount.value = 1;
-				return ["babe"];
-			},
-			getUserIdentities: function (aCount) {
-				dump("calICalendarACLEntry getUserIdentities:" + self.name + "\n");
-				aCount.value = idList.length;
-				return idList;
-			},
-			getOwnerIdentities: function (aCount) {
-				dump("calICalendarACLEntry getOwnerIdentities:" + self.name + "\n");
-				aCount.value = idList.length;
-				return idList;
-			},
-			refresh: function () {
-				dump("calICalendarACLEntry refresh:" + self.name + "\n");
-			},
-		};
-
-	},
-
-
-	//  calIOperation modifyItem(in calIItemBase aNewItem,
-	//                   in calIItemBase aOldItem,
-	//                   in calIOperationListener aListener);
-
-	modifyItem: function _modifyItem(aNewItem, aOldItem, aListener) {
-
-		if (this.debug) this.logInfo("modifyItem");
-		var result = Ci.calIErrors.MODIFICATION_FAILED;
-
-		if (this.OnlyShowAvailability) {
-			this.readOnlyInternal = true;
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				Ci.calIOperationListener.MODIFY,
-				aNewItem.id,
-				aNewItem);
-			return null;
-		}
-
-		if (this.readOnly) {
-			// When we hit this it probably is the change on a alarm. We will process this only in the local cache.
-			if (this.debug) this.logInfo("modifyItem and this calendar is ReadOnly");
-			this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.MODIFY,
-				aNewItem.id,
-				aNewItem);
-			return null;
-		}
-
-		if ((aOldItem.className) && (!aOldItem.canModify)) {
-			if (this.debug) this.logInfo("modifyItem and this item is ReadOnly for this user.");
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.MODIFY,
-				aOldItem.id,
-				aOldItem);
-			return null;
-		}
-
-		if (this.debug) this.logInfo("1 -- aOldItem.recurrenceInfo:" + aOldItem.recurrenceInfo + ", aNewItem.recurrenceInfo:" + aNewItem.recurrenceInfo);
-		if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("1 -- aOldItem.recurrenceInfo.toString():" + aOldItem.recurrenceInfo.toString());
-		if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("1 -- aNewItem.recurrenceInfo.toString():" + aNewItem.recurrenceInfo.toString());
-
-		if (!aNewItem) {
-			throw Cr.NS_ERROR_INVALID_ARG;
-		}
-
-		var this_ = this;
-
-		function reportError(errStr, errId) {
-			this_.notifyOperationComplete(aListener,
-				errId ? errId : Cr.NS_ERROR_FAILURE,
-				Ci.calIOperationListener.MODIFY,
-				aNewItem.id,
-				errStr);
-			return null;
-		}
-
-		if (aNewItem.id == null) {
-			// this is definitely an error
-			return reportError("ID for modifyItem item is null");
-		}
-
-		// See if attachments changed.
-		var newAttachments = aNewItem.getAttachments({});
-		var attachments = {};
-
-		var attachmentsUpdates = {
-			create: [],
-			delete: []
-		};
-		if (newAttachments.length > 0) {
-			if (this.debug) this.logInfo("  -- We have newAttachments:" + newAttachments.length);
-			for (var index in newAttachments) {
-				if (newAttachments[index].getParameter("X-AttachmentId")) {
-					attachments[newAttachments[index].getParameter("X-AttachmentId")] = newAttachments[index];
-				}
-				else {
-					attachmentsUpdates.create.push(newAttachments[index]);
-					if (this.debug) this.logInfo("newAttachment:" + newAttachments[index].uri.spec);
-				}
-			}
-		}
-		// Check which have been removed.
-		var oldAttachments = aOldItem.getAttachments({});
-		for (var index in oldAttachments) {
-			if (!attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
-				attachmentsUpdates.delete.push(oldAttachments[index]);
-				if (this.debug) this.logInfo("removedAttachment:" + oldAttachments[index].uri.spec);
-			}
-		}
-
-
-		if (isEvent(aNewItem)) {
-			if (this.debug) this.logInfo("ModifyItem: it is an event.");
-			var doSendMeetingRespons = false;
-			var meOld = this.getInvitedAttendee(aOldItem);
-			if (!meOld) {
-				if (this.debug) this.logInfo("Did not find meOld");
-				meOld = cal.createAttendee();
-				meOld.participationStatus = "NEEDS-ACTION";
-			}
-
-			var meNew = this.getInvitedAttendee(aNewItem);
-			if (!meNew) {
-				if (this.debug) this.logInfo("Did not find meNew");
-				meNew = cal.createAttendee();
-				meNew.participationStatus = "NEEDS-ACTION";
-			}
-
-			if (aOldItem.isInvitation) {
-
-				if (this.debug) this.logInfo("1 meOld.participationStatus=" + meOld.participationStatus + ", meNew.participationStatus=" + meNew.participationStatus);
-				if (this.debug) this.logInfo("1 aOldItem.status=" + aOldItem.getProperty("STATUS") + ", aNewItem.status=" + aNewItem.getProperty("STATUS"));
-
-				if ((meOld) && (meNew) && (meOld.participationStatus != meNew.participationStatus)) {
-					doSendMeetingRespons = true;
-				}
-
-				if ((meNew) && (meNew.participationStatus == "NEEDS-ACTION") && (meOld.participationStatus != meNew.participationStatus)) {
-					// They choose to confirm at a later state. Do not change this item.
-					this.notifyOperationComplete(aListener,
-						Cr.NS_OK,
-						Ci.calIOperationListener.MODIFY,
-						aNewItem.id,
-						aNewItem);
-
-					return null;
-				}
-
-				if ((meOld) && (meNew) && (aOldItem.getProperty("STATUS") != aNewItem.getProperty("STATUS")) && (!doSendMeetingRespons)) {
-					switch (aNewItem.getProperty("STATUS")) {
-					case "CONFIRMED":
-						meNew.participationStatus = "ACCEPTED";
-						break;
-					case null:
-					case "TENTATIVE":
-						meNew.participationStatus = "TENTATIVE";
-						break;
-					case "CANCELLED":
-						meNew.participationStatus = "DECLINED";
-						break;
-					}
-					doSendMeetingRespons = true;
-				}
-
-			}
-
-			if (doSendMeetingRespons) {
-				// The item is an invitation.
-				// My status has changed. Send to this.globalFunctions.
-				if (this.debug) this.logInfo("2 aOldItem.participationStatus=" + meOld.participationStatus + ", aNewItem.participationStatus=" + (meNew ? meNew.participationStatus : ".."));
-				if (this.debug) this.logInfo("3a aOldItem.id=" + aOldItem.id);
-				if (this.debug) this.logInfo("3b aNewItem.id=" + aNewItem.id);
-
-				var requestResponseItem = aNewItem;
-				requestResponseItem.setProperty("X-MEETINGREQUEST", true);
-				var aResponse = null;
-
-				// Loop through meetingRequestsCache to find it.
-				var cachedItem = null;
-				for (var index in this.meetingRequestsCache) {
-					if (this.meetingRequestsCache[index]) {
-						if (this.meetingRequestsCache[index].uid == aNewItem.id) {
-							cachedItem = this.meetingRequestsCache[index];
-							break;
-						}
-					}
-				}
-
-				if (cachedItem) {
-					if (this.debug) this.logInfo("___________ Found in meeting request cache.");
-					var tmpItem = cachedItem;
-					var tmpUID = aNewItem.id;
-					requestResponseItem = this.cloneItem(aNewItem);
-					requestResponseItem.id = tmpItem.id;
-					//requestResponseItem.setProperty("X-UID",  tmpItem.uid);
-					//requestResponseItem.setProperty("X-ChangeKey",  tmpItem.changeKey);
-				}
-				else {
-					if (this.debug) this.logInfo("___________ NOT Found in meeting request cache. X-UID:" + aNewItem.uid);
-
-					if (aNewItem.id == aNewItem.parentItem.id) {
-						if (this.debug) this.logInfo("_________ it is a master.");
-					}
-
-					if ((!this.itemCacheById[aNewItem.id]) && (!this.recurringMasterCache[aNewItem.uid])) {
-						this.getMeetingRequestFromServer(aNewItem, aOldItem.uid, Ci.calIOperationListener.MODIFY, aListener);
-						return;
-					}
-
-				}
-
-				if (this.sendMeetingRespons(requestResponseItem, null, "exisiting", aResponse)) {
-					//return;
-					result = Cr.NS_OK;
-				}
-				else {
-					if (this.debug) this.logInfo("modifyItem: canceled by user.");
-					result = Cr.NS_OK;
-				}
-			}
-			else {
-
-				var input = {
-					item: aNewItem,
-					response: "sendtonone"
-				};
-
-				if (aNewItem.organizer) {
-					if (this.debug) this.logInfo("The organizer is:" + aNewItem.organizer.id);
-				}
-				else {
-					if (this.debug) this.logInfo("We have no organizer!");
-				}
-
-
-				var changesObj = this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation);
-				var changes;
-				if (changesObj) {
-					changes = changesObj.changes;
-				}
-				var weHaveChanges = (changes || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
-				//				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
-
-				var iAmOrganizer = ((aNewItem.organizer) && (aNewItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
-				if (iAmOrganizer) {
-
-					if (((changes) && ((changesObj) && (!changesObj.onlySnoozeChanged))) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0)) {
-
-						input.response = "sendtoall";
-
-						// Get the eventsummarywindow to attach dialog to.
-						let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-							.getService(Ci.nsIWindowMediator);
-						let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane");
-
-						var attendees = aNewItem.getAttendees({}).length + aOldItem.getAttendees({}).length;
-						if (this.debug) this.logInfo("  -- aOldItem.getAttendees({}).length=" + aOldItem.getAttendees({}).length);
-						if (this.debug) this.logInfo("  -- aNewItem.getAttendees({}).length=" + aNewItem.getAttendees({}).length);
-						if (this.getInvitedAttendee(aOldItem)) {
-							attendees--;
-						}
-						if (this.getInvitedAttendee(aNewItem)) {
-							attendees--;
-						}
-
-						if ((calWindow) && (attendees > 0) && (weHaveChanges)) {
-							calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
-								"sendUpdateTo",
-								"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-								input);
-						}
-
-						if ((attendees == 0) || (!weHaveChanges)) {
-							if (this.debug) this.logInfo(" -- There are no attendees left");
-							input.response = "sendtonone";
-						}
-					}
-					else {
-						if (this.debug) this.logInfo(" -- The user/organizer only dismissed or removed a reminder. We are not going to send this update to the invited people of the meeting.");
-						input.response = "sendtonone";
-					}
-				}
-
-				if (this.debug) this.logInfo("modifyItem: it is a event. aOldItem.CalendarItemType=:" + aOldItem.calendarItemType);
-
-				// We have a Single or master
-				if (aOldItem.calendarItemType == "RecurringMaster") {
-					if (this.debug) this.logInfo(" Master changed:" + aNewItem.title);
-					// See if the aNewItem is also the master record.
-					var masterChanged = (aNewItem.parentItem.id == aNewItem.id);
-
-					// We need to find out wat has changed;
-					if (this.debug) this.logInfo(" ==1 invite=" + aOldItem.isInvitation);
-
-					if (changes) {
-						if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
-
-						var self = this;
-						this.addToQueue(erUpdateItemRequest, {
-								user: this.user,
-								mailbox: this.mailbox,
-								folderBase: this.folderBase,
-								serverUrl: this.serverUrl,
-								item: aOldItem,
-								folderID: this.folderID,
-								changeKey: this.changeKey,
-								updateReq: changes,
-								newItem: aNewItem,
-								actionStart: Date.now(),
-								attachmentsUpdates: attachmentsUpdates,
-								onlySnoozeChanges: changesObj.onlySnoozeChanged,
-								sendto: input.response
-							},
-							function (erUpdateItemRequest, aId, aChangeKey) {
-								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-							},
-							function (erUpdateItemRequest, aCode, aMsg) {
-								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-							},
-							aListener);
-						return;
-					}
-					else {
-						if (this.debug) this.logInfo("modifyItem: No changes for master.");
-						// No changes to a master could means that one of the occurrences
-						// was deleted. 
-						var removedOccurrence = this.getRemovedOccurrence(aOldItem, aNewItem);
-						if (removedOccurrence) {
-							// Delete this occurrence; multi
-							this.notifyTheObservers("onDeleteItem", [removedOccurrence], true);
-							this.deleteItem(removedOccurrence);
-							result = Cr.NS_OK;
-						}
-						else {
-							// Could be an alarm dismiss or snooze
-							dump("IF YOU SEE THIS PLEASE REPORT..(CODE1)\n");
-							this.masterModified(aNewItem);
-						}
-						result = Cr.NS_OK;
-					}
-				}
-				else {
-					if (this.debug) this.logInfo("modifyItem: '" + aOldItem.calendarItemType + "' event modification");
-					// We need to find out wat has changed;
-					if (this.debug) this.logInfo(" ==1 invite=" + aOldItem.isInvitation);
-
-					if (changes) {
-						if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
-
-						var self = this;
-						this.addToQueue(erUpdateItemRequest, {
-								user: this.user,
-								mailbox: this.mailbox,
-								folderBase: this.folderBase,
-								serverUrl: this.serverUrl,
-								item: aOldItem,
-								folderID: this.folderID,
-								changeKey: this.changeKey,
-								updateReq: changes,
-								newItem: aNewItem,
-								actionStart: Date.now(),
-								attachmentsUpdates: attachmentsUpdates,
-								onlySnoozeChanges: changesObj.onlySnoozeChanged,
-								sendto: input.response
-							},
-							function (erUpdateItemRequest, aId, aChangeKey) {
-								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-							},
-							function (erUpdateItemRequest, aCode, aMsg) {
-								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-							},
-							aListener);
-						this.singleModified(aNewItem, true, true);
-						return;
-					}
-					else {
-						if (this.doAttachmentUpdates(attachmentsUpdates, aOldItem, input.response, aListener)) {
-							// We are done
-							if (this.debug) this.logInfo("modifyItem: No only attachment changes no other fields.");
-							return;
-						}
-						else {
-							if (this.debug) this.logInfo("modifyItem: No changes 1.");
-							if (!aOldItem.isInvitation) {
-								//aNewItem.parentItem = aNewItem; move to storagecalendar
-								this.singleModified(aNewItem, true, true);
-							}
-							result = Cr.NS_OK;
-						}
-					}
-				}
-			}
-		}
-		else {
-			if (isToDo(aNewItem)) {
-				if (this.debug) this.logInfo("modifyItem: it is a todo");
-
-				var changesObj = this.makeUpdateOneItem(aNewItem, aOldItem);
-				var changes;
-				if (changesObj) {
-					changes = changesObj.changes;
-				}
-				if (changes) {
-					if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
-					var self = this;
-					this.addToQueue(erUpdateItemRequest, {
-							user: this.user,
-							mailbox: this.mailbox,
-							folderBase: this.folderBase,
-							serverUrl: this.serverUrl,
-							item: aOldItem,
-							folderID: this.folderID,
-							changeKey: this.changeKey,
-							updateReq: changes,
-							newItem: aNewItem,
-							attachmentsUpdates: attachmentsUpdates,
-							actionStart: Date.now()
-						},
-						function (erUpdateItemRequest, aId, aChangeKey) {
-							self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-						},
-						function (erUpdateItemRequest, aCode, aMsg) {
-							self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-						},
-						aListener);
-					this.singleModified(aNewItem, true, true);
-					return;
-				}
-				else {
-					if (this.doAttachmentUpdates(attachmentsUpdates, aOldItem, "sendtonone", aListener)) {
-						// We are done
-						if (this.debug) this.logInfo("modifyItem: No only attachment changes no other fields.");
-						return;
-					}
-					else {
-						if (this.debug) this.logInfo("modifyItem: No changes 2.");
-						//aNewItem.parentItem = aNewItem;
-						this.singleModified(aNewItem, true, true);
-						result = Cr.NS_OK;
-					}
-				}
-			}
-			else {
-				return reportError("Unknown itemtype for modifyItem");
-			}
-		}
-
-		//this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
-
-		this.notifyOperationComplete(aListener,
-			result,
-			Ci.calIOperationListener.MODIFY,
-			aNewItem.id,
-			aNewItem);
-
-		return null;
-	},
-
-	getChildByUIDandNativeTime: function _getChildByUIDandNativeTime(aUID, aNativeTime) {
-		for (var index in this.itemCacheById) {
-			if ((this.itemCacheById[index]) && (this.itemCacheById[index].uid == aUID)) {
-				// We found a child with the specified UID.
-				if ((this.itemCacheById[index].recurrenceId) && (this.itemCacheById[index].recurrenceId.nativeTime == aNativeTime)) {
-					return this.itemCacheById[index];
-				}
-			}
-		}
-
-		return null;
-	},
-
-	deleteItemCancelled: function _deleteItemCancelled(aItem, aListener) {
-		if (this.debug) this.logInfo("deleteItemCancelled: " + aItem.title);
-		if ((aItem.className) && (!aItem.canDelete)) {
-			if (this.debug) this.logInfo("User is not allowed to delete this item.");
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				Ci.calIOperationListener.DELETE,
-				aItem.id,
-				aItem);
-			return null;
-		}
-
-		if (aItem.id == null) {
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-					Ci.calIErrors.MODIFICATION_FAILED,
-					Ci.calIOperationListener.DELETE,
-					null,
-					"ID is null for deleteItem");
-			}
-			return;
-		}
-
-		// Check if this item is still in cache
-		if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid])) {
-			if (this.debug) this.logInfo("Item is not in itemCache anymore. Probably not removed from view by Lightning..");
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.DELETE,
-					aItem.id,
-					aItem);
-			}
-			return;
-		}
-
-		switch (aItem.calendarItemType) {
-		case "Single":
-			if (this.debug) this.logInfo("-- Single CalendarItemType");
-			this.removeItemFromCache(aItem);
-
-			var self = this;
-			this.addToQueue(erDeleteItemRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					item: aItem,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					actionStart: Date.now(),
-					itemType: "single"
-				},
-				function (erDeleteItemRequest) {
-					self.deleteItemOk(erDeleteItemRequest);
-				},
-				function (erDeleteItemRequest, aCode, aMsg) {
-					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
-				},
-				aListener);
-
-			break;
-		case "Occurrence":
-		case "Exception":
-			if (this.debug) this.logInfo("-- " + aItem.calendarItemType + " CalendarItemType");
-			this.removeItemFromCache(aItem);
-
-			var self = this;
-			this.addToQueue(erGetOccurrenceIndexRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					masterItem: aItem,
-					item: aItem,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					action: "deleteItem",
-					itemType: "occurrence",
-					whichOccurrence: "occurrence"
-				}, //dialogArg.answer}, 
-				function (erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
-					self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);
-				},
-				function (erGetOccurrenceIndexRequest, aCode, aMsg) {
-					self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);
-				},
-				aListener);
-
-			break;
-		case "RecurringMaster":
-			if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
-			this.removeItemFromCache(aItem);
-
-			var self = this;
-			this.addToQueue(erDeleteItemRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					item: aItem,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					itemType: "master",
-					actionStart: Date.now(),
-					whichOccurrence: "all_occurrences"
-				},
-				function (erDeleteItemRequest) {
-					self.deleteItemOk(erDeleteItemRequest);
-				},
-				function (erDeleteItemRequest, aCode, aMsg) {
-					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
-				},
-				aListener);
-			break;
-		default:
-			// TODO: This will happen when the sync to/from EWS has not yet happened.
-			if (this.debug) this.logInfo("WARNING: unknown CalendarItemType=" + aItem.calendarItemType);
-		}
-
-	},
-	//  calIOperation deleteItem(in calIItemBase aItem,
-	//                   in calIOperationListener aListener);
-	deleteItem: function _deleteItem(aItem, aListener) {
-		if (this.debug) this.logInfo("deleteItem");
-
-		if (this.OnlyShowAvailability) {
-			this.readOnlyInternal = true;
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				Ci.calIOperationListener.DELETE,
-				aItem.id,
-				aItem);
-			/*	            this.notifyOperationComplete(aListener,
-				                                         Ci.calIErrors.CAL_IS_READONLY,
-				                                         Ci.calIOperationListener.DELETE,
-				                                         null,
-				                                         "Calendar is readonly");*/
-			return null;
-		}
-
-		if ((aItem.className) && (!aItem.canDelete)) {
-			if (this.debug) this.logInfo("User is not allowed to delete this item.");
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				Ci.calIOperationListener.DELETE,
-				aItem.id,
-				aItem);
-			return null;
-		}
-
-		if (aItem.id == null) {
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-					Ci.calIErrors.MODIFICATION_FAILED,
-					Ci.calIOperationListener.DELETE,
-					null,
-					"ID is null for deleteItem");
-			}
-			return;
-		}
-
-		// Check if this item is still in cache
-		if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid])) {
-			if (this.debug) this.logInfo("Item is not in itemCache anymore. Probably not removed from view by Lightning..");
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.DELETE,
-					aItem.id,
-					aItem);
-			}
-			return;
-		}
-
-		var self = this;
-		if (isEvent(aItem)) {
-			if (this.debug) this.logInfo("deleteItem is calIEvent");
-
-			var iAmOrganizer = ((aItem.organizer) && (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
-			var isCancelled = aItem.isCancelled;
-			var isInvitation = this.isInvitation(aItem, true);
-
-			if ((isInvitation) && (!isCancelled)) {
-				//			if ((this.folderBase == "calendar") && (!this.folderID) && 
-				//			    (!iAmOrganizer) && (aItem.getProperty("STATUS") != "DECLINED") &&
-				//			    (aItem.getProperty("STATUS") != "NONE") && (!isCancelled)) {
-				//var aOldItem = aItem.clone();
-				var aOldItem = this.cloneItem(aItem);
-				aOldItem.setProperty("STATUS", "DECLINED");
-
-				if (!this.sendMeetingRespons(aOldItem, null, "exisiting", "DECLINED")) {
-					if (this.debug) this.logInfo("deleteItem: canceled by user.");
-					if (aListener) {
-						this.notifyOperationComplete(aListener,
-							Ci.calIErrors.OPERATION_CANCELLED,
-							Ci.calIOperationListener.DELETE,
-							aItem.id,
-							aItem);
-					}
-					return;
-				}
-				else {
-					if (aListener) {
-						this.notifyOperationComplete(aListener,
-							Cr.NS_OK,
-							Ci.calIOperationListener.DELETE,
-							aItem.id,
-							aItem);
-					}
-					return;
-				}
-
-			}
-
-			var input = {
-				item: aItem,
-				response: "sendtonone"
-			};
-
-			if (iAmOrganizer) {
-
-				input.response = "sendtoall";
-
-				// Get the eventsummarywindow to attach dialog to.
-				let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-					.getService(Ci.nsIWindowMediator);
-				let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane");
-
-				var attendees = aItem.getAttendees({}).length;
-				var meOld = this.getInvitedAttendee(aItem);
-
-				if (meOld) {
-					attendees--;
-				}
-
-				if ((calWindow) && (attendees > 0)) {
-					calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
-						"sendUpdateTo",
-						"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-						input);
-				}
-
-				if (attendees == 0) {
-					input.response = "sendtonone";
-				}
-
-			}
-
-
-			switch (aItem.calendarItemType) {
-
-			case "Single":
-				if (this.debug) this.logInfo("-- Single CalendarItemType");
-
-				var self = this;
-				this.addToQueue(erDeleteItemRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						folderBase: this.folderBase,
-						serverUrl: this.serverUrl,
-						item: aItem,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						actionStart: Date.now(),
-						itemType: "single"
-					},
-					function (erDeleteItemRequest) {
-						self.deleteItemOk(erDeleteItemRequest);
-					},
-					function (erDeleteItemRequest, aCode, aMsg) {
-						self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
-					},
-					aListener);
-
-				break;
-			case "Occurrence":
-			case "Exception":
-				if (this.debug) this.logInfo("-- " + aItem.calendarItemType + " CalendarItemType");
-
-				var self = this;
-				this.addToQueue(erGetOccurrenceIndexRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						folderBase: this.folderBase,
-						serverUrl: this.serverUrl,
-						masterItem: aItem,
-						item: aItem,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						action: "deleteItem",
-						itemType: "occurrence",
-						whichOccurrence: "occurrence"
-					}, //dialogArg.answer}, 
-					function (erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
-						self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);
-					},
-					function (erGetOccurrenceIndexRequest, aCode, aMsg) {
-						self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);
-					},
-					aListener);
-
-				break;
-			case "RecurringMaster":
-				if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
-
-				var self = this;
-				this.addToQueue(erDeleteItemRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						folderBase: this.folderBase,
-						serverUrl: this.serverUrl,
-						item: aItem,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						itemType: "master",
-						actionStart: Date.now(),
-						whichOccurrence: "all_occurrences"
-					},
-					function (erDeleteItemRequest) {
-						self.deleteItemOk(erDeleteItemRequest);
-					},
-					function (erDeleteItemRequest, aCode, aMsg) {
-						self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
-					},
-					aListener);
-				break;
-			default:
-				// TODO: This will happen when the sync to/from EWS has not yet happened.
-				if (this.debug) this.logInfo("WARNING: unknown CalendarItemType=" + aItem.calendarItemType);
-			}
-		}
-
-		if (isToDo(aItem)) {
-			if (this.debug) this.logInfo("deleteItem is calITask");
-			var self = this;
-			this.addToQueue(erDeleteItemRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					item: aItem,
-					actionStart: Date.now(),
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					itemType: "single"
-				},
-				function (erDeleteItemRequest) {
-					self.deleteItemOk(erDeleteItemRequest);
-				},
-				function (erDeleteItemRequest, aCode, aMsg) {
-					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
-				},
-				aListener);
-		}
-	},
-
-	//  calIOperation getItem(in string aId, in calIOperationListener aListener);
-	getItem: function _getItem(aId, aListener, aRetry) {
-		if (this.debug) this.logInfo("getItem: aId:" + aId);
-
-		if (!aListener)
-			return;
-
-		var item = null;
-
-		for (var index in this.itemCacheById) {
-			if (this.itemCacheById[index]) {
-				if (this.itemCacheById[index].uid == aId) {
-					var item = this.itemCacheById[index];
-					break;
-				}
-			}
-		}
-
-
-		if (!item) {
-			var cachedRequest = null;
-			for (var index in this.meetingCancelationsCache) {
-				if (this.meetingCancelationsCache[index]) {
-					if (this.meetingCancelationsCache[index].uid == aId) {
-						cachedRequest = this.meetingCancelationsCache[index];
-						break;
-					}
-				}
-			}
-
-			if (cachedRequest) {
-				//We have a meeting cancelation but not any calendaritem.
-				if (this.debug) this.logInfo("This is odd we have a meeting cancelation but not any calendaritem. THIS SHOULD NOT HAPPEN");
-				delete this.meetingCancelationsCache[cachedRequest.id];
-				return;
-			}
-
-		}
-
-		/*	if (!item) {
-				for (var index in this.meetingRequestsCache) {
-					if (this.meetingRequestsCache[index]) {
-						if (this.meetingRequestsCache[index].uid == aId) {
-							if (this.debug) this.logInfo("getItem is in meetingRequestsCache");
-							if (this.debug) this.logInfo("  id="+index);
-							var item = this.meetingRequestsCache[index];
-							break;
-						}
-					}
-				}  
-			}*/
-
-		if (!item) {
-			// Wait with an answer until next sync. This could be an iTIP request
-			// we could have received am email with a meetingrequest which was not
-			// yet received through sync. Therefore we do not find it in cache. And
-			// iTIP will show accept buttons and stuff. We do not want those buttons because
-			// when pressed they will try to add the item to the calendar which gets synced to
-			// EWS and we get an conflict...(item allready exists in EWS).
-			// After next sync we can do this check again.
-			if (!aRetry) {
-				if (this.debug) this.logInfo("Not found putting it in ItemSyncQue");
-				this.getItemSyncQueue.push({
-					id: aId,
-					listener: aListener
-				});
-				this.notifyOperationComplete(aListener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.GET,
-					aId,
-					null);
-				this.refresh();
-				return;
-			}
-			else {
-				if (this.debug) this.logInfo("getItem not FOUND");
-				// querying by id is a valid use case, even if no item is returned:
-				this.notifyOperationComplete(aListener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.GET,
-					aId,
-					null);
-				return;
-			}
-		}
-
-		var item_iid = null;
-		if (isEvent(item))
-			item_iid = Ci.calIEvent;
-		else if (isToDo(item))
-			item_iid = Ci.calITodo;
-		else {
-			this.notifyOperationComplete(aListener,
-				Cr.NS_ERROR_FAILURE,
-				Ci.calIOperationListener.GET,
-				aId,
-				"Can't deduce item type based on QI");
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.GET,
-				aId,
-				null);
-			return;
-		}
-
-		if (this.debug) this.logInfo("Found item in cache with Status:" + item.getProperty("STATUS"));
-
-		this.notifyOperationComplete(aListener,
-			Cr.NS_OK,
-			Ci.calIOperationListener.GET,
-			aId,
-			null);
-		/*
-		aListener.onGetResult (this, 
-		                       Cr.NS_OK,
-		                       item_iid, null,
-		                       1, [item]);*/
-		return;
-	},
-
-	typeString: function _typeString(o) {
-		if (typeof o != 'object')
-			return typeof o;
-
-		if (o === null)
-			return "null";
-		//object, array, function, date, regexp, string, number, boolean, error
-		var internalClass = Object.prototype.toString.call(o)
-			.match(/\[object\s(\w+)\]/)[1];
-		return internalClass.toLowerCase();
-	},
-
-	//  calIOperation getItems(in unsigned long aItemFilter,
-	//                 in unsigned long aCount,
-	//                 in calIDateTime aRangeStart,
-	//                 in calIDateTime aRangeEndEx,
-	//                 in calIOperationListener aListener);
-	getItems: function _getItems(aItemFilter, aCount,
-		aRangeStart, aRangeEnd, aListener) {
-
-		this.logInfo("getItems: aItemFilter, " + aItemFilter
-			+ " aCount, " + aCount
-			+ " aListener , " + aListener);
-
-		if (aRangeStart) {
-			this.logInfo("getItems: aRangeStart:" + aRangeStart.toString());
-		}
-		else {
-			this.logInfo("getItems: aRangeStart: null");
-		}
-
-		if (aRangeEnd) {
-			this.logInfo("getItems: aRangeEnd:" + aRangeEnd.toString());
-		}
-		else {
-			this.logInfo("getItems: aRangeEnd: null");
-		}
-
-		// Start poller if not already runnning  this may resolve suspend issue
-		this.startCalendarPoller();
-
-		if (this.typeString(aListener) === "object") {
-			this.logInfo("getItems: We received a getItems from repeatingInvitationsTimer function.\
-			Because this request if always for a full year it will consume a lot of\
-			memory when we have a lot of recurring events with no end date.\
-			So for now we only request the period we have in memory cache.\
-			startDate:" + this.startDate + ", endDate:" + this.endDate);
-
-			if (this.startDate) {
-				aRangeStart = this.startDate.clone();
-			}
-			else {
-				aRangeStart = undefined;
-			}
-
-			if (this.endDate) {
-				aRangeEnd = this.endDate.clone();
-			}
-			else {
-				aRangeEnd = undefined;
-			}
-		}
-
-		/*
-		 * Check minimal assestements before looking for items:
-		 *  - calendar is not in creation
-		 *  - calendar is initialized
-		 *  - calendar support requested items
-		 *  - first synchronization is done
-		 */
-
-		// Unfold request filters to booleans
-		let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) !== 0);
-		let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) !== 0);
-		let asOccurrences = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) !== 0);
-		let wantInvitations = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_REQUEST_NEEDS_ACTION) !== 0);
-
-		if (wantEvents) {
-			this.logInfo("getItems: Events are requested by calendar.");
-		}
-
-		if (wantTodos) {
-			this.logInfo("getItems: Tasks are requested by calendar.");
-		}
-
-		if (wantInvitations) {
-			this.logInfo("getItems: Invitations are requested by calendar.");
-		}
-
-		// Calendar creation is not finished, we just update calendar range selection and stop
-		if (this.newCalendar) {
-			this.logInfo("getItems: We are still creating this calendar. Ignore getItems for now.");
-
-			// Update start/end range for events
-			if (wantEvents) {
-				if (aRangeStart) {
-					if (this.newCalRangeStartEvents) {
-						if (aRangeStart.compare(this.newCalRangeStartEvents) < 0) {
-							this.newCalRangeStartEvents = aRangeStart.clone();
-						}
-					}
-					else {
-						this.newCalRangeStartEvents = aRangeStart.clone();
-					}
-					
-				}
-
-				if (aRangeEnd) {
-					if (this.newCalRangeEndEvents) {
-						if (aRangeEnd.compare(this.newCalRangeEndEvents) > 0) {
-							this.newCalRangeEndEvents = aRangeEnd.clone();
-						}
-					}
-					else {
-						this.newCalRangeEndEvents = aRangeEnd.clone();
-					}
-				}
-			}
-
-			// Update start/end range for tasks
-			if (wantTodos) {
-				if (aRangeStart) {
-					if (this.newCalRangeStartTodos) {
-						if (aRangeStart.compare(this.newCalRangeStartTodos) < 0) {
-							this.newCalRangeStartTodos = aRangeStart.clone();
-						}
-					}
-					else {
-						this.newCalRangeStartTodos = aRangeStart.clone();
-					}
-				}
-
-				if (aRangeEnd) {
-					if (this.newCalRangeEndTodos) {
-						if (aRangeEnd.compare(this.newCalRangeEndTodos) > 0) {
-							this.newCalRangeEndTodos = aRangeEnd.clone();
-						}
-					}
-					else {
-						this.newCalRangeEndTodos = aRangeEnd.clone();
-					}
-				}
-			}
-
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.GET,
-					null,
-					null);
-			}
-
-			return;
-		}
-
-		if (!this.firstSyncDone) {
-			this.getItemsSyncQueue.push({
-				itemFilter: aItemFilter,
-				count: aCount,
-				rangeStart: aRangeStart,
-				rangeEnd: aRangeEnd,
-				listener: aListener
-			});
-
-			return;
-		}
-
-		if (!this.isInitialized) {
-			if (aListener) {
-				this.notifyOperationComplete(aListener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.GET,
-					null,
-					null);
-			}
-
-			return;
-		}
-
-		let validPeriod = false;
-		if (aRangeStart
-			&& aRangeStart.isDate
-			&& aRangeEnd
-			&& aRangeEnd.isDate) {
-			validPeriod = true;
-			this.lastValidRangeStart = aRangeStart.clone();
-			this.lastValidRangeEnd = aRangeEnd.clone();
-		}
-
-		this.exporting = false;
-		if (aItemFilter === Ci.calICalendar.ITEM_FILTER_ALL_ITEMS
-			&& aCount === 0
-			&& aRangeStart === null
-			&& aRangeEnd === null) {
-
-			this.logInfo("getItems: Request to get all Items in Calendar. Probably an export");
-
-			this.exporting = true;
-		}
-
-		if (!wantEvents
-			&& !wantInvitations
-			&& !wantTodos) {
-
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.GET,
-				null, null);
-
-			return;
-		}
-
-		let eventsRequestedAndPossible = (wantEvents && this.supportsEvents);
-		let tasksRequestedAndPossible = (wantTodos && this.supportsTasks);
-
-		// When only availability is readable, we can also request events:
-		if (this.OnlyShowAvailability) {
-			eventsRequestedAndPossible = true;
-		}
-
-		if (eventsRequestedAndPossible) {
-			this.logInfo("getItems: Events are requested and this is possible for this folder");
-		}
-
-		if (tasksRequestedAndPossible) {
-			this.logInfo("getItems: Tasks are requested and this is possible for this folder");
-		}
-
-		// Calendar is not able to complete request (item type is not supported)
-		if (!eventsRequestedAndPossible
-			&& !tasksRequestedAndPossible) {
-			this.logInfo("getItems: This folder is not able to support requested items.");
-
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.GET,
-				null, null);
-
-			return;
-		}
-
-		/*
-		 * All checks passed, look for items to send
-		 *
-		 */
-
-		// When range start is not defined,
-		// set it to five 5 before now.
-		if (!aRangeStart) {
-			let offset = cal.createDuration();
-			offset.weeks = -5;
-
-			aRangeStart = cal.now().addDuration(offset);
-
-			// If cache already contains a bigger range, use it
-			if (this.startDate
-				&& this.startDate.compare(aRangeStart) < 0) {
-				aRangeStart = this.startDate.clone();
-			}
-
-			this.logInfo("getItems: aRangeStart has been updated:" + aRangeStart.toString());
-		}
-
-		// When range end is not defined,
-		// set it to five 5 after now.
-		if (!aRangeEnd) {
-			let offset = cal.createDuration();
-			offset.weeks = 5;
-
-			aRangeEnd = cal.now().addDuration(offset);
-
-			// If cache already contains a bigger range, use it
-			if ((this.endDate) && (this.endDate.compare(aRangeEnd) > 0)) {
-				aRangeEnd = this.endDate.clone();
-			}
-
-			this.logInfo("getItems: aRangeEnd has been updated:" + aRangeEnd.toString());
-		}
-
-		if (!this.lastValidRangeStart) {
-			this.lastValidRangeStart = aRangeStart.clone();
-		}
-
-		if (!this.lastValidRangeEnd) {
-			this.lastValidRangeEnd = aRangeEnd.clone();
-		}
-
-		// Check if requested range is bigger than memory cache.
-
-		let dateChanged = false;
-		let startChanged = false;
-		let endChanged = false;
-
-		if (this.startDate) {
-			// New start date is before the memory cache one.
-			// memory cache is growing.
-			if (this.startDate.compare(aRangeStart) > 0) {
-				this.logInfo("getItems: calendar has start date and aRangeStart (" + aRangeStart.toString() + ") is before current startDate (" + this.startDate.toString() + ")");
-
-				var oldStartDate = this.startDate.clone();
-				this.startDate = aRangeStart.clone();
-
-				dateChanged = true;
-				startChanged = true;
-			}
-		}
-		else {
-			this.logInfo("getItems: calendar hasn't start date, use the range start");
-
-			this.startDate = aRangeStart.clone();
-			dateChanged = true;
-		}
-
-		if (this.endDate) {
-			// New end date is after the memory cache one.
-			// Memory cache is growing.
-			if (this.endDate.compare(aRangeEnd) < 0) {
-				this.logInfo("getItems: calendar has endDate and aRangeEnd (" + aRangeEnd.toString() + ") is after current endDate (" + this.endDate.toString() + ")");
-
-				var oldEndDate = this.endDate.clone();
-				this.endDate = aRangeEnd.clone();
-				dateChanged = true;
-				endChanged = true;
-			}
-		}
-		else {
-			this.logInfo("getItems: calendar hasn't end date, use the range end");
-
-			this.endDate = aRangeEnd.clone();
-			dateChanged = true;
-		}
-
-		// If offline cache is enabled and requested range is bigger than the
-		// memory cache one, try to get items from offline cache.
-		if (this.useOfflineCache
-			&& dateChanged) {
-			if ((eventsRequestedAndPossible && !this.OnlyShowAvailability)
-				|| tasksRequestedAndPossible) {
-				if (startChanged) {
-					this.logInfo("getItems: Startdate has changed to an earlier date. Requesting difference from offline cache.");
-					this.getItemsFromOfflineCache(aRangeStart, oldStartDate, aListener);
-				}
-
-				if (endChanged) {
-					this.logInfo("getItems: Enddate has changed to a later date. Requesting difference from offline cache.");
-					this.getItemsFromOfflineCache(oldEndDate, aRangeEnd, aListener);
-				}
-
-				// We didn't had any memory cache (startDate and endDate has just been defined)
-				if (!startChanged
-					&& !endChanged) {
-					this.logInfo("getItems: New time period to cache. Requesting full period from offline cache.");
-					this.getItemsFromOfflineCache(aRangeStart, aRangeEnd, aListener);
-				}
-			}
-
-			// Update startChanged and endChanged according to offline cache range
-			// It allows us to know if we have to ask Exchange server new items
-			if (this.offlineStartDate) {
-				if (aRangeStart.compare(this.offlineStartDate) < 0) {
-					this.logInfo("getItems: aRangestart is before offlineCache start.");
-					oldStartDate = this.offlineStartDate.clone();
-					startChanged = true;
-				}
-				else {
-					this.logInfo("getItems: aRangestart is after offlineCache start.");
-					startChanged = false;
-				}
-			}
-			else {
-				startChanged = true;
-			}
-
-			if (this.offlineEndDate) {
-				if (aRangeEnd.compare(this.offlineEndDate) > 0) {
-					this.logInfo("RangeEnd is after offlineCache end.");
-					oldEndDate = this.offlineEndDate.clone();
-					endChanged = true;
-				}
-				else {
-					this.logInfo("RangeEnd is before offlineCache end.");
-					endChanged = false;
-				}
-			}
-			else {
-				endChanged = true;
-			}
-		}
-
-		// Update calendar/task view with items in memory
-		this.getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, this.exporting);
-
-		if (this.OnlyShowAvailability) {
-			if (startChanged) {
-				this.getOnlyFreeBusyInformation(aRangeStart, oldStartDate);
-			}
-
-			if (endChanged) {
-				this.getOnlyFreeBusyInformation(oldEndDate, aRangeEnd);
-			}
-
-			if (!startChanged
-				&& !endChanged) {
-				this.getOnlyFreeBusyInformation(aRangeStart, aRangeEnd);
-			}
-
-			return;
-		}
-
-		// Check if we should add items from Exchange server
-		if (!dateChanged) {
-			this.logInfo("getItems: No dateChanged. Not going to request items from server.");
-
-			return;
-		}
-
-		if (this.isOffline) {
-			this.logInfo("getItems: We are offline. Not going to request items from server.");
-
-			return;
-		}
-
-		if (eventsRequestedAndPossible) {
-
-			this.logInfo("getItems: Requesting events from exchange server.");
-			if ((startChanged && oldStartDate)
-				|| (endChanged && oldEndDate)) {
-
-				if (startChanged) {
-					if (this.debug) this.logInfo("Startdate has changed to an earlier date. Requesting difference.");
-					this.requestPeriod(aRangeStart, oldStartDate, aItemFilter, aCount, false);
-				}
-
-				if (endChanged) {
-					if (this.debug) this.logInfo("Enddate has changed to a later date. Requesting difference.");
-					this.requestPeriod(oldEndDate, aRangeEnd, aItemFilter, aCount, true);
-				}
-
-				// We need to get the period which did not change from memorycache.
-			}
-			else {
-				this.logInfo("New time period. Requesting items in period.");
-				this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
-			}
-		}
-
-		// Request server when calendar date changed  .
-		if (tasksRequestedAndPossible
-			&& (startChanged || endChanged)) {
-			this.logInfo("getItems: Requesting tasks from exchange server.");
-
-			var self = this;
-			this.addToQueue(erFindTaskItemsRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					serverUrl: this.serverUrl,
-					folderBase: this.folderBase,
-					itemFilter: aItemFilter,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					actionStart: Date.now()
-				},
-				function (erFindTaskItemsRequest, aIds) {
-					self.findTaskItemsOK(erFindTaskItemsRequest, aIds);
-				},
-				function (erFindTaskItemsRequest, aCode, aMsg) {
-					self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);
-				},
-				null);
-
-			if (!this.deactivateTaskFollowup) {
-				this.logInfo("getItems: Requesting followup tasks from exchange server.");
-				this.addToQueue(erFindFollowupItemsRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl,
-						folderBase: "inbox",
-						itemFilter: aItemFilter,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						actionStart: Date.now()
-					},
-					function (erFindFollowupItemsRequest, aIds) {
-						self.findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds);
-					},
-					function (erFindFollowupItemsRequest, aCode, aMsg) {
-						self.findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg);
-					},
-					null);
-			}
-		}
-	},
-
-	getItemsFromMemoryCache: function _getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, aExporting) {
-		this.logInfo("getItemsFromMemoryCache: startDate:" + aRangeStart + ", endDate:" + aRangeEnd + ", aListener:" + aListener + ", aExporting:" + aExporting);
-
-		let events = [];
-		let tasks = [];
-
-		let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) != 0);
-		let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) != 0);
-
-		// This is by using the this.itemCacheByStartDate and this.itemCacheByEndDate index.
-		if (wantEvents) {
-			let ids = {};
-
-			let dayOffset = cal.createDuration();
-			dayOffset.days = 1;
-
-			let dayPos = cal.createDateTime();
-			dayPos = aRangeStart.clone();
-
-			// Convert date from local timezone to UTC
-			// Given range is in local timezone and cache save in UTC
-			dayPos.isDate = false;
-			dayPos = dayPos.getInTimezone(cal.UTC());
-			dayPos.isDate = true;
-
-			// Go through all days bewteen the range start day and the range end day
-			while (dayPos.compare(aRangeEnd) < 0 ) {
-				if (this.itemCacheByStartDate
-					&& this.itemCacheByStartDate[dayPos.year]
-					&& this.itemCacheByStartDate[dayPos.year][dayPos.yearday]) {
-					for (let itemid in this.itemCacheByStartDate[dayPos.year][dayPos.yearday]) {
-						ids[itemid] = true;
-					}
-				}
-
-				dayPos.addDuration(dayOffset);
-			}
-
-			// For all found ids, if item cache has it, push it to events answer
-			// Check also if invitation should be cancelled
-			for (let itemid in ids) {
-				if (this.itemCacheById[itemid]
-					&& cal.isEvent(this.itemCacheById[itemid])) {
-					events.push(this.itemCacheById[itemid]);
-
-					if (this.deleteCancelledInvitation
-						&& this.itemCacheById[itemid].isCancelled) {
-						this.deleteItemCancelled(this.itemCacheById[itemid]);
-					}
-				}
-			}
-		}
-		else if (wantTodos) {
-			let wantCompletedTodo = aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_YES;
-			let wantNotCompletedTodo = aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_NO;
-
-			for (let index in this.itemCacheById) {
-				if (cal.isToDo(this.itemCacheById[index])) {
-					if (this.deactivateTaskFollowup
-						&& this.itemCacheById[index].itemClass == "IPM.Note") {
-						//Do not change order or removing from local or it will throw db error
-						//remove from offlinecache
-						this.removeFromOfflineCache(this.itemCacheById[index]);
-						//remove from lighting GUI
-						this.removeItemFromCache(this.itemCacheById[index]);
-					}
-					else if ((this.itemCacheById[index].isCompleted && wantCompletedTodo)
-						|| (!this.itemCacheById[index].isCompleted && wantNotCompletedTodo)) {
-						tasks.push(this.itemCacheById[index]);
-					}
-				}
-			}
-		}
-
-		this.logInfo("getItemsFromMemoryCache: We got '" + events.length + "' events and  '" + tasks.length + "'  tasks from memory cache.");
-		if (aListener) {
-			this.logInfo("getItemsFromMemoryCache: We have a listener so going to inform it.");
-			if (events.length > 0
-				&& wantEvents) {
-				aListener.onGetResult(this,
-					Cr.NS_OK,
-					Ci.calIEvent,
-					null,
-					events.length,
-					events);
-			}
-
-			if (tasks.length > 0
-				&& wantTodos) {
-				aListener.onGetResult(this,
-					Cr.NS_OK,
-					Ci.calITodo,
-					null,
-					tasks.length,
-					tasks);
-			}
-
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.GET,
-				null, null);
-		}
-	},
-
-	requestPeriod: function _requestPeriod(aStartDate, aEndDate, aItemFilter, aCount, findReverse, aUID) {
-		if (this.debug) this.logInfo("Getting period from: " + aStartDate + " until " + aEndDate);
-		//dump(this.name+": Getting period from: "+aStartDate+" until "+aEndDate+"\n");
-
-		/*      		var self = this;
-				this.addToQueue( erFindCalendarItemsRequest, 
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 serverUrl: this.serverUrl,
-					 count: aCount,
-					 rangeStart: aStartDate.clone(),
-					 rangeEnd: aEndDate.clone(),
-					 folderBase: this.folderBase,
-					 itemFilter: aItemFilter,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 actionStart: Date.now() }, 
-					function(erFindCalendarItemsRequest, aIds, aOccurrences) { self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);}, 
-					function(erFindCalendarItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);},
-					null);
-
-				return;*/
-
-		if (findReverse) {
-			var endDate = aEndDate.clone();
-			var startDate = endDate.clone();
-
-			var offset = cal.createDuration();
-			offset.weeks = -1;
-			startDate.addDuration(offset);
-			if ((aStartDate) && (startDate.compare(aStartDate) < 1)) {
-				startDate = aStartDate.clone();
-			}
-		}
-		else {
-			var startDate = aStartDate.clone();
-			var endDate = startDate.clone();
-
-			var offset = cal.createDuration();
-			offset.weeks = 1;
-			endDate.addDuration(offset);
-			if ((aEndDate) && (endDate.compare(aEndDate) > -1)) {
-				endDate = aEndDate.clone();
-			}
-		}
-
-		var self = this;
-		var doStop = false;
-		var stopNext = false;
-
-		while (!doStop) {
-			if (startDate.compare(endDate) != 0) {
-				if (this.debug) this.logInfo("Getting period part of: " + startDate.toString() + " until " + endDate.toString());
-				//dump(this.name+": Getting period part of: "+startDate.toString()+" until "+endDate.toString()+"\n");
-				this.addToQueue(erFindCalendarItemsRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl,
-						count: aCount,
-						rangeStart: startDate.clone(),
-						rangeEnd: endDate.clone(),
-						folderBase: this.folderBase,
-						itemFilter: aItemFilter,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						actionStart: Date.now(),
-						uid: aUID
-					},
-					function (erFindCalendarItemsRequest, aIds, aOccurrences) {
-						self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);
-					},
-					function (erFindCalendarItemsRequest, aCode, aMsg) {
-						self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);
-					},
-					null);
-			}
-
-			if (!stopNext) {
-				if (findReverse) {
-					endDate = startDate.clone();
-					startDate.addDuration(offset);
-					if ((aStartDate) && (startDate.compare(aStartDate) < 1)) {
-						startDate = aStartDate.clone();
-						stopNext = true;
-					}
-					if (!aStartDate) {
-						doStop = true;
-					}
-				}
-				else {
-					startDate = endDate.clone();
-					endDate.addDuration(offset);
-					if ((aEndDate) && (endDate.compare(aEndDate) > -1)) {
-						endDate = aEndDate.clone();
-						stopNext = true;
-					}
-					if (!aEndDate) {
-						doStop = true;
-					}
-				}
-			}
-			else {
-				doStop = true;
-			}
-		}
-		if (this.debug) this.logInfo("Getting period done.");
-	},
-
-	//  calIOperation refresh();
-	refresh: function _refresh() {
-
-		if (this.debug) this.logInfo("refresh");
-		if (this.shutdown) {
-			if (this.debug) this.logInfo("Shutting down. So no refresh.");
-			return;
-		}
-
-		if (((!this.syncState) && (!this.OnlyShowAvailability)) || (this.weAreSyncing)) {
-			if (this.weAreSyncing) {
-				if (this.debug) this.logInfo("weAreSyncing. So no refresh.");
-			}
-
-
-
-			else {
-				if (this.debug) this.logInfo("No syncState yet. So no refresh.");
-			}
-			return;
-		}
-
-		if (this.isOffline) {
-			if (this.debug) this.logInfo("We are offline. So no refresh.");
-			return;
-		}
-
-		if (this._disabled) {
-			if (this.debug) this.logInfo("We are disabled. So no refresh.");
-			return;
-		}
-
-		if (!this.isInitialized) {
-			if (this.debug) this.logInfo("Not initialized yet. So no refresh.");
-			return;
-		}
-
-		//if (this.debug) this.logInfo("Refresh. We start a sync.");
-		//var self = this;
-
-		if (this.OnlyShowAvailability) {
-			if (!this.lastValidRangeStart) this.lastValidRangeStart = aRangeStart.clone();
-			this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
-		}
-		else {
-			this.getSyncState();
-		}
-
-		return;
-
-	},
-
-	//  void startBatch();
-	startBatch: function _startBatch() {
-		dump("Start batch\n");
-	},
-
-	//  void endBatch();
-	endBatch: function _endBatch() {
-		dump("End batch\n");
-	},
-
-	// End calICalendar
-
-	// Begin calISchedulingSupport
-	//  boolean isInvitation(in calIItemBase aItem);
-	isInvitation: function _isInvitation(aItem, ignoreStatus) {
-		try {
-			var exchangeItem = aItem.QueryInterface(Ci.mivExchangeEvent);
-
-			if (exchangeItem) {
-				if (aItem.canModify) {
-					//dump("X-exchangeITIP1:"+aItem.getProperty("X-exchangeITIP1")+"\n");
-					//dump("X-exchangeITIP2:"+aItem.getProperty("X-exchangeITIP2")+"\n");
-					return aItem.isInvitation;
-				}
-			}
-		}
-		catch (err) {}
-
-		return false;
-	},
-
-	// boolean canNotify(in AUTF8String aMethod, in calIItemBase aItem);
-	canNotify: function _canNotify(aMethod, aItem) {
-		if (this.debug) this.logInfo("canNotify: aMethod=" + aMethod + ":" + aItem.title);
-
-		return true;
-	},
-
-	// calIAttendee getInvitedAttendee(in calIItemBase aItem);
-	getInvitedAttendee: function _getInvitedAttendee(aItem) {
-		//if (this.debug) this.logInfo("getInvitedAttendee 1:"+aItem.title);
-		if (!aItem) {
-			return;
-		}
-
-		// Parse through the attendees
-		var attendees = aItem.getAttendees({});
-		for each(var attendee in attendees) {
-			if (this.debug) this.logInfo("getInvitedAttendee 2:" + attendee.id);
-			if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase())
-				|| (attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase())) {
-				if (this.debug) this.logInfo("getInvitedAttendee FOUND myself:" + aItem.title + ", attendee.participationStatus:" + attendee.participationStatus + ", aItem.myResponseType:" + aItem.myResponseType);
-				//				attendee.participationStatus = participationMap[aItem.myResponseType];
-				return attendee; //.clone();
-			}
-			else {
-				if (this.debug) this.logInfo("getInvitedAttendee FOUND someonelse:" + aItem.title + ", attendee.id:" + attendee.id + ", attendee.participationStatus:" + attendee.participationStatus);
-			}
-		}
-
-		if (aItem.isInvitation) {
-			if (this.debug) this.logInfo("getInvitedAttendee  X-IsInvitation = true");
-			var tmpAttendee = cal.createAttendee();
-			tmpAttendee.id = "mailto:" + this.mailbox;
-			tmpAttendee.commonName = this.userDisplayName;
-			tmpAttendee.rsvp = "FALSE";
-			tmpAttendee.userType = "INDIVIDUAL";
-			tmpAttendee.role = "REQ-PARTICIPANT";
-			tmpAttendee.participationStatus = aItem.participationStatus;
-			return tmpAttendee;
-		}
-
-		//dump("Did not find an attendee.!\n");
-
-	},
-	// End calISchedulingSupport
-
-	// Begin calIFreeBusyProvider
-	//    calIOperation getFreeBusyIntervals(in AUTF8String aCalId,
-	//                               in calIDateTime aRangeStart,
-	//                               in calIDateTime aRangeEnd,
-	//                               in unsigned long aBusyTypes,
-	//                               in calIGenericOperationListener aListener);
-
-	getFreeBusyIntervals: function (aCalId, aRangeStart, aRangeEnd,
-		aBusyTypes, aListener) {
-		if (this.debug) this.logInfo("getFreeBusyIntervals: " + aCalId + ", aBusyTypes:" + aBusyTypes + ", aRangeStart:" + aRangeStart + ", aRangeEnd:" + aRangeEnd);
-
-		if (aCalId.indexOf("@") < 0 || aCalId.indexOf(".") < 0) {
-			// No valid email, screw it
-			if (aListener) {
-				aListener.onResult(null, null);
-			}
-			return;
-		}
-
-		var tmpStartDate = aRangeStart.clone();
-		tmpStartDate.isDate = false;
-		var tmpEndDate = aRangeEnd.clone();
-		tmpEndDate.isDate = false;
-
-		var self = this;
-		this.addToQueue(erGetUserAvailabilityRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: this.folderBase,
-				serverUrl: this.serverUrl,
-				email: aCalId.replace(/^mailto:/i, ""),
-				attendeeType: 'Required',
-				start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
-				end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
-				calId: aCalId,
-				folderID: this.folderID,
-				changeKey: this.changeKey
-			},
-			function (erGetUserAvailabilityRequest, aEvents) {
-				self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);
-			},
-			function (erGetUserAvailabilityRequest, aCode, aMsg) {
-				self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);
-			},
-			aListener);
-
-	},
-	// End calIFreeBusyProvider
-
-	// Begin calIItipTransport
-	//    readonly attribute AUTF8String scheme;
-	get scheme() {
-		if (this.debug) this.logInfo("get scheme");
-		return "";
-	},
-
-	//    attribute AUTF8String senderAddress;
-	get senderAddress() {
-		if (this.debug) this.logInfo("get senderAddress");
-		return "hihi";
-	},
-
-	set senderAddress(aValue) {
-		if (this.debug) this.logInfo("set senderAddress(" + aValue + ")");
-	},
-
-	//    readonly attribute AUTF8String type;
-	//* IS DEFINED EARLIER AS PART OF calICalendar
-
-	/**
-	 * Sends a calIItipItem to the recipients using the specified title and
-	 * alternative representation. If a calIItipItem is attached, then an ICS
-	 * representation of those objects are generated and attached to the email.
-	 * If the calIItipItem is null, then the item(s) is sent without any
-	 * text/calendar mime part.
-	 * @param count             size of recipient array
-	 * @param recipientArray    array of recipients
-	 * @param calIItipItem      set of calIItems encapsulated as calIItipItems
-	 */
-	//    void sendItems(in PRUint32 count,
-	//                   [array, size_is(count)] in calIAttendee recipientArray,
-	//                   in calIItipItem item);
-	sendItems: function _sendItems(count, recipientArray, item) {
-		if (this.debug) this.logInfo("sendItems");
-	},
-	// End calIItipTransport
-
-	isRemoved: function _isRemoved(aItem) {
-		if (!aItem) {
-			return null;
-		}
-
-		if (this.debug) this.logInfo("isRemoved title:" + aItem.title + ", status=" + aItem.status);
-
-		if (aItem.status == "") {
-			return true;
-		}
-
-		return false;
-	},
-
-	getExceptions: function _getExceptions(aRecurrenceItems) {
-		var tmpCount = 0;
-		var exceptions = {};
-		for each(var recurrenceItem in aRecurrenceItems) {
-			tmpCount++;
-			if (this.debug) this.logInfo("getExceptions: nr:" + tmpCount + ", isNegative:" + recurrenceItem.isNegative);
-			if (recurrenceItem.isNegative) {
-				// A deletion is an exception and therefore isNegative === true
-				var occurrences = recurrenceItem.getOccurrences(this.startDate, this.startDate, this.endDate, 0, {});
-				if (this.debug) this.logInfo("getExceptions: we have occurrences.length=" + occurrences.length);
-				for each(var occurrence in occurrences) {
-					exceptions[occurrence.toString()] = occurrence;
-				}
-			}
-		}
-		return exceptions;
-	},
-
-	getRemovedOccurrence: function _getRemovedOccurrence(aOldItem, aNewItem) {
-		if (this.debug) this.logInfo("getRemovedOccurrence");
-
-		// We first check if an occurrence was removed.
-		var oldCount = {};
-		var oldOccurrences = aOldItem.getOccurrences(oldCount);
-
-		var newCount = {};
-		var newOccurrences = aNewItem.getOccurrences(newCount);
-
-		if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value=" + oldCount.value);
-		if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value=" + newCount.value);
-		if (newCount.value > oldCount.value) {
-			if (this.debug) this.logInfo("getRemovedOccurrence: We have less occurrences than before.");
-
-			for each(var newOccurrence in newOccurrences) {
-				var foundOld = false;
-				for each(var oldOccurrence in oldOccurrences) {
-					if (oldOccurrence.id == newOccurrence.id) {
-						foundOld = true;
-						break;
-					}
-				}
-				if (foundOld == false) {
-					if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed occurrence: startdate:" + newOccurrence.startDate.toString());
-					return newOccurrence;
-				}
-			}
-		}
-
-		// No occurrence was removed. We check the exceptions.
-		var oldCount = {};
-		var oldExceptions = aOldItem.getExceptions(oldCount);
-
-		var newCount = {};
-		var newExceptions = aNewItem.getExceptions(newCount);
-
-		if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value=" + oldCount.value);
-		if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value=" + newCount.value);
-
-		if (newCount.value > oldCount.value) {
-			if (this.debug) this.logInfo("getRemovedOccurrence: We have less exceptions than before.");
-
-			for each(var newException in newExceptions) {
-				var foundOld = false;
-				for each(var oldException in oldExceptions) {
-					if (oldException.id == newException.id) {
-						foundOld = true;
-						break;
-					}
-				}
-				if (foundOld == false) {
-					if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed exception: startdate:" + newException.startDate.toString());
-					return newException;
-				}
-			}
-		}
-
-		if (this.debug) this.logInfo("getRemovedOccurrence: we DID NOT FIND our removed occurrence or exception");
-		return null;
-	},
-
-	get prefs() {
-		return this.mPrefs;
-	},
-
-	get exchangePrefVersion() {
-		return this.globalFunctions.safeGetIntPref(this.prefs, "exchangePrefVersion", 0);
-	},
-
-	get isInitialized() {
-		if (!this.id) {
-			return false;
-		}
-
-		if (!this.mPrefs) {
-			if (this.debug) this.logInfo("Found old version preferences. THIS IS A PROBLEM.");
-			return false;
-		}
-
-		if (this.globalFunctions.safeGetBoolPref(this.prefs, "disabled", false)) {
-			return false;
-		}
-
-		if (this.firstrun) {
-			this.firstrun = false;
-
-			//Add Prvider for busy free information for  invite attendees etc.
-			getFreeBusyService().addProvider(this);
-
-			// The first thing we want to do is check the folderbase and folderpath for their id & changekey.
-			// It might have changed between restarts.
-			this.checkFolderPath();
-
-			/* Disabled as on startup we do not wish to use old syncstate until we get some offline caching implemented for this (2013-12-20)
-						this.syncInboxState = this.globalFunctions.safeGetCharPref(this.prefs,"syncInboxState", "");
-						if (this.syncInboxState != "") {
-							this.saveToFile("syncInboxState.txt", this.syncInboxState);
-							this.prefs.deleteBranch("syncInboxState");
-						}
-			*/
-			if (this.useOfflineCache) {
-				this.syncStateInbox = this.loadFromFile("syncStateInbox.txt");
-				this.prefs.deleteBranch("syncStateInbox");
-
-				this.syncState = this.loadFromFile("syncState.txt");
-				this.prefs.deleteBranch("syncState");
-			}
-
-			//			this.syncInboxState = this.loadFromFile("syncInboxState.txt");
-
-			this.getSyncState();
-
-			if ((this.isOffline) || ((this.useOfflineCache) && (this.syncState))) {
-				this.firstSyncDone = true;
-				if (this.debug) this.logInfo("First sync is done. Normal operation is starting.");
-
-				while (this.getItemsSyncQueue.length > 0) {
-					let getItemsReq = this.getItemsSyncQueue.shift();
-					this.getItems(getItemsReq.itemFilter, getItemsReq.count, getItemsReq.rangeStart, getItemsReq.rangeEnd, getItemsReq.listener);
-				}
-				if (this.debug) this.logInfo("First sync is done. Processed getItemsSyncQueue.");
-			}
-
-			//dump(this.name+": Going to load testdata ("+this.id+")\n");
-			//			var testData = this.loadFromFile("testitem");
-			//			if (testData) {
-			//				var testJSON = xml2json.newJSON();
-			//				xml2json.parseXML(testJSON, testData);
-			//				var tmpItems = [testJSON[telements][0]];
-			//try{
-			//				this.updateCalendar(null, tmpItems, true, false);
-			//}catch(err){dump(this.name+": Testdata error:"+err+"\n");}
-			//				dump("Loaded testdata\n");
-			//			}
-		}
-		return true;
-
-	},
-
-	getCharPref: function (aName) {
-		return this.globalFunctions.safeGetCharPref(this.prefs, aName, null);
-	},
-
-	setCharPref: function (aName, aValue) {
-		if (this.prefs) {
-			return this.prefs.setCharPref(aName, aValue);
-		}
-	},
-
-	get user() {
-		var username = this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
-		if (username.indexOf("@") > -1) {
-			return username;
-		}
-		else {
-			if (this.domain == "") {
-				return this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
-			}
-			else {
-				return this.domain + "\\" + this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
-			}
-		}
-	},
-
-	set user(value) {
-		if ((value.indexOf("\\") > -1) && (value.indexOf("@") == -1)) {
-			this.domain = value.substr(0, value.indexOf("\\"));
-			this.setCharPref("ecUser", value.substr(value.indexOf("\\") + 1));
-		}
-		else {
-			this.setCharPref("ecUser", value);
-		}
-	},
-
-	get domain() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecDomain", "");
-	},
-
-	set domain(value) {
-		return this.setCharPref("ecDomain", value);
-	},
-
-	get mailbox() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecMailbox", "");
-	},
-
-	get serverUrl() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecServer", "");
-	},
-
-	get userDisplayName() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecDisplayname", "");
-	},
-
-	get folderBase() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderbase", "calendar");
-	},
-
-	get folderPath() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderpath", "/");
-	},
-
-	get folderID() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderID", null);
-	},
-
-	set folderID(aValue) {
-		this.prefs.setCharPref("ecFolderID", aValue);
-	},
-
-	get changeKey() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecChangeKey", null);
-	},
-
-	set changeKey(aValue) {
-		this.prefs.setCharPref("ecChangeKey", aValue);
-	},
-
-	get folderIDOfShare() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderIDOfShare", "");
-	},
-
-	get isPublicFolder() {
-		if (publicFoldersMap[this.folderBase]) {
-			return true;
-		}
-		else {
-			return false;
-		}
-	},
-
-	get doPollInbox() {
-		if (this.doReset) {
-			return false;
-		}
-
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecPollInbox", true);
-	},
-
-	get pollInboxInterval() {
-		return this.globalFunctions.safeGetIntPref(this.prefs, "ecPollInboxInterval", 180);
-	},
-
-	get doAutoRespondMeeting() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRespondMeetingRequest", false);
-	},
-
-	get autoResponseAnswer() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecAutoRespondAnswer", "TENTATIVE");
-	},
-
-	get doAutoRemoveInvitationCancelation1() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRemoveInvitationCancellation1", false);
-	},
-
-	get doAutoRemoveInvitationCancelation2() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRemoveInvitationCancellation2", false);
-	},
-
-	get doAutoRemoveInvitationResponse1() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRemoveInvitationResponse1", true);
-	},
-
-	get sendAutoRespondMeetingRequestMessage() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecSendAutoRespondMeetingRequestMessage", false);
-	},
-
-	get autoRespondMeetingRequestMessage() {
-		return this.globalFunctions.safeGetCharPref(this.prefs, "ecAutoRespondMeetingRequestMessage", "");
-	},
-
-	get cacheStartupBefore() {
-		return this.globalFunctions.safeGetIntPref(null, "extensions.1st-setup.cache.startupBefore", 30, true);
-	},
-
-	get cacheStartupAfter() {
-		return this.globalFunctions.safeGetIntPref(null, "extensions.1st-setup.cache.startupAfter", 30, true);
-	},
-
-	get startCacheDate() {
-		var aDate = cal.now();
-		var tmpDur = cal.createDuration();
-		tmpDur.hours = -1 * 24 * this.cacheStartupBefore;
-		aDate.addDuration(tmpDur);
-		if (this.debug) this.logInfo("startCacheDate:" + aDate.toString());
-		return aDate
-	},
-
-	get endCacheDate() {
-		var aDate = cal.now();
-		var tmpDur = cal.createDuration();
-		tmpDur.hours = 1 * 24 * this.cacheStartupAfter;
-		aDate.addDuration(tmpDur);
-		if (this.debug) this.logInfo("endCacheDate:" + aDate.toString());
-		return aDate
-	},
-
-	get deleteCancelledInvitation() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingdeletecancelleditems", true);
-	},
-
-	get deactivateTaskFollowup() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "followup.task.deactivate", false);
-	},
-
-	get markEventasTentative() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingmarkeventtentative", false);
-	},
-
-	checkInbox: function _checkInbox() {
-		if (this.debug) this.logInfo("checkInbox 1.");
-
-		if (this.isOffline) return;
-
-		if ((this.weAreInboxSyncing) || (!this.doPollInbox) || (this.OnlyShowAvailability)) {
-			return;
-		}
-
-		this.weAreInboxSyncing = true;
-		var self = this;
-
-		//if (this.debug) this.logInfo("checkInbox 2.");
-		this.addToQueue(erSyncInboxRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				serverUrl: this.serverUrl,
-				folderBase: 'inbox',
-				folderID: null,
-				changeKey: null,
-				syncState: this.syncInboxState,
-				actionStart: Date.now()
-			},
-			function (erSyncInboxRequest, creations, updates, deletions, syncState) {
-				self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);
-			},
-			function (erSyncInboxRequest, aCode, aMsg) {
-				self.syncInboxError(erSyncInboxRequest, aCode, aMsg);
-			},
-			null);
-	},
-
-	syncInbox: function _syncInbox() {
-		if (this.debug) this.logInfo("syncInbox 1.");
-
-		if (this.isOffline) return;
-
-		if ((this.folderBase != "calendar") || (this.folderID)) {
-			if (this.debug) this.logInfo("syncInbox 2.");
-			return;
-		}
-
-		if ((this.weAreInboxSyncing) || (!this.doPollInbox) || (this.OnlyShowAvailability)) {
-			if (this.debug) this.logInfo("syncInbox 3.");
-			return;
-		}
-
-		this.inboxPoller.cancel();
-
-		var self = this;
-		this.weAreInboxSyncing = true;
-
-		//if (this.debug) this.logInfo("syncInbox 2.");
-		this.addToQueue(erSyncInboxRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				serverUrl: this.serverUrl,
-				folderBase: 'inbox',
-				folderID: null,
-				changeKey: null,
-				syncState: this.syncInboxState,
-				actionStart: Date.now()
-			},
-			function (erSyncInboxRequest, creations, updates, deletions, syncState) {
-				self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);
-			},
-			function (erSyncInboxRequest, aCode, aMsg) {
-				self.syncInboxError(erSyncInboxRequest, aCode, aMsg);
-			},
-			null);
-	},
-
-	removeMeetingItem: function _removeMeetingItem(aRequestItem) {
-		var self = this;
-
-		if (this.debug) this.logInfo("Going to remove meetingItem:" + aRequestItem.title);
-		this.addToQueue(erDeleteItemRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: 'inbox',
-				serverUrl: this.serverUrl,
-				item: null,
-				folderID: null,
-				id: aRequestItem.id,
-				changeKey: aRequestItem.changeKey,
-				itemType: "meeting"
-			},
-			function (erDeleteItemRequest) {
-				self.removeMeetingItemOk(erDeleteItemRequest);
-			},
-			function (erDeleteItemRequest, aCode, aMsg) {
-				self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);
-			},
-			null);
-	},
-
-	removeResponseItem: function _removeResponseItem(aResponse) {
-		var self = this;
-
-		//		if (this.debug) this.logInfo("Going to remove responseItem:"+xml2json.getAttributeByTag(aResponse, "t:Subject")+" from:"+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:Name")+" ("+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:EmailAddress")+")");
-		if (this.debug) this.logInfo("Going to remove responseItem:" + xml2json.getAttributeByTag(aResponse, "t:Subject"));
-		this.addToQueue(erDeleteItemRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: 'inbox',
-				serverUrl: this.serverUrl,
-				item: null,
-				folderID: null,
-				id: xml2json.getAttributeByTag(aResponse, "t:ItemId", "Id"),
-				changeKey: xml2json.getAttributeByTag(aResponse, "t:ItemId", "ChangeKey"),
-				itemType: "response"
-			},
-			function (erDeleteItemRequest) {
-				self.removeMeetingItemOk(erDeleteItemRequest);
-			},
-			function (erDeleteItemRequest, aCode, aMsg) {
-				self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);
-			},
-			null);
-	},
-
-	removeMeetingItemOk: function _removeMeetingItemOk(erDeleteItemRequest) {
-		this.notConnected = false;
-		this.saveCredentials(erDeleteItemRequest.argument);
-		if (this.debug) this.logInfo("removeItemOk: " + erDeleteItemRequest.argument.itemType);
-
-	},
-
-	removeMeetingItemError: function _removeMeetingItemError(erDeleteItemRequest, aCode, aMsg) {
-		this.saveCredentials(erDeleteItemRequest.argument);
-		this.notConnected = true;
-		if (this.debug) this.logInfo("removeItemError: " + erDeleteItemRequest.argument.itemType + " msg:" + String(aMsg));
-	},
-
-	syncInboxOK: function _syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState) {
-		if (this.debug) this.logInfo("syncInboxOk.");
-		this.notConnected = false;
-		this.saveCredentials(erSyncFolderItemsRequest.argument);
-
-		if ((creations.meetingrequests.length > 0) || (updates.meetingrequests.length > 0) || (deletions.meetingrequests.length > 0)) {
-			this.addActivity(calGetString("calExchangeCalendar", "syncInboxRequests", [creations.meetingrequests.length, updates.meetingrequests.length, deletions.meetingrequests.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
-			this.refresh();
-		}
-
-		if ((creations.meetingCancellations.length > 0) || (updates.meetingCancellations.length > 0) || (deletions.meetingCancellations.length > 0)) {
-			this.addActivity(calGetString("calExchangeCalendar", "syncInboxCancelations", [creations.meetingCancellations.length, updates.meetingCancellations.length, deletions.meetingCancellations.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
-			this.refresh();
-		}
-
-		if ((creations.meetingResponses.length > 0) || (updates.meetingResponses.length > 0) || (deletions.meetingResponses.length > 0)) {
-			this.addActivity(calGetString("calExchangeCalendar", "syncInboxResponses", [creations.meetingResponses.length, updates.meetingResponses.length, deletions.meetingResponses.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
-			this.refresh();
-		}
-
-		// Do something with the output.
-		if ((this.syncInboxState) && (syncState == this.syncInboxState)) {
-			this.logError("Same syncState received.");
-		}
-
-		this.syncInboxState = syncState;
-		//this.prefs.setCharPref("syncInboxState", syncState);
-		this.saveToFile("syncInboxState.txt", syncState);
-
-		if ((creations.meetingrequests.length == 0) && (updates.meetingrequests.length == 0) && (deletions.meetingrequests.length == 0)
-			&& (creations.meetingCancellations.length == 0) && (updates.meetingCancellations.length == 0) && (deletions.meetingCancellations.length == 0)
-			&& (creations.meetingResponses.length == 0) && (updates.meetingResponses.length == 0) && (deletions.meetingResponses.length == 0)) {
-			if (this.debug) this.logInfo("syncInboxOk: No new, changed or deleted meetingrequests, meetingCancellations and meetingresponses.");
-			this.weAreInboxSyncing = false;
-			this.startSyncInboxPoller();
-
-			return;
-		}
-
-		// Do something with the results.
-		//		if (this.debug) this.logInfo("syncInboxOK meetingrequests: Creation:"+creations.meetingrequests.length+", Updates:"+updates.meetingrequests.length+", Deletions:"+deletions.meetingrequests.length);
-		//		if (this.debug) this.logInfo("syncInboxOK meetingCancellations: Creation:"+creations.meetingCancellations.length+", Updates:"+updates.meetingCancellations.length+", Deletions:"+deletions.meetingCancellations.length);
-
-		// Save requests into cache.
-		if (creations.meetingrequests.length > 0) {
-			for each(var request in creations.meetingrequests) {
-				var meetingItem = this.convertExchangeAppointmentToCalAppointment(request, true);
-				if (meetingItem) {
-					if (this.debug) this.logInfo(" -- MeetingRequest creation:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
-					meetingItem.setProperty("X-MEETINGREQUEST", true);
-					meetingItem.setProperty("STATUS", "NONE")
-					//this.meetingRequestsCache[request.getTagValue("t:UID")] = meetingItem;
-					this.meetingRequestsCache[meetingItem.id] = meetingItem;
-				}
-			}
-		}
-
-		if (updates.meetingrequests.length > 0) {
-			for each(var update in updates.meetingrequests) {
-				var meetingItem = this.convertExchangeAppointmentToCalAppointment(update, true);
-				if (meetingItem) {
-					if (this.debug) this.logInfo(" -- MeetingRequest update:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
-					meetingItem.setProperty("X-MEETINGREQUEST", true);
-
-					if ((this.meetingRequestsCache[update.id]) && (this.meetingRequestsCache[update.id].uid == meetingItem.uid)) {
-						if (this.debug) this.logInfo("2 modifing  meeting request:" + update.id);
-						//					this.meetingRequestsCache[update.getTagValue("t:UID")] = meetingItem;
-						this.meetingRequestsCache[meetingItem.id] = meetingItem;
-					}
-					else {
-						if (this.debug) this.logInfo("WE DO NOT HAVE AN MEETING IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
-					}
-				}
-			}
-		}
-
-		if (deletions.meetingrequests.length > 0) {
-			for each(var deletion in deletions.meetingrequests) {
-				var meetingItem = this.convertExchangeAppointmentToCalAppointment(deletion, true);
-				if (meetingItem) {
-					if (this.debug) this.logInfo(" -- MeetingRequest deletion:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
-					meetingItem.setProperty("X-MEETINGREQUEST", true);
-					this.removeFromMeetingRequestCache(deletion.id);
-					this.meetingrequestAnswered[deletion.id] = false;
-				}
-			}
-		}
-
-		// Save cancelations into cache and remove request for which we received a cancelation.
-		if (creations.meetingCancellations.length > 0) {
-			for each(var request in creations.meetingCancellations) {
-				var cancelItem = this.convertExchangeAppointmentToCalAppointment(request, true);
-				if (cancelItem) {
-					if (this.debug) this.logInfo(" -- MeetingCancelation creation:" + cancelItem.title + ", UID:" + cancelItem.uid + ",id:" + cancelItem.id + ",changeKey:" + cancelItem.changeKey);
-					cancelItem.setProperty("X-MEETINGCANCELATION", true);
-					this.meetingCancelationsCache[request.id] = cancelItem;
-				}
-			}
-		}
-
-		if (updates.meetingCancellations.length > 0) {
-			for each(var update in updates.meetingCancellations) {
-				var cancelItem = this.convertExchangeAppointmentToCalAppointment(update, true);
-				if (cancelItem) {
-					cancelItem.setProperty("X-MEETINGCANCELATION", true);
-					if (this.meetingCancelationsCache[update.id].uid == cancelItem.uid) {
-						this.meetingCancelationsCache[update.id] = meetingItem;
-					}
-					else {
-						if (this.debug) this.logInfo("WE DO NOT HAVE A MEETING IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
-					}
-				}
-			}
-		}
-
-		if (deletions.meetingCancellations.length > 0) {
-			for each(var deletion in deletions.meetingCancellations) {
-				delete this.meetingCancelationsCache[deletion.id];
-			}
-		}
-
-		var requestCount = 0;
-		var cancelationCount = 0;
-		var tmpInCalendarCache = {};
-		for each(var index in this.meetingRequestsCache) {
-			if (index) {
-				// Remove request for which we have an calendaritem which is confirmed
-				var tmpID = index.id;
-				var tmpUID = index.uid;
-				var inCalendar = null;
-
-				// First check recurring Masters
-				if (this.recurringMasterCache[tmpUID]) {
-					inCalendar = this.recurringMasterCache[tmpUID];
-				}
-
-				// Check single items
-				if (!inCalendar) {
-					for each(var item in this.itemCacheById) {
-						if ((item) && (item.uid == tmpUID)) {
-							inCalendar = item;
-							break;
-						}
-					}
-				}
-
-				var confirmed = false;
-
-				// We turn this off for now (10-12-2011) This so meeting update items in mailbox are not removed.
-				/*if (inCalendar) {
-					//if (this.debug) this.logInfo("request '"+inCalendar.title+"' allready in Calendar with status="+inCalendar.getProperty("STATUS"));
-					//var newItem = 
-					confirmed = (inCalendar.getProperty("STATUS") != "NONE");
-					tmpInCalendarCache[tmpUID] = inCalendar;
-				}*/
-
-				if (confirmed) {
-					// Remove request. Meeting is in calendar and confirmed.
-					this.removeMeetingItem(index);
-					this.removeFromMeetingRequestCache(tmpID);
-					//this.meetingRequestsCache[tmpUID] = null;
-					this.meetingrequestAnswered[tmpID] = false;
-				}
-				else {
-					// Keep this request
-					requestCount++;
-					//if (this.debug) this.logInfo("meetingRequest:"+index.getTagValue("t:Subject"));
-
-					// This is a new request. Check if we should autorespond.
-					if (!this.meetingrequestAnswered[tmpID]) {
-						this.meetingrequestAnswered[tmpID] = false;
-					}
-
-					if ((this.doAutoRespondMeeting) && (this.meetingrequestAnswered[tmpID] === false)) {
-
-						var bodyText = null;
-						if (this.sendAutoRespondMeetingRequestMessage) {
-							bodyText = this.autoRespondMeetingRequestMessage;
-							this.addActivity(calGetString("calExchangeCalendar", "sendAutoRespondMeetingRequestMessage", [index.title, this.name], "exchangecalendar"), "", Date.now(), Date.now());
-
-						}
-
-						if (inCalendar) {
-							//var aItem = inCalendar.clone();
-							var aItem = this.cloneItem(inCalendar);
-							this.sendMeetingRespons(aItem, null, "existing", this.autoResponseAnswer, bodyText);
-						}
-						else {
-							//var aItem = index.clone();
-							var aItem = this.cloneItem(index);
-							this.sendMeetingRespons(aItem, null, "existing", this.autoResponseAnswer, bodyText); // TODO: might have to set new
-						}
-						this.meetingrequestAnswered[tmpID] = true;
-					}
-				}
-
-				// We turn this off for now (10-12-2011) This so meeting update items in mailbox are not removed.
-				/*				if (inCalendar) {
-									// remove our cached request from calendar otherwise it will appear twice.
-									this.notifyTheObservers("onDeleteItem", [index]);
-									this.removeFromMeetingRequestCache(tmpUID);
-									//this.meetingRequestsCache[tmpUID] == null;
-									this.meetingrequestAnswered[tmpUID] = false;
-								}*/
-			}
-		}
-
-		for each(var index in this.meetingCancelationsCache) {
-			if (index) {
-				// Remove cancelation for which we do not have an calendaritem.
-				var tmpID = index.id;
-				var tmpUID = index.uid;
-				var inCalendar = false;
-
-				// First check recurring Masters
-				if (this.recurringMasterCache[tmpUID]) {
-					inCalendar = this.recurringMasterCache[tmpUID];
-				}
-
-				// Check single items
-				if (!inCalendar) {
-					for each(var item in this.itemCacheById) {
-						if ((item) && (item.uid == tmpUID)) {
-							inCalendar = item;
-							break;
-						}
-					}
-				}
-
-				// Check meetingrequest cache
-				var inCache = false;
-				if (!inCalendar) {
-					inCalendar = this.meetingRequestsCache[tmpID];
-					if (inCalendar) {
-						// We have a cancellation and a request but no item in the calendar
-						inCache = true;
-					}
-				}
-
-				if (inCalendar) {
-					// Keep this cancelation if it is allready confirmed. Or remove it when we we have it only in cache.
-					if (((inCalendar.getProperty("STATUS") == "NONE") && (this.doAutoRemoveInvitationCancelation1))
-						|| (inCache)) {
-						// We have an calendaritem for this cancelation but it is not yet confirmed.
-						// We remove the cancelation and the meetingitem if it is not in cache
-						// and user specified this in the EWS settings.
-						if (inCache) {
-							// We remove it from the cache
-							if (this.meetingRequestsCache[tmpID]) {
-								this.removeMeetingItem(this.meetingRequestsCache[tmpID]);
-								this.removeFromMeetingRequestCache(tmpID);
-								//this.meetingRequestsCache[tmpUID] = null;
-							}
-							this.removeMeetingItem(index);
-							this.notifyTheObservers("onDeleteItem", [inCalendar]);
-							this.removeFromMeetingRequestCache(tmpID);
-							//this.meetingRequestsCache[tmpUID] = null;
-							this.meetingrequestAnswered[tmpID] = false;
-							delete this.meetingCancelationsCache[tmpID];
-						}
-						else {
-							// We remove it from the real calendar.
-							this.removeMeetingItem(index);
-							this.deleteItem(inCalendar);
-						}
-					}
-					else {
-						if (!inCalendar.isCancelled) {
-							if (!this.doAutoRemoveInvitationCancelation2) {
-								// It is in calendar and allready confirmed. We update the current calendaritem.
-								// Change title of current calendaritem.
-								//var newItem = inCalendar.clone();
-								var newItem = this.cloneItem(inCalendar);
-								newItem.setProperty("X-IsCancelled", true);
-								newItem.title = index.title;
-								// Set status in calendar as free.
-								newItem.setProperty("TRANSP", "TRANSPARENT");
-								if (inCache) {
-									this.notifyTheObservers("onModifyItem", [newItem, inCalendar]);
-									this.meetingRequestsCache[tmpID] = newItem;
-								}
-								else {
-									this.modifyItem(inCalendar, newItem, null);
-								}
-								cancelationCount++;
-							}
-							else {
-								// Remove calendar item and cancellation message
-								// because user specified so in the EWS settings.
-								// We remove it from the real calendar and in the inbox.
-								this.addActivity(calGetString("calExchangeCalendar", "autoRemoveConfirmedInvitationOnCancellation", [inCalendar.title, this.name], "exchangecalendar"), "", Date.now(), Date.now());
-								inCalendar.setProperty("X-IsCancelled", true);
-								this.deleteItem(inCalendar);
-								this.removeMeetingItem(index);
-								this.removeFromMeetingRequestCache(tmpID);
-								//this.meetingRequestsCache[tmpUID] = null;
-							}
-						}
-						delete this.meetingCancelationsCache[tmpID];
-						if (this.debug) this.logInfo("meetingCancelation:" + index.title);
-					}
-				}
-				else {
-					// Meeting is not in calendar yet. We remove it if user specified it
-					// as a setting in EWS settings.
-					if (this.doAutoRemoveInvitationCancelation1) {
-						if (this.meetingRequestsCache[tmpID]) {
-							this.removeMeetingItem(this.meetingRequestsCache[tmpID]);
-							this.removeFromMeetingRequestCache(tmpID);
-							//this.meetingRequestsCache[tmpUID] = null;
-						}
-						this.removeMeetingItem(index);
-						delete this.meetingCancelationsCache[tmpID];
-					}
-				}
-			}
-		}
-
-		// Process Meetingresponses
-		// Save responses into cache and remove request for which we received a cancelation.
-		for each(var response in creations.meetingResponses) {
-			this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")] = response;
-		}
-
-		for each(var response in updates.meetingResponses) {
-			if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")]) {
-				this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")] = response;
-			}
-			else {
-				if (this.debug) this.logInfo("WE DO NOT HAVE A RESPONSE IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
-			}
-		}
-
-		for each(var response in deletions.meetingResponses) {
-			if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")]) {
-				delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")];
-			}
-		}
-
-
-		if (this.doAutoRemoveInvitationResponse1) {
-			for each(var response in this.meetingResponsesCache) {
-				// Check if we have this meeting 
-				var tmpUID = xml2json.getTagValue(response, "t:UID");
-				var inCalendar = false;
-
-				// First check recurring Masters
-				if (this.recurringMasterCache[tmpUID]) {
-					inCalendar = this.recurringMasterCache[tmpUID];
-				}
-
-				// Check single items
-				if (!inCalendar) {
-					for each(var item in this.itemCacheById) {
-						if ((item) && (item.uid == tmpUID)) {
-							inCalendar = item;
-							break;
-						}
-					}
-				}
-
-				if (inCalendar) {
-					// Check if we are the organiser of this item.
-					var iAmOrganizer = ((inCalendar.organizer) && (inCalendar.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
-					if (!iAmOrganizer) {
-						// Remove the response in the inbox. Do not update calendar.
-						this.removeResponseItem(response);
-						delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")];
-					}
-				}
-			}
-		}
-
-		this.weAreInboxSyncing = false;
-
-		if ((requestCount > 0) || (cancelationCount > 0)) {
-			this.refresh();
-		}
-
-		if (this.debug) this.logInfo("syncInboxOK: left with meetingRequests:" + requestCount + ", meetingCancelations:" + cancelationCount);
-
-		this.startSyncInboxPoller();
-	},
-
-	startSyncInboxPoller: function _startSyncInboxPoller() {
-		if (!this.doPollInbox) {
-			return;
-		}
-
-		this.inboxPoller.cancel();
-		let self = this;
-		this.inboxPoller.initWithCallback({
-			notify: function setTimeout_notify() {
-				self.syncInbox();
-			}
-		}, this.pollInboxInterval * 1000, this.inboxPoller.TYPE_REPEATING_SLACK);
-	},
-
-	syncInboxError: function _syncInboxError(erSyncFolderItemsRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("syncInboxError");
-		this.saveCredentials(erSyncFolderItemsRequest.argument);
-		this.notConnected = true;
-		this.weAreInboxSyncing = false;
-		//this.processItemSyncQueue();
-
-		this.startSyncInboxPoller();
-	},
-
-	doAvailability: function _doAvailability(aCalId, aCi) {
-		const x = Ci.calIFreeBusyInterval;
-
-		const types = {
-			"Free": x.FREE,
-			"Tentative": x.BUSY_TENTATIVE,
-			"Busy": x.BUSY,
-			"OOF": x.BUSY_UNAVAILABLE,
-			"NoData": x.UNKNOWN
-		};
-
-		var start = null;
-		if (xml2json.getTagValue(aCi, "t:StartTime", null)) {
-			if (this.isVersion2007) {
-				start = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:StartTime", null), this.globalFunctions.ecUTC());
-			}
-			else {
-				start = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:StartTime", null), this.globalFunctions.ecDefaultTimeZone());
-			}
-		}
-
-		var end = null;
-		if (xml2json.getTagValue(aCi, "t:EndTime", null)) {
-			if (this.isVersion2007) {
-				end = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:EndTime", null), this.globalFunctions.ecUTC());
-			}
-			else {
-				end = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:EndTime", null), this.globalFunctions.ecDefaultTimeZone());
-			}
-		}
-
-		//		var start = this.tryToSetDateValue(aCi.getTagValue("t:StartTime"));
-		//		var end   = this.tryToSetDateValue(aCi.getTagValue("t:EndTime"));
-		var type = types[xml2json.getTagValue(aCi, "t:BusyType")];
-		return new cal.FreeBusyInterval(aCalId, type,
-			start, end);
-	},
-
-	md5: function _md5(aString) {
-
-		if (!aString) {
-			return "";
-		}
-
-		var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-		createInstance(Ci.nsIScriptableUnicodeConverter);
-
-		// we use UTF-8 here, you can choose other encodings.
-		converter.charset = "UTF-8";
-		// result is an out parameter,
-		// result.value will contain the array length
-		var result = {};
-		// data is an array of bytes
-		var data = converter.convertToByteArray(aString, result);
-		var ch = Cc["@mozilla.org/security/hash;1"]
-			.createInstance(Ci.nsICryptoHash);
-		ch.init(ch.MD5);
-		ch.update(data, data.length);
-		return ch.finish(true);
-	},
-
-	getUserAvailabilityRequestOK: function _getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents) {
-		this.notConnected = false;
-		if (this.debug) this.logInfo("getUserAvailabilityRequestOK: aEvents.length:" + aEvents.length + ", this.folderIsNotAvailable:" + this.folderIsNotAvailable);
-		this.saveCredentials(erGetUserAvailabilityRequest.argument);
-
-		var items = new Array();
-		if (this.OnlyShowAvailability) {
-			this.updateCalendar(erGetUserAvailabilityRequest, aEvents, true, false, false);
-			aEvents = null;
-			erGetUserAvailabilityRequest = null;
-		}
-		else {
-			for (var index in aEvents) {
-				var item = this.doAvailability(erGetUserAvailabilityRequest.argument.calId, aEvents[index]);
-				items.push(item);
-			}
-
-			if (erGetUserAvailabilityRequest.listener) {
-				erGetUserAvailabilityRequest.listener.onResult(null, items);
-			}
-		}
-	},
-
-	getUserAvailabilityRequestError: function _getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg) {
-		this.saveCredentials(erGetUserAvailabilityRequest.argument);
-
-		if (aCode != -7) {
-			this.notConnected = true;
-		}
-
-		if (this.OnlyShowAvailability) {
-			if (this.debug) this.logInfo("getUserAvailabilityRequestError: this.OnlyShowAvailability:" + this.OnlyShowAvailability);
-			this.OnlyShowAvailability = false;
-		}
-		else {
-			if (erGetUserAvailabilityRequest.listener) {
-				erGetUserAvailabilityRequest.listener.onResult(null, null);
-			}
-		}
-	},
-
-	resetCalendar: function _resetCalendar() {
-		if (this.debug) this.logInfo(" resetCalendar 1a");
-
-		try {
-
-			// Clean the job queue.
-			this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
-			this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
-
-			this.offlineQueue = [];
-
-			this.doReset = true;
-
-			this.resetStart = Date.now();
-
-			this.inboxPoller.cancel();
-
-			if (this.offlineTimer) {
-				this.offlineTimer.cancel();
-			}
-			this.offlineTimer = null;
-
-			if (this.calendarPoller) {
-				this.calendarPoller.cancel();
-			}
-
-			//dump("\resetCalendar\n");
-			var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
-			myAuthPrompt2.removeUserCanceled(this.serverUrl);
-		}
-		catch (err) {
-			dump("\n EROROR:" + err + "\n");
-		}
-
-		if (this.getProperty("disabled")) {
-			// Remove all items in cache from calendar.
-			if (this.debug) this.logInfo("Calendar is disabled. So we are done resetting.");
-			for (var index in this.itemCacheById) {
-				if (this.itemCacheById[index]) {
-					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
-				}
-			}
-			this.doReset = false;
-		}
-		else {
-			this.performReset();
-		}
-	},
-
-	performReset: function _performReset() {
-		if (this.debug) this.logInfo(" performReset 1");
-
-		if (!this.doReset) {
-			return;
-		}
-
-		this.doReset = false;
-
-		// Clean the job queue again.
-		this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
-
-		this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
-
-		this.offlineQueue = [];
-
-		// Now we can initialize.
-		this.syncState = null;
-		//this.prefs.deleteBranch("syncState");
-		this.removeFile("syncState.txt");
-		if (this.folderBase == "tasks") {
-			this.syncStateInbox = null;
-			this.removeFile("syncStateInbox.txt");
-		}
-		this.weAreSyncing = false;
-		this.firstSyncDone = false;
-
-		// Remove all items in cache from calendar.
-		//this.observers.notify("onStartBatch");
-		for (var index in this.itemCacheById) {
-			if (this.itemCacheById[index]) {
-				this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
-				/*if (this.itemCacheById[index].className) {
-					this.itemCacheById[index].deleteItem();
-				}
-				this.itemCacheById[index] = null;
-				delete this.itemCacheById[index];*/
-				this.removeItemFromCache(this.itemCacheById[index]);
-
-			}
-		}
-		//this.observers.notify("onEndBatch");
-
-		// Reset caches.
-		this.itemCacheById = {};
-		this.itemCacheByStartDate = {};
-		this.itemCacheByEndDate = {};
-
-		for (var index in this.recurringMasterCache) {
-			if (this.recurringMasterCache[index]) {
-				this.recurringMasterCache[index].deleteItem();
-				this.recurringMasterCache[index] = null;
-				delete this.recurringMasterCache[index];
-			}
-		}
-		this.recurringMasterCache = {};
-		this.recurringMasterCacheById = {};
-
-		if (this.startDate) {
-			var oldBeginDate = this.startDate.clone();
-		}
-		else {
-			if (this.debug) this.logInfo(" THIS IS STRANGE beginDate");
-			var oldBeginDate = now();
-		}
-		if (this.endDate) {
-			var oldEndDate = this.endDate.clone();
-		}
-		else {
-			if (this.debug) this.logInfo(" THIS IS STRANGE endDate");
-			var oldEndDate = now();
-		}
-
-		this.startDate = null;
-		this.endDate = null;
-
-		// Reload calendar on currently known dateRanges.
-		for (var index in this.meetingRequestsCache) {
-			if (this.meetingRequestsCache[index]) {
-				this.notifyTheObservers("onDeleteItem", [this.meetingRequestsCache[index]]);
-				this.removeFromMeetingRequestCache(index);
-				//this.meetingRequestsCache[index] = null;
-				this.meetingrequestAnswered[index] = false;
-			}
-		}
-		this.meetingRequestsCache = [];
-		this.meetingCancelationsCache = [];
-		this.meetingrequestAnswered = [];
-		this.meetingResponsesCache = [];
-		this.syncInboxState = null;
-		//this.prefs.deleteBranch("syncInboxState");
-		this.removeFile("syncInboxState.txt");
-		this.weAreInboxSyncing = false;
-
-		this.supportsTasks = false;
-		this.supportsEvents = false;
-
-		//this.mUseOfflineCache = null;
-
-		this.firstrun = true;
-
-		this.performStartup();
-
-		if (this.debug) this.logInfo("oldBeginDate:" + oldBeginDate.toString() + ", oldEndDate:" + oldEndDate.toString());
-		this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO
-			+ Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, oldBeginDate, oldEndDate, null);
-
-		// Make an event for thistory.
-		this.addActivity(calGetString("calExchangeCalendar", "resetEventMessage", [this.name], "exchangecalendar"), "", this.resetStart, Date.now());
-		if (this.debug) this.logInfo(" performReset 2");
-	},
-
-	addActivity: function _addActivity(aTitle, aText, aStartDate, aEndDate) {
-		if (!gActivityManager) {
-			return;
-		}
-
-		let event = Cc["@mozilla.org/activity-event;1"].createInstance(nsIAE);
-
-		event.init(aTitle,
-			null,
-			aText,
-			aStartDate,
-			aEndDate);
-
-		gActivityManager.addActivity(event);
-	},
-
-	makeRecurrenceRule: function _makeRecurrenceRule(aItem, e) {
-		if (!aItem.parentItem) {
-			return;
-		}
-
-		if (!aItem.recurrenceInfo || aItem.parentItem.id != aItem.id) {
-			if (!aItem.recurrenceInfo) {
-				if (this.debug) this.logInfo("makeRecurrenceRule: We have no recurrenceInfo");
-			}
-			if (aItem.parentItem.id != aItem.id) {
-				if (this.debug) this.logInfo("makeRecurrenceRule: We have aItem.parentItem.id != aItem.id");
-			}
-			return;
-		}
-
-		var rrule = null;
-		for each(var ritem in aItem.recurrenceInfo.getRecurrenceItems({})) {
-			if (calInstanceOf(ritem, Ci.calIRecurrenceRule)) {
-				rrule = ritem;
-				if (this.debug) this.logInfo(" ;;;; rrule:" + rrule.icalProperty.icalString);
-				//break;
-			}
-		}
-
-		if (!rrule) {
-			// XXX exception?
-			if (this.debug) this.logInfo("makeRecurrenceRule: We have no rrule");
-			return;
-		}
-
-		var r = e.addChildTag("Recurrence", "nsTypes", null);
-
-		/* can't get parameters of RRULEs... have to do it manually :/ */
-		var prop = {};
-		for each(let ps in rrule.icalProperty.value.split(';')) {
-			let m = ps.split('=');
-			prop[m[0]] = m[1];
-		}
-
-		var startDate;
-		var originalDate;
-		if (isEvent(aItem)) {
-			startDate = aItem.startDate.clone();
-			originalDate = aItem.startDate.clone();
-		}
-		else {
-			if (aItem.entryDate) {
-				startDate = aItem.entryDate.clone();
-				startDate.isDate = false;
-				originalDate = aItem.entryDate.clone();
-			}
-		}
-
-		if (startDate) {
-			var startDate = startDate.clone();
-		}
-		else {
-			var startDate = cal.now();
-		}
-		startDate.isDate = true;
-
-		prop["BYMONTHDAY"] = prop["BYMONTHDAY"] || startDate.day;
-		prop["BYMONTH"] = prop["BYMONTH"] || (startDate.month + 1);
-
-		switch (rrule.type) {
-		case 'YEARLY':
-			if (prop["BYDAY"]) {
-				var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
-				var ryr = r.addChildTag("RelativeYearlyRecurrence", "nsTypes", null);
-				ryr.addChildTag("DaysOfWeek", "nsTypes", dayRevMap[m[2]]);
-				ryr.addChildTag("DayOfWeekIndex", "nsTypes", dayRevMap[m[1]]);
-				ryr.addChildTag("Month", "nsTypes", monthIdxMap[prop["BYMONTH"] - 1]);
-			}
-			else {
-				var ayr = r.addChildTag("AbsoluteYearlyRecurrence", "nsTypes", null);
-				ayr.addChildTag("DayOfMonth", "nsTypes", prop["BYMONTHDAY"]);
-				ayr.addChildTag("Month", "nsTypes", monthIdxMap[prop["BYMONTH"] - 1]);
-			}
-			break;
-		case 'MONTHLY':
-			if (prop["BYDAY"]) {
-				var rmr = r.addChildTag("RelativeMonthlyRecurrence", "nsTypes", null);
-				rmr.addChildTag("Interval", "nsTypes", rrule.interval);
-				var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
-				rmr.addChildTag("DaysOfWeek", "nsTypes", dayRevMap[m[2]]);
-				rmr.addChildTag("DayOfWeekIndex", "nsTypes", weekRevMap[m[1]]);
-			}
-			else {
-				var amr = r.addChildTag("AbsoluteMonthlyRecurrence", "nsTypes", null);
-				amr.addChildTag("Interval", "nsTypes", rrule.interval);
-				amr.addChildTag("DayOfMonth", "nsTypes", prop["BYMONTHDAY"]);
-			}
-			break;
-		case 'WEEKLY':
-			var wr = r.addChildTag("WeeklyRecurrence", "nsTypes", null);
-			wr.addChildTag("Interval", "nsTypes", rrule.interval);
-			var days = [];
-			var daystr = prop["BYDAY"] || dayIdxMap[startDate.weekday];
-			for each(let day in daystr.split(",")) {
-				days.push(dayRevMap[day]);
-			}
-			wr.addChildTag("DaysOfWeek", "nsTypes", days.join(' '));
-			break;
-		case 'DAILY':
-			if (prop["BYDAY"]) {
-				var wr = r.addChildTag("WeeklyRecurrence", "nsTypes", null);
-				wr.addChildTag("Interval", "nsTypes", rrule.interval);
-				var days = [];
-				var daystr = prop["BYDAY"];
-				for each(let day in daystr.split(",")) {
-					days.push(dayRevMap[day]);
-				}
-				wr.addChildTag("DaysOfWeek", "nsTypes", days.join(' '));
-			}
-			else {
-				var dr = r.addChildTag("DailyRecurrence", "nsTypes", null);
-				dr.addChildTag("Interval", "nsTypes", rrule.interval);
-			}
-			break;
-		}
-
-		if (isEvent(aItem)) {
-			var startDateStr = cal.toRFC3339(startDate.getInTimezone(this.globalFunctions.ecUTC()));
-			//			var startDateStr = cal.toRFC3339(originalDate.getInTimezone(this.globalFunctions.ecUTC()));
-		}
-		else {
-			// We make a non-UTC datetime value for this.globalFunctions.
-			// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-			//LOG("  ==== tmpStart:"+cal.toRFC3339(tmpStart));
-			var startDateStr = cal.toRFC3339(startDate).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
-		}
-
-		if (rrule.isByCount && rrule.count != -1) {
-			var nr = r.addChildTag("NumberedRecurrence", "nsTypes", null);
-			nr.addChildTag("StartDate", "nsTypes", startDateStr);
-			nr.addChildTag("NumberOfOccurrences", "nsTypes", rrule.count);
-		}
-		else if (!rrule.isByCount && rrule.untilDate) {
-
-			var endDate = rrule.untilDate.clone();
-			if (isEvent(aItem)) {
-				endDate.isDate = true;
-				var endDateStr = cal.toRFC3339(endDate.getInTimezone(this.globalFunctions.ecUTC()));
-			}
-			else {
-				if (!endDate.isDate) {
-					endDate.isDate = true;
-					endDate.isDate = false;
-					var tmpDuration = cal.createDuration();
-					tmpDuration.days = 1;
-					endDate.addDuration(tmpDuration);
-
-					endDate.isDate = true;
-				}
-				var endDateStr = cal.toRFC3339(endDate).substr(0, 19); //cal.toRFC3339(tmpEnd).length-6);
-			}
-			var edr = r.addChildTag("EndDateRecurrence", "nsTypes", null);
-			edr.addChildTag("StartDate", "nsTypes", startDateStr);
-			edr.addChildTag("EndDate", "nsTypes", endDateStr);
-		}
-		else {
-			var ner = r.addChildTag("NoEndRecurrence", "nsTypes", null);
-			ner.addChildTag("StartDate", "nsTypes", startDateStr);
-		}
-
-		/* We won't write WKST/FirstDayOfWeek for now because it is Exchange 2010 and up */
-	},
-
-	getAlarmTime: function _getAlarmTime(aItem) {
-		if (!aItem) {
-			return null;
-		}
-
-		var alarms = aItem.getAlarms({});
-		var alarm = alarms[0];
-		if (!alarm) {
-			return null;
-		}
-
-		switch (alarm.related) {
-		case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-			var alarmTime = alarm.alarmDate;
-			break;
-		case Ci.calIAlarm.ALARM_RELATED_START:
-			if (isEvent(aItem)) {
-				var alarmTime = aItem.startDate.clone();
-			}
-			else {
-				var alarmTime = aItem.entryDate.clone();
-			}
-			alarmTime.addDuration(alarm.offset);
-			break;
-		case Ci.calIAlarm.ALARM_RELATED_END:
-			if (isEvent(aItem)) {
-				var alarmTime = aItem.endDate.clone();
-			}
-			else {
-				var alarmTime = aItem.dueDate.clone();
-			}
-			alarmTime.addDuration(alarm.offset);
-			break;
-		}
-
-		alarmTime = alarmTime.getInTimezone(cal.UTC());
-
-		return alarmTime;
-	},
-
-	getSingleSnoozeState: function _getSingleSnoozeState(e, aSingle) {
-		if (this.debug) this.logInfo("getSingleSnoozeState");
-		var tmpStr = null;
-		var mozSnooze = aSingle.getProperty("X-MOZ-SNOOZE-TIME");
-		if (mozSnooze) {
-			if (aSingle.alarmLastAck) {
-				// We have a X-MOZ-SNOOZE and an alarmLastAck. We are going to check if the LastAck is before the X-MOZ-SNOOZE or after
-				if (this.debug) this.logInfo("We have a X-MOZ-SNOOZE and an alarmLastAck. We are going to check if the LastAck is before the X-MOZ-SNOOZE or after.");
-
-				// if mozSnooze < alarmLastAck it means the last alarm has been Acked and it was a dismiss.
-				// if mozSnooze >= alarmLastAck it means the last alarm was snoozed to a new alarm time in the future.
-				var tmpMozSnooze = cal.createDateTime(mozSnooze);
-				if (tmpMozSnooze.compare(aSingle.alarmLastAck) == -1) {
-					if (this.debug) this.logInfo("The X-MOZ-SNOOZE is before alarmLastAck. The alarm has been dismissed.");
-					tmpStr = "4501-01-01T00:00:00Z";
-				}
-				else {
-					if (this.debug) this.logInfo("The X-MOZ-SNOOZE is after or equal to alarmLastAck. The alarm has been snoozed.");
-					tmpStr = mozSnooze;
-				}
-			}
-			else {
-				// We have a X-MOZ-SNOOZE and no alarmLastAck. This means we use the X-MOZ-SNOOZE as the next reminder time.
-				if (this.debug) this.logInfo("We have a X-MOZ-SNOOZE and no alarmLastAck. This means no snooze or dismiss yet and we use the X-MOZ-SNOOZE as the next reminder time.");
-				tmpStr = mozSnooze;
-			}
-		}
-		else {
-			if (aSingle.alarmLastAck) {
-				// The alarm has been snoozed or dismissed before and we do not have a X-MOZ-SNOOZE. So it is dismissed.
-				if (this.debug) this.logInfo("The alarm has been snoozed or dismissed before and we do not have a X-MOZ-SNOOZE. So it is dismissed.");
-				tmpStr = "4501-01-01T00:00:00Z";
-			}
-			else {
-				// We have no snooze time and no alarmLastAck this means the alarm was never snoozed or dismissed
-				// We set the next reminder to the alarm time.
-				if (this.getAlarmTime(aSingle)) {
-					if (this.debug) this.logInfo("We have no snooze time and no alarmLastAck this means the alarm was never snoozed or dismissed. We set the next reminder to the alarm time.");
-					tmpStr = this.getAlarmTime(aSingle).icalString;
-				}
-				else {
-					if (this.debug) this.logInfo("We have no snooze time and no alarmLastAck this means the alarm was never snoozed or dismissed AND we have no alarm time skipping PidLidReminderSignalTime.");
-					tmpStr = null;
-				}
-			}
-		}
-
-		if (tmpStr) {
-			if (this.debug) this.logInfo("We have a new PidLidReminderSignalTime:" + tmpStr);
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Common");
-			extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
-			extField.setAttribute("PropertyType", "SystemTime");
-
-			var newSnoozeTime = cal.createDateTime(tmpStr);
-			newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
-			eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
-		}
-
-		if (this.debug) this.logInfo("getSingleSnoozeState END");
-		return tmpStr;
-	},
-
-	getMasterSnoozeStates: function _getMasterSnoozeStates(e, aMaster, aItem) {
-		if (this.debug) this.logInfo("getMasterSnoozeStates");
-		var tmpStr = "";
-
-		if ((aItem) && (aMaster)) {
-			if (this.debug) this.logInfo("getMasterSnoozeStates: We have an item (occurrence/exception) and a master.");
-			if (aMaster.hasProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime)) {
-				tmpStr = aMaster.getProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime);
-				if (this.debug) this.logInfo("getMasterSnoozeStates: Master has a X-MOZ-SNOOZE-TIME value for this occurrence. startDate:" + aItem.startDate.icalString + ", X-MOZ-SNOOZE-TIME:" + tmpStr);
-
-				// What value does alarmLastAck has?? This will determine what to send to 
-			}
-			else {
-				if (this.debug) this.logInfo("getMasterSnoozeStates: Master has NO X-MOZ-SNOOZE-TIME value for this occurrence. startDate:" + aItem.startDate.icalString);
-
-				// If alarmLastAck for this item is null then the item was dismissed.
-				tmpStr = "";
-			}
-		}
-		else {
-			if (aMaster) {
-				if (this.debug) this.logInfo("getMasterSnoozeStates: We only have a master and no item. We are going to see if a X-MOZ-SNOOZE-TIME- is set for a child event.");
-
-				// We need to get the event for which the alarm is active.
-				var props = aMaster.propertyEnumerator;
-				while (props.hasMoreElements()) {
-					var prop = props.getNext().QueryInterface(Components.interfaces.nsIProperty);
-					if (prop.name.indexOf("X-MOZ-SNOOZE-TIME-") == 0) {
-						if (this.debug) this.logInfo("getMasterSnoozeStates: " + prop.name + "=" + prop.value);
-						tmpStr = prop.value;
-						if (this.debug) this.logInfo("getMasterSnoozeStates2: Master has a X-MOZ-SNOOZE-TIME- value. " + prop.name + ":" + tmpStr);
-						break;
-					}
-				}
-
-				if (tmpStr == "") {
-					if (this.debug) this.logInfo("We did not find a X-MOZ-SNOOZE-TIME- for one of the children.");
-
-					// Nothing smoozed we are going to set it to the next alarm.
-					if (this.debug) this.logInfo("We did not find a childEvent by using the X-MOZ-SNOOZE-TIME-. We are going to find the child by the alarmLastAck of the Master. alarmLastAck:" + aMaster.alarmLastAck);
-					if (aMaster.alarmLastAck) {
-						if (this.debug) this.logInfo("Master has an alarmLastAck. We set the alarm to the first child with an alarm after alarmLastAck.");
-						var prevTime = aMaster.alarmLastAck.clone();
-					}
-					else {
-						if (this.debug) this.logInfo("Master has no alarmLastAck. We set the alarm to the first child with an alarm in the future.");
-						var prevTime = cal.createDateTime().getInTimezone(cal.UTC());
-					}
-
-					var childEvent = null;
-
-					if (this.debug) this.logInfo("Trying to find a child event with an alarmdate after '" + prevTime.icalString + "'");
-					var childAlarm = cal.createDateTime("4501-01-01T00:00:00Z");
-					for (var index in this.itemCacheById) {
-						if ((this.itemCacheById[index]) && (this.itemCacheById[index].uid == aMaster.uid)) {
-							var newChildAlarm = this.getAlarmTime(this.itemCacheById[index]);
-							if ((newChildAlarm) && (newChildAlarm.compare(prevTime) == 1)) {
-								if (childAlarm.compare(newChildAlarm) == 1) {
-									childAlarm = newChildAlarm.clone();
-									childEvent = this.itemCacheById[index];
-									if (this.debug) this.logInfo("Found child event for which the alarmdate (" + childAlarm.icalString + ") is set after '" + prevTime.icalString + "'");
-								}
-							}
-						}
-					}
-					if ((childAlarm) && (childEvent)) {
-						if (this.debug) this.logInfo("Found a child and we are going to calculate the alarmLastAck based on it.");
-						tmpStr = this.getAlarmTime(childEvent);
-						if (tmpStr) {
-							tmpStr = tmpStr.icalString;
-							if (this.debug) this.logInfo("This child has the following alarm:" + tmpStr);
-						}
-						else {
-							tmpStr = "";
-							if (this.debug) this.logInfo("Did not find an alarm time for the child. This is strange..!!");
-						}
-
-					}
-					else {
-						if (this.debug) this.logInfo("We did not find a child. Unable to set alarmLastAck... Maybe set it to 4501-01-01T00:00:00Z");
-						tmpStr = "4501-01-01T00:00:00Z";
-					}
-				}
-			}
-			else {
-				if (this.debug) this.logInfo("Only an item was specified. This is odd this should never happen. Bailing out.");
-				return;
-			}
-		}
-
-		if (tmpStr != "") {
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Common");
-			extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
-			extField.setAttribute("PropertyType", "SystemTime");
-
-			var newSnoozeTime = cal.createDateTime(tmpStr);
-			newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
-			eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
-		}
-		if (this.debug) this.logInfo("getMasterSnoozeStates END");
-		return tmpStr;
-	},
-
-	getAlarmLastAck: function _getAlarmLastAck(e, aItem) {
-		if (this.debug) this.logInfo("getAlarmLastAck");
-		var tmpStr = "";
-		return tmpStr;
-	},
-
-	addSnoozeDismissState: function _addSnoozeDismissState(e, aItem, aAlarmTime) {
-		// Check if we have a single item or not
-		var tmpStr = this.getAlarmLastAck(e, aItem);
-
-		if (this.debug) this.logInfo("addSnoozeDismissState: Start1");
-
-		if (aAlarmTime) {
-			if (this.debug) this.logInfo("addSnoozeDismissState: item has alarms");
-
-			var tmpDateTime;
-			var nextReminder = "";
-
-			if ((aItem.id != aItem.parentItem.id) && (aItem.parentItem.recurrenceInfo)) {
-				if (this.debug) this.logInfo("addSnoozeDismissState: Occurrence or Exception");
-				// Find out which one got snoozed/dismisses
-				tmpStr = tmpStr + this.getMasterSnoozeStates(e, aItem.parentItem, aItem);
-			}
-			else {
-				if (aItem.recurrenceInfo) {
-					if (this.debug) this.logInfo("addSnoozeDismissState: Master");
-					tmpStr = tmpStr + this.getMasterSnoozeStates(e, aItem, null);
-				}
-				else {
-					if (this.debug) this.logInfo("addSnoozeDismissState: Single");
-					nextReminder = this.getSingleSnoozeState(e, aItem)
-					tmpStr = tmpStr + nextReminder;
-				}
-
-			}
-
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Common");
-			extField.setAttribute("PropertyId", MAPI_PidLidReminderSet);
-			extField.setAttribute("PropertyType", "Boolean");
-			//	if (nextReminder.indexOf("4501-01-01T00:00:00Z") > -1) {
-			// Reminder is turned off.
-			//		eprop.nsTypes::Value = "false";
-			//	}
-			//	else {
-			eprop.addChildTag("Value", "nsTypes", "true");
-			//	}
-		}
-		else {
-			if (this.debug) this.logInfo("addSnoozeDismissState: item has no alarms");
-
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Common");
-			extField.setAttribute("PropertyId", MAPI_PidLidReminderSet);
-			extField.setAttribute("PropertyType", "Boolean");
-			eprop.addChildTag("Value", "nsTypes", "false");
-		}
-
-		if (this.debug) this.logInfo("addSnoozeDismissState: End:" + tmpStr);
-
-		return tmpStr;
-	},
-
-	convertCalAppointmentToExchangeAppointment: function _convertCalAppointmentToExchangeAppointment(aItem, aAction, isNew) {
-		if (!aAction) {
-			aAction = "modify";
-		}
-
-		// The order in which create items are specified is important.
-		// EWS expects the right order.
-
-		var e = this.globalFunctions.xmlToJxon('<nsTypes:CalendarItem xmlns:nsTypes="' + nsTypesStr + '" xmlns:nsMessages="' + nsMessagesStr + '"/>');
-
-		e.addChildTag("Subject", "nsTypes", aItem.title);
-
-		const privacies = {
-			"PUBLIC": "Normal",
-			"CONFIDENTIAL": "Confidential",
-			"PRIVATE": "Private",
-			null: "Normal"
-		};
-
-		if (privacies[aItem.privacy] == undefined) {
-			e.addChildTag("Sensitivity", "nsTypes", "Normal");
-		}
-		else {
-			e.addChildTag("Sensitivity", "nsTypes", privacies[aItem.privacy]);
-		}
-
-		//var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
-		if (aItem.bodyType == "HTML") {
-			var body = e.addChildTag("Body", "nsTypes", "<html>" + aItem.body + "</html>" || "");
-			body.setAttribute("BodyType", "HTML");
-		}
-		else {
-			var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
-			body.setAttribute("BodyType", "Text");
-		}
-
-		var categories = aItem.getCategories({});
-		var categoriesTag = e.addChildTag("Categories", "nsTypes", null);
-		for each(var category in categories) {
-			categoriesTag.addChildTag("String", "nsTypes", category);
-		}
-
-		var importance = "Normal";
-		if (aItem.priority > 5) {
-			importance = "Low";
-		}
-		if (aItem.priority == 5) {
-			importance = "Normal";
-		}
-		if (aItem.priority < 5) {
-			importance = "High";
-		}
-		if (aItem.priority == 0) {
-			importance = "Normal";
-		}
-		e.addChildTag("Importance", "nsTypes", importance);
-
-		// Precalculate right start and end time for exchange.
-		// If not timezone specified set them to the lightning preference.
-		//		if ((aItem.startDate.timezone.isFloating) && (!aItem.startDate.isDate)) {
-		if (aItem.startDate.timezone.isFloating) {
-			aItem.startDate = aItem.startDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-		}
-
-		//		if ((aItem.endDate.timezone.isFloating) && (!aItem.endDate.isDate)) {
-		if (aItem.endDate.timezone.isFloating) {
-			aItem.endDate = aItem.endDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-		}
-
-		var tmpStart = aItem.startDate.clone();
-		var tmpEnd = aItem.endDate.clone();
-
-		if (aItem.startDate.isDate) {
-			tmpStart.isDate = false;
-			tmpEnd.isDate = false;
-			var tmpDuration = cal.createDuration();
-			tmpDuration.minutes = -1;
-			tmpEnd.addDuration(tmpDuration);
-
-			// We make a non-UTC datetime value for this.globalFunctions.
-			// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-			var exchStart = cal.toRFC3339(tmpStart.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19) + "Z"; //cal.toRFC3339(tmpStart).length-6);
-			var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19) + "Z"; //cal.toRFC3339(tmpEnd).length-6);
-		}
-		else {
-			// We set in bias advanced to UCT datetime values for this.globalFunctions.
-			var exchStart = cal.toRFC3339(tmpStart.getInTimezone(cal.UTC()));
-			var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(cal.UTC()));
-		}
-
-		var alarms = aItem.getAlarms({});
-		if (this.debug) this.logInfo("We have '" + alarms.length + "' alarms.");
-		if (alarms.length > 0) {
-
-			// Exchange alarm is always an offset to the start.
-			switch (alarms[0].related) {
-			case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-				if (this.debug) this.logInfo("ALARM_RELATED_ABSOLUTE we are going to calculate a offset from the start.");
-				var newAlarmTime = alarms[0].alarmDate.clone();
-
-				// Calculate offset from start of item.
-				var offset = newAlarmTime.subtractDate(aItem.startDate);
-				break;
-			case Ci.calIAlarm.ALARM_RELATED_START:
-				if (this.debug) this.logInfo("ALARM_RELATED_START this is easy exchange does the same.");
-				var newAlarmTime = aItem.startDate.clone();
-				var offset = alarms[0].offset.clone();
-				break;
-			case Ci.calIAlarm.ALARM_RELATED_END:
-				if (this.debug) this.logInfo("ALARM_RELATED_END we are going to calculate the offset from the start.");
-				var newAlarmTime = aItem.endDate.clone();
-				newAlarmTime.addDuration(alarms[0].offset);
-
-				var offset = newAlarmTime.subtractDate(aItem.startDate);
-				break;
-			}
-
-			e.addChildTag("ReminderIsSet", "nsTypes", "true");
-			if (offset.inSeconds != 0) {
-				e.addChildTag("ReminderMinutesBeforeStart", "nsTypes", String((offset.inSeconds / 60) * -1));
-			}
-			else {
-				e.addChildTag("ReminderMinutesBeforeStart", "nsTypes", "0");
-			}
-
-		}
-		else {
-			e.addChildTag("ReminderIsSet", "nsTypes", "false");
-		}
-
-		// An imported item alreay could have a snooze time set.
-		if (aItem.hasProperty("X-MOZ-SNOOZE-TIME")) {
-			//dump("Item is snoozed. Going to set the snooze time\n");
-			var newSnoozeTime = cal.createDateTime(aItem.getProperty("X-MOZ-SNOOZE-TIME"));
-			newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
-			const MAPI_PidLidReminderSignalTime = "34144";
-
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Common");
-			extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
-			extField.setAttribute("PropertyType", "SystemTime");
-			eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
-
-		}
-
-		if (aItem.uid) {
-			e.addChildTag("UID", "nsTypes", aItem.uid);
-		}
-		else {
-			// TODO: Check if this is still valid..
-			if (aItem.id) {
-				// This is when we accept and an iTIP
-				e.addChildTag("UID", "nsTypes", aItem.id);
-				//aItem.setProperty("X-UID", aItem.id);
-				if (aItem.currenceInfo) {
-					if (this.debug) this.logInfo("we have recurrence info");
-					//aItem.setProperty("X-CalendarItemType", "RecurringMaster");
-					this.recurringMasterCache[aItem.id] = aItem;
-					this.recurringMasterCacheById[aItem.id] = aItem;
-				}
-				else {
-					//aItem.setProperty("X-CalendarItemType", "Single");
-				}
-			}
-		}
-
-		const freeBusy = {
-			"TRANSPARENT": "Free",
-			"OPAQUE": "Busy",
-			null: "Busy"
-		};
-
-		const attendeeStatus = {
-			"NEEDS-ACTION": "Unknown",
-			"TENTATIVE": "Tentative",
-			"ACCEPTED": "Accept",
-			"DECLINED": "Decline",
-			null: "Unknown"
-		};
-
-		if (!this.isInvitation(aItem, true)) {
-			if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: Item is not an invitation.\n");
-			e.addChildTag("Start", "nsTypes", exchStart);
-			e.addChildTag("End", "nsTypes", exchEnd);
-
-			e.addChildTag("IsAllDayEvent", "nsTypes", aItem.startDate.isDate);
-
-			e.addChildTag("LegacyFreeBusyStatus", "nsTypes", freeBusy[aItem.getProperty("TRANSP")]);
-
-			e.addChildTag("Location", "nsTypes", aItem.getProperty("LOCATION") || "");
-
-			var attendees = aItem.getAttendees({});
-			var ae;
-
-			for each(var attendee in attendees) {
-				//dump("attendee.role:"+attendee.role+"\n");
-				switch (attendee.role) {
-				case "REQ-PARTICIPANT":
-					if (!reqAttendees) {
-						var reqAttendees = e.addChildTag("RequiredAttendees", "nsTypes", null);
-					}
-					ae = reqAttendees.addChildTag("Attendee", "nsTypes", null);
-					break;
-				case "OPT-PARTICIPANT":
-					if (!optAttendees) {
-						var optAttendees = e.addChildTag("OptionalAttendees", "nsTypes", null);
-					}
-					ae = optAttendees.addChildTag("Attendee", "nsTypes", null);
-					break;
-				case "CHAIR":
-					/*					if (!tmpOrganizer) {
-											var tmpOrganizer = e.addChildTag("Organizer", "nsTypes", null);
-										}
-										ae = tmpOrganizer;
-										break;*/ // Sadly this is not posible when we create a new item.
-				default:
-					ae = null;
-				}
-
-				if (ae) {
-					var mailbox = ae.addChildTag("Mailbox", "nsTypes", null);
-					mailbox.addChildTag("Name", "nsTypes", attendee.commonName);
-
-					var tmpEmailAddress = attendee.id.replace(/^mailto:/i, '');
-					if (tmpEmailAddress.indexOf("@") > 0) {
-						mailbox.addChildTag("EmailAddress", "nsTypes", tmpEmailAddress);
-					}
-					else {
-						mailbox.addChildTag("EmailAddress", "nsTypes", "unknown@somewhere.com");
-					}
-					if (attendee.role != "CHAIR") {
-						ae.addChildTag("ResponseType", "nsTypes", attendeeStatus[attendee.participationStatus]);
-					}
-				}
-			}
-
-			this.makeRecurrenceRule(aItem, e);
-
-			if (this.isVersion2007) {
-				e.addChildTag("MeetingTimeZone", "nsTypes", null).setAttribute("TimeZoneName", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
-			}
-			else {
-				e.addChildTag("StartTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
-				e.addChildTag("EndTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpEnd.timezone, tmpEnd));
-			}
-
-		}
-		else {
-			if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: Item is an invitation.\n");
-
-			//return e;
-
-			if ((aItem.hasProperty("X-exchangeITIP1")) && (aItem.getProperty("X-exchangeITIP1") == "true")) {
-				if (this.debug) this.logInfo("This is a message which came from an import or an copy/paste operation or is an invitation from an external party outside our Exchange.");
-
-				e.addChildTag("Start", "nsTypes", exchStart);
-				e.addChildTag("End", "nsTypes", exchEnd);
-
-				e.addChildTag("IsAllDayEvent", "nsTypes", aItem.startDate.isDate);
-
-				e.addChildTag("LegacyFreeBusyStatus", "nsTypes", freeBusy[aItem.getProperty("TRANSP")]);
-
-				e.addChildTag("Location", "nsTypes", aItem.getProperty("LOCATION") || "");
-
-				// Set if the item is from the user itself or not.
-				if (aItem.organizer) {
-					if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
-						if (this.debug) this.logInfo(" ## I am the organizer of this meeting.");
-					}
-					else {
-						if (this.debug) this.logInfo(" ## I am NOT the organizer of this meeting.'" + aItem.organizer.id.replace(/^mailto:/i, '') + "' is the organizer.");
-					}
-				}
-				else {
-					if (this.debug) this.logInfo(" ## There is not organizer for this meeting.");
-				}
-
-
-				this.makeRecurrenceRule(aItem, e);
-
-				if (this.isVersion2007) {
-					e.addChildTag("MeetingTimeZone", "nsTypes", null).setAttribute("TimeZoneName", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
-				}
-				else {
-					e.addChildTag("StartTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
-					e.addChildTag("EndTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpEnd.timezone, tmpEnd));
-				}
-
-			}
-		}
-
-		if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: " + String(e));
-
-		return e;
-	},
-
-	convertCalTaskToExchangeTask: function _convertCalTaskToExchangeTask(aItem, aAction) {
-		if (!aAction) {
-			aAction = "modify";
-		}
-
-		var e = this.globalFunctions.xmlToJxon('<nsTypes:Task xmlns:nsTypes="' + nsTypesStr + '" xmlns:nsMessages="' + nsMessagesStr + '"/>');
-
-		e.addChildTag("Subject", "nsTypes", aItem.title);
-
-		const privacies = {
-			"PUBLIC": "Normal",
-			"CONFIDENTIAL": "Confidential",
-			"PRIVATE": "Private",
-			null: "Normal"
-		};
-		if (!aItem.privacy) {
-			e.addChildTag("Sensitivity", "nsTypes", "Normal");
-		}
-		else {
-			e.addChildTag("Sensitivity", "nsTypes", privacies[aItem.privacy]);
-		}
-
-		//var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
-		if (aItem.bodyType == "HTML") {
-			var body = e.addChildTag("Body", "nsTypes", "<html>" + aItem.body + "</html>" || "");
-			body.setAttribute("BodyType", "HTML");
-		}
-		else {
-			var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
-			body.setAttribute("BodyType", "Text");
-		}
-
-
-		var categories = aItem.getCategories({});
-		var categoriesTag = null;
-		for each(var category in categories) {
-			if (categoriesTag == null) {
-				categoriesTag = e.addChildTag("Categories", "nsTypes", null);
-			}
-			categoriesTag.addChildTag("String", "nsTypes", category);
-		}
-
-		var importance = "Normal";
-		if (aItem.priority > 5) {
-			importance = "Low";
-		}
-		if (aItem.priority == 5) {
-			importance = "Normal";
-		}
-		if (aItem.priority < 5) {
-			importance = "High";
-		}
-		if (aItem.priority == 0) {
-			importance = "Normal";
-		}
-		e.addChildTag("Importance", "nsTypes", importance);
-
-		var alarms = aItem.getAlarms({});
-		if (this.debug) this.logInfo("We have '" + alarms.length + "' alarms.");
-		if (alarms.length > 0) {
-
-			// Exchange alarm for task is always an absolute date and time.
-			switch (alarms[0].related) {
-			case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
-				if (this.debug) this.logInfo("ALARM_RELATED_ABSOLUTE.");
-				var newAlarmTime = alarms[0].alarmDate.clone().getInTimezone(cal.UTC());
-				break;
-			case Ci.calIAlarm.ALARM_RELATED_START:
-				if (this.debug) this.logInfo("ALARM_RELATED_START we are going to calculate the absolute.");
-				var newAlarmTime = aItem.entryDate.clone();
-				newAlarmTime.addDuration(alarms[0].offset);
-				break;
-			case Ci.calIAlarm.ALARM_RELATED_END:
-				if (this.debug) this.logInfo("ALARM_RELATED_END we are going to calculate the absolute.");
-				var newAlarmTime = aItem.dueDate.clone();
-				newAlarmTime.addDuration(alarms[0].offset);
-				break;
-			}
-
-			e.addChildTag("ReminderDueBy", "nsTypes", cal.toRFC3339(newAlarmTime));
-			e.addChildTag("ReminderIsSet", "nsTypes", "true");
-		}
-		else {
-			e.addChildTag("ReminderIsSet", "nsTypes", "false");
-		}
-
-
-		/*		// Delegation changes
-				if (aItem.hasProperty("X-exchWebService-PidLidTaskLastUpdate")) {
-					var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-					var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-					extField.setAttribute("DistinguishedPropertySetId", "Task");
-					extField.setAttribute("PropertyId", "33045");
-					extField.setAttribute("PropertyType", "SystemTime");
-					eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskLastUpdate"));
-				}
-
-				if (aItem.hasProperty("X-exchWebService-PidLidTaskHistory")) {
-					var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-					var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-					extField.setAttribute("DistinguishedPropertySetId", "Task");
-					extField.setAttribute("PropertyId", "33050");
-					extField.setAttribute("PropertyType", "Integer");
-					eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskHistory"));
-				}
-
-				if (aItem.hasProperty("X-exchWebService-PidLidTaskAccepted")) {
-					var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-					var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-					extField.setAttribute("DistinguishedPropertySetId", "Task");
-					extField.setAttribute("PropertyId", "33032");
-					extField.setAttribute("PropertyType", "Boolean");
-					eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskAccepted"));
-				}
-		*/
-
-		// An imported item alreay could have a snooze time set.
-		if (aItem.hasProperty("X-MOZ-SNOOZE-TIME")) {
-			//dump("Item is snoozed. Going to set the snooze time\n");
-			var newSnoozeTime = cal.createDateTime(aItem.getProperty("X-MOZ-SNOOZE-TIME"));
-			newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
-			const MAPI_PidLidReminderSignalTime = "34144";
-
-			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
-			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
-			extField.setAttribute("DistinguishedPropertySetId", "Common");
-			extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
-			extField.setAttribute("PropertyType", "SystemTime");
-			eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
-
-		}
-
-		if (aItem.actualWork) {
-			e.addChildTag("ActualWork", "nsTypes", aItem.actualWork);
-		}
-
-		if (aItem.billingInformation) {
-			e.addChildTag("BillingInformation", "nsTypes", aItem.billingInformation);
-		}
-
-		var companiesTag = e.addChildTag("Companies", "nsTypes", null);
-
-		var companies = aItem.getCompanies({});
-		var first = true;
-		for each(var company in companies) {
-			companiesTag.addChildTag("String", "nsTypes", company);
-		}
-
-		if (aItem.completedDate) {
-
-			tmpStart = aItem.completedDate.clone();
-
-			if (tmpStart.timezone.isFloating) {
-				tmpStart = tmpStart.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-			}
-
-			tmpStart = tmpStart.getInTimezone(this.globalFunctions.ecUTC());
-
-			tmpStart.isDate = true;
-			tmpStart.isDate = false;
-			/*	var tmpDuration = cal.createDuration();
-				tmpDuration.minutes = -1;
-				tmpStart.addDuration(tmpDuration);*/
-
-			e.addChildTag("CompleteDate", "nsTypes", cal.toRFC3339(tmpStart));
-		}
-
-
-		//		if ((!aItem.parentItem.id) ||
-		//		    (!aItem.recurrenceInfo)) {
-		if (aItem.dueDate) {
-			if (aItem.dueDate.timezone.isFloating) {
-				aItem.dueDate = aItem.dueDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-			}
-
-			e.addChildTag("DueDate", "nsTypes", cal.toRFC3339(aItem.dueDate));
-		}
-
-		if (aItem.mileage) {
-			e.addChildTag("Mileage", "nsTypes", aItem.mileage);
-		}
-
-		if (aItem.percentComplete) {
-			e.addChildTag("PercentComplete", "nsTypes", aItem.percentComplete);
-		}
-		//}
-
-		this.makeRecurrenceRule(aItem, e);
-
-		//		if ((!aItem.parentItem.id) ||
-		//		    (!aItem.recurrenceInfo)) {
-
-		if (aItem.entryDate) {
-			if (aItem.entryDate.timezone.isFloating) {
-				aItem.entryDate = aItem.entryDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-			}
-
-			e.addChildTag("StartDate", "nsTypes", cal.toRFC3339(aItem.entryDate));
-		}
-		//		}
-
-		const statuses = {
-			"NONE": "NotStarted",
-			"IN-PROCESS": "InProgress",
-			"COMPLETED": "Completed",
-			"NEEDS-ACTION": "WaitingOnOthers",
-			"CANCELLED": "Deferred",
-			null: "NotStarted"
-		};
-		if (!statuses[aItem.status]) {
-			e.addChildTag("Status", "nsTypes", "NotStarted");
-		}
-		else {
-			e.addChildTag("Status", "nsTypes", statuses[aItem.status]);
-		}
-
-		if (aItem.totalWork) {
-			e.addChildTag("TotalWork", "nsTypes", aItem.totalWork);
-		}
-
-		if (this.debug) this.logInfo("!!CHANGED:" + String(e));
-
-		return e;
-	},
-
-
-	createItemOk: function _createItemOk(erCreateItemRequest, aId, aChangeKey) {
-		this.notConnected = false;
-		this.saveCredentials(erCreateItemRequest.argument);
-		if (this.debug) this.logInfo("createItemOk 1");
-
-		// Check if we have attachmentsUpdates
-		if ((erCreateItemRequest.argument.attachmentsUpdates) && (erCreateItemRequest.argument.attachmentsUpdates.create.length > 0)) {
-			if (this.debug) this.logInfo("createItemOk We have " + erCreateItemRequest.argument.attachmentsUpdates.create.length + " attachments to create.");
-			var self = this;
-			this.addToQueue(erCreateAttachmentRequest, {
-					user: this.user,
-					serverUrl: this.serverUrl,
-					item: erCreateItemRequest.argument.item,
-					parentItemId: aId,
-					parentItemChangeKey: aChangeKey,
-					attachmentsUpdates: erCreateItemRequest.argument.attachmentsUpdates,
-					actionStart: Date.now(),
-					sendto: erCreateItemRequest.argument.sendto
-				},
-				function (erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
-					self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);
-				},
-				function (erCreateAttachmentRequest, aCode, aMsg) {
-					self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);
-				},
-				erCreateItemRequest.listener);
-		}
-		else {
-			if (this.debug) this.logInfo("createItemOk We have no attachments to create.");
-
-			if (erCreateItemRequest.listener) {
-				this.notifyOperationComplete(erCreateItemRequest.listener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.ADD,
-					erCreateItemRequest.argument.item.id,
-					erCreateItemRequest.argument.item);
-			}
-
-		}
-
-		// Make an event for thistory.
-		if (isEvent(erCreateItemRequest.argument.item)) {
-			this.addActivity(calGetString("calExchangeCalendar", "addCalendarEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erCreateItemRequest.argument.actionStart, Date.now());
-		}
-		else {
-			//this.notifyTheObservers("onAddItem", [newItem]);
-			this.addActivity(calGetString("calExchangeCalendar", "addTaskEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erCreateItemRequest.argument.actionStart, Date.now());
-		}
-
-
-		// We do a refresh to get all details of the new item which EWS added.
-		if ((!erCreateItemRequest.argument.attachmentsUpdates) || (erCreateItemRequest.argument.attachmentsUpdates.create.length == 0)) {
-			this.refresh();
-		}
-	},
-
-	createAttachmentOk: function _createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
-		if (this.debug) this.logInfo("createAttachmentOk");
-		this.notConnected = false;
-
-		if (erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length > 0) {
-			if (this.debug) this.logInfo("We also need to delete some attachments: count=" + erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length);
-			var self = this;
-			this.addToQueue(erDeleteAttachmentRequest, {
-					user: this.user,
-					serverUrl: this.serverUrl,
-					item: erCreateAttachmentRequest.argument.item,
-					parentItemId: RootItemId,
-					parentItemChangeKey: RootItemChangeKey,
-					attachmentsUpdates: erCreateAttachmentRequest.argument.attachmentsUpdates,
-					sendto: erCreateAttachmentRequest.argument.sendto,
-					actionStart: Date.now()
-				},
-				function (erDeleteAttachmentRequest, aId, aChangeKey) {
-					self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);
-				},
-				function (erDeleteAttachmentRequest, aCode, aMsg) {
-					self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);
-				},
-				erCreateAttachmentRequest.listener);
-			return;
-		}
-		else {
-			if (this.debug) this.logInfo("We have no attachment deletions.");
-			if ((erCreateAttachmentRequest.argument.sendto) && ((erCreateAttachmentRequest.argument.sendto != "sendtonone"))) {
-				// The item we processed was a meeting of which I'm the organiser.
-				// It contained new attachments and we need to send an item update to get it to the invited.
-				if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:" + erCreateAttachmentRequest.argument.sendto);
-				this.doAttachmentUpdatesFinalize(erCreateAttachmentRequest.argument.attachmentsUpdates, erCreateAttachmentRequest.argument.item, RootItemId, RootItemChangeKey, erCreateAttachmentRequest.argument.sendto, erCreateAttachmentRequest.listener);
-				return;
-			}
-			else {
-				if (this.debug) this.logInfo("createAttachmentOk erCreateAttachmentRequest.argument.sendto is not set.");
-				if (erCreateAttachmentRequest.listener) {
-					this.notifyOperationComplete(erCreateAttachmentRequest.listener,
-						Cr.NS_OK,
-						Ci.calIOperationListener.MODIFY,
-						erCreateAttachmentRequest.argument.item.id,
-						erCreateAttachmentRequest.argument.item);
-				}
-
-				this.refresh();
-			}
-		}
-	},
-
-	createAttachmentError: function _createAttachmentError(erDeleteAttachmentRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("createAttachmentError: aCode:" + aCode + ", aMsg:" + aMsg);
-		this.notConnected = true;
-
-	},
-
-	deleteAttachmentOk: function _deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey) {
-		if (this.debug) this.logInfo("deleteAttachmentOk");
-		this.notConnected = false;
-
-		// See if we need to update the item when it is an invitation to others
-		// This to get the invitation uncluding the attachments send out.
-		this.addAttachmentsToOfflineCache({
-			man: {
-				calItem: erDeleteAttachmentRequest.argument.item
-			}
-		});
-
-		if ((erDeleteAttachmentRequest.argument.sendto) && ((erDeleteAttachmentRequest.argument.sendto != "sendtonone"))) {
-			// The item we processed was a meeting of which I'm the organiser.
-			// It contained new attachments and we need to send an item update to get it to the invited.
-			if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:" + erDeleteAttachmentRequest.argument.sendto);
-			this.doAttachmentUpdatesFinalize(erDeleteAttachmentRequest.argument.attachmentsUpdates, erDeleteAttachmentRequest.argument.item, aId, aChangeKey, erDeleteAttachmentRequest.argument.sendto, erDeleteAttachmentRequest.listener);
-			return;
-		}
-		else {
-			if (erDeleteAttachmentRequest.listener) {
-				this.notifyOperationComplete(erDeleteAttachmentRequest.listener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.MODIFY,
-					erDeleteAttachmentRequest.argument.item.id,
-					erDeleteAttachmentRequest.argument.item);
-			}
-
-			this.refresh();
-		}
-	},
-
-	deleteAttachmentError: function _deleteAttachmentError(erCreateAttachmentRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("deleteAttachmentError");
-		this.notConnected = true;
-	},
-
-	makeUpdateOneItem: function _makeUpdateOneItem(aNewItem, aOldItem, aIndex, aMasterId, aMasterChangeKey, aInvitation) {
-		var upd = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="' + nsTypesStr + '"/>');
-
-		if (!aIndex) {
-			var itemId = upd.addChildTag("ItemId", "nsTypes", null);
-			itemId.setAttribute("Id", aOldItem.id);
-			itemId.setAttribute("ChangeKey", aOldItem.changeKey);
-		}
-		else {
-			var oItemId = upd.addChildTag("OccurrenceItemId", "nsTypes", null);
-			oItemId.setAttribute("RecurringMasterId", aMasterId);
-			oItemId.setAttribute("ChangeKey", aMasterChangeKey);
-			oItemId.setAttribute("InstanceIndex", aIndex);
-		}
-
-		var isInvitation = aInvitation;
-		if (!aInvitation) {
-			isInvitation = false;
-		}
-
-		var onlySnoozeChanged = true;
-
-		var updateObject = aNewItem.updateXML;
-
-		if (updateObject.toString() == '<t:Updates xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"/>') {
-			// Nothing changed
-			return {
-				changes: null,
-				onlySnoozeChanged: false
-			};
-		}
-
-		upd.addChildTagObject(updateObject);
-		updateObject = null;
-		if (aNewItem.nonPersonalDataChanged) {
-			onlySnoozeChanged = false;
-		}
-
-		if (onlySnoozeChanged) {
-			if (this.debug) this.logInfo("onlySnoozeChanged Or reminder time before start.");
-		}
-
-		return {
-			changes: upd,
-			onlySnoozeChanged: onlySnoozeChanged
-		};
-	},
-
-	sendMeetingRespons: function _sendMeetingRespons(aItem, aListener, aItemType, aResponse, aBodyText) {
-		// Check if I'm the organiser. Do not send to myself.
-		if (aItem.organizer) {
-			if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
-				return true;
-			}
-		}
-		var me = this.getInvitedAttendee(aItem);
-		if ((!me) && (!aResponse)) {
-			return false;
-		}
-
-		if (aResponse) {
-			var tmpResponse = aResponse;
-		}
-		else {
-			var tmpResponse = me.participationStatus;
-		}
-
-		var messageDisposition = null;
-
-		// First ask the user if he wants to send a response.
-		// Get the eventsummarywindow to attach dialog to.
-		let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
-			.getService(Ci.nsIWindowMediator);
-		let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow();
-
-		var preInput = {
-			item: aItem,
-			response: tmpResponse,
-			answer: ""
-		};
-
-		if (calWindow) {
-			calWindow.openDialog("chrome://exchangecalendar/content/preInvitationResponse.xul",
-				"preInvitationResponseId",
-				"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-				preInput);
-		}
-
-		if (preInput.answer != "send") {
-			if (this.debug) this.logInfo("User canceled preInvitationDialog.");
-			return false;
-		}
-
-		var input = {
-			item: aItem,
-			response: tmpResponse,
-			answer: "",
-			proposeStart: "",
-			proposeEnd: "",
-			serverUrl: this.serverUrl,
-			bodyText: ""
-		};
-
-		if (preInput.response == "edit") {
-			// If the user would like to edit his response we show him the window for it.
-			if (this.debug) this.logInfo("User indicated he would like to edit response.");
-			if (aBodyText) {
-				input.bodyText = aBodyText;
-				input.answer = "send";
-			}
-
-			if ((calWindow) && (!aBodyText)) {
-				calWindow.openDialog("chrome://exchangecalendar/content/invitationResponse.xul",
-					"invitationResponseId",
-					"chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
-					input);
-			}
-
-			if (input.answer != "send") {
-				if (this.debug) this.logInfo("User canceled invitationDialog.");
-				return false;
-			}
-
-		}
-		else {
-			if (this.debug) this.logInfo("User indicated he does not want to edit the response.");
-			if (preInput.response == "donotsend") {
-				if (this.debug) this.logInfo("User indicated he does not want to send a response.");
-				messageDisposition = "SaveOnly";
-			}
-		}
-		if (this.debug) this.logInfo("  -------------- messageDisposition=" + messageDisposition);
-
-		var proposeStart = this.tryToSetDateValue(input.proposeStart, "");
-		var proposeEnd = this.tryToSetDateValue(input.proposeEnd, "");
-		var proposeNewTime = false;
-
-		if (proposeStart)
-			input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
-		if (proposeEnd)
-			input.proposeEnd = cal.toRFC3339(proposeEnd.getInTimezone(this.globalFunctions.ecUTC()));
-
-		if (input.proposeStart && input.proposeEnd) {
-			proposeNewTime = true;
-		}
-
-		var self = this;
-		this.addToQueue(erSendMeetingResponsRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: this.folderBase,
-				serverUrl: this.serverUrl,
-				item: aItem,
-				folderID: this.folderID,
-				changeKey: this.changeKey,
-				response: input.response,
-				bodyText: input.bodyText,
-				proposeStart: input.proposeStart,
-				proposeEnd: input.proposeEnd,
-				proposeNewTime: proposeNewTime,
-				senderMailbox: this.mailbox,
-				actionStart: Date.now(),
-				itemType: aItemType,
-				messageDisposition: messageDisposition
-			},
-			function (erSendMeetingResponsRequest) {
-				self.sendMeetingResponsOk(erSendMeetingResponsRequest);
-			},
-			function (erSendMeetingResponsRequest, aCode, aMsg) {
-				self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);
-			},
-			aListener);
-		return true;
-	},
-
-	sendMeetingResponsOk: function _sendMeetingResponsOk(erSendMeetingResponsRequest) {
-		if (this.debug) this.logInfo("sendMeetingResponsOk");
-		this.saveCredentials(erSendMeetingResponsRequest.argument);
-		this.notConnected = false;
-
-		if (erSendMeetingResponsRequest.listener) {
-			this.notifyOperationComplete(erSendMeetingResponsRequest.listener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.MODIFY,
-				erSendMeetingResponsRequest.argument.item.id,
-				erSendMeetingResponsRequest.argument.item);
-		}
-
-		if (!erSendMeetingResponsRequest.argument.item.getProperty("X-MEETINGREQUEST")) {
-			//this.notifyTheObservers("onModifyItem", [erSendMeetingResponsRequest.argument.item, this.itemCacheById[erSendMeetingResponsRequest.argument.item.id]]);
-			//this.itemCacheById[erSendMeetingResponsRequest.argument.item.id] = erSendMeetingResponsRequest.argument.item;
-			this.addItemToCache(erSendMeetingResponsRequest.argument.item);
-		}
-		else {
-			// From meetingrequest cache. Do not remove meetingrequest from cache this will be done when invitation is removed
-			//this.removeFromMeetingRequestCache(erSendMeetingResponsRequest.argument.item.uid);
-			//this.meetingrequestAnswered[erSendMeetingResponsRequest.argument.item.uid] = false;
-		}
-
-		this.addActivity(calGetString("calExchangeCalendar", "ewsMeetingResponsEventMessage", [erSendMeetingResponsRequest.argument.item.title, erSendMeetingResponsRequest.argument.response, this.name], "exchangecalendar"), erSendMeetingResponsRequest.argument.bodyText, erSendMeetingResponsRequest.argument.actionStart, Date.now());
-		this.refresh();
-	},
-
-	modifyItemgetOccurrenceIndexOk: function _modifyItemgetOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
-		if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk");
-		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
-		this.notConnected = false;
-
-		var changesObj = this.makeUpdateOneItem(erGetOccurrenceIndexRequest.argument.newItem, erGetOccurrenceIndexRequest.argument.masterItem, aIndex, aMasterId, aMasterChangeKey);
-		var changes;
-		if (changesObj) {
-			changes = changesObj.changes;
-		}
-		if (changes) {
-
-			// We remove the item from cache and calendar because the update request will add
-			// it again.
-
-			// bug 13.o when we change an occurrence it will send an updated master
-			//	this.notifyTheObservers("onDeleteItem", [this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
-			//	delete this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id];
-			this.notifyTheObservers("onModifyItem", [erGetOccurrenceIndexRequest.argument.newItem, this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
-			//this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id] = erGetOccurrenceIndexRequest.argument.newItem;
-			this.addItemToCache(erGetOccurrenceIndexRequest.argument.newItem);
-
-
-			var self = this;
-			if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: changed:" + String(changes));
-			this.addToQueue(erUpdateItemRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					item: erGetOccurrenceIndexRequest.argument.masterItem,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					updateReq: changes,
-					newItem: erGetOccurrenceIndexRequest.argument.newItem,
-					actionStart: Date.now(),
-					attachmentsUpdates: erGetOccurrenceIndexRequest.argument.attachmentsUpdates,
-					sendto: erGetOccurrenceIndexRequest.argument.sendto
-				},
-				function (erUpdateItemRequest, aId, aChangeKey) {
-					self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-				},
-				function (erUpdateItemRequest, aCode, aMsg) {
-					self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-				},
-				erGetOccurrenceIndexRequest.listener);
-			return;
-
-		}
-		else {
-			if (this.doAttachmentUpdates(erGetOccurrenceIndexRequest.argument.attachmentsUpdates, erGetOccurrenceIndexRequest.argument.masterItem, erGetOccurrenceIndexRequest.argument.sendto, erGetOccurrenceIndexRequest.listener)) {
-				if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: Only attachment changes no field changes 3.");
-				return;
-			}
-			else {
-				if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: No changes 3.");
-				if (!this.isInvitation(erGetOccurrenceIndexRequest.argument.newItem, true)) {
-					this.singleModified(erGetOccurrenceIndexRequest.argument.newItem, true);
-				}
-			}
-		}
-
-		if (erGetOccurrenceIndexRequest.listener) {
-			this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.MODIFY,
-				erGetOccurrenceIndexRequest.argument.newItem.id,
-				erGetOccurrenceIndexRequest.argument.newItem);
-		}
-	},
-
-	whichOccurrencegetOccurrenceIndexError: function _whichOccurrencegetOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("whichOccurrencegetOccurrenceIndexError:(" + aCode + ")" + aMsg);
-		this.notConnected = true;
-		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
-
-		if ((aCode == -8) && (aMsg = "ErrorCalendarIsCancelledForDecline")) {
-			if (erGetOccurrenceIndexRequest.listener) {
-				this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.MODIFY,
-					erGetOccurrenceIndexRequest.argument.newItem.id,
-					erGetOccurrenceIndexRequest.argument.newItem);
-			}
-			return;
-		}
-
-		// TODO: We need to retry when we get here from adoptItem.
-		//		if ((aCode == -8) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
-		if ((aCode == erGetOccurrenceIndexRequest.ER_ERROR_ER_ERROR_SOAP_ERROR) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
-			// Probably the item on the EWS server was changed and that
-			// update was not received by us yet.
-			// Do a refresh en retry modification.
-			if (this.debug) this.logInfo("We have a conflict with the server for this update. We are going to refresh and then retry.");
-			this.refresh();
-			//var newItem = erGetOccurrenceIndexRequest.argument.newItem.clone();
-			var newItem = this.cloneItem(erGetOccurrenceIndexRequest.argument.newItem);
-			//var oldItem = this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id].clone();
-			var oldItem = this.cloneItem(this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id]);
-			if (erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount")) {
-				oldItem.setProperty("X-RetryCount", erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount") + 1);
-			}
-			else {
-				oldItem.setProperty("X-RetryCount", 1);
-			}
-
-			if (this.debug) this.logInfo("X-RetryCount=" + oldItem.getProperty("X-RetryCount"));
-
-			if (oldItem.getProperty("X-RetryCount") < 25) {
-				this.modifyItem(newItem, oldItem, erGetOccurrenceIndexRequest.listener);
-			}
-			else {
-				if (this.debug) this.logInfo("To many update retries. Giving up.");
-				if (erGetOccurrenceIndexRequest.listener) {
-					this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-						Ci.calIErrors.READ_FAILED,
-						Ci.calIOperationListener.MODIFY,
-						erGetOccurrenceIndexRequest.argument.newItem.id,
-						erGetOccurrenceIndexRequest.argument.newItem);
-				}
-			}
-		}
-		else {
-			this.addActivity(calGetString("calExchangeCalendar", "ewsErrorEventMessage", [this.name, aMsg, aCode], "exchangecalendar"), aMsg, erGetOccurrenceIndexRequest.argument.actionStart, Date.now());
-
-			var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-				.getService(Components.interfaces.nsIPromptService);
-			if (aMsg.indexOf(":") > -1) {
-				var msgStr = aMsg.substr(aMsg.indexOf(":") + 1);
-				switch (msgStr) {
-				case "ErrorCalendarMeetingRequestIsOutOfDate":
-					msgStr = "Meeting request is Out Of Date. You cannot use it anymore. (" + msgStr + ")";
-					break;
-				case "ErrorItemNotFound":
-					msgStr = "Calendar item is not available anymore in the exchange database. (" + msgStr + ")";
-					break;
-				}
-				promptService.alert(null, "Info", msgStr);
-			}
-			else {
-				promptService.alert(null, "Info", aMsg);
-			}
-
-			if (erGetOccurrenceIndexRequest.listener) {
-				this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-					Ci.calIErrors.MODIFICATION_FAILED,
-					Ci.calIOperationListener.MODIFY,
-					erGetOccurrenceIndexRequest.argument.newItem.id,
-					erGetOccurrenceIndexRequest.argument.newItem);
-			}
-		}
-	},
-
-	doAttachmentUpdates: function _doAttachmentUpdates(aAttachmentsUpdates, aItem, aSendTo, aListener) {
-		var result = false;
-		if ((aAttachmentsUpdates) && ((aAttachmentsUpdates.create.length > 0) || (aAttachmentsUpdates.delete.length > 0))) {
-			result = true;
-			if (aAttachmentsUpdates.create.length > 0) {
-				if (this.debug) this.logInfo("doAttachmentUpdates We have " + aAttachmentsUpdates.create.length + " attachments to create.");
-				var self = this;
-				this.addToQueue(erCreateAttachmentRequest, {
-						user: this.user,
-						serverUrl: this.serverUrl,
-						item: aItem,
-						parentItemId: aItem.id,
-						parentItemChangeKey: aItem.changeKey,
-						attachmentsUpdates: aAttachmentsUpdates,
-						sendto: aSendTo,
-						actionStart: Date.now()
-					},
-					function (erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
-						self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);
-					},
-					function (erCreateAttachmentRequest, aCode, aMsg) {
-						self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);
-					},
-					aListener);
-			}
-			else {
-				if (this.debug) this.logInfo("updateItemOk We have " + aAttachmentsUpdates.delete.length + " attachments to delete.");
-				var self = this;
-				this.addToQueue(erDeleteAttachmentRequest, {
-						user: this.user,
-						serverUrl: this.serverUrl,
-						item: aItem,
-						parentItemId: aItem.id,
-						parentItemChangeKey: aItem.changeKey,
-						attachmentsUpdates: aAttachmentsUpdates,
-						sendto: aSendTo,
-						actionStart: Date.now()
-					},
-					function (erDeleteAttachmentRequest, aId, aChangeKey) {
-						self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);
-					},
-					function (erDeleteAttachmentRequest, aCode, aMsg) {
-						self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);
-					},
-					aListener);
-			}
-		}
-		return result;
-	},
-
-	doAttachmentUpdatesFinalize: function _doAttachmentUpdatesFinalize(aAttachmentsUpdates, aItem, aId, aChangeKey, aSendTo, aListener) {
-		if (this.debug) this.logInfo("doAttachmentUpdatesFinalize: item:" + aItem.title + ", aSendTo:" + aSendTo);
-
-		/*var req = <nsTypes:ItemChange xmlns:nsTypes="http://schemas.microsoft.com/exchange/services/2006/types">
-			  <nsTypes:ItemId Id={aId} ChangeKey={aChangeKey}/>
-			  <nsTypes:Updates>
-			    <nsTypes:SetItemField>
-			      <nsTypes:FieldURI FieldURI="item:Subject"/>
-			      <nsTypes:CalendarItem>
-				<nsTypes:Subject>{aItem.title}</nsTypes:Subject>
-			      </nsTypes:CalendarItem>
-			    </nsTypes:SetItemField>
-			  </nsTypes:Updates>
-			</nsTypes:ItemChange>;*/
-
-		var req = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="' + nsTypesStr + '"/>');
-		var itemId = req.addChildTag("ItemId", "nsTypes", null);
-		itemId.setAttribute("Id", aId);
-		itemId.setAttribute("ChangeKey", aChangeKey);
-		var setItemField = req.addChildTag("Updates", "nsTypes", null).addChildTag("SetItemField", "nsTypes", null);
-		setItemField.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
-		setItemField.addChildTag("CalendarItem", "nsTypes", null).addChildTag("Subject", "nsTypes", aItem.title);
-
-		var self = this;
-		this.addToQueue(erUpdateItemRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: this.folderBase,
-				serverUrl: this.serverUrl,
-				item: aItem,
-				folderID: this.folderID,
-				changeKey: this.changeKey,
-				updateReq: req,
-				newItem: aItem,
-				actionStart: Date.now(),
-				attachmentsUpdates: null,
-				sendto: aSendTo
-			},
-			function (erUpdateItemRequest, aId, aChangeKey) {
-				self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-			},
-			function (erUpdateItemRequest, aCode, aMsg) {
-				self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-			},
-			aListener);
-
-	},
-
-	updateItemOk: function _updateItemOk(erUpdateItemRequest, aId, aChangeKey) {
-		if (this.debug) this.logInfo("updateItemOk: aId" + aId);
-
-		this.saveCredentials(erUpdateItemRequest.argument);
-		this.notConnected = false;
-
-		// Make an event for thistory.
-		if (isEvent(erUpdateItemRequest.argument.newItem)) {
-			this.addActivity(calGetString("calExchangeCalendar", "updateCalendarEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
-		}
-		else {
-			this.addActivity(calGetString("calExchangeCalendar", "updateTaskEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
-		}
-
-		if (!this.doAttachmentUpdates(erUpdateItemRequest.argument.attachmentsUpdates, erUpdateItemRequest.argument.item, erUpdateItemRequest.argument.sendto, erUpdateItemRequest.listener)) {
-			if (erUpdateItemRequest.listener) {
-				this.notifyOperationComplete(erUpdateItemRequest.listener,
-					Cr.NS_OK,
-					Ci.calIOperationListener.MODIFY,
-					erUpdateItemRequest.argument.newItem.id,
-					erUpdateItemRequest.argument.newItem);
-			}
-
-			this.refresh();
-		}
-	},
-
-	getOccurrenceIndexOk: function _getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
-		if (this.debug) this.logInfo("getOccurrenceIndexOk index=" + aIndex);
-		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
-
-		this.notifyTheObservers("onDeleteItem", [erGetOccurrenceIndexRequest.argument.masterItem]);
-		//this.itemCacheById[erGetOccurrenceIndexRequest.argument.masterItem.id]= null;
-		this.removeItemFromCache(erGetOccurrenceIndexRequest.argument.masterItem);
-
-		this.notConnected = false;
-		var self = this;
-		switch (erGetOccurrenceIndexRequest.argument.action) {
-		case "deleteItem":
-			this.addToQueue(erDeleteItemRequest, {
-					user: erGetOccurrenceIndexRequest.argument.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: erGetOccurrenceIndexRequest.argument.serverUrl,
-					item: erGetOccurrenceIndexRequest.argument.item,
-					folderID: erGetOccurrenceIndexRequest.argument.folderID,
-					masterID: aMasterId,
-					masterChangeKey: aMasterChangeKey,
-					itemIndex: aIndex,
-					actionStart: Date.now(),
-					itemType: erGetOccurrenceIndexRequest.argument.itemType,
-					whichOccurrence: erGetOccurrenceIndexRequest.argument.whichOccurrence
-				},
-				function (erDeleteItemRequest) {
-					self.deleteItemOk(erDeleteItemRequest);
-				},
-				function (erDeleteItemRequest, aCode, aMsg) {
-					self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
-				},
-				erGetOccurrenceIndexRequest.listener);
-			break;
-		}
-	},
-
-	getOccurrenceIndexError: function _getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg) {
-		//		if (this.debug) this.logInfo("getOccurrenceIndexError");
-		this.saveCredentials(erGetOccurrenceIndexRequest.argument);
-		this.notConnected = true;
-		switch (erGetOccurrenceIndexRequest.argument.action) {
-		case "deleteItem":
-			if (erGetOccurrenceIndexRequest.listener) {
-				this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
-					Ci.calIErrors.MODIFICATION_FAILED,
-					Ci.calIOperationListener.DELETE,
-					null,
-					aMsg);
-			}
-			break;
-		}
-	},
-
-	deleteItemOk: function _deleteItemOk(erDeleteItemRequest) {
-		this.saveCredentials(erDeleteItemRequest.argument);
-		if (this.debug) this.logInfo("deleteItemOK");
-		this.notConnected = false;
-
-		if (erDeleteItemRequest.listener) {
-			this.notifyOperationComplete(erDeleteItemRequest.listener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.DELETE,
-				erDeleteItemRequest.argument.item.id,
-				erDeleteItemRequest.argument.item);
-		}
-
-		if (this.debug) this.logInfo("itemType:" + erDeleteItemRequest.itemType + ", Subject:" + erDeleteItemRequest.argument.item.title);
-		switch (erDeleteItemRequest.itemType) {
-		case "master":
-			// Also remove the children.
-			// 12-12-2011 Turned this of because this is done when we receive the update from the exchange server.
-			//this.removeChildrenFromMaster(erDeleteItemRequest.argument.item);
-			//delete this.recurringMasterCache[erDeleteItemRequest.argument.item.uid];
-			break;
-		case "single":
-		case "occurrence":
-
-			// This will be done on receiving the update from this.globalFunctions.
-			//this.notifyTheObservers("onDeleteItem", [erDeleteItemRequest.argument.item]);
-			//delete this.itemCacheById[erDeleteItemRequest.argument.item.id];
-			break;
-		}
-
-
-		if (isEvent(erDeleteItemRequest.argument.item)) {
-			this.addActivity(calGetString("calExchangeCalendar", "deleteCalendarEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erDeleteItemRequest.argument.actionStart, Date.now());
-		}
-		else {
-			this.addActivity(calGetString("calExchangeCalendar", "deleteTaskEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erDeleteItemRequest.argument.actionStart, Date.now());
-		}
-
-		//delete erDeleteItemRequest.argument.item;
-		this.refresh();
-	},
-
-	deleteItemError: function _deleteItemError(erDeleteItemRequest, aCode, aMsg) {
-		this.saveCredentials(erDeleteItemRequest.argument);
-		this.notConnected = true;
-		if (this.debug) this.logInfo("deleteItemError msg:" + String(aMsg));
-		if (erDeleteItemRequest.listener) {
-			this.notifyOperationComplete(erDeleteItemRequest.listener,
-				Ci.calIErrors.MODIFICATION_FAILED,
-				Ci.calIOperationListener.DELETE,
-				null,
-				aMsg);
-		}
-	},
-
-	saveCredentials: function _saveCredentials(aCredentials) {
-		if (aCredentials) {
-			if ((aCredentials.user != "") && (aCredentials.user != "\\") && (aCredentials.user != "/")) {
-				this.user = aCredentials.user;
-			}
-		}
-	},
-
-	addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
-		if (this.getProperty("disabled")) {
-			if (this.debug) this.logInfo("Not adding to queue because we are disabled.");
-			return;
-		}
-
-		//if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
-
-		this.loadBalancer.addToQueue({
-			calendar: this,
-			ecRequest: aRequest,
-			arguments: aArgument,
-			cbOk: aCbOk,
-			cbError: aCbError,
-			listener: aListener
-		});
-	},
-
-	findCalendarItemsOK: function _findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences, doNotCheckCache) {
-		if (this.debug) this.logInfo("findCalendarItemsOK: aIds.length=" + aIds.length + ", aOccurrences.length=" + aOccurrences.length);
-
-		if (erFindCalendarItemsRequest) this.saveCredentials(erFindCalendarItemsRequest.argument);
-		this.notConnected = false;
-
-		if ((aIds.length == 0) && (aOccurrences.length)) {
-			return;
-		}
-
-		if (doNotCheckCache === undefined) {
-			if (this.useOfflineCache) {
-				doNotCheckCache = false;
-			}
-			else {
-				doNotCheckCache = true;
-			}
-		}
-
-		// Removed Single/Master items in the lists which we already have in memory
-		var newIdList = new Array();
-		//dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
-		for each(var item in aIds) {
-			if (!doNotCheckCache) {
-				var inItemCache = ((this.itemCacheById[item.Id]) && (this.itemCacheById[item.Id].changeKey == item.ChangeKey));
-				if ((!inItemCache) && (this.useOfflineCache)) {
-					inItemCache = (this.itemIsInOfflineCache(item.Id) == item.ChangeKey);
-				}
-				var inMasterCache = ((item.type == "RecurringMaster") && (this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].changeKey == item.ChangeKey));
-			}
-			else {
-				var inItemCache = false;
-				var inMasterCache = false;
-			}
-			if ((!inItemCache) && (!inMasterCache)) {
-				newIdList.push(item);
-			}
-		}
-
-		// Remove Occurrence/Exception items in the lists which we already have in memory
-		var newOccurrenceList = new Array();
-		//dump("     findCalendarItemsOK: aOccurrences.length:"+aOccurrences.length+"\n");
-		for each(var item in aOccurrences) {
-			if (!this.recurringMasterCache[item.uid]) {
-				newOccurrenceList.push(item);
-			}
-		}
-		//dump("     findCalendarItemsOK: newOccurrenceList.length:"+newOccurrenceList.length+"\n");
-
-		var self = this;
-
-		// We have single and/or master items. Get full details and cache them.
-		if (newIdList.length > 0) {
-			this.addToQueue(erGetItemsRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					folderBase: this.folderBase,
-					serverUrl: this.serverUrl,
-					ids: newIdList,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					occurrences: newOccurrenceList,
-					folderClass: this.folderClass,
-					GUID: calExchangeCalendarGUID
-				},
-				function (erGetItemsRequest, aIds, aItemErrors) {
-					self.getCalendarItemsOK(erGetItemsRequest, aIds, aItemErrors);
-				},
-				function (erGetItemsRequest, aCode, aMsg) {
-					self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);
-				},
-				null);
-		}
-
-		this.startCalendarPoller();
-	},
-
-	startCalendarPoller: function _startCalendarPoller() {
-		var self = this;
-		var timerCallback = {
-			notify: function setTimeout_notify() {
-				self.refresh();
-			}
-		};
-
-		if (60 > this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 0)) {
-			this.prefs.setIntPref("ecCalendarPollInterval", 60);
-		}
-
-		if (!this.calendarPoller) {
-			// start the calendar poller
-			this.calendarPoller = Cc["@mozilla.org/timer;1"]
-				.createInstance(Ci.nsITimer);
-			this.calendarPoller.initWithCallback(timerCallback, this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 60) * 1000, this.calendarPoller.TYPE_REPEATING_SLACK);
-		}
-		else {
-			this.calendarPoller.initWithCallback(timerCallback, this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 60) * 1000, this.calendarPoller.TYPE_REPEATING_SLACK);
-		}
-	},
-
-	findCalendarItemsError: function _findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("findCalendarItemsError aCode:" + aCode + ", aMsg:" + aMsg);
-		if ((aCode == -8) && (aMsg == "ErrorCalendarFolderIsInvalidForCalendarView")) {
-			this.supportsEvents = false;
-		}
-		else {
-			this.notConnected = true;
-		}
-		this.saveCredentials(erFindCalendarItemsRequest.argument);
-	},
-
-	/*	findMasterOccurrencesOk: function _findMasterOccurrencesOk(erGetItemsRequest, aIds)
-		{
-			if (this.debug) this.logInfo("findMasterOccurrencesOk:Start: aIds.length="+aIds.length);
-
-			this.saveCredentials(erFindCalendarItemsRequest.argument);
-			this.notConnected = false;
-
-			if (aIds.length == 0) {
-				return;
-			}
-
-			// Cache full master details.
-			this.updateCalendar(erGetItemsRequest, aIds, true);
-			if (this.debug) this.logInfo("findMasterOccurrencesOk:End: aIds.length="+aIds.length);
-			erGetItemsRequest= null;
-			aIds = null;
-
-		},*/
-
-	findOccurrencesOK: function _findOccurrencesOK(erFindOccurrencesRequest, aIds) {
-		if (this.debug) this.logInfo("findOccurrencesOK: aIds.length=" + aIds.length);
-		//dump("findOccurrencesOK: aIds.length="+aIds.length+"\n");
-		// Get full details of occurrences and exceptions and cache them.
-		this.notConnected = false;
-		this.findCalendarItemsOK(erFindOccurrencesRequest, aIds, []);
-	},
-
-	findFollowupTaskItemsOK: function _findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds) {
-		if (this.debug) this.logInfo("findFollowupTaskItemsOK: aIds.length:" + aIds.length);
-		this.saveCredentials(erFindFollowupItemsRequest.argument);
-		this.notConnected = false;
-
-		if (aIds.length == 0) {
-			return;
-		}
-
-		var self = this;
-
-		this.addToQueue(erGetItemsRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: this.folderBase,
-				serverUrl: this.serverUrl,
-				ids: aIds,
-				folderID: this.folderID,
-				changeKey: this.changeKey,
-				folderClass: "IPF.Note",
-				GUID: calExchangeCalendarGUID
-			},
-			function (erGetItemsRequest, aIds, aItemErrors) {
-				self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);
-			},
-			function (erGetItemsRequest, aCode, aMsg) {
-				self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);
-			},
-			null);
-
-		this.startCalendarPoller();
-	},
-
-	findFollowupTaskItemsError: function _findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg) {
-		this.saveCredentials(erFindFollowupItemsRequest.argument);
-		this.notConnected = true;
-
-	},
-
-	findTaskItemsOK: function _findTaskItemsOK(erFindTaskItemsRequest, aIds, doNotCheckCache) {
-		if (this.debug) this.logInfo("findTaskItemsOK: aIds.length:" + aIds.length);
-		this.saveCredentials(erFindTaskItemsRequest.argument);
-		this.notConnected = false;
-
-		if (aIds.length == 0) {
-			return;
-		}
-
-		if (doNotCheckCache === undefined) {
-			if (this.useOfflineCache) {
-				doNotCheckCache = false;
-			}
-			else {
-				doNotCheckCache = true;
-			}
-		}
-
-		// Removed Single/Master items in the lists which we already have in memory
-		var newIdList = new Array();
-		//dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
-		for each(var item in aIds) {
-			if (!doNotCheckCache) {
-				var inItemCache = ((this.itemCacheById[item.Id]) && (this.itemCacheById[item.Id].changeKey == item.ChangeKey));
-				if ((!inItemCache) && (this.useOfflineCache)) {
-					inItemCache = (this.itemIsInOfflineCache(item.Id) == item.ChangeKey);
-				}
-			}
-			else {
-				var inItemCache = false;
-			}
-			if ((!inItemCache)) {
-				newIdList.push(item);
-			}
-		}
-
-		var self = this;
-		this.addToQueue(erGetItemsRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: this.folderBase,
-				serverUrl: this.serverUrl,
-				ids: newIdList,
-				folderID: this.folderID,
-				changeKey: this.changeKey,
-				folderClass: this.folderClass,
-				GUID: calExchangeCalendarGUID
-			},
-			function (erGetItemsRequest, aIds, aItemErrors) {
-				self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);
-			},
-			function (erGetItemsRequest, aCode, aMsg) {
-				self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);
-			},
-			null);
-
-		this.startCalendarPoller();
-	},
-
-	findTaskItemsError: function _findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg) {
-		this.saveCredentials(erFindTaskItemsRequest.argument);
-		this.notConnected = true;
-
-	},
-
-	tryToSetDateValue: function _TryToSetDateValue(ewsvalue, aDefault) {
-		if ((ewsvalue) && (ewsvalue.toString().length)) {
-			return cal.fromRFC3339(ewsvalue, this.globalFunctions.ecTZService().UTC).getInTimezone(this.globalFunctions.ecDefaultTimeZone());
-		}
-
-		return aDefault;
-	},
-
-	tryToSetValue: function _tryToSetValue(ewsvalue, aDefault) {
-		if (ewsvalue) {
-			return ewsvalue;
-		}
-
-		return aDefault;
-	},
-
-	processItemSyncQueue: function _processItemSyncQueue() {
-		if (this.processItemSyncQueueBusy) {
-			return;
-		}
-
-		this.processItemSyncQueueBusy = true;
-
-		// Process this.getItemSyncQueue
-		while (this.getItemSyncQueue.length > 0) {
-			if (this.debug) this.logInfo("processItemSyncQueue: id:" + this.getItemSyncQueue[0].id);
-			this.getItem(this.getItemSyncQueue[0].id, this.getItemSyncQueue[0].listener, true);
-			this.getItemSyncQueue.shift();
-		}
-
-		this.processItemSyncQueueBusy = false;
-
-	},
-
-	getTaskItemsOK: function _getTaskItemsOK(erGetItemsRequest, aItems, aItemErrors) {
-		if (this.debug) this.logInfo("getTaskItemsOK: aItems.length:" + aItems.length);
-
-		this.saveCredentials(erGetItemsRequest.argument);
-		this.notConnected = false;
-
-		if (this.debug) this.logInfo("getTaskItemsOK 2");
-
-		if ((aItemErrors) && (aItemErrors.length > 0)) {
-			// Remove these items as they have an error
-			var i = 0;
-			while (i < aItemErrors.length) {
-				if (this.itemCacheById[aItemErrors[i]]) {
-					this.removeFromOfflineCache(this.itemCacheById[aItemErrors[i]]);
-					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[aItemErrors[i]]]);
-					this.removeItemFromCache(this.itemCacheById[aItemErrors[i]]);
-				}
-				else {
-					this.removeFromOfflineCache({
-						id: aItemErrors[i],
-						title: "from offline"
-					});
-				}
-				i++;
-			}
-		}
-
-		if (aItems.length == 0) {
-			this.processItemSyncQueue();
-			return;
-		}
-
-		if (this.debug) this.logInfo("getTaskItemsOK 3");
-		this.updateCalendar(erGetItemsRequest, aItems, true);
-
-		if ((erGetItemsRequest.argument) && (erGetItemsRequest.argument.syncState)) {
-			if (this.debug) this.logInfo("getTaskItemsOK: We have a syncState to save.");
-			//this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
-
-			switch (erGetItemsRequest.argument.folderBase) {
-			case "inbox":
-				this.syncStateInbox = erGetItemsRequest.argument.syncState;
-				this.saveToFile("syncStateInbox.txt", erGetItemsRequest.argument.syncState);
-				this.prefs.setCharPref("syncStateInbox", erGetItemsRequest.argument.syncState);
-				break;
-			default:
-				this.syncState = erGetItemsRequest.argument.syncState;
-				this.saveToFile("syncState.txt", erGetItemsRequest.argument.syncState);
-				this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
-			}
-		}
-
-		aItems = null;
-		erGetItemsRequest = null;
-
-		if (this.debug) this.logInfo("getTaskItemsOK 4");
-
-		this.processItemSyncQueue();
-
-	},
-
-	getTaskItemsError: function _getTaskItemsError(erGetItemsRequest, aCode, aMsg) {
-		//		if (this.debug) this.logInfo("getTaskItemsError: aMsg:"+ aMsg);
-		this.saveCredentials(erGetItemsRequest.argument);
-		this.notConnected = true;
-
-		this.processItemSyncQueue();
-
-	},
-
-	getMeetingRequestFromServer: function _getMeetingRequestFromServer(aItem, aUID, aOperation, aListener) {
-		if (this.debug) this.logInfo("aUID=" + aUID);
-
-		// We do not have a meetingrequest in cache but it is an iTIP.
-		// Is inbox polling off? Or did the inbox polling not yet happen interval to long.
-		// bug 59		if (!this.doPollInbox) {
-		// We are not polling the inbox so treat it as a meetingrespons.
-		if (this.debug) this.logInfo("We get a new calendar item. It looks like an iTIP respons because aItem.id is set. Going to check if we can find it in the users inbox.");
-		// We mis the exchange id and changekey which we need for responding.
-		// We can get these by polling or searching the inbox but this is async. We can do this
-		// because we received a listener. So search inbox for this uid and then use the full exchange message.
-		// We could have multiple meetingrequest with the same uid but different id and changekey. How do we handle those??
-
-		var self = this;
-		this.addToQueue(erGetMeetingRequestByUIDRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: "inbox",
-				serverUrl: this.serverUrl,
-				item: aItem,
-				uid: aUID,
-				actionStart: Date.now(),
-				operation: aOperation,
-				GUID: calExchangeCalendarGUID
-			},
-			function (erGetMeetingRequestByUIDRequest, aMeetingRequests) {
-				self.getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests);
-			},
-			function (erGetMeetingRequestByUIDRequest, aCode, aMsg) {
-				self.getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg);
-			},
-			aListener);
-
-		return;
-		// bug 59		}
-		/* bug 59		else {
-					if (this.debug) this.logInfo("!! THIS IS A SITUATION WHICH NEVER SHOULD HAPPEN !!");
-					if (this.debug) this.logInfo("We have an iTIP respons and are polling the inbox but the item is not in the meetingrequestcache.");
-					if (this.debug) this.logInfo("We see this when someone imports an ICS file or imports a meeting request into another calendar.");
-					// If it is an ICS we would like it to be added to the calendar as new item
-					// If is a meeting request then we want it accepted and not added. This must produce an error
-					// Problem is we cannot identify it as a ICS import or a acceptation of a meeting request.
-					aItem.id = undefined;
-					this.adoptItem(aItem, aListener);
-				/*	// We could do the same as we are not polling inbox..
-					if (aListener) {
-						this.notifyOperationComplete(aListener,
-			        	                             Ci.calIErrors.MODIFICATION_FAILED,
-			                        	             aOperation,
-			                        	             aUID,
-			                        	             aItem);
-					} */
-		/* bug 59			return;
-				} */ // bug 59
-	},
-
-	createAttendee: function _createAttendee(aElement, aType, aMyResponseType) {
-		let mbox = aElement.getTag("t:Mailbox");
-		let attendee = cal.createAttendee();
-
-		if (!aType) {
-			aType = "REQ-PARTICIPANT";
-		}
-
-		switch (mbox.getTagValue("t:RoutingType", "unknown")) {
-		case "SMTP":
-			attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress", "unknown");
-			break;
-		case "EX":
-			attendee.id = 'ldap:' + mbox.getTagValue("t:EmailAddress", "unknown");
-			break;
-		default:
-			this.logInfo("createAttendee: Unknown RoutingType:'" + mbox.getTagValue("t:RoutingType") + "'");
-			attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress", "unknown");
-			break;
-		}
-		attendee.commonName = mbox.getTagValue("t:Name");
-		attendee.rsvp = "FALSE";
-		attendee.userType = "INDIVIDUAL";
-		attendee.role = aType;
-
-		if (aElement.getTagValue("t:ResponseType", "") != "") {
-			attendee.participationStatus = participationMap[aElement.getTagValue("t:ResponseType")];
-
-			// check if we specified a myResponseType for the complete item and the specified mailbox is equal to the mailbox for the calendar.
-			if ((aMyResponseType) && (mbox.getTagValue("t:EmailAddress", "unknown").toLowerCase() == this.mailbox.toLowerCase())) {
-				attendee.participationStatus = participationMap[aMyResponseType];
-				//if (this.debug) this.logInfo("Setting my response type from the global myresponsetype for the item.");
-			}
-		}
-
-		return attendee;
-	},
-
-	createMeAsAttendee: function _createMeAsAttendee(aMyResponseType) {
-		var attendee = cal.createAttendee();
-
-		attendee.id = 'mailto:' + this.mailbox;
-		attendee.commonName = this.userDisplayName;
-		attendee.rsvp = "FALSE";
-		attendee.userType = "INDIVIDUAL";
-		attendee.role = "REQ-PARTICIPANT";
-
-		attendee.participationStatus = participationMap[aMyResponseType];
-
-		return attendee;
-	},
-
-	get notifyObservers() {
-		return this.observers;
-	},
-
-	notifyTheObservers: function _notifyTheObservers(aCommand, aArray, aFastNotify) {
-		if (aFastNotify) {
-			this.observers.notify(aCommand, aArray);
-		}
-		else {
-			this.lightningNotifier.addToNotifyQueue(this, aCommand, aArray);
-		}
+    get timeStamp() {
+        var elapsed = new Date().getTime() - globalStart;
+        //dump("elapsed:"+elapsed);
+        return elapsed;
+    },
+
+    __proto__: cal.ProviderBase.prototype,
+
+    // Begin nsIClassInfo
+    classID: components.ID("{" + calExchangeCalendarGUID + "}"),
+    contractID: "@mozilla.org/calendar/calendar;1?type=exchangecalendar",
+    classDescription: "Exchange 2007/2010 Calendar and Tasks Provider",
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeCalendar,
+            Ci.calICalendarACLManager,
+            Ci.calICalendar,
+            Ci.calICalendarProvider,
+            Ci.calIFreeBusyService,
+            Ci.calIItipTransport,
+            Ci.calISchedulingSupport,
+            Ci.calICalendarProvider,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    // nsISupports getHelperForLanguage(in PRUint32 language);
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+    flags: 0,
+    // End nsIClassInfo
+
+    // Begin nsISupports
+    // void QueryInterface(in nsIIDRef uuid, [iid_is(uuid),retval] out nsQIResult result);
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeCalendar,
+        Ci.calICalendarACLManager,
+        Ci.calICalendar,
+        Ci.calICalendarProvider,
+        Ci.calIFreeBusyService,
+        Ci.calIItipTransport,
+        Ci.calISchedulingSupport,
+        Ci.calICalendarProvider,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+    // End nsISupports
+
+    // Begin calICalendarProvider
+    // readonly attribute nsIURI prefChromeOverlay;
+    get prefChromeOverlay() {
+        if (this.debug) this.logInfo("get prefChromeOverlay()");
+        return null;
+    },
+
+    get displayName() {
+        if (this.debug) this.logInfo("get displayName()");
+        return calGetString("calExchangeCalendar", "displayName", null, "exchangecalendar");
+    },
+
+    //  void createCalendar(in AUTF8String aName, in nsIURI aURL,
+    //	            in calIProviderListener aListener);
+    createCalendar: function calWcapCalendar_createCalendar(name, url, listener) {
+        if (this.debug) this.logInfo("createCalendar");
+        throw NS_ERROR_NOT_IMPLEMENTED;
+    },
+
+    //  void deleteCalendar(in calICalendar aCalendar,
+    //  	            in calIProviderListener aListener);
+    deleteCalendar: function calWcapCalendar_deleteCalendar(calendar, listener) {
+        if (this.debug) this.logInfo("deleteCalendar");
+        throw NS_ERROR_NOT_IMPLEMENTED;
+    },
+
+    //  calICalendar getCalendar(in nsIURI aURL);
+    getCalendar: function calWcapCalendar_getCalendar(url) {
+        if (this.debug) this.logInfo("getCalendar");
+        throw NS_ERROR_NOT_IMPLEMENTED;
+    },
+    // End calICalendarProvider
+
+    // Begin calICalendarACLManager
+    /* Gets the calICalendarACLEntry of the current user for the specified
+    calendar. */
+    //void getCalendarEntry(in calICalendar aCalendar,
+    //	          in calIOperationListener aListener);
+    getCalendarEntry: function _getCalendarEntry(aCalendar, aListener) {
+        //dump("getCalendarEntry: aCalendar.name:"+aCalendar.name+", aLsitener:"+aListener+"\n");
+    },
+
+    /* Gets the calIItemACLEntry of the current user for the specified
+    calendar item. Depending on the implementation, each item can have
+    different permissions based on specific attributes.
+    (TODO: should be made asynchronous one day) */
+    //calIItemACLEntry getItemEntry(in calIItemBase aItem);
+    getItemEntry: function _getItemEntry(aItem) {
+        //dump("getItemEntry: aCalendar.name:"+this.name+", aItem:"+aItem.title+"\n");
+        if (this.itemCacheById[aItem.id]) {
+            return this.itemCacheById[aItem.id].aclEntry;
+        }
+    },
+
+    // End calICalendarACLManager
+
+    // Begin calICalendar
+
+    //  attribute AUTF8String id;
+
+    //   attribute AUTF8String name;
+
+    //  readonly attribute AUTF8String type;
+    get type() {
+        //		if (this.debug) this.logInfo("get type()");
+        return "exchangecalendar";
+    },
+
+    //  readonly attribute AString providerID;
+    get providerID() {
+        return "exchangecalendar@extensions.1st-setup.nl";
+    },
+
+    //  attribute calICalendar superCalendar;
+
+    get id() {
+        return this.myId;
+    },
+
+    set id(aValue) {
+        // We ignore this.
+        //dump("Someone is setting the id to '"+aValue+"' for calendar:"+this.name+"\n");
+    },
+
+    //  attribute nsIURI uri;
+    get uri() {
+        return this.mUri;
+    },
+
+    set uri(aUri) {
+        //if (this.debug) this.logInfo("set uri:"+aUri.path);
+        this.myId = aUri.path.substr(1);
+        this.mUri = aUri;
+
+        this.mPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + this.myId + ".");
+        if (this.exchangePrefVersion < 1) {
+            this.mPrefs = null;
+            this.myId = null;
+        }
+
+        if (this.name) {
+            this.newCalendar = false;
+            this.performStartup();
+        }
+        else {
+            if (this.debug) this.logInfo("We are not going to perform a startup because we do not have a name yet and the calendar is probably still created.");
+            this.newCalendar = true;
+        }
+
+        return this.uri;
+    },
+
+    startupLoadFromOfflineCache: function _startupLoadFromOfflineCache() {
+        if (this.debug) this.logInfo("startupLoadFromOfflineCache: Starting load from offline cache.");
+
+        if (this.loadingFromCache) return;
+
+        this.loadingFromCache = true;
+
+        var startTime = cal.createDateTime();
+
+        if (!this.startDate) {
+            this.startDate = this.offlineStartDate;
+        }
+        if (!this.endDate) {
+            this.endDate = this.offlineEndDate;
+        }
+        var itemsFromCache = this.getItemsFromOfflineCache(this.startDate, this.endDate);
+        if (itemsFromCache) {
+            var endTime = cal.createDateTime();
+            var duration = endTime.subtractDate(startTime);
+            if (this.debug) this.logInfo("We got '" + itemsFromCache.length + "' items from offline cache.(took " + duration.inSeconds + " seconds)");
+        }
+
+        this.loadingFromCache = false;
+
+    },
+
+    performStartup: function _performStartup() {
+        if (this.debug) this.logInfo("Performing startup.");
+
+        if (this.getProperty("disabled")) {
+            if (this.debug) this.logInfo("This calendar is disabled so not doing the startup.");
+            return;
+        }
+
+        // Load from offline Cache into memory cache.
+        /*		if (this.useOfflineCache) {
+        			if (this.debug) this.logInfo("Getting items from offlineCache.");
+
+        			let self = this;
+        			this.cacheLoader.cancel();
+        			this.cacheLoader.initWithCallback({ notify: function setTimeout_notify() {self.startupLoadFromOfflineCache();	}}, 0, this.cacheLoader.TYPE_ONE_SHOT);
+
+        		}
+        */
+        if (!this.isOffline) {
+            // Start online processes.
+            // 1. Check folder.
+            // 2. Get timezone settings.
+            // 3. Start pollers.
+            if (this.debug) this.logInfo("Initialized:" + this.isInitialized);
+
+            /*			if (this.useOfflineCache) {
+            				this.syncExchangeToOfflineCache();
+            			}*/ // Not necessary anymore as it will follow the cache by default.
+        }
+
+        //Enable cache on startup :)
+        this.prefs.setBoolPref("useOfflineCache", true);
+    },
+
+    set readOnly(aValue) {
+        //dump("set readOnly:"+this.name+"|"+this.globalFunctions.STACK(10)+"\n");
+        this.prefs.setBoolPref("UserReadOnly", aValue);
+        this.readOnlyInternal = aValue;
+    },
+
+    get readOnly() {
+        var userPref = this.globalFunctions.safeGetBoolPref(this.prefs, "UserReadOnly", false);
+        if (userPref === true) return true;
+        return this.readOnlyInternal;
+    },
+
+    set readOnlyInternal(aValue) {
+        //dump("set readOnlyInternal:"+this.name+"\n");
+        if (this.folderProperties) {
+            var effectiveRights = this.folderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/t:CalendarFolder/t:EffectiveRights");
+            if (effectiveRights.length > 0) {
+                if (((effectiveRights[0].getTagValue("t:Delete") == "false") || (effectiveRights[0].getTagValue("t:Modify") == "false"))
+                    && (effectiveRights[0].getTagValue("t:CreateContents") == "false")) {
+                    aValue = true;
+                }
+            }
+            effectiveRights = null;
+
+        }
+
+        var changed = false;
+        if (aValue != this._readOnly) {
+            if (this.debug) this.logInfo("readOnly property changed from " + this._readOnly + " to " + aValue);
+            changed = true;
+        }
+
+        if (this.debug) this.logInfo("set readOnly to '" + aValue + "'");
+        this._readOnly = aValue;
+
+        if (changed) {
+            var userPref = this.globalFunctions.safeGetBoolPref(this.prefs, "UserReadOnly", false);
+            if ((userPref === true) && (aValue === false)) return; // Do not change icon when use wants it readonly.
+
+            this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", aValue, !aValue]);
+            this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
+        }
+    },
+
+    //  attribute boolean readOnly;
+    get readOnlyInternal() {
+        //dump("get readOnly: name:"+this.name+", this._readOnly:"+this._readOnly+", this.notConnected:"+this.notConnected+"\n");
+        return ((this._readOnly) || (this.notConnected));
+    },
+
+    set notConnected(aValue) {
+        if (aValue != this.mNotConnected) {
+            this.mNotConnected = aValue;
+            if (aValue) {
+                this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", true, false]);
+                this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
+            }
+            else {
+                this.observers.notify("onPropertyChanged", [this.superCalendar, "readOnly", false, true]);
+                this.observerService.notifyObservers(this, "onExchangeReadOnlyChange", this.name);
+            }
+        }
+
+    },
+
+    get notConnected() {
+        return this.mNotConnected;
+    },
+
+    //  readonly attribute boolean canRefresh;
+    get canRefresh() {
+        return true;
+    },
+
+    //  attribute boolean transientProperties;
+
+    //  nsIVariant getProperty(in AUTF8String aName);
+    getProperty: function _getProperty(aName) {
+        //	if (!this.isInitialized) {
+        //		return;
+        //	}
+
+        //dump("2 getProperty("+aName+")\n");
+        switch (aName) {
+        case "exchWebService.offlineCacheDBHandle":
+            return this.offlineCacheDB;
+
+        case "exchWebService.offlineOrNotConnected":
+            return ((this.notConnected) || (this.isOffline));
+
+        case "exchWebService.useOfflineCache":
+            return this.useOfflineCache;
+        case "exchWebService.getFolderProperties":
+            this.globalFunctions.LOG("Requesting exchWebService.getFolderProperties property.");
+            if (this.folderProperties) {
+                return this.folderProperties.toString();
+            }
+            return null;
+            break;
+        case "exchWebService.checkFolderPath":
+            this.globalFunctions.LOG("Requesting exchWebService.checkFolderPath property.");
+            this.checkFolderPath();
+            return "ok";
+            break;
+        case "capabilities.tasks.supported":
+            return this.supportsTasks;
+            break;
+        case "capabilities.events.supported":
+            return this.supportsEvents;
+            break;
+        case "auto-enabled":
+            return true;
+        case "organizerId":
+            //if (this.debug) this.logInfo("getProperty: organizerId");
+            //return "exchangecalendar:" + this.mailbox;
+            return "mailto:" + this.mailbox;
+            break;
+        case "organizerCN":
+            return this.userDisplayName;
+            break;
+        case "cache.supported":
+            return false;
+        case "requiresNetwork":
+            return false;
+        case "disabled":
+            if (this.prefs) {
+                this._disabled = this.globalFunctions.safeGetBoolPref(this.prefs, "disabled", false);
+                if (this._disabled) return this._disabled;
+            }
+
+            return ((!this.isInitialized) && (this.folderPathStatus == 0));
+        case "itip.notify-replies":
+            return true;
+        case "itip.transport":
+            if (this.debug) this.logInfo("getProperty: itip.transport");
+            return this.QueryInterface(Ci.calIItipTransport);
+            break;
+            //return true;
+        case "capabilities.autoschedule.supported":
+            if (this.debug) this.logInfo("capabilities.autoschedule.supported");
+            return true;
+        case "exchangeCurrentStatus":
+            return this._exchangeCurrentStatus;
+        }
+        // itip.disableRevisionChecks
+
+        // capabilities.events.supported
+        // capabilities.tasks.supported
+
+        //dump("1 getProperty("+aName+")="+this.__proto__.__proto__.getProperty.apply(this, arguments)+"\n");
+        return this.__proto__.__proto__.getProperty.apply(this, arguments);
+    },
+
+    //  void setProperty(in AUTF8String aName, in nsIVariant aValue);
+    setProperty: function setProperty(aName, aValue) {
+
+        if (this.debug) this.logInfo("setProperty. aName:" + aName + ", aValue:" + aValue);
+        switch (aName) {
+        case "exchangeCurrentStatus":
+            //dump("name1:"+this.name+", exchangeCurrentStatus:"+this._exchangeCurrentStatus+", newStatus:"+aValue+"\n");
+            var oldStatus = this._exchangeCurrentStatus;
+            this._exchangeCurrentStatus = aValue;
+            if (aValue != oldStatus) {
+                //dump("name2:"+this.name+", exchangeCurrentStatus:"+aValue+"\n");
+                this.observers.notify("onPropertyChanged", [this.superCalendar, "exchangeCurrentStatus", aValue, oldStatus]);
+            }
+            return;
+        case "disabled":
+            var oldDisabledState = this._disabled;
+            this._disabled = aValue;
+            this.prefs.setBoolPref("disabled", aValue);
+            if ((aValue) && (oldDisabledState != this._disabled)) {
+                //dump("Calendar is set to disabled\n");
+                this.resetCalendar();
+            }
+            if ((!this._disabled) && (oldDisabledState != this._disabled)) {
+                this.doReset = true;
+                this.resetCalendar();
+            }
+            return;
+        case "exchWebService.useOfflineCache":
+
+            this.useOfflineCache = aValue;
+            if (this.debug) this.logInfo("setProperty: useOfflineCache = " + this.useOfflineCache + "  offlineCacheDB  " + this.offlineCacheDB);
+
+            if (!aValue) {
+                if (this.offlineCacheDB) {
+                    try {
+                        if (this.offlineCacheDB) this.offlineCacheDB.close();
+                        this.offlineCacheDB = null;
+                    }
+                    catch (exc) {}
+                }
+
+                // Remove the offline cache database when we delete the calendar.
+                if (this.dbFile) {
+                    this.dbFile.remove(true);
+                    this.offlineCacheDB = null;
+                }
+            }
+            return;
+        }
+
+        this.__proto__.__proto__.setProperty.apply(this, arguments);
+
+    },
+
+    //  void deleteProperty(in AUTF8String aName);
+
+    //  void addObserver( in calIObserver observer );
+    //  void removeObserver( in calIObserver observer );
+
+    //  calIOperation addItem(in calIItemBase aItem,
+    //                in calIOperationListener aListener);
+    addItem: function _addItem(aItem, aListener) {
+        if (this.debug) this.logInfo("addItem id=" + aItem.id + ", aItem.calendar:" + aItem.calendar);
+
+        var itemEnum = aItem.propertyEnumerator;
+        /*		dump("Properties of:"+aItem.title+"\n");
+        		while (itemEnum.hasMoreElements()) {
+        			var property = itemEnum.getNext().QueryInterface(Components.interfaces.nsIProperty);
+        			dump(property.name+":"+property.value+"\n");
+        		}*/
+        var invite = aItem.getAttendees({});
+        //dump("a. Attendee count:"+invite.length+"\n");
+
+        // if aItem.id == null then it is a newly created item in Lightning.
+        // if aItem.id == "040000008200E00074C5B7101A82E008000000005D721F845633CD0100000000000000001000000006CC9AC20EA39441B863D6E454306174" it is from iTIP
+        // if aItem.id == "31d9835f-1c29-4d18-ab39-7587c56e3982" paste in lightning after a copy in lightning.
+        // if aItem.id == "AAMkAGFkNzVhOGVlLTYxMDktNGU0MC05YWZjLWIzMWY1YmNmOTAzNQBGAAAAAAD9bSPYK6piTIbhfZ5n6SOXBwAfSIGbKdCWQbNg+oqR8EJMAAAA9OKyAAAfSIGbKdCWQbNg+oqR8EJMAAB8S1QtAAA=" copy back and forth between exchange to other type and exchange.
+
+        if (this.OnlyShowAvailability) {
+            this.readOnlyInternal = true;
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                Ci.calIOperationListener.ADD,
+                aItem.id,
+                aItem);
+
+            /*	            this.notifyOperationComplete(aListener,
+            	                                         Ci.calIErrors.CAL_IS_READONLY,
+            	                                         Ci.calIOperationListener.ADD,
+            	                                         null,
+            	                                         "Calendar is readonly");*/
+            return null;
+        }
+
+        var newItem = aItem;
+
+        // Make sure we have one of our own object types
+        if ((cal.isEvent(aItem)) && (!aItem.className)) {
+            var newItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+                .createInstance(Ci.mivExchangeEvent);
+            newItem.cloneToCalEvent(aItem);
+        }
+
+        if ((!cal.isEvent(aItem)) && (!aItem.className)) {
+            var newItem = Cc["@1st-setup.nl/exchange/calendartodo;1"]
+                .createInstance(Ci.mivExchangeTodo);
+            newItem.cloneToCalEvent(aItem);
+        }
+
+        if (aItem.calendar === null) {
+            if (this.debug) this.logInfo("addItem Calendar is null for item going add me '" + this.name + "' as calendar.\n");
+            newItem.calendar = this.superCalendar;
+        }
+
+        var invite = newItem.getAttendees({});
+        //dump("b. Attendee count:"+invite.length+"\n");
+        //let newItem = aItem.clone();
+
+        // We check if we not allready have this item in Cache. If so we modify.
+        // This will happen when someone pressed the accept,decline or tentative buttons
+        // in the itip status bar on the header of an email message.
+        if (this.itemCacheById[newItem.id]) {
+            if (newItem.calendar === null) {
+                // This is an import from an export and item still exists
+                newItem.calendar = this;
+            }
+            if (this.itemCacheById[newItem.id].isInvitation) {
+                return this.modifyItem(newItem, this.itemCacheById[newItem.id], aListener); // We do this when we receive an update for an invitation.
+            }
+            else {
+                this.deleteItem(this.itemCacheById[newItem.id], null); // we do this on import of item which was exported earlier.
+            }
+        }
+
+        if ((newItem.id) && ((newItem.id.indexOf("-") > 2) || (newItem.id.length == 152))) {
+            // This is added from a copy/paste procedure.
+            newItem.id = null;
+            newItem.clearId(null);
+            if (this.debug) this.logInfo("addItem Copy/pasted item. item.id:" + newItem.id);
+            //newItem.deleteProperty("X-UID");
+
+            // If I am invited. Remove myself.
+            var attendees = newItem.getAttendees({});
+            newItem.removeAllAttendees(); // Need to have this. When we add attendees when we create a new calendaritem we become organizer.
+            for each(var attendee in attendees) {
+                if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase())
+                    || (attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase())) {
+                    if (this.debug) this.logInfo("addItem: FOUND myself as an attendee and we are going to remove myself:" + newItem.title);
+                    newItem.removeAttendee(attendee);
+                }
+            }
+        }
+
+        var invite = newItem.getAttendees({});
+        //dump("c. Attendee count:"+invite.length+"\n");
+        return this.adoptItem(newItem, aListener);
+    },
+
+
+    //  calIOperation adoptItem(in calIItemBase aItem,
+    //                  in calIOperationListener aListener);
+    adoptItem: function _adoptItem(aItem, aListener) {
+        if (this.debug) this.logInfo("adoptItem()");
+
+        if ((this.readOnly) || (this.OnlyShowAvailability)) {
+            this.readOnlyInternal = true;
+            if (this.OnlyShowAvailability) {
+                this.notifyOperationComplete(aListener,
+                    Ci.calIErrors.OPERATION_CANCELLED,
+                    Ci.calIOperationListener.ADD,
+                    aItem.id,
+                    aItem);
+            }
+            else {
+                this.notifyOperationComplete(aListener,
+                    Ci.calIErrors.CAL_IS_READONLY,
+                    Ci.calIOperationListener.ADD,
+                    null,
+                    "Calendar is readonly");
+            }
+            return;
+        }
+
+        if (isEvent(aItem)) {
+            // michel123
+
+            if (aItem.exchangeXML) {
+                var tmpItem = aItem.clone();
+                if (this.debug) this.logInfo("adoptItem 1 Copy/pasted item. item.id:" + tmpItem.id);
+            }
+            else {
+                if (!aItem.className) {
+                    var tmpItem = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+                        .createInstance(Ci.mivExchangeEvent);
+                    tmpItem.addMailboxAlias(this.mailbox);
+                    tmpItem.cloneToCalEvent(aItem);
+                }
+                else {
+                    var tmpItem = aItem.clone();
+                    tmpItem.addMailboxAlias(this.mailbox);
+                }
+                if (this.debug) this.logInfo("adoptItem 2 Copy/pasted item. item.id:" + tmpItem.id);
+            }
+
+            var invite = tmpItem.getAttendees({});
+            //dump("d. Attendee count:"+invite.length+"\n");
+
+            //			if ((tmpItem.id) && (tmpItem.id != "not a valid id")) {
+            if ((tmpItem.hasProperty("UID")) && (!aItem.id)) {
+                // This is and item create through an iTIP response.
+
+                var cachedItem = null;
+                for (var index in this.meetingRequestsCache) {
+                    if (this.meetingRequestsCache[index]) {
+                        //						if (this.meetingRequestsCache[index].uid == tmpItem.id) {
+                        if (this.meetingRequestsCache[index].uid == tmpItem.getProperty("UID")) {
+                            cachedItem = this.meetingRequestsCache[index];
+                            break;
+                        }
+                    }
+                }
+
+                if (cachedItem) {
+                    // We have meeting request in our cache.
+                    // Send meetingrespons base on status and remove message in inbox.
+                    if (this.debug) this.logInfo("BOA: iTIP action item with STATUS:" + tmpItem.getProperty("STATUS"));
+
+                    var aNewItem = this.cloneItem(tmpItem);
+                    //aNewItem.setProperty("X-UID", cachedItem.uid);
+                    //aNewItem.setProperty("X-ChangeKey", cachedItem.changeKey);
+                    aNewItem.setProperty("X-MEETINGREQUEST", cachedItem.getProperty("X-MEETINGREQUEST"));
+                    //aNewItem.setProperty("X-IsInvitation" , cachedItem.isInvitation);
+                    aNewItem.id = cachedItem.id;
+
+
+                    if ((aNewItem) && (this.sendMeetingRespons(aNewItem, null, "new"))) {
+                        this.notifyOperationComplete(aListener,
+                            Cr.NS_OK,
+                            Ci.calIOperationListener.ADD,
+                            tmpItem.getProperty("UID"),
+                            aNewItem);
+                    }
+                    else {
+                        // User cancel.. How to respond!!
+                        this.notifyOperationComplete(aListener,
+                            Ci.calIErrors.OPERATION_CANCELLED,
+                            Ci.calIOperationListener.ADD,
+                            tmpItem.getProperty("UID"),
+                            aNewItem);
+                    }
+                    return;
+                }
+                else {
+                    if (this.debug) this.logInfo("getMeetingRequestFromServer:" + tmpItem.title);
+                    //					this.getMeetingRequestFromServer(tmpItem, tmpItem.id, Ci.calIOperationListener.ADD, aListener);
+                    this.getMeetingRequestFromServer(tmpItem, tmpItem.getProperty("UID"), Ci.calIOperationListener.ADD, aListener);
+                    return;
+
+                }
+            }
+            var ewsItem = this.convertCalAppointmentToExchangeAppointment(tmpItem, "create", true);
+        }
+        if (isToDo(aItem)) {
+            var ewsItem = this.convertCalTaskToExchangeTask(aItem, "create");
+        }
+
+        if (ewsItem) {
+
+            // Create attachment create and delete object
+            var attachmentsUpdates = null;
+
+            var attachments = aItem.getAttachments({});
+            if (attachments.length > 0) {
+                if (this.debug) this.logInfo("  -- We have attachments:" + attachments.length);
+                var attachmentsUpdates = {
+                    create: [],
+                    delete: []
+                };
+                for (var index in attachments) {
+                    attachmentsUpdates.create.push(attachments[index]);
+                }
+            }
+
+            var self = this;
+            this.addToQueue(erCreateItemRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    item: aItem,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    createReq: ewsItem,
+                    newItem: aItem,
+                    attachmentsUpdates: attachmentsUpdates,
+                    actionStart: Date.now(),
+                    sendto: "sendtoall"
+                },
+                function (erCreateItemRequest, aId, aChangeKey) {
+                    self.createItemOk(erCreateItemRequest, aId, aChangeKey);
+                },
+                function (erCreateItemRequest, aCode, aMsg) {
+                    self.whichOccurrencegetOccurrenceIndexError(erCreateItemRequest, aCode, aMsg);
+                },
+                aListener);
+        }
+        else {
+            // notify the listener
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.MODIFICATION_FAILED,
+                Ci.calIOperationListener.ADD,
+                aItem.id,
+                aItem);
+        }
+
+    },
+
+    getMeetingRequestByUIDOk: function _getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests) {
+        this.notConnected = false;
+        this.saveCredentials(erGetMeetingRequestByUIDRequest.argument);
+        if (this.debug) this.logInfo("getMeetingRequestByUIDOk: itemcount=" + aMeetingRequests.length);
+
+        if (erGetMeetingRequestByUIDRequest.argument.item.organizer) {
+            if (this.debug) this.logInfo(" >>>>>>> 1 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+        }
+        else {
+            if (this.debug) this.logInfo("item has no oranizer!!!!!!!!!!!!");
+        }
+
+        if (aMeetingRequests.length > 0) {
+            // Convert list to CalAppointment and try to find the matching one
+            var tmpList = [];
+            for (var i = 0; i < aMeetingRequests.length; i++) {
+                var tmpItem = this.convertExchangeAppointmentToCalAppointment(aMeetingRequests[i], true);
+                if (tmpItem) {
+                    tmpList.push(tmpItem);
+                }
+            }
+            var ewsItem = this.findItemInListByDatesAndID(tmpList, erGetMeetingRequestByUIDRequest.argument.item);
+
+            //var ewsItem = this.convertExchangeAppointmentToCalAppointment(aMeetingRequests[aMeetingRequests.length-1], true);
+
+            if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with STATUS:" + erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS"));
+
+            var me = this.getInvitedAttendee(erGetMeetingRequestByUIDRequest.argument.item);
+            if (me) {
+                if (this.debug) this.logInfo("getMeetingRequestByUIDOk: me.participationStatus:" + me.participationStatus);
+                var tmpMe = this.getInvitedAttendee(ewsItem);
+                if (tmpMe) {
+                    if (this.debug) this.logInfo("getMeetingRequestByUIDOk: tmpMe.participationStatus:" + tmpMe.participationStatus);
+                    tmpMe.participationStatus = me.participationStatus;
+
+                    switch (tmpMe.participationStatus) {
+                    case "ACCEPTED":
+                        ewsItem.setProperty("STATUS", "CONFIRMED");
+                        break;
+                    case null:
+                    case "TENTATIVE":
+                        ewsItem.setProperty("STATUS", "TENTATIVE");
+                        break;
+                    case "DECLINED":
+                        ewsItem.setProperty("STATUS", "CANCELLED");
+                        break;
+                    }
+                }
+            }
+            if (!me) {
+                // I'm not directly invited. Just through distributionlist or mailgroup.
+                if (this.debug) this.logInfo("getMeetingRequestByUIDOk: I'm not directly invited so we are going to create a dummy attendee for now.");
+                me = cal.createAttendee();
+                me.id = "mailto:" + this.mailbox;
+                me.commonName = this.userDisplayName;
+                me.rsvp = "FALSE";
+                me.userType = "INDIVIDUAL";
+                me.role = "NON-PARTICIPANT";
+                switch (erGetMeetingRequestByUIDRequest.argument.item.getProperty("STATUS")) {
+                case "CONFIRMED":
+                    me.participationStatus = "ACCEPTED";
+                    break;
+                case "TENTATIVE":
+                    me.participationStatus = "TENTATIVE";
+                    break;
+                case "CANCELLED":
+                    me.participationStatus = "DECLINED";
+                    break;
+                }
+
+            }
+
+            if (this.debug) this.logInfo("getMeetingRequestByUIDOk: iTIP action item with ewsItem.STATUS:" + ewsItem.getProperty("STATUS"));
+
+            ewsItem.setProperty("X-MEETINGREQUEST", true);
+            if ((ewsItem) && (this.sendMeetingRespons(ewsItem, null, "new", me.participationStatus))) {
+                if (erGetMeetingRequestByUIDRequest.listener) {
+                    this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
+                        Cr.NS_OK,
+                        erGetMeetingRequestByUIDRequest.argument.operation,
+                        erGetMeetingRequestByUIDRequest.argument.item.id,
+                        ewsItem);
+                }
+                return;
+            }
+            // User cancel or other problem.
+        }
+        else {
+            // inbox item has been removed between pressing iTIP button and requesting the info from the server.
+            // Or it is an ICS import or a invitation from another mailbox... BUG 59
+            if (this.debug) this.logInfo("Meeting request was removed from inbox after iTIP button was pressed and before Exchange server could be checked.");
+            if (this.debug) this.logInfo("Someone else working in the same inbox?");
+            if (this.debug) this.logInfo("OR We see this when someone imports an ICS file or imports a meeting request into another calendar.");
+            // If it is an ICS we would like it to be added to the calendar as new item
+            // If is a meeting request then we want it accepted and not added. This must produce an error
+            // Problem is we cannot identify it as a ICS import or a acceptation of a meeting request.
+            var doStop = false;
+
+            if (erGetMeetingRequestByUIDRequest.argument.item.organizer) {
+                if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+                if (erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT") == "CLIENT") {
+                    // looks like iTIP because SCHEDULE-AGENT is set. 
+                    if (this.debug) this.logInfo(" >>>>>>> 2 We have a organizer and SCHEDULE-AGENT=" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+                    if (this.debug) this.logInfo(" !!!!!!!!!!!!!! THIS SHOULD NEVER HAPPEN ON AN iTIP. DO WE HAVE AN iTIP");
+                    if (this.debug) this.logInfo("iCalString:" + erGetMeetingRequestByUIDRequest.argument.item.icalString);
+                    //if (this.debug) this.logInfo(" Stopping processing.. Report this problem to exchangecalendar@extensions.1st-setup.nl");
+                    //doStop = true;  // For now we going to clean out the UID and me as an attendee
+                    // We fake that we do a paste and that it is an invitation.
+
+                    if (this.debug) this.logInfo(" !!!>>  We are going to treat this as a copy/paste for a new event.");
+                    var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
+                    tmpItem.clearId("xxxx-xxxx-xxx-xxxx");
+                    //tmpItem.setProperty("X-IsInvitation", "true");
+                    tmpItem.setProperty("X-exchangeITIP1", "true");
+                    tmpItem.setProperty("X-IsMeeting", true);
+                    this.addItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
+                    return;
+
+                }
+
+                if (erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT")) {
+                    if (this.debug) this.logInfo("Unknown SCHEDULE-AGENT property for item. SCHEDULE-AGENT:" + erGetMeetingRequestByUIDRequest.argument.item.organizer.getProperty("SCHEDULE-AGENT"));
+                    if (this.debug) this.logInfo("Please mail the previous line to exchangecalendar@extensions.1st-setup.nl");
+                    return;
+                }
+                else {
+                    if (this.debug) this.logInfo("SCHEDULE-AGENT not set. We are going add the item. At a later stage we will want to have a proper restore.");
+                    var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
+                    tmpItem.clearId("xxxx-xxxx-xxx-xxxx");
+                    tmpItem.setProperty("X-exchangeITIP2", "true");
+                    tmpItem.removeAllAttendees();
+                    this.addItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
+                    return;
+                }
+            }
+
+            if (!doStop) {
+                if (erGetMeetingRequestByUIDRequest.argument.item.isMutable) {
+                    if (this.debug) this.logInfo("item is Mutable.");
+                    erGetMeetingRequestByUIDRequest.argument.item.clearId("not a valid id");
+                    if (this.debug) this.logInfo("item is Mutable. item.id set to '" + erGetMeetingRequestByUIDRequest.argument.item.id + "'");
+                    this.adoptItem(erGetMeetingRequestByUIDRequest.argument.item, erGetMeetingRequestByUIDRequest.listener);
+                }
+                else {
+                    if (this.debug) this.logInfo("item is NOT Mutable. Going to create clone.");
+                    var tmpItem = erGetMeetingRequestByUIDRequest.argument.item.clone();
+                    tmpItem.clearId("not a valid id");
+                    this.adoptItem(tmpItem, erGetMeetingRequestByUIDRequest.listener);
+                }
+                return;
+            }
+        }
+
+        // User cancel.. How to respond!!
+        if (erGetMeetingRequestByUIDRequest.listener) {
+            this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                erGetMeetingRequestByUIDRequest.argument.operation,
+                erGetMeetingRequestByUIDRequest.argument.item.id,
+                erGetMeetingRequestByUIDRequest.argument.item);
+        }
+    },
+
+    getMeetingRequestByUIDError: function _getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg) {
+        this.saveCredentials(erGetMeetingRequestByUIDRequest.argument);
+        this.notConnected = true;
+        if (this.debug) this.logInfo("getMeetingRequestByUIDError: aCode:" + aCode + ", aMsg:" + aMsg);
+
+        this.notifyOperationComplete(erGetMeetingRequestByUIDRequest.listener,
+            Ci.calIErrors.OPERATION_CANCELLED,
+            Ci.calIOperationListener.ADD,
+            erGetMeetingRequestByUIDRequest.argument.item.id,
+            erGetMeetingRequestByUIDRequest.argument.item);
+
+        var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+            .getService(Components.interfaces.nsIPromptService);
+        promptService.alert(null, "Error", aMsg + " (" + aCode + ")");
+    },
+
+    singleModified: function _singleModified(aModifiedSingle, doNotify, aFastNotify) {
+        if (this.itemCacheById[aModifiedSingle.id]) {
+            this.itemUpdates++;
+            //dump(" ==Cal:"+this.name+", item updated:"+this.itemUpdates+", title:"+aModifiedSingle.title+", startDate:"+aModifiedSingle.startDate+"\n");
+
+            if (doNotify) {
+                if (this.debug) this.logInfo("singleModified doNotify");
+                this.notifyTheObservers("onModifyItem", [aModifiedSingle, this.itemCacheById[aModifiedSingle.id]], aFastNotify);
+            }
+            /*if (this.itemCacheById[aModifiedSingle.id].className) {
+            	this.itemCacheById[aModifiedSingle.id].deleteItem();
+            }
+            this.itemCacheById[aModifiedSingle.id] = null;
+            delete this.itemCacheById[aModifiedSingle.id];*/
+            this.removeItemFromCache(aModifiedSingle);
+
+            //this.itemCacheById[aModifiedSingle.id] = aModifiedSingle;
+            this.addItemToCache(aModifiedSingle);
+        }
+    },
+
+    masterModified: function _masterModified(aModifiedMaster) {
+        //if (this.debug) this.logInfo("masterModified:"+aModifiedMaster.title);
+        if (!this.recurringMasterCache[aModifiedMaster.uid]) {
+            return null;
+        }
+
+        // Master was modified so tell the chidlren they have a new parent.
+        for each(var item in this.itemCacheById) {
+            //			if ((item) && (item.parentItem.id != item.id) && (item.uid == aModifiedMaster.uid)) {
+            if ((item) && (item.uid == aModifiedMaster.uid)) {
+                //var newItem = item.clone();
+                var newItem = this.cloneItem(item);
+                newItem.parentItem = aModifiedMaster;
+                this.singleModified(newItem, true);
+                //this.notifyTheObservers("onModifyItem", [newItem, item]);
+                //this.itemCacheById[newItem.id] = newItem;
+            }
+        }
+
+        // We send a modify for the master. But we do not show the masters in the calendar 
+        //miv		this.notifyTheObservers("onModifyItem", [aModifiedMaster, this.recurringMasterCache[aModifiedMaster.uid]]);
+        // Because we do not want it to be visible and the previous modify made it visible.
+        //miv		this.notifyTheObservers("onDeleteItem", [aModifiedMaster]);
+        this.recurringMasterCache[aModifiedMaster.uid] = aModifiedMaster;
+        this.recurringMasterCacheById[aModifiedMaster.id] = aModifiedMaster;
+    },
+
+    /**
+     * Returns the acl entry associated to the calendar.
+     */
+    //readonly attribute calICalendarACLEntry aclEntry;
+    get aclEntry() {
+        var accountMgr = Cc["@mozilla.org/messenger/account-manager;1"].getService(Ci.nsIMsgAccountManager);
+        var identities = accountMgr.allIdentities;
+        var idList = [];
+        if ((identities["Count"]) && (identities["QueryElementAt"])) {
+            for (var index = 0; index < identities.Count; index++) {
+                var identity = identities.QueryElementAt(index, Ci.nsIMsgIdentity);
+                idList.push(identity);
+                /*if (!this.name) {
+                	dump("aclEntry: index:"+index+", identitie:"+identity+"\n");
+                }*/
+            }
+        }
+        else {
+            for (var index = 0; index < identities.length; index++) {
+                var identity = identities.queryElementAt(index, Ci.nsIMsgIdentity);
+                idList.push(identity);
+                /*if (!this.name) {
+                	dump("aclEntry: index:"+index+", identitie:"+identity+"\n");
+                }*/
+            }
+        }
+        var self = this;
+        return {
+            aclManager: this,
+            hasAccessControl: true,
+            userIsOwner: (this.canDelete || this.canModify),
+            userCanAddItems: this._canCreateContent,
+            userCanDeleteItems: this._canDelete,
+            getUserAddresses: function (aCount) {
+                dump("calICalendarACLEntry getUserAddresses:" + self.name + "\n");
+                aCount.value = 1;
+                return ["babe"];
+            },
+            getUserIdentities: function (aCount) {
+                dump("calICalendarACLEntry getUserIdentities:" + self.name + "\n");
+                aCount.value = idList.length;
+                return idList;
+            },
+            getOwnerIdentities: function (aCount) {
+                dump("calICalendarACLEntry getOwnerIdentities:" + self.name + "\n");
+                aCount.value = idList.length;
+                return idList;
+            },
+            refresh: function () {
+                dump("calICalendarACLEntry refresh:" + self.name + "\n");
+            },
+        };
+
+    },
+
+
+    //  calIOperation modifyItem(in calIItemBase aNewItem,
+    //                   in calIItemBase aOldItem,
+    //                   in calIOperationListener aListener);
+
+    modifyItem: function _modifyItem(aNewItem, aOldItem, aListener) {
+
+        if (this.debug) this.logInfo("modifyItem");
+        var result = Ci.calIErrors.MODIFICATION_FAILED;
+
+        if (this.OnlyShowAvailability) {
+            this.readOnlyInternal = true;
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                Ci.calIOperationListener.MODIFY,
+                aNewItem.id,
+                aNewItem);
+            return null;
+        }
+
+        if (this.readOnly) {
+            // When we hit this it probably is the change on a alarm. We will process this only in the local cache.
+            if (this.debug) this.logInfo("modifyItem and this calendar is ReadOnly");
+            this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.MODIFY,
+                aNewItem.id,
+                aNewItem);
+            return null;
+        }
+
+        if ((aOldItem.className) && (!aOldItem.canModify)) {
+            if (this.debug) this.logInfo("modifyItem and this item is ReadOnly for this user.");
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.MODIFY,
+                aOldItem.id,
+                aOldItem);
+            return null;
+        }
+
+        if (this.debug) this.logInfo("1 -- aOldItem.recurrenceInfo:" + aOldItem.recurrenceInfo + ", aNewItem.recurrenceInfo:" + aNewItem.recurrenceInfo);
+        if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("1 -- aOldItem.recurrenceInfo.toString():" + aOldItem.recurrenceInfo.toString());
+        if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("1 -- aNewItem.recurrenceInfo.toString():" + aNewItem.recurrenceInfo.toString());
+
+        if (!aNewItem) {
+            throw Cr.NS_ERROR_INVALID_ARG;
+        }
+
+        var this_ = this;
+
+        function reportError(errStr, errId) {
+            this_.notifyOperationComplete(aListener,
+                errId ? errId : Cr.NS_ERROR_FAILURE,
+                Ci.calIOperationListener.MODIFY,
+                aNewItem.id,
+                errStr);
+            return null;
+        }
+
+        if (aNewItem.id == null) {
+            // this is definitely an error
+            return reportError("ID for modifyItem item is null");
+        }
+
+        // See if attachments changed.
+        var newAttachments = aNewItem.getAttachments({});
+        var attachments = {};
+
+        var attachmentsUpdates = {
+            create: [],
+            delete: []
+        };
+        if (newAttachments.length > 0) {
+            if (this.debug) this.logInfo("  -- We have newAttachments:" + newAttachments.length);
+            for (var index in newAttachments) {
+                if (newAttachments[index].getParameter("X-AttachmentId")) {
+                    attachments[newAttachments[index].getParameter("X-AttachmentId")] = newAttachments[index];
+                }
+                else {
+                    attachmentsUpdates.create.push(newAttachments[index]);
+                    if (this.debug) this.logInfo("newAttachment:" + newAttachments[index].uri.spec);
+                }
+            }
+        }
+        // Check which have been removed.
+        var oldAttachments = aOldItem.getAttachments({});
+        for (var index in oldAttachments) {
+            if (!attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
+                attachmentsUpdates.delete.push(oldAttachments[index]);
+                if (this.debug) this.logInfo("removedAttachment:" + oldAttachments[index].uri.spec);
+            }
+        }
+
+
+        if (isEvent(aNewItem)) {
+            if (this.debug) this.logInfo("ModifyItem: it is an event.");
+            var doSendMeetingRespons = false;
+            var meOld = this.getInvitedAttendee(aOldItem);
+            if (!meOld) {
+                if (this.debug) this.logInfo("Did not find meOld");
+                meOld = cal.createAttendee();
+                meOld.participationStatus = "NEEDS-ACTION";
+            }
+
+            var meNew = this.getInvitedAttendee(aNewItem);
+            if (!meNew) {
+                if (this.debug) this.logInfo("Did not find meNew");
+                meNew = cal.createAttendee();
+                meNew.participationStatus = "NEEDS-ACTION";
+            }
+
+            if (aOldItem.isInvitation) {
+
+                if (this.debug) this.logInfo("1 meOld.participationStatus=" + meOld.participationStatus + ", meNew.participationStatus=" + meNew.participationStatus);
+                if (this.debug) this.logInfo("1 aOldItem.status=" + aOldItem.getProperty("STATUS") + ", aNewItem.status=" + aNewItem.getProperty("STATUS"));
+
+                if ((meOld) && (meNew) && (meOld.participationStatus != meNew.participationStatus)) {
+                    doSendMeetingRespons = true;
+                }
+
+                if ((meNew) && (meNew.participationStatus == "NEEDS-ACTION") && (meOld.participationStatus != meNew.participationStatus)) {
+                    // They choose to confirm at a later state. Do not change this item.
+                    this.notifyOperationComplete(aListener,
+                        Cr.NS_OK,
+                        Ci.calIOperationListener.MODIFY,
+                        aNewItem.id,
+                        aNewItem);
+
+                    return null;
+                }
+
+                if ((meOld) && (meNew) && (aOldItem.getProperty("STATUS") != aNewItem.getProperty("STATUS")) && (!doSendMeetingRespons)) {
+                    switch (aNewItem.getProperty("STATUS")) {
+                    case "CONFIRMED":
+                        meNew.participationStatus = "ACCEPTED";
+                        break;
+                    case null:
+                    case "TENTATIVE":
+                        meNew.participationStatus = "TENTATIVE";
+                        break;
+                    case "CANCELLED":
+                        meNew.participationStatus = "DECLINED";
+                        break;
+                    }
+                    doSendMeetingRespons = true;
+                }
+
+            }
+
+            if (doSendMeetingRespons) {
+                // The item is an invitation.
+                // My status has changed. Send to this.globalFunctions.
+                if (this.debug) this.logInfo("2 aOldItem.participationStatus=" + meOld.participationStatus + ", aNewItem.participationStatus=" + (meNew ? meNew.participationStatus : ".."));
+                if (this.debug) this.logInfo("3a aOldItem.id=" + aOldItem.id);
+                if (this.debug) this.logInfo("3b aNewItem.id=" + aNewItem.id);
+
+                var requestResponseItem = aNewItem;
+                requestResponseItem.setProperty("X-MEETINGREQUEST", true);
+                var aResponse = null;
+
+                // Loop through meetingRequestsCache to find it.
+                var cachedItem = null;
+                for (var index in this.meetingRequestsCache) {
+                    if (this.meetingRequestsCache[index]) {
+                        if (this.meetingRequestsCache[index].uid == aNewItem.id) {
+                            cachedItem = this.meetingRequestsCache[index];
+                            break;
+                        }
+                    }
+                }
+
+                if (cachedItem) {
+                    if (this.debug) this.logInfo("___________ Found in meeting request cache.");
+                    var tmpItem = cachedItem;
+                    var tmpUID = aNewItem.id;
+                    requestResponseItem = this.cloneItem(aNewItem);
+                    requestResponseItem.id = tmpItem.id;
+                    //requestResponseItem.setProperty("X-UID",  tmpItem.uid);
+                    //requestResponseItem.setProperty("X-ChangeKey",  tmpItem.changeKey);
+                }
+                else {
+                    if (this.debug) this.logInfo("___________ NOT Found in meeting request cache. X-UID:" + aNewItem.uid);
+
+                    if (aNewItem.id == aNewItem.parentItem.id) {
+                        if (this.debug) this.logInfo("_________ it is a master.");
+                    }
+
+                    if ((!this.itemCacheById[aNewItem.id]) && (!this.recurringMasterCache[aNewItem.uid])) {
+                        this.getMeetingRequestFromServer(aNewItem, aOldItem.uid, Ci.calIOperationListener.MODIFY, aListener);
+                        return;
+                    }
+
+                }
+
+                if (this.sendMeetingRespons(requestResponseItem, null, "exisiting", aResponse)) {
+                    //return;
+                    result = Cr.NS_OK;
+                }
+                else {
+                    if (this.debug) this.logInfo("modifyItem: canceled by user.");
+                    result = Cr.NS_OK;
+                }
+            }
+            else {
+
+                var input = {
+                    item: aNewItem,
+                    response: "sendtonone"
+                };
+
+                if (aNewItem.organizer) {
+                    if (this.debug) this.logInfo("The organizer is:" + aNewItem.organizer.id);
+                }
+                else {
+                    if (this.debug) this.logInfo("We have no organizer!");
+                }
+
+
+                var changesObj = this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation);
+                var changes;
+                if (changesObj) {
+                    changes = changesObj.changes;
+                }
+                var weHaveChanges = (changes || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
+                //				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
+
+                var iAmOrganizer = ((aNewItem.organizer) && (aNewItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
+                if (iAmOrganizer) {
+
+                    if (((changes) && ((changesObj) && (!changesObj.onlySnoozeChanged))) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0)) {
+
+                        input.response = "sendtoall";
+
+                        // Get the eventsummarywindow to attach dialog to.
+                        let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
+                            .getService(Ci.nsIWindowMediator);
+                        let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane");
+
+                        var attendees = aNewItem.getAttendees({}).length + aOldItem.getAttendees({}).length;
+                        if (this.debug) this.logInfo("  -- aOldItem.getAttendees({}).length=" + aOldItem.getAttendees({}).length);
+                        if (this.debug) this.logInfo("  -- aNewItem.getAttendees({}).length=" + aNewItem.getAttendees({}).length);
+                        if (this.getInvitedAttendee(aOldItem)) {
+                            attendees--;
+                        }
+                        if (this.getInvitedAttendee(aNewItem)) {
+                            attendees--;
+                        }
+
+                        if ((calWindow) && (attendees > 0) && (weHaveChanges)) {
+                            calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
+                                "sendUpdateTo",
+                                "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+                                input);
+                        }
+
+                        if ((attendees == 0) || (!weHaveChanges)) {
+                            if (this.debug) this.logInfo(" -- There are no attendees left");
+                            input.response = "sendtonone";
+                        }
+                    }
+                    else {
+                        if (this.debug) this.logInfo(" -- The user/organizer only dismissed or removed a reminder. We are not going to send this update to the invited people of the meeting.");
+                        input.response = "sendtonone";
+                    }
+                }
+
+                if (this.debug) this.logInfo("modifyItem: it is a event. aOldItem.CalendarItemType=:" + aOldItem.calendarItemType);
+
+                // We have a Single or master
+                if (aOldItem.calendarItemType == "RecurringMaster") {
+                    if (this.debug) this.logInfo(" Master changed:" + aNewItem.title);
+                    // See if the aNewItem is also the master record.
+                    var masterChanged = (aNewItem.parentItem.id == aNewItem.id);
+
+                    // We need to find out wat has changed;
+                    if (this.debug) this.logInfo(" ==1 invite=" + aOldItem.isInvitation);
+
+                    if (changes) {
+                        if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
+
+                        var self = this;
+                        this.addToQueue(erUpdateItemRequest, {
+                                user: this.user,
+                                mailbox: this.mailbox,
+                                folderBase: this.folderBase,
+                                serverUrl: this.serverUrl,
+                                item: aOldItem,
+                                folderID: this.folderID,
+                                changeKey: this.changeKey,
+                                updateReq: changes,
+                                newItem: aNewItem,
+                                actionStart: Date.now(),
+                                attachmentsUpdates: attachmentsUpdates,
+                                onlySnoozeChanges: changesObj.onlySnoozeChanged,
+                                sendto: input.response
+                            },
+                            function (erUpdateItemRequest, aId, aChangeKey) {
+                                self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+                            },
+                            function (erUpdateItemRequest, aCode, aMsg) {
+                                self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+                            },
+                            aListener);
+                        return;
+                    }
+                    else {
+                        if (this.debug) this.logInfo("modifyItem: No changes for master.");
+                        // No changes to a master could means that one of the occurrences
+                        // was deleted. 
+                        var removedOccurrence = this.getRemovedOccurrence(aOldItem, aNewItem);
+                        if (removedOccurrence) {
+                            // Delete this occurrence; multi
+                            this.notifyTheObservers("onDeleteItem", [removedOccurrence], true);
+                            this.deleteItem(removedOccurrence);
+                            result = Cr.NS_OK;
+                        }
+                        else {
+                            // Could be an alarm dismiss or snooze
+                            dump("IF YOU SEE THIS PLEASE REPORT..(CODE1)\n");
+                            this.masterModified(aNewItem);
+                        }
+                        result = Cr.NS_OK;
+                    }
+                }
+                else {
+                    if (this.debug) this.logInfo("modifyItem: '" + aOldItem.calendarItemType + "' event modification");
+                    // We need to find out wat has changed;
+                    if (this.debug) this.logInfo(" ==1 invite=" + aOldItem.isInvitation);
+
+                    if (changes) {
+                        if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
+
+                        var self = this;
+                        this.addToQueue(erUpdateItemRequest, {
+                                user: this.user,
+                                mailbox: this.mailbox,
+                                folderBase: this.folderBase,
+                                serverUrl: this.serverUrl,
+                                item: aOldItem,
+                                folderID: this.folderID,
+                                changeKey: this.changeKey,
+                                updateReq: changes,
+                                newItem: aNewItem,
+                                actionStart: Date.now(),
+                                attachmentsUpdates: attachmentsUpdates,
+                                onlySnoozeChanges: changesObj.onlySnoozeChanged,
+                                sendto: input.response
+                            },
+                            function (erUpdateItemRequest, aId, aChangeKey) {
+                                self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+                            },
+                            function (erUpdateItemRequest, aCode, aMsg) {
+                                self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+                            },
+                            aListener);
+                        this.singleModified(aNewItem, true, true);
+                        return;
+                    }
+                    else {
+                        if (this.doAttachmentUpdates(attachmentsUpdates, aOldItem, input.response, aListener)) {
+                            // We are done
+                            if (this.debug) this.logInfo("modifyItem: No only attachment changes no other fields.");
+                            return;
+                        }
+                        else {
+                            if (this.debug) this.logInfo("modifyItem: No changes 1.");
+                            if (!aOldItem.isInvitation) {
+                                //aNewItem.parentItem = aNewItem; move to storagecalendar
+                                this.singleModified(aNewItem, true, true);
+                            }
+                            result = Cr.NS_OK;
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            if (isToDo(aNewItem)) {
+                if (this.debug) this.logInfo("modifyItem: it is a todo");
+
+                var changesObj = this.makeUpdateOneItem(aNewItem, aOldItem);
+                var changes;
+                if (changesObj) {
+                    changes = changesObj.changes;
+                }
+                if (changes) {
+                    if (this.debug) this.logInfo("modifyItem: changed:" + String(changes));
+                    var self = this;
+                    this.addToQueue(erUpdateItemRequest, {
+                            user: this.user,
+                            mailbox: this.mailbox,
+                            folderBase: this.folderBase,
+                            serverUrl: this.serverUrl,
+                            item: aOldItem,
+                            folderID: this.folderID,
+                            changeKey: this.changeKey,
+                            updateReq: changes,
+                            newItem: aNewItem,
+                            attachmentsUpdates: attachmentsUpdates,
+                            actionStart: Date.now()
+                        },
+                        function (erUpdateItemRequest, aId, aChangeKey) {
+                            self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+                        },
+                        function (erUpdateItemRequest, aCode, aMsg) {
+                            self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+                        },
+                        aListener);
+                    this.singleModified(aNewItem, true, true);
+                    return;
+                }
+                else {
+                    if (this.doAttachmentUpdates(attachmentsUpdates, aOldItem, "sendtonone", aListener)) {
+                        // We are done
+                        if (this.debug) this.logInfo("modifyItem: No only attachment changes no other fields.");
+                        return;
+                    }
+                    else {
+                        if (this.debug) this.logInfo("modifyItem: No changes 2.");
+                        //aNewItem.parentItem = aNewItem;
+                        this.singleModified(aNewItem, true, true);
+                        result = Cr.NS_OK;
+                    }
+                }
+            }
+            else {
+                return reportError("Unknown itemtype for modifyItem");
+            }
+        }
+
+        //this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
+
+        this.notifyOperationComplete(aListener,
+            result,
+            Ci.calIOperationListener.MODIFY,
+            aNewItem.id,
+            aNewItem);
+
+        return null;
+    },
+
+    getChildByUIDandNativeTime: function _getChildByUIDandNativeTime(aUID, aNativeTime) {
+        for (var index in this.itemCacheById) {
+            if ((this.itemCacheById[index]) && (this.itemCacheById[index].uid == aUID)) {
+                // We found a child with the specified UID.
+                if ((this.itemCacheById[index].recurrenceId) && (this.itemCacheById[index].recurrenceId.nativeTime == aNativeTime)) {
+                    return this.itemCacheById[index];
+                }
+            }
+        }
+
+        return null;
+    },
+
+    deleteItemCancelled: function _deleteItemCancelled(aItem, aListener) {
+        if (this.debug) this.logInfo("deleteItemCancelled: " + aItem.title);
+        if ((aItem.className) && (!aItem.canDelete)) {
+            if (this.debug) this.logInfo("User is not allowed to delete this item.");
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                Ci.calIOperationListener.DELETE,
+                aItem.id,
+                aItem);
+            return null;
+        }
+
+        if (aItem.id == null) {
+            if (aListener) {
+                this.notifyOperationComplete(aListener,
+                    Ci.calIErrors.MODIFICATION_FAILED,
+                    Ci.calIOperationListener.DELETE,
+                    null,
+                    "ID is null for deleteItem");
+            }
+            return;
+        }
+
+        // Check if this item is still in cache
+        if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid])) {
+            if (this.debug) this.logInfo("Item is not in itemCache anymore. Probably not removed from view by Lightning..");
+            if (aListener) {
+                this.notifyOperationComplete(aListener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.DELETE,
+                    aItem.id,
+                    aItem);
+            }
+            return;
+        }
+
+        switch (aItem.calendarItemType) {
+        case "Single":
+            if (this.debug) this.logInfo("-- Single CalendarItemType");
+            this.removeItemFromCache(aItem);
+
+            var self = this;
+            this.addToQueue(erDeleteItemRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    item: aItem,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    actionStart: Date.now(),
+                    itemType: "single"
+                },
+                function (erDeleteItemRequest) {
+                    self.deleteItemOk(erDeleteItemRequest);
+                },
+                function (erDeleteItemRequest, aCode, aMsg) {
+                    self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+                },
+                aListener);
+
+            break;
+        case "Occurrence":
+        case "Exception":
+            if (this.debug) this.logInfo("-- " + aItem.calendarItemType + " CalendarItemType");
+            this.removeItemFromCache(aItem);
+
+            var self = this;
+            this.addToQueue(erGetOccurrenceIndexRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    masterItem: aItem,
+                    item: aItem,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    action: "deleteItem",
+                    itemType: "occurrence",
+                    whichOccurrence: "occurrence"
+                }, //dialogArg.answer}, 
+                function (erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+                    self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);
+                },
+                function (erGetOccurrenceIndexRequest, aCode, aMsg) {
+                    self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);
+                },
+                aListener);
+
+            break;
+        case "RecurringMaster":
+            if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
+            this.removeItemFromCache(aItem);
+
+            var self = this;
+            this.addToQueue(erDeleteItemRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    item: aItem,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    itemType: "master",
+                    actionStart: Date.now(),
+                    whichOccurrence: "all_occurrences"
+                },
+                function (erDeleteItemRequest) {
+                    self.deleteItemOk(erDeleteItemRequest);
+                },
+                function (erDeleteItemRequest, aCode, aMsg) {
+                    self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+                },
+                aListener);
+            break;
+        default:
+            // TODO: This will happen when the sync to/from EWS has not yet happened.
+            if (this.debug) this.logInfo("WARNING: unknown CalendarItemType=" + aItem.calendarItemType);
+        }
+
+    },
+    //  calIOperation deleteItem(in calIItemBase aItem,
+    //                   in calIOperationListener aListener);
+    deleteItem: function _deleteItem(aItem, aListener) {
+        if (this.debug) this.logInfo("deleteItem");
+
+        if (this.OnlyShowAvailability) {
+            this.readOnlyInternal = true;
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                Ci.calIOperationListener.DELETE,
+                aItem.id,
+                aItem);
+            /*	            this.notifyOperationComplete(aListener,
+            	                                         Ci.calIErrors.CAL_IS_READONLY,
+            	                                         Ci.calIOperationListener.DELETE,
+            	                                         null,
+            	                                         "Calendar is readonly");*/
+            return null;
+        }
+
+        if ((aItem.className) && (!aItem.canDelete)) {
+            if (this.debug) this.logInfo("User is not allowed to delete this item.");
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                Ci.calIOperationListener.DELETE,
+                aItem.id,
+                aItem);
+            return null;
+        }
+
+        if (aItem.id == null) {
+            if (aListener) {
+                this.notifyOperationComplete(aListener,
+                    Ci.calIErrors.MODIFICATION_FAILED,
+                    Ci.calIOperationListener.DELETE,
+                    null,
+                    "ID is null for deleteItem");
+            }
+            return;
+        }
+
+        // Check if this item is still in cache
+        if ((aItem.id == aItem.parentItem.id) && (!this.itemCacheById[aItem.id]) && (!this.recurringMasterCache[aItem.uid])) {
+            if (this.debug) this.logInfo("Item is not in itemCache anymore. Probably not removed from view by Lightning..");
+            if (aListener) {
+                this.notifyOperationComplete(aListener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.DELETE,
+                    aItem.id,
+                    aItem);
+            }
+            return;
+        }
+
+        var self = this;
+        if (isEvent(aItem)) {
+            if (this.debug) this.logInfo("deleteItem is calIEvent");
+
+            var iAmOrganizer = ((aItem.organizer) && (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
+            var isCancelled = aItem.isCancelled;
+            var isInvitation = this.isInvitation(aItem, true);
+
+            if ((isInvitation) && (!isCancelled)) {
+                //			if ((this.folderBase == "calendar") && (!this.folderID) && 
+                //			    (!iAmOrganizer) && (aItem.getProperty("STATUS") != "DECLINED") &&
+                //			    (aItem.getProperty("STATUS") != "NONE") && (!isCancelled)) {
+                //var aOldItem = aItem.clone();
+                var aOldItem = this.cloneItem(aItem);
+                aOldItem.setProperty("STATUS", "DECLINED");
+
+                if (!this.sendMeetingRespons(aOldItem, null, "exisiting", "DECLINED")) {
+                    if (this.debug) this.logInfo("deleteItem: canceled by user.");
+                    if (aListener) {
+                        this.notifyOperationComplete(aListener,
+                            Ci.calIErrors.OPERATION_CANCELLED,
+                            Ci.calIOperationListener.DELETE,
+                            aItem.id,
+                            aItem);
+                    }
+                    return;
+                }
+                else {
+                    if (aListener) {
+                        this.notifyOperationComplete(aListener,
+                            Cr.NS_OK,
+                            Ci.calIOperationListener.DELETE,
+                            aItem.id,
+                            aItem);
+                    }
+                    return;
+                }
+
+            }
+
+            var input = {
+                item: aItem,
+                response: "sendtonone"
+            };
+
+            if (iAmOrganizer) {
+
+                input.response = "sendtoall";
+
+                // Get the eventsummarywindow to attach dialog to.
+                let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
+                    .getService(Ci.nsIWindowMediator);
+                let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow() || wm.getMostRecentWindow("mail:3pane");
+
+                var attendees = aItem.getAttendees({}).length;
+                var meOld = this.getInvitedAttendee(aItem);
+
+                if (meOld) {
+                    attendees--;
+                }
+
+                if ((calWindow) && (attendees > 0)) {
+                    calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
+                        "sendUpdateTo",
+                        "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+                        input);
+                }
+
+                if (attendees == 0) {
+                    input.response = "sendtonone";
+                }
+
+            }
+
+
+            switch (aItem.calendarItemType) {
+
+            case "Single":
+                if (this.debug) this.logInfo("-- Single CalendarItemType");
+
+                var self = this;
+                this.addToQueue(erDeleteItemRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        folderBase: this.folderBase,
+                        serverUrl: this.serverUrl,
+                        item: aItem,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        actionStart: Date.now(),
+                        itemType: "single"
+                    },
+                    function (erDeleteItemRequest) {
+                        self.deleteItemOk(erDeleteItemRequest);
+                    },
+                    function (erDeleteItemRequest, aCode, aMsg) {
+                        self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+                    },
+                    aListener);
+
+                break;
+            case "Occurrence":
+            case "Exception":
+                if (this.debug) this.logInfo("-- " + aItem.calendarItemType + " CalendarItemType");
+
+                var self = this;
+                this.addToQueue(erGetOccurrenceIndexRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        folderBase: this.folderBase,
+                        serverUrl: this.serverUrl,
+                        masterItem: aItem,
+                        item: aItem,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        action: "deleteItem",
+                        itemType: "occurrence",
+                        whichOccurrence: "occurrence"
+                    }, //dialogArg.answer}, 
+                    function (erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+                        self.getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey);
+                    },
+                    function (erGetOccurrenceIndexRequest, aCode, aMsg) {
+                        self.getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg);
+                    },
+                    aListener);
+
+                break;
+            case "RecurringMaster":
+                if (this.debug) this.logInfo("-- RecurringMaster CalendarItemType");
+
+                var self = this;
+                this.addToQueue(erDeleteItemRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        folderBase: this.folderBase,
+                        serverUrl: this.serverUrl,
+                        item: aItem,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        itemType: "master",
+                        actionStart: Date.now(),
+                        whichOccurrence: "all_occurrences"
+                    },
+                    function (erDeleteItemRequest) {
+                        self.deleteItemOk(erDeleteItemRequest);
+                    },
+                    function (erDeleteItemRequest, aCode, aMsg) {
+                        self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+                    },
+                    aListener);
+                break;
+            default:
+                // TODO: This will happen when the sync to/from EWS has not yet happened.
+                if (this.debug) this.logInfo("WARNING: unknown CalendarItemType=" + aItem.calendarItemType);
+            }
+        }
+
+        if (isToDo(aItem)) {
+            if (this.debug) this.logInfo("deleteItem is calITask");
+            var self = this;
+            this.addToQueue(erDeleteItemRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    item: aItem,
+                    actionStart: Date.now(),
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    itemType: "single"
+                },
+                function (erDeleteItemRequest) {
+                    self.deleteItemOk(erDeleteItemRequest);
+                },
+                function (erDeleteItemRequest, aCode, aMsg) {
+                    self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+                },
+                aListener);
+        }
+    },
+
+    //  calIOperation getItem(in string aId, in calIOperationListener aListener);
+    getItem: function _getItem(aId, aListener, aRetry) {
+        if (this.debug) this.logInfo("getItem: aId:" + aId);
+
+        if (!aListener)
+            return;
+
+        var item = null;
+
+        for (var index in this.itemCacheById) {
+            if (this.itemCacheById[index]) {
+                if (this.itemCacheById[index].uid == aId) {
+                    var item = this.itemCacheById[index];
+                    break;
+                }
+            }
+        }
+
+
+        if (!item) {
+            var cachedRequest = null;
+            for (var index in this.meetingCancelationsCache) {
+                if (this.meetingCancelationsCache[index]) {
+                    if (this.meetingCancelationsCache[index].uid == aId) {
+                        cachedRequest = this.meetingCancelationsCache[index];
+                        break;
+                    }
+                }
+            }
+
+            if (cachedRequest) {
+                //We have a meeting cancelation but not any calendaritem.
+                if (this.debug) this.logInfo("This is odd we have a meeting cancelation but not any calendaritem. THIS SHOULD NOT HAPPEN");
+                delete this.meetingCancelationsCache[cachedRequest.id];
+                return;
+            }
+
+        }
+
+        /*	if (!item) {
+        		for (var index in this.meetingRequestsCache) {
+        			if (this.meetingRequestsCache[index]) {
+        				if (this.meetingRequestsCache[index].uid == aId) {
+        					if (this.debug) this.logInfo("getItem is in meetingRequestsCache");
+        					if (this.debug) this.logInfo("  id="+index);
+        					var item = this.meetingRequestsCache[index];
+        					break;
+        				}
+        			}
+        		}  
+        	}*/
+
+        if (!item) {
+            // Wait with an answer until next sync. This could be an iTIP request
+            // we could have received am email with a meetingrequest which was not
+            // yet received through sync. Therefore we do not find it in cache. And
+            // iTIP will show accept buttons and stuff. We do not want those buttons because
+            // when pressed they will try to add the item to the calendar which gets synced to
+            // EWS and we get an conflict...(item allready exists in EWS).
+            // After next sync we can do this check again.
+            if (!aRetry) {
+                if (this.debug) this.logInfo("Not found putting it in ItemSyncQue");
+                this.getItemSyncQueue.push({
+                    id: aId,
+                    listener: aListener
+                });
+                this.notifyOperationComplete(aListener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.GET,
+                    aId,
+                    null);
+                this.refresh();
+                return;
+            }
+            else {
+                if (this.debug) this.logInfo("getItem not FOUND");
+                // querying by id is a valid use case, even if no item is returned:
+                this.notifyOperationComplete(aListener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.GET,
+                    aId,
+                    null);
+                return;
+            }
+        }
+
+        var item_iid = null;
+        if (isEvent(item))
+            item_iid = Ci.calIEvent;
+        else if (isToDo(item))
+            item_iid = Ci.calITodo;
+        else {
+            this.notifyOperationComplete(aListener,
+                Cr.NS_ERROR_FAILURE,
+                Ci.calIOperationListener.GET,
+                aId,
+                "Can't deduce item type based on QI");
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.GET,
+                aId,
+                null);
+            return;
+        }
+
+        if (this.debug) this.logInfo("Found item in cache with Status:" + item.getProperty("STATUS"));
+
+        this.notifyOperationComplete(aListener,
+            Cr.NS_OK,
+            Ci.calIOperationListener.GET,
+            aId,
+            null);
+        /*
+        aListener.onGetResult (this, 
+                               Cr.NS_OK,
+                               item_iid, null,
+                               1, [item]);*/
+        return;
+    },
+
+    typeString: function _typeString(o) {
+        if (typeof o != 'object')
+            return typeof o;
+
+        if (o === null)
+            return "null";
+        //object, array, function, date, regexp, string, number, boolean, error
+        var internalClass = Object.prototype.toString.call(o)
+            .match(/\[object\s(\w+)\]/)[1];
+        return internalClass.toLowerCase();
+    },
+
+    //  calIOperation getItems(in unsigned long aItemFilter,
+    //                 in unsigned long aCount,
+    //                 in calIDateTime aRangeStart,
+    //                 in calIDateTime aRangeEndEx,
+    //                 in calIOperationListener aListener);
+    getItems: function _getItems(aItemFilter, aCount,
+        aRangeStart, aRangeEnd, aListener) {
+
+        this.logInfo("getItems: aItemFilter, " + aItemFilter
+            + " aCount, " + aCount
+            + " aListener , " + aListener);
+
+        if (aRangeStart) {
+            this.logInfo("getItems: aRangeStart:" + aRangeStart.toString());
+        }
+        else {
+            this.logInfo("getItems: aRangeStart: null");
+        }
+
+        if (aRangeEnd) {
+            this.logInfo("getItems: aRangeEnd:" + aRangeEnd.toString());
+        }
+        else {
+            this.logInfo("getItems: aRangeEnd: null");
+        }
+
+        // Start poller if not already runnning  this may resolve suspend issue
+        this.startCalendarPoller();
+
+        if (this.typeString(aListener) === "object") {
+            this.logInfo("getItems: We received a getItems from repeatingInvitationsTimer function.\
+			Because this request if always for a full year it will consume a lot of\
+			memory when we have a lot of recurring events with no end date.\
+			So for now we only request the period we have in memory cache.\
+			startDate:" + this.startDate + ", endDate:" + this.endDate);
 
-		switch (aCommand) {
-		case "onDeleteItem":
-			if (!this.notConnected) {
-				this.removeFromOfflineCache(aArray[0]);
-			}
-			break;
-		}
-	},
-
-	removeChildrenFromMaster: function _removeChildrenFromMaster(aMaster) {
-		if (this.debug) this.logInfo("removeChildrenFromMaster start. Title:" + aMaster.title);
-		// Remove children of this master. They will be added later.
-		for each(var child in aMaster.getExceptions({})) {
-			this.notifyTheObservers("onDeleteItem", [child]);
-			aMaster.removeException(child);
-			/*if (this.itemCacheById[child.id]) {
+            if (this.startDate) {
+                aRangeStart = this.startDate.clone();
+            }
+            else {
+                aRangeStart = undefined;
+            }
+
+            if (this.endDate) {
+                aRangeEnd = this.endDate.clone();
+            }
+            else {
+                aRangeEnd = undefined;
+            }
+        }
+
+        /*
+         * Check minimal assestements before looking for items:
+         *  - calendar is not in creation
+         *  - calendar is initialized
+         *  - calendar support requested items
+         *  - first synchronization is done
+         */
+
+        // Unfold request filters to booleans
+        let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) !== 0);
+        let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) !== 0);
+        let asOccurrences = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) !== 0);
+        let wantInvitations = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_REQUEST_NEEDS_ACTION) !== 0);
+
+        if (wantEvents) {
+            this.logInfo("getItems: Events are requested by calendar.");
+        }
+
+        if (wantTodos) {
+            this.logInfo("getItems: Tasks are requested by calendar.");
+        }
+
+        if (wantInvitations) {
+            this.logInfo("getItems: Invitations are requested by calendar.");
+        }
+
+        // Calendar creation is not finished, we just update calendar range selection and stop
+        if (this.newCalendar) {
+            this.logInfo("getItems: We are still creating this calendar. Ignore getItems for now.");
+
+            // Update start/end range for events
+            if (wantEvents) {
+                if (aRangeStart) {
+                    if (this.newCalRangeStartEvents) {
+                        if (aRangeStart.compare(this.newCalRangeStartEvents) < 0) {
+                            this.newCalRangeStartEvents = aRangeStart.clone();
+                        }
+                    }
+                    else {
+                        this.newCalRangeStartEvents = aRangeStart.clone();
+                    }
+
+                }
+
+                if (aRangeEnd) {
+                    if (this.newCalRangeEndEvents) {
+                        if (aRangeEnd.compare(this.newCalRangeEndEvents) > 0) {
+                            this.newCalRangeEndEvents = aRangeEnd.clone();
+                        }
+                    }
+                    else {
+                        this.newCalRangeEndEvents = aRangeEnd.clone();
+                    }
+                }
+            }
+
+            // Update start/end range for tasks
+            if (wantTodos) {
+                if (aRangeStart) {
+                    if (this.newCalRangeStartTodos) {
+                        if (aRangeStart.compare(this.newCalRangeStartTodos) < 0) {
+                            this.newCalRangeStartTodos = aRangeStart.clone();
+                        }
+                    }
+                    else {
+                        this.newCalRangeStartTodos = aRangeStart.clone();
+                    }
+                }
+
+                if (aRangeEnd) {
+                    if (this.newCalRangeEndTodos) {
+                        if (aRangeEnd.compare(this.newCalRangeEndTodos) > 0) {
+                            this.newCalRangeEndTodos = aRangeEnd.clone();
+                        }
+                    }
+                    else {
+                        this.newCalRangeEndTodos = aRangeEnd.clone();
+                    }
+                }
+            }
+
+            if (aListener) {
+                this.notifyOperationComplete(aListener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.GET,
+                    null,
+                    null);
+            }
+
+            return;
+        }
+
+        if (!this.firstSyncDone) {
+            this.getItemsSyncQueue.push({
+                itemFilter: aItemFilter,
+                count: aCount,
+                rangeStart: aRangeStart,
+                rangeEnd: aRangeEnd,
+                listener: aListener
+            });
+
+            return;
+        }
+
+        if (!this.isInitialized) {
+            if (aListener) {
+                this.notifyOperationComplete(aListener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.GET,
+                    null,
+                    null);
+            }
+
+            return;
+        }
+
+        let validPeriod = false;
+        if (aRangeStart
+            && aRangeStart.isDate
+            && aRangeEnd
+            && aRangeEnd.isDate) {
+            validPeriod = true;
+            this.lastValidRangeStart = aRangeStart.clone();
+            this.lastValidRangeEnd = aRangeEnd.clone();
+        }
+
+        this.exporting = false;
+        if (aItemFilter === Ci.calICalendar.ITEM_FILTER_ALL_ITEMS
+            && aCount === 0
+            && aRangeStart === null
+            && aRangeEnd === null) {
+
+            this.logInfo("getItems: Request to get all Items in Calendar. Probably an export");
+
+            this.exporting = true;
+        }
+
+        if (!wantEvents
+            && !wantInvitations
+            && !wantTodos) {
+
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.GET,
+                null, null);
+
+            return;
+        }
+
+        let eventsRequestedAndPossible = (wantEvents && this.supportsEvents);
+        let tasksRequestedAndPossible = (wantTodos && this.supportsTasks);
+
+        // When only availability is readable, we can also request events:
+        if (this.OnlyShowAvailability) {
+            eventsRequestedAndPossible = true;
+        }
+
+        if (eventsRequestedAndPossible) {
+            this.logInfo("getItems: Events are requested and this is possible for this folder");
+        }
+
+        if (tasksRequestedAndPossible) {
+            this.logInfo("getItems: Tasks are requested and this is possible for this folder");
+        }
+
+        // Calendar is not able to complete request (item type is not supported)
+        if (!eventsRequestedAndPossible
+            && !tasksRequestedAndPossible) {
+            this.logInfo("getItems: This folder is not able to support requested items.");
+
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.GET,
+                null, null);
+
+            return;
+        }
+
+        /*
+         * All checks passed, look for items to send
+         *
+         */
+
+        // When range start is not defined,
+        // set it to five 5 before now.
+        if (!aRangeStart) {
+            let offset = cal.createDuration();
+            offset.weeks = -5;
+
+            aRangeStart = cal.now().addDuration(offset);
+
+            // If cache already contains a bigger range, use it
+            if (this.startDate
+                && this.startDate.compare(aRangeStart) < 0) {
+                aRangeStart = this.startDate.clone();
+            }
+
+            this.logInfo("getItems: aRangeStart has been updated:" + aRangeStart.toString());
+        }
+
+        // When range end is not defined,
+        // set it to five 5 after now.
+        if (!aRangeEnd) {
+            let offset = cal.createDuration();
+            offset.weeks = 5;
+
+            aRangeEnd = cal.now().addDuration(offset);
+
+            // If cache already contains a bigger range, use it
+            if ((this.endDate) && (this.endDate.compare(aRangeEnd) > 0)) {
+                aRangeEnd = this.endDate.clone();
+            }
+
+            this.logInfo("getItems: aRangeEnd has been updated:" + aRangeEnd.toString());
+        }
+
+        if (!this.lastValidRangeStart) {
+            this.lastValidRangeStart = aRangeStart.clone();
+        }
+
+        if (!this.lastValidRangeEnd) {
+            this.lastValidRangeEnd = aRangeEnd.clone();
+        }
+
+        // Check if requested range is bigger than memory cache.
+
+        let dateChanged = false;
+        let startChanged = false;
+        let endChanged = false;
+
+        if (this.startDate) {
+            // New start date is before the memory cache one.
+            // memory cache is growing.
+            if (this.startDate.compare(aRangeStart) > 0) {
+                this.logInfo("getItems: calendar has start date and aRangeStart (" + aRangeStart.toString() + ") is before current startDate (" + this.startDate.toString() + ")");
+
+                var oldStartDate = this.startDate.clone();
+                this.startDate = aRangeStart.clone();
+
+                dateChanged = true;
+                startChanged = true;
+            }
+        }
+        else {
+            this.logInfo("getItems: calendar hasn't start date, use the range start");
+
+            this.startDate = aRangeStart.clone();
+            dateChanged = true;
+        }
+
+        if (this.endDate) {
+            // New end date is after the memory cache one.
+            // Memory cache is growing.
+            if (this.endDate.compare(aRangeEnd) < 0) {
+                this.logInfo("getItems: calendar has endDate and aRangeEnd (" + aRangeEnd.toString() + ") is after current endDate (" + this.endDate.toString() + ")");
+
+                var oldEndDate = this.endDate.clone();
+                this.endDate = aRangeEnd.clone();
+                dateChanged = true;
+                endChanged = true;
+            }
+        }
+        else {
+            this.logInfo("getItems: calendar hasn't end date, use the range end");
+
+            this.endDate = aRangeEnd.clone();
+            dateChanged = true;
+        }
+
+        // If offline cache is enabled and requested range is bigger than the
+        // memory cache one, try to get items from offline cache.
+        if (this.useOfflineCache
+            && dateChanged) {
+            if ((eventsRequestedAndPossible && !this.OnlyShowAvailability)
+                || tasksRequestedAndPossible) {
+                if (startChanged) {
+                    this.logInfo("getItems: Startdate has changed to an earlier date. Requesting difference from offline cache.");
+                    this.getItemsFromOfflineCache(aRangeStart, oldStartDate, aListener);
+                }
+
+                if (endChanged) {
+                    this.logInfo("getItems: Enddate has changed to a later date. Requesting difference from offline cache.");
+                    this.getItemsFromOfflineCache(oldEndDate, aRangeEnd, aListener);
+                }
+
+                // We didn't had any memory cache (startDate and endDate has just been defined)
+                if (!startChanged
+                    && !endChanged) {
+                    this.logInfo("getItems: New time period to cache. Requesting full period from offline cache.");
+                    this.getItemsFromOfflineCache(aRangeStart, aRangeEnd, aListener);
+                }
+            }
+
+            // Update startChanged and endChanged according to offline cache range
+            // It allows us to know if we have to ask Exchange server new items
+            if (this.offlineStartDate) {
+                if (aRangeStart.compare(this.offlineStartDate) < 0) {
+                    this.logInfo("getItems: aRangestart is before offlineCache start.");
+                    oldStartDate = this.offlineStartDate.clone();
+                    startChanged = true;
+                }
+                else {
+                    this.logInfo("getItems: aRangestart is after offlineCache start.");
+                    startChanged = false;
+                }
+            }
+            else {
+                startChanged = true;
+            }
+
+            if (this.offlineEndDate) {
+                if (aRangeEnd.compare(this.offlineEndDate) > 0) {
+                    this.logInfo("RangeEnd is after offlineCache end.");
+                    oldEndDate = this.offlineEndDate.clone();
+                    endChanged = true;
+                }
+                else {
+                    this.logInfo("RangeEnd is before offlineCache end.");
+                    endChanged = false;
+                }
+            }
+            else {
+                endChanged = true;
+            }
+        }
+
+        // Update calendar/task view with items in memory
+        this.getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, this.exporting);
+
+        if (this.OnlyShowAvailability) {
+            if (startChanged) {
+                this.getOnlyFreeBusyInformation(aRangeStart, oldStartDate);
+            }
+
+            if (endChanged) {
+                this.getOnlyFreeBusyInformation(oldEndDate, aRangeEnd);
+            }
+
+            if (!startChanged
+                && !endChanged) {
+                this.getOnlyFreeBusyInformation(aRangeStart, aRangeEnd);
+            }
+
+            return;
+        }
+
+        // Check if we should add items from Exchange server
+        if (!dateChanged) {
+            this.logInfo("getItems: No dateChanged. Not going to request items from server.");
+
+            return;
+        }
+
+        if (this.isOffline) {
+            this.logInfo("getItems: We are offline. Not going to request items from server.");
+
+            return;
+        }
+
+        if (eventsRequestedAndPossible) {
+
+            this.logInfo("getItems: Requesting events from exchange server.");
+            if ((startChanged && oldStartDate)
+                || (endChanged && oldEndDate)) {
+
+                if (startChanged) {
+                    if (this.debug) this.logInfo("Startdate has changed to an earlier date. Requesting difference.");
+                    this.requestPeriod(aRangeStart, oldStartDate, aItemFilter, aCount, false);
+                }
+
+                if (endChanged) {
+                    if (this.debug) this.logInfo("Enddate has changed to a later date. Requesting difference.");
+                    this.requestPeriod(oldEndDate, aRangeEnd, aItemFilter, aCount, true);
+                }
+
+                // We need to get the period which did not change from memorycache.
+            }
+            else {
+                this.logInfo("New time period. Requesting items in period.");
+                this.requestPeriod(aRangeStart, aRangeEnd, aItemFilter, aCount, false);
+            }
+        }
+
+        // Request server when calendar date changed  .
+        if (tasksRequestedAndPossible
+            && (startChanged || endChanged)) {
+            this.logInfo("getItems: Requesting tasks from exchange server.");
+
+            var self = this;
+            this.addToQueue(erFindTaskItemsRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    serverUrl: this.serverUrl,
+                    folderBase: this.folderBase,
+                    itemFilter: aItemFilter,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    actionStart: Date.now()
+                },
+                function (erFindTaskItemsRequest, aIds) {
+                    self.findTaskItemsOK(erFindTaskItemsRequest, aIds);
+                },
+                function (erFindTaskItemsRequest, aCode, aMsg) {
+                    self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);
+                },
+                null);
+
+            if (!this.deactivateTaskFollowup) {
+                this.logInfo("getItems: Requesting followup tasks from exchange server.");
+                this.addToQueue(erFindFollowupItemsRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        serverUrl: this.serverUrl,
+                        folderBase: "inbox",
+                        itemFilter: aItemFilter,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        actionStart: Date.now()
+                    },
+                    function (erFindFollowupItemsRequest, aIds) {
+                        self.findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds);
+                    },
+                    function (erFindFollowupItemsRequest, aCode, aMsg) {
+                        self.findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg);
+                    },
+                    null);
+            }
+        }
+    },
+
+    getItemsFromMemoryCache: function _getItemsFromMemoryCache(aRangeStart, aRangeEnd, aItemFilter, aListener, aExporting) {
+        this.logInfo("getItemsFromMemoryCache: startDate:" + aRangeStart + ", endDate:" + aRangeEnd + ", aListener:" + aListener + ", aExporting:" + aExporting);
+
+        let events = [];
+        let tasks = [];
+
+        let wantEvents = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_EVENT) != 0);
+        let wantTodos = ((aItemFilter & Ci.calICalendar.ITEM_FILTER_TYPE_TODO) != 0);
+
+        // This is by using the this.itemCacheByStartDate and this.itemCacheByEndDate index.
+        if (wantEvents) {
+            let ids = {};
+
+            let dayOffset = cal.createDuration();
+            dayOffset.days = 1;
+
+            let dayPos = cal.createDateTime();
+            dayPos = aRangeStart.clone();
+
+            // Convert date from local timezone to UTC
+            // Given range is in local timezone and cache save in UTC
+            dayPos.isDate = false;
+            dayPos = dayPos.getInTimezone(cal.UTC());
+            dayPos.isDate = true;
+
+            // Go through all days bewteen the range start day and the range end day
+            while (dayPos.compare(aRangeEnd) < 0) {
+                if (this.itemCacheByStartDate
+                    && this.itemCacheByStartDate[dayPos.year]
+                    && this.itemCacheByStartDate[dayPos.year][dayPos.yearday]) {
+                    for (let itemid in this.itemCacheByStartDate[dayPos.year][dayPos.yearday]) {
+                        ids[itemid] = true;
+                    }
+                }
+
+                dayPos.addDuration(dayOffset);
+            }
+
+            // For all found ids, if item cache has it, push it to events answer
+            // Check also if invitation should be cancelled
+            for (let itemid in ids) {
+                if (this.itemCacheById[itemid]
+                    && cal.isEvent(this.itemCacheById[itemid])) {
+                    events.push(this.itemCacheById[itemid]);
+
+                    if (this.deleteCancelledInvitation
+                        && this.itemCacheById[itemid].isCancelled) {
+                        this.deleteItemCancelled(this.itemCacheById[itemid]);
+                    }
+                }
+            }
+        }
+        else if (wantTodos) {
+            let wantCompletedTodo = aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_YES;
+            let wantNotCompletedTodo = aItemFilter & Ci.calICalendar.ITEM_FILTER_COMPLETED_NO;
+
+            for (let index in this.itemCacheById) {
+                if (cal.isToDo(this.itemCacheById[index])) {
+                    if (this.deactivateTaskFollowup
+                        && this.itemCacheById[index].itemClass == "IPM.Note") {
+                        //Do not change order or removing from local or it will throw db error
+                        //remove from offlinecache
+                        this.removeFromOfflineCache(this.itemCacheById[index]);
+                        //remove from lighting GUI
+                        this.removeItemFromCache(this.itemCacheById[index]);
+                    }
+                    else if ((this.itemCacheById[index].isCompleted && wantCompletedTodo)
+                        || (!this.itemCacheById[index].isCompleted && wantNotCompletedTodo)) {
+                        tasks.push(this.itemCacheById[index]);
+                    }
+                }
+            }
+        }
+
+        this.logInfo("getItemsFromMemoryCache: We got '" + events.length + "' events and  '" + tasks.length + "'  tasks from memory cache.");
+        if (aListener) {
+            this.logInfo("getItemsFromMemoryCache: We have a listener so going to inform it.");
+            if (events.length > 0
+                && wantEvents) {
+                aListener.onGetResult(this,
+                    Cr.NS_OK,
+                    Ci.calIEvent,
+                    null,
+                    events.length,
+                    events);
+            }
+
+            if (tasks.length > 0
+                && wantTodos) {
+                aListener.onGetResult(this,
+                    Cr.NS_OK,
+                    Ci.calITodo,
+                    null,
+                    tasks.length,
+                    tasks);
+            }
+
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.GET,
+                null, null);
+        }
+    },
+
+    requestPeriod: function _requestPeriod(aStartDate, aEndDate, aItemFilter, aCount, findReverse, aUID) {
+        if (this.debug) this.logInfo("Getting period from: " + aStartDate + " until " + aEndDate);
+        //dump(this.name+": Getting period from: "+aStartDate+" until "+aEndDate+"\n");
+
+        /*      		var self = this;
+        		this.addToQueue( erFindCalendarItemsRequest, 
+        			{user: this.user, 
+        			 mailbox: this.mailbox,
+        			 serverUrl: this.serverUrl,
+        			 count: aCount,
+        			 rangeStart: aStartDate.clone(),
+        			 rangeEnd: aEndDate.clone(),
+        			 folderBase: this.folderBase,
+        			 itemFilter: aItemFilter,
+        			 folderID: this.folderID,
+        			 changeKey: this.changeKey,
+        			 actionStart: Date.now() }, 
+        			function(erFindCalendarItemsRequest, aIds, aOccurrences) { self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);}, 
+        			function(erFindCalendarItemsRequest, aCode, aMsg) { self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);},
+        			null);
+
+        		return;*/
+
+        if (findReverse) {
+            var endDate = aEndDate.clone();
+            var startDate = endDate.clone();
+
+            var offset = cal.createDuration();
+            offset.weeks = -1;
+            startDate.addDuration(offset);
+            if ((aStartDate) && (startDate.compare(aStartDate) < 1)) {
+                startDate = aStartDate.clone();
+            }
+        }
+        else {
+            var startDate = aStartDate.clone();
+            var endDate = startDate.clone();
+
+            var offset = cal.createDuration();
+            offset.weeks = 1;
+            endDate.addDuration(offset);
+            if ((aEndDate) && (endDate.compare(aEndDate) > -1)) {
+                endDate = aEndDate.clone();
+            }
+        }
+
+        var self = this;
+        var doStop = false;
+        var stopNext = false;
+
+        while (!doStop) {
+            if (startDate.compare(endDate) != 0) {
+                if (this.debug) this.logInfo("Getting period part of: " + startDate.toString() + " until " + endDate.toString());
+                //dump(this.name+": Getting period part of: "+startDate.toString()+" until "+endDate.toString()+"\n");
+                this.addToQueue(erFindCalendarItemsRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        serverUrl: this.serverUrl,
+                        count: aCount,
+                        rangeStart: startDate.clone(),
+                        rangeEnd: endDate.clone(),
+                        folderBase: this.folderBase,
+                        itemFilter: aItemFilter,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        actionStart: Date.now(),
+                        uid: aUID
+                    },
+                    function (erFindCalendarItemsRequest, aIds, aOccurrences) {
+                        self.findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences);
+                    },
+                    function (erFindCalendarItemsRequest, aCode, aMsg) {
+                        self.findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg);
+                    },
+                    null);
+            }
+
+            if (!stopNext) {
+                if (findReverse) {
+                    endDate = startDate.clone();
+                    startDate.addDuration(offset);
+                    if ((aStartDate) && (startDate.compare(aStartDate) < 1)) {
+                        startDate = aStartDate.clone();
+                        stopNext = true;
+                    }
+                    if (!aStartDate) {
+                        doStop = true;
+                    }
+                }
+                else {
+                    startDate = endDate.clone();
+                    endDate.addDuration(offset);
+                    if ((aEndDate) && (endDate.compare(aEndDate) > -1)) {
+                        endDate = aEndDate.clone();
+                        stopNext = true;
+                    }
+                    if (!aEndDate) {
+                        doStop = true;
+                    }
+                }
+            }
+            else {
+                doStop = true;
+            }
+        }
+        if (this.debug) this.logInfo("Getting period done.");
+    },
+
+    //  calIOperation refresh();
+    refresh: function _refresh() {
+
+        if (this.debug) this.logInfo("refresh");
+        if (this.shutdown) {
+            if (this.debug) this.logInfo("Shutting down. So no refresh.");
+            return;
+        }
+
+        if (((!this.syncState) && (!this.OnlyShowAvailability)) || (this.weAreSyncing)) {
+            if (this.weAreSyncing) {
+                if (this.debug) this.logInfo("weAreSyncing. So no refresh.");
+            }
+
+
+
+            else {
+                if (this.debug) this.logInfo("No syncState yet. So no refresh.");
+            }
+            return;
+        }
+
+        if (this.isOffline) {
+            if (this.debug) this.logInfo("We are offline. So no refresh.");
+            return;
+        }
+
+        if (this._disabled) {
+            if (this.debug) this.logInfo("We are disabled. So no refresh.");
+            return;
+        }
+
+        if (!this.isInitialized) {
+            if (this.debug) this.logInfo("Not initialized yet. So no refresh.");
+            return;
+        }
+
+        //if (this.debug) this.logInfo("Refresh. We start a sync.");
+        //var self = this;
+
+        if (this.OnlyShowAvailability) {
+            if (!this.lastValidRangeStart) this.lastValidRangeStart = aRangeStart.clone();
+            this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
+        }
+        else {
+            this.getSyncState();
+        }
+
+        return;
+
+    },
+
+    //  void startBatch();
+    startBatch: function _startBatch() {
+        dump("Start batch\n");
+    },
+
+    //  void endBatch();
+    endBatch: function _endBatch() {
+        dump("End batch\n");
+    },
+
+    // End calICalendar
+
+    // Begin calISchedulingSupport
+    //  boolean isInvitation(in calIItemBase aItem);
+    isInvitation: function _isInvitation(aItem, ignoreStatus) {
+        try {
+            var exchangeItem = aItem.QueryInterface(Ci.mivExchangeEvent);
+
+            if (exchangeItem) {
+                if (aItem.canModify) {
+                    //dump("X-exchangeITIP1:"+aItem.getProperty("X-exchangeITIP1")+"\n");
+                    //dump("X-exchangeITIP2:"+aItem.getProperty("X-exchangeITIP2")+"\n");
+                    return aItem.isInvitation;
+                }
+            }
+        }
+        catch (err) {}
+
+        return false;
+    },
+
+    // boolean canNotify(in AUTF8String aMethod, in calIItemBase aItem);
+    canNotify: function _canNotify(aMethod, aItem) {
+        if (this.debug) this.logInfo("canNotify: aMethod=" + aMethod + ":" + aItem.title);
+
+        return true;
+    },
+
+    // calIAttendee getInvitedAttendee(in calIItemBase aItem);
+    getInvitedAttendee: function _getInvitedAttendee(aItem) {
+        //if (this.debug) this.logInfo("getInvitedAttendee 1:"+aItem.title);
+        if (!aItem) {
+            return;
+        }
+
+        // Parse through the attendees
+        var attendees = aItem.getAttendees({});
+        for each(var attendee in attendees) {
+            if (this.debug) this.logInfo("getInvitedAttendee 2:" + attendee.id);
+            if ((attendee.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase())
+                || (attendee.id.replace(/^exchangecalendar:/, '').toLowerCase() == this.mailbox.toLowerCase())) {
+                if (this.debug) this.logInfo("getInvitedAttendee FOUND myself:" + aItem.title + ", attendee.participationStatus:" + attendee.participationStatus + ", aItem.myResponseType:" + aItem.myResponseType);
+                //				attendee.participationStatus = participationMap[aItem.myResponseType];
+                return attendee; //.clone();
+            }
+            else {
+                if (this.debug) this.logInfo("getInvitedAttendee FOUND someonelse:" + aItem.title + ", attendee.id:" + attendee.id + ", attendee.participationStatus:" + attendee.participationStatus);
+            }
+        }
+
+        if (aItem.isInvitation) {
+            if (this.debug) this.logInfo("getInvitedAttendee  X-IsInvitation = true");
+            var tmpAttendee = cal.createAttendee();
+            tmpAttendee.id = "mailto:" + this.mailbox;
+            tmpAttendee.commonName = this.userDisplayName;
+            tmpAttendee.rsvp = "FALSE";
+            tmpAttendee.userType = "INDIVIDUAL";
+            tmpAttendee.role = "REQ-PARTICIPANT";
+            tmpAttendee.participationStatus = aItem.participationStatus;
+            return tmpAttendee;
+        }
+
+        //dump("Did not find an attendee.!\n");
+
+    },
+    // End calISchedulingSupport
+
+    // Begin calIFreeBusyProvider
+    //    calIOperation getFreeBusyIntervals(in AUTF8String aCalId,
+    //                               in calIDateTime aRangeStart,
+    //                               in calIDateTime aRangeEnd,
+    //                               in unsigned long aBusyTypes,
+    //                               in calIGenericOperationListener aListener);
+
+    getFreeBusyIntervals: function (aCalId, aRangeStart, aRangeEnd,
+        aBusyTypes, aListener) {
+        if (this.debug) this.logInfo("getFreeBusyIntervals: " + aCalId + ", aBusyTypes:" + aBusyTypes + ", aRangeStart:" + aRangeStart + ", aRangeEnd:" + aRangeEnd);
+
+        if (aCalId.indexOf("@") < 0 || aCalId.indexOf(".") < 0) {
+            // No valid email, screw it
+            if (aListener) {
+                aListener.onResult(null, null);
+            }
+            return;
+        }
+
+        var tmpStartDate = aRangeStart.clone();
+        tmpStartDate.isDate = false;
+        var tmpEndDate = aRangeEnd.clone();
+        tmpEndDate.isDate = false;
+
+        var self = this;
+        this.addToQueue(erGetUserAvailabilityRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                email: aCalId.replace(/^mailto:/i, ""),
+                attendeeType: 'Required',
+                start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
+                end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
+                calId: aCalId,
+                folderID: this.folderID,
+                changeKey: this.changeKey
+            },
+            function (erGetUserAvailabilityRequest, aEvents) {
+                self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);
+            },
+            function (erGetUserAvailabilityRequest, aCode, aMsg) {
+                self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);
+            },
+            aListener);
+
+    },
+    // End calIFreeBusyProvider
+
+    // Begin calIItipTransport
+    //    readonly attribute AUTF8String scheme;
+    get scheme() {
+        if (this.debug) this.logInfo("get scheme");
+        return "";
+    },
+
+    //    attribute AUTF8String senderAddress;
+    get senderAddress() {
+        if (this.debug) this.logInfo("get senderAddress");
+        return "hihi";
+    },
+
+    set senderAddress(aValue) {
+        if (this.debug) this.logInfo("set senderAddress(" + aValue + ")");
+    },
+
+    //    readonly attribute AUTF8String type;
+    //* IS DEFINED EARLIER AS PART OF calICalendar
+
+    /**
+     * Sends a calIItipItem to the recipients using the specified title and
+     * alternative representation. If a calIItipItem is attached, then an ICS
+     * representation of those objects are generated and attached to the email.
+     * If the calIItipItem is null, then the item(s) is sent without any
+     * text/calendar mime part.
+     * @param count             size of recipient array
+     * @param recipientArray    array of recipients
+     * @param calIItipItem      set of calIItems encapsulated as calIItipItems
+     */
+    //    void sendItems(in PRUint32 count,
+    //                   [array, size_is(count)] in calIAttendee recipientArray,
+    //                   in calIItipItem item);
+    sendItems: function _sendItems(count, recipientArray, item) {
+        if (this.debug) this.logInfo("sendItems");
+    },
+    // End calIItipTransport
+
+    isRemoved: function _isRemoved(aItem) {
+        if (!aItem) {
+            return null;
+        }
+
+        if (this.debug) this.logInfo("isRemoved title:" + aItem.title + ", status=" + aItem.status);
+
+        if (aItem.status == "") {
+            return true;
+        }
+
+        return false;
+    },
+
+    getExceptions: function _getExceptions(aRecurrenceItems) {
+        var tmpCount = 0;
+        var exceptions = {};
+        for each(var recurrenceItem in aRecurrenceItems) {
+            tmpCount++;
+            if (this.debug) this.logInfo("getExceptions: nr:" + tmpCount + ", isNegative:" + recurrenceItem.isNegative);
+            if (recurrenceItem.isNegative) {
+                // A deletion is an exception and therefore isNegative === true
+                var occurrences = recurrenceItem.getOccurrences(this.startDate, this.startDate, this.endDate, 0, {});
+                if (this.debug) this.logInfo("getExceptions: we have occurrences.length=" + occurrences.length);
+                for each(var occurrence in occurrences) {
+                    exceptions[occurrence.toString()] = occurrence;
+                }
+            }
+        }
+        return exceptions;
+    },
+
+    getRemovedOccurrence: function _getRemovedOccurrence(aOldItem, aNewItem) {
+        if (this.debug) this.logInfo("getRemovedOccurrence");
+
+        // We first check if an occurrence was removed.
+        var oldCount = {};
+        var oldOccurrences = aOldItem.getOccurrences(oldCount);
+
+        var newCount = {};
+        var newOccurrences = aNewItem.getOccurrences(newCount);
+
+        if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value=" + oldCount.value);
+        if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value=" + newCount.value);
+        if (newCount.value > oldCount.value) {
+            if (this.debug) this.logInfo("getRemovedOccurrence: We have less occurrences than before.");
+
+            for each(var newOccurrence in newOccurrences) {
+                var foundOld = false;
+                for each(var oldOccurrence in oldOccurrences) {
+                    if (oldOccurrence.id == newOccurrence.id) {
+                        foundOld = true;
+                        break;
+                    }
+                }
+                if (foundOld == false) {
+                    if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed occurrence: startdate:" + newOccurrence.startDate.toString());
+                    return newOccurrence;
+                }
+            }
+        }
+
+        // No occurrence was removed. We check the exceptions.
+        var oldCount = {};
+        var oldExceptions = aOldItem.getExceptions(oldCount);
+
+        var newCount = {};
+        var newExceptions = aNewItem.getExceptions(newCount);
+
+        if (this.debug) this.logInfo("getRemovedOccurrence: oldCount.value=" + oldCount.value);
+        if (this.debug) this.logInfo("getRemovedOccurrence: newCount.value=" + newCount.value);
+
+        if (newCount.value > oldCount.value) {
+            if (this.debug) this.logInfo("getRemovedOccurrence: We have less exceptions than before.");
+
+            for each(var newException in newExceptions) {
+                var foundOld = false;
+                for each(var oldException in oldExceptions) {
+                    if (oldException.id == newException.id) {
+                        foundOld = true;
+                        break;
+                    }
+                }
+                if (foundOld == false) {
+                    if (this.debug) this.logInfo("getRemovedOccurrence: We found the removed exception: startdate:" + newException.startDate.toString());
+                    return newException;
+                }
+            }
+        }
+
+        if (this.debug) this.logInfo("getRemovedOccurrence: we DID NOT FIND our removed occurrence or exception");
+        return null;
+    },
+
+    get prefs() {
+        return this.mPrefs;
+    },
+
+    get exchangePrefVersion() {
+        return this.globalFunctions.safeGetIntPref(this.prefs, "exchangePrefVersion", 0);
+    },
+
+    get isInitialized() {
+        if (!this.id) {
+            return false;
+        }
+
+        if (!this.mPrefs) {
+            if (this.debug) this.logInfo("Found old version preferences. THIS IS A PROBLEM.");
+            return false;
+        }
+
+        if (this.globalFunctions.safeGetBoolPref(this.prefs, "disabled", false)) {
+            return false;
+        }
+
+        if (this.firstrun) {
+            this.firstrun = false;
+
+            //Add Prvider for busy free information for  invite attendees etc.
+            getFreeBusyService().addProvider(this);
+
+            // The first thing we want to do is check the folderbase and folderpath for their id & changekey.
+            // It might have changed between restarts.
+            this.checkFolderPath();
+
+            /* Disabled as on startup we do not wish to use old syncstate until we get some offline caching implemented for this (2013-12-20)
+            			this.syncInboxState = this.globalFunctions.safeGetCharPref(this.prefs,"syncInboxState", "");
+            			if (this.syncInboxState != "") {
+            				this.saveToFile("syncInboxState.txt", this.syncInboxState);
+            				this.prefs.deleteBranch("syncInboxState");
+            			}
+            */
+            if (this.useOfflineCache) {
+                this.syncStateInbox = this.loadFromFile("syncStateInbox.txt");
+                this.prefs.deleteBranch("syncStateInbox");
+
+                this.syncState = this.loadFromFile("syncState.txt");
+                this.prefs.deleteBranch("syncState");
+            }
+
+            //			this.syncInboxState = this.loadFromFile("syncInboxState.txt");
+
+            this.getSyncState();
+
+            if ((this.isOffline) || ((this.useOfflineCache) && (this.syncState))) {
+                this.firstSyncDone = true;
+                if (this.debug) this.logInfo("First sync is done. Normal operation is starting.");
+
+                while (this.getItemsSyncQueue.length > 0) {
+                    let getItemsReq = this.getItemsSyncQueue.shift();
+                    this.getItems(getItemsReq.itemFilter, getItemsReq.count, getItemsReq.rangeStart, getItemsReq.rangeEnd, getItemsReq.listener);
+                }
+                if (this.debug) this.logInfo("First sync is done. Processed getItemsSyncQueue.");
+            }
+
+            //dump(this.name+": Going to load testdata ("+this.id+")\n");
+            //			var testData = this.loadFromFile("testitem");
+            //			if (testData) {
+            //				var testJSON = xml2json.newJSON();
+            //				xml2json.parseXML(testJSON, testData);
+            //				var tmpItems = [testJSON[telements][0]];
+            //try{
+            //				this.updateCalendar(null, tmpItems, true, false);
+            //}catch(err){dump(this.name+": Testdata error:"+err+"\n");}
+            //				dump("Loaded testdata\n");
+            //			}
+        }
+        return true;
+
+    },
+
+    getCharPref: function (aName) {
+        return this.globalFunctions.safeGetCharPref(this.prefs, aName, null);
+    },
+
+    setCharPref: function (aName, aValue) {
+        if (this.prefs) {
+            return this.prefs.setCharPref(aName, aValue);
+        }
+    },
+
+    get user() {
+        var username = this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
+        if (username.indexOf("@") > -1) {
+            return username;
+        }
+        else {
+            if (this.domain == "") {
+                return this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
+            }
+            else {
+                return this.domain + "\\" + this.globalFunctions.safeGetCharPref(this.prefs, "ecUser", "");
+            }
+        }
+    },
+
+    set user(value) {
+        if ((value.indexOf("\\") > -1) && (value.indexOf("@") == -1)) {
+            this.domain = value.substr(0, value.indexOf("\\"));
+            this.setCharPref("ecUser", value.substr(value.indexOf("\\") + 1));
+        }
+        else {
+            this.setCharPref("ecUser", value);
+        }
+    },
+
+    get domain() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecDomain", "");
+    },
+
+    set domain(value) {
+        return this.setCharPref("ecDomain", value);
+    },
+
+    get mailbox() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecMailbox", "");
+    },
+
+    get serverUrl() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecServer", "");
+    },
+
+    get userDisplayName() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecDisplayname", "");
+    },
+
+    get folderBase() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderbase", "calendar");
+    },
+
+    get folderPath() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderpath", "/");
+    },
+
+    get folderID() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderID", null);
+    },
+
+    set folderID(aValue) {
+        this.prefs.setCharPref("ecFolderID", aValue);
+    },
+
+    get changeKey() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecChangeKey", null);
+    },
+
+    set changeKey(aValue) {
+        this.prefs.setCharPref("ecChangeKey", aValue);
+    },
+
+    get folderIDOfShare() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecFolderIDOfShare", "");
+    },
+
+    get isPublicFolder() {
+        if (publicFoldersMap[this.folderBase]) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    },
+
+    get doPollInbox() {
+        if (this.doReset) {
+            return false;
+        }
+
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecPollInbox", true);
+    },
+
+    get pollInboxInterval() {
+        return this.globalFunctions.safeGetIntPref(this.prefs, "ecPollInboxInterval", 180);
+    },
+
+    get doAutoRespondMeeting() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRespondMeetingRequest", false);
+    },
+
+    get autoResponseAnswer() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecAutoRespondAnswer", "TENTATIVE");
+    },
+
+    get doAutoRemoveInvitationCancelation1() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRemoveInvitationCancellation1", false);
+    },
+
+    get doAutoRemoveInvitationCancelation2() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRemoveInvitationCancellation2", false);
+    },
+
+    get doAutoRemoveInvitationResponse1() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecAutoRemoveInvitationResponse1", true);
+    },
+
+    get sendAutoRespondMeetingRequestMessage() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecSendAutoRespondMeetingRequestMessage", false);
+    },
+
+    get autoRespondMeetingRequestMessage() {
+        return this.globalFunctions.safeGetCharPref(this.prefs, "ecAutoRespondMeetingRequestMessage", "");
+    },
+
+    get cacheStartupBefore() {
+        return this.globalFunctions.safeGetIntPref(null, "extensions.1st-setup.cache.startupBefore", 30, true);
+    },
+
+    get cacheStartupAfter() {
+        return this.globalFunctions.safeGetIntPref(null, "extensions.1st-setup.cache.startupAfter", 30, true);
+    },
+
+    get startCacheDate() {
+        var aDate = cal.now();
+        var tmpDur = cal.createDuration();
+        tmpDur.hours = -1 * 24 * this.cacheStartupBefore;
+        aDate.addDuration(tmpDur);
+        if (this.debug) this.logInfo("startCacheDate:" + aDate.toString());
+        return aDate
+    },
+
+    get endCacheDate() {
+        var aDate = cal.now();
+        var tmpDur = cal.createDuration();
+        tmpDur.hours = 1 * 24 * this.cacheStartupAfter;
+        aDate.addDuration(tmpDur);
+        if (this.debug) this.logInfo("endCacheDate:" + aDate.toString());
+        return aDate
+    },
+
+    get deleteCancelledInvitation() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingdeletecancelleditems", true);
+    },
+
+    get deactivateTaskFollowup() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "followup.task.deactivate", false);
+    },
+
+    get markEventasTentative() {
+        return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingmarkeventtentative", false);
+    },
+
+    checkInbox: function _checkInbox() {
+        if (this.debug) this.logInfo("checkInbox 1.");
+
+        if (this.isOffline) return;
+
+        if ((this.weAreInboxSyncing) || (!this.doPollInbox) || (this.OnlyShowAvailability)) {
+            return;
+        }
+
+        this.weAreInboxSyncing = true;
+        var self = this;
+
+        //if (this.debug) this.logInfo("checkInbox 2.");
+        this.addToQueue(erSyncInboxRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                folderBase: 'inbox',
+                folderID: null,
+                changeKey: null,
+                syncState: this.syncInboxState,
+                actionStart: Date.now()
+            },
+            function (erSyncInboxRequest, creations, updates, deletions, syncState) {
+                self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);
+            },
+            function (erSyncInboxRequest, aCode, aMsg) {
+                self.syncInboxError(erSyncInboxRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    syncInbox: function _syncInbox() {
+        if (this.debug) this.logInfo("syncInbox 1.");
+
+        if (this.isOffline) return;
+
+        if ((this.folderBase != "calendar") || (this.folderID)) {
+            if (this.debug) this.logInfo("syncInbox 2.");
+            return;
+        }
+
+        if ((this.weAreInboxSyncing) || (!this.doPollInbox) || (this.OnlyShowAvailability)) {
+            if (this.debug) this.logInfo("syncInbox 3.");
+            return;
+        }
+
+        this.inboxPoller.cancel();
+
+        var self = this;
+        this.weAreInboxSyncing = true;
+
+        //if (this.debug) this.logInfo("syncInbox 2.");
+        this.addToQueue(erSyncInboxRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                folderBase: 'inbox',
+                folderID: null,
+                changeKey: null,
+                syncState: this.syncInboxState,
+                actionStart: Date.now()
+            },
+            function (erSyncInboxRequest, creations, updates, deletions, syncState) {
+                self.syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState);
+            },
+            function (erSyncInboxRequest, aCode, aMsg) {
+                self.syncInboxError(erSyncInboxRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    removeMeetingItem: function _removeMeetingItem(aRequestItem) {
+        var self = this;
+
+        if (this.debug) this.logInfo("Going to remove meetingItem:" + aRequestItem.title);
+        this.addToQueue(erDeleteItemRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: 'inbox',
+                serverUrl: this.serverUrl,
+                item: null,
+                folderID: null,
+                id: aRequestItem.id,
+                changeKey: aRequestItem.changeKey,
+                itemType: "meeting"
+            },
+            function (erDeleteItemRequest) {
+                self.removeMeetingItemOk(erDeleteItemRequest);
+            },
+            function (erDeleteItemRequest, aCode, aMsg) {
+                self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    removeResponseItem: function _removeResponseItem(aResponse) {
+        var self = this;
+
+        //		if (this.debug) this.logInfo("Going to remove responseItem:"+xml2json.getAttributeByTag(aResponse, "t:Subject")+" from:"+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:Name")+" ("+aResponse.getTag("t:Sender").getTag("t:Mailbox").getTagValue("t:EmailAddress")+")");
+        if (this.debug) this.logInfo("Going to remove responseItem:" + xml2json.getAttributeByTag(aResponse, "t:Subject"));
+        this.addToQueue(erDeleteItemRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: 'inbox',
+                serverUrl: this.serverUrl,
+                item: null,
+                folderID: null,
+                id: xml2json.getAttributeByTag(aResponse, "t:ItemId", "Id"),
+                changeKey: xml2json.getAttributeByTag(aResponse, "t:ItemId", "ChangeKey"),
+                itemType: "response"
+            },
+            function (erDeleteItemRequest) {
+                self.removeMeetingItemOk(erDeleteItemRequest);
+            },
+            function (erDeleteItemRequest, aCode, aMsg) {
+                self.removeMeetingItemError(erDeleteItemRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    removeMeetingItemOk: function _removeMeetingItemOk(erDeleteItemRequest) {
+        this.notConnected = false;
+        this.saveCredentials(erDeleteItemRequest.argument);
+        if (this.debug) this.logInfo("removeItemOk: " + erDeleteItemRequest.argument.itemType);
+
+    },
+
+    removeMeetingItemError: function _removeMeetingItemError(erDeleteItemRequest, aCode, aMsg) {
+        this.saveCredentials(erDeleteItemRequest.argument);
+        this.notConnected = true;
+        if (this.debug) this.logInfo("removeItemError: " + erDeleteItemRequest.argument.itemType + " msg:" + String(aMsg));
+    },
+
+    syncInboxOK: function _syncInboxOK(erSyncInboxRequest, creations, updates, deletions, syncState) {
+        if (this.debug) this.logInfo("syncInboxOk.");
+        this.notConnected = false;
+        this.saveCredentials(erSyncFolderItemsRequest.argument);
+
+        if ((creations.meetingrequests.length > 0) || (updates.meetingrequests.length > 0) || (deletions.meetingrequests.length > 0)) {
+            this.addActivity(calGetString("calExchangeCalendar", "syncInboxRequests", [creations.meetingrequests.length, updates.meetingrequests.length, deletions.meetingrequests.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
+            this.refresh();
+        }
+
+        if ((creations.meetingCancellations.length > 0) || (updates.meetingCancellations.length > 0) || (deletions.meetingCancellations.length > 0)) {
+            this.addActivity(calGetString("calExchangeCalendar", "syncInboxCancelations", [creations.meetingCancellations.length, updates.meetingCancellations.length, deletions.meetingCancellations.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
+            this.refresh();
+        }
+
+        if ((creations.meetingResponses.length > 0) || (updates.meetingResponses.length > 0) || (deletions.meetingResponses.length > 0)) {
+            this.addActivity(calGetString("calExchangeCalendar", "syncInboxResponses", [creations.meetingResponses.length, updates.meetingResponses.length, deletions.meetingResponses.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
+            this.refresh();
+        }
+
+        // Do something with the output.
+        if ((this.syncInboxState) && (syncState == this.syncInboxState)) {
+            this.logError("Same syncState received.");
+        }
+
+        this.syncInboxState = syncState;
+        //this.prefs.setCharPref("syncInboxState", syncState);
+        this.saveToFile("syncInboxState.txt", syncState);
+
+        if ((creations.meetingrequests.length == 0) && (updates.meetingrequests.length == 0) && (deletions.meetingrequests.length == 0)
+            && (creations.meetingCancellations.length == 0) && (updates.meetingCancellations.length == 0) && (deletions.meetingCancellations.length == 0)
+            && (creations.meetingResponses.length == 0) && (updates.meetingResponses.length == 0) && (deletions.meetingResponses.length == 0)) {
+            if (this.debug) this.logInfo("syncInboxOk: No new, changed or deleted meetingrequests, meetingCancellations and meetingresponses.");
+            this.weAreInboxSyncing = false;
+            this.startSyncInboxPoller();
+
+            return;
+        }
+
+        // Do something with the results.
+        //		if (this.debug) this.logInfo("syncInboxOK meetingrequests: Creation:"+creations.meetingrequests.length+", Updates:"+updates.meetingrequests.length+", Deletions:"+deletions.meetingrequests.length);
+        //		if (this.debug) this.logInfo("syncInboxOK meetingCancellations: Creation:"+creations.meetingCancellations.length+", Updates:"+updates.meetingCancellations.length+", Deletions:"+deletions.meetingCancellations.length);
+
+        // Save requests into cache.
+        if (creations.meetingrequests.length > 0) {
+            for each(var request in creations.meetingrequests) {
+                var meetingItem = this.convertExchangeAppointmentToCalAppointment(request, true);
+                if (meetingItem) {
+                    if (this.debug) this.logInfo(" -- MeetingRequest creation:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
+                    meetingItem.setProperty("X-MEETINGREQUEST", true);
+                    meetingItem.setProperty("STATUS", "NONE")
+                        //this.meetingRequestsCache[request.getTagValue("t:UID")] = meetingItem;
+                    this.meetingRequestsCache[meetingItem.id] = meetingItem;
+                }
+            }
+        }
+
+        if (updates.meetingrequests.length > 0) {
+            for each(var update in updates.meetingrequests) {
+                var meetingItem = this.convertExchangeAppointmentToCalAppointment(update, true);
+                if (meetingItem) {
+                    if (this.debug) this.logInfo(" -- MeetingRequest update:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
+                    meetingItem.setProperty("X-MEETINGREQUEST", true);
+
+                    if ((this.meetingRequestsCache[update.id]) && (this.meetingRequestsCache[update.id].uid == meetingItem.uid)) {
+                        if (this.debug) this.logInfo("2 modifing  meeting request:" + update.id);
+                        //					this.meetingRequestsCache[update.getTagValue("t:UID")] = meetingItem;
+                        this.meetingRequestsCache[meetingItem.id] = meetingItem;
+                    }
+                    else {
+                        if (this.debug) this.logInfo("WE DO NOT HAVE AN MEETING IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
+                    }
+                }
+            }
+        }
+
+        if (deletions.meetingrequests.length > 0) {
+            for each(var deletion in deletions.meetingrequests) {
+                var meetingItem = this.convertExchangeAppointmentToCalAppointment(deletion, true);
+                if (meetingItem) {
+                    if (this.debug) this.logInfo(" -- MeetingRequest deletion:" + meetingItem.title + ", UID:" + meetingItem.uid + ",id:" + meetingItem.id + ",changeKey:" + meetingItem.changeKey);
+                    meetingItem.setProperty("X-MEETINGREQUEST", true);
+                    this.removeFromMeetingRequestCache(deletion.id);
+                    this.meetingrequestAnswered[deletion.id] = false;
+                }
+            }
+        }
+
+        // Save cancelations into cache and remove request for which we received a cancelation.
+        if (creations.meetingCancellations.length > 0) {
+            for each(var request in creations.meetingCancellations) {
+                var cancelItem = this.convertExchangeAppointmentToCalAppointment(request, true);
+                if (cancelItem) {
+                    if (this.debug) this.logInfo(" -- MeetingCancelation creation:" + cancelItem.title + ", UID:" + cancelItem.uid + ",id:" + cancelItem.id + ",changeKey:" + cancelItem.changeKey);
+                    cancelItem.setProperty("X-MEETINGCANCELATION", true);
+                    this.meetingCancelationsCache[request.id] = cancelItem;
+                }
+            }
+        }
+
+        if (updates.meetingCancellations.length > 0) {
+            for each(var update in updates.meetingCancellations) {
+                var cancelItem = this.convertExchangeAppointmentToCalAppointment(update, true);
+                if (cancelItem) {
+                    cancelItem.setProperty("X-MEETINGCANCELATION", true);
+                    if (this.meetingCancelationsCache[update.id].uid == cancelItem.uid) {
+                        this.meetingCancelationsCache[update.id] = meetingItem;
+                    }
+                    else {
+                        if (this.debug) this.logInfo("WE DO NOT HAVE A MEETING IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
+                    }
+                }
+            }
+        }
+
+        if (deletions.meetingCancellations.length > 0) {
+            for each(var deletion in deletions.meetingCancellations) {
+                delete this.meetingCancelationsCache[deletion.id];
+            }
+        }
+
+        var requestCount = 0;
+        var cancelationCount = 0;
+        var tmpInCalendarCache = {};
+        for each(var index in this.meetingRequestsCache) {
+            if (index) {
+                // Remove request for which we have an calendaritem which is confirmed
+                var tmpID = index.id;
+                var tmpUID = index.uid;
+                var inCalendar = null;
+
+                // First check recurring Masters
+                if (this.recurringMasterCache[tmpUID]) {
+                    inCalendar = this.recurringMasterCache[tmpUID];
+                }
+
+                // Check single items
+                if (!inCalendar) {
+                    for each(var item in this.itemCacheById) {
+                        if ((item) && (item.uid == tmpUID)) {
+                            inCalendar = item;
+                            break;
+                        }
+                    }
+                }
+
+                var confirmed = false;
+
+                // We turn this off for now (10-12-2011) This so meeting update items in mailbox are not removed.
+                /*if (inCalendar) {
+                	//if (this.debug) this.logInfo("request '"+inCalendar.title+"' allready in Calendar with status="+inCalendar.getProperty("STATUS"));
+                	//var newItem = 
+                	confirmed = (inCalendar.getProperty("STATUS") != "NONE");
+                	tmpInCalendarCache[tmpUID] = inCalendar;
+                }*/
+
+                if (confirmed) {
+                    // Remove request. Meeting is in calendar and confirmed.
+                    this.removeMeetingItem(index);
+                    this.removeFromMeetingRequestCache(tmpID);
+                    //this.meetingRequestsCache[tmpUID] = null;
+                    this.meetingrequestAnswered[tmpID] = false;
+                }
+                else {
+                    // Keep this request
+                    requestCount++;
+                    //if (this.debug) this.logInfo("meetingRequest:"+index.getTagValue("t:Subject"));
+
+                    // This is a new request. Check if we should autorespond.
+                    if (!this.meetingrequestAnswered[tmpID]) {
+                        this.meetingrequestAnswered[tmpID] = false;
+                    }
+
+                    if ((this.doAutoRespondMeeting) && (this.meetingrequestAnswered[tmpID] === false)) {
+
+                        var bodyText = null;
+                        if (this.sendAutoRespondMeetingRequestMessage) {
+                            bodyText = this.autoRespondMeetingRequestMessage;
+                            this.addActivity(calGetString("calExchangeCalendar", "sendAutoRespondMeetingRequestMessage", [index.title, this.name], "exchangecalendar"), "", Date.now(), Date.now());
+
+                        }
+
+                        if (inCalendar) {
+                            //var aItem = inCalendar.clone();
+                            var aItem = this.cloneItem(inCalendar);
+                            this.sendMeetingRespons(aItem, null, "existing", this.autoResponseAnswer, bodyText);
+                        }
+                        else {
+                            //var aItem = index.clone();
+                            var aItem = this.cloneItem(index);
+                            this.sendMeetingRespons(aItem, null, "existing", this.autoResponseAnswer, bodyText); // TODO: might have to set new
+                        }
+                        this.meetingrequestAnswered[tmpID] = true;
+                    }
+                }
+
+                // We turn this off for now (10-12-2011) This so meeting update items in mailbox are not removed.
+                /*				if (inCalendar) {
+                					// remove our cached request from calendar otherwise it will appear twice.
+                					this.notifyTheObservers("onDeleteItem", [index]);
+                					this.removeFromMeetingRequestCache(tmpUID);
+                					//this.meetingRequestsCache[tmpUID] == null;
+                					this.meetingrequestAnswered[tmpUID] = false;
+                				}*/
+            }
+        }
+
+        for each(var index in this.meetingCancelationsCache) {
+            if (index) {
+                // Remove cancelation for which we do not have an calendaritem.
+                var tmpID = index.id;
+                var tmpUID = index.uid;
+                var inCalendar = false;
+
+                // First check recurring Masters
+                if (this.recurringMasterCache[tmpUID]) {
+                    inCalendar = this.recurringMasterCache[tmpUID];
+                }
+
+                // Check single items
+                if (!inCalendar) {
+                    for each(var item in this.itemCacheById) {
+                        if ((item) && (item.uid == tmpUID)) {
+                            inCalendar = item;
+                            break;
+                        }
+                    }
+                }
+
+                // Check meetingrequest cache
+                var inCache = false;
+                if (!inCalendar) {
+                    inCalendar = this.meetingRequestsCache[tmpID];
+                    if (inCalendar) {
+                        // We have a cancellation and a request but no item in the calendar
+                        inCache = true;
+                    }
+                }
+
+                if (inCalendar) {
+                    // Keep this cancelation if it is allready confirmed. Or remove it when we we have it only in cache.
+                    if (((inCalendar.getProperty("STATUS") == "NONE") && (this.doAutoRemoveInvitationCancelation1))
+                        || (inCache)) {
+                        // We have an calendaritem for this cancelation but it is not yet confirmed.
+                        // We remove the cancelation and the meetingitem if it is not in cache
+                        // and user specified this in the EWS settings.
+                        if (inCache) {
+                            // We remove it from the cache
+                            if (this.meetingRequestsCache[tmpID]) {
+                                this.removeMeetingItem(this.meetingRequestsCache[tmpID]);
+                                this.removeFromMeetingRequestCache(tmpID);
+                                //this.meetingRequestsCache[tmpUID] = null;
+                            }
+                            this.removeMeetingItem(index);
+                            this.notifyTheObservers("onDeleteItem", [inCalendar]);
+                            this.removeFromMeetingRequestCache(tmpID);
+                            //this.meetingRequestsCache[tmpUID] = null;
+                            this.meetingrequestAnswered[tmpID] = false;
+                            delete this.meetingCancelationsCache[tmpID];
+                        }
+                        else {
+                            // We remove it from the real calendar.
+                            this.removeMeetingItem(index);
+                            this.deleteItem(inCalendar);
+                        }
+                    }
+                    else {
+                        if (!inCalendar.isCancelled) {
+                            if (!this.doAutoRemoveInvitationCancelation2) {
+                                // It is in calendar and allready confirmed. We update the current calendaritem.
+                                // Change title of current calendaritem.
+                                //var newItem = inCalendar.clone();
+                                var newItem = this.cloneItem(inCalendar);
+                                newItem.setProperty("X-IsCancelled", true);
+                                newItem.title = index.title;
+                                // Set status in calendar as free.
+                                newItem.setProperty("TRANSP", "TRANSPARENT");
+                                if (inCache) {
+                                    this.notifyTheObservers("onModifyItem", [newItem, inCalendar]);
+                                    this.meetingRequestsCache[tmpID] = newItem;
+                                }
+                                else {
+                                    this.modifyItem(inCalendar, newItem, null);
+                                }
+                                cancelationCount++;
+                            }
+                            else {
+                                // Remove calendar item and cancellation message
+                                // because user specified so in the EWS settings.
+                                // We remove it from the real calendar and in the inbox.
+                                this.addActivity(calGetString("calExchangeCalendar", "autoRemoveConfirmedInvitationOnCancellation", [inCalendar.title, this.name], "exchangecalendar"), "", Date.now(), Date.now());
+                                inCalendar.setProperty("X-IsCancelled", true);
+                                this.deleteItem(inCalendar);
+                                this.removeMeetingItem(index);
+                                this.removeFromMeetingRequestCache(tmpID);
+                                //this.meetingRequestsCache[tmpUID] = null;
+                            }
+                        }
+                        delete this.meetingCancelationsCache[tmpID];
+                        if (this.debug) this.logInfo("meetingCancelation:" + index.title);
+                    }
+                }
+                else {
+                    // Meeting is not in calendar yet. We remove it if user specified it
+                    // as a setting in EWS settings.
+                    if (this.doAutoRemoveInvitationCancelation1) {
+                        if (this.meetingRequestsCache[tmpID]) {
+                            this.removeMeetingItem(this.meetingRequestsCache[tmpID]);
+                            this.removeFromMeetingRequestCache(tmpID);
+                            //this.meetingRequestsCache[tmpUID] = null;
+                        }
+                        this.removeMeetingItem(index);
+                        delete this.meetingCancelationsCache[tmpID];
+                    }
+                }
+            }
+        }
+
+        // Process Meetingresponses
+        // Save responses into cache and remove request for which we received a cancelation.
+        for each(var response in creations.meetingResponses) {
+            this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")] = response;
+        }
+
+        for each(var response in updates.meetingResponses) {
+            if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")]) {
+                this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")] = response;
+            }
+            else {
+                if (this.debug) this.logInfo("WE DO NOT HAVE A RESPONSE IN CACHE FOR THIS UPDATE!!!!. PLEASE REPORT");
+            }
+        }
+
+        for each(var response in deletions.meetingResponses) {
+            if (this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")]) {
+                delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")];
+            }
+        }
+
+
+        if (this.doAutoRemoveInvitationResponse1) {
+            for each(var response in this.meetingResponsesCache) {
+                // Check if we have this meeting 
+                var tmpUID = xml2json.getTagValue(response, "t:UID");
+                var inCalendar = false;
+
+                // First check recurring Masters
+                if (this.recurringMasterCache[tmpUID]) {
+                    inCalendar = this.recurringMasterCache[tmpUID];
+                }
+
+                // Check single items
+                if (!inCalendar) {
+                    for each(var item in this.itemCacheById) {
+                        if ((item) && (item.uid == tmpUID)) {
+                            inCalendar = item;
+                            break;
+                        }
+                    }
+                }
+
+                if (inCalendar) {
+                    // Check if we are the organiser of this item.
+                    var iAmOrganizer = ((inCalendar.organizer) && (inCalendar.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
+                    if (!iAmOrganizer) {
+                        // Remove the response in the inbox. Do not update calendar.
+                        this.removeResponseItem(response);
+                        delete this.meetingResponsesCache[xml2json.getAttributeByTag(response, "t:ItemId", "Id")];
+                    }
+                }
+            }
+        }
+
+        this.weAreInboxSyncing = false;
+
+        if ((requestCount > 0) || (cancelationCount > 0)) {
+            this.refresh();
+        }
+
+        if (this.debug) this.logInfo("syncInboxOK: left with meetingRequests:" + requestCount + ", meetingCancelations:" + cancelationCount);
+
+        this.startSyncInboxPoller();
+    },
+
+    startSyncInboxPoller: function _startSyncInboxPoller() {
+        if (!this.doPollInbox) {
+            return;
+        }
+
+        this.inboxPoller.cancel();
+        let self = this;
+        this.inboxPoller.initWithCallback({
+            notify: function setTimeout_notify() {
+                self.syncInbox();
+            }
+        }, this.pollInboxInterval * 1000, this.inboxPoller.TYPE_REPEATING_SLACK);
+    },
+
+    syncInboxError: function _syncInboxError(erSyncFolderItemsRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("syncInboxError");
+        this.saveCredentials(erSyncFolderItemsRequest.argument);
+        this.notConnected = true;
+        this.weAreInboxSyncing = false;
+        //this.processItemSyncQueue();
+
+        this.startSyncInboxPoller();
+    },
+
+    doAvailability: function _doAvailability(aCalId, aCi) {
+        const x = Ci.calIFreeBusyInterval;
+
+        const types = {
+            "Free": x.FREE,
+            "Tentative": x.BUSY_TENTATIVE,
+            "Busy": x.BUSY,
+            "OOF": x.BUSY_UNAVAILABLE,
+            "NoData": x.UNKNOWN
+        };
+
+        var start = null;
+        if (xml2json.getTagValue(aCi, "t:StartTime", null)) {
+            if (this.isVersion2007) {
+                start = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:StartTime", null), this.globalFunctions.ecUTC());
+            }
+            else {
+                start = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:StartTime", null), this.globalFunctions.ecDefaultTimeZone());
+            }
+        }
+
+        var end = null;
+        if (xml2json.getTagValue(aCi, "t:EndTime", null)) {
+            if (this.isVersion2007) {
+                end = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:EndTime", null), this.globalFunctions.ecUTC());
+            }
+            else {
+                end = cal.fromRFC3339(xml2json.getTagValue(aCi, "t:EndTime", null), this.globalFunctions.ecDefaultTimeZone());
+            }
+        }
+
+        //		var start = this.tryToSetDateValue(aCi.getTagValue("t:StartTime"));
+        //		var end   = this.tryToSetDateValue(aCi.getTagValue("t:EndTime"));
+        var type = types[xml2json.getTagValue(aCi, "t:BusyType")];
+        return new cal.FreeBusyInterval(aCalId, type,
+            start, end);
+    },
+
+    md5: function _md5(aString) {
+
+        if (!aString) {
+            return "";
+        }
+
+        var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+        createInstance(Ci.nsIScriptableUnicodeConverter);
+
+        // we use UTF-8 here, you can choose other encodings.
+        converter.charset = "UTF-8";
+        // result is an out parameter,
+        // result.value will contain the array length
+        var result = {};
+        // data is an array of bytes
+        var data = converter.convertToByteArray(aString, result);
+        var ch = Cc["@mozilla.org/security/hash;1"]
+            .createInstance(Ci.nsICryptoHash);
+        ch.init(ch.MD5);
+        ch.update(data, data.length);
+        return ch.finish(true);
+    },
+
+    getUserAvailabilityRequestOK: function _getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents) {
+        this.notConnected = false;
+        if (this.debug) this.logInfo("getUserAvailabilityRequestOK: aEvents.length:" + aEvents.length + ", this.folderIsNotAvailable:" + this.folderIsNotAvailable);
+        this.saveCredentials(erGetUserAvailabilityRequest.argument);
+
+        var items = new Array();
+        if (this.OnlyShowAvailability) {
+            this.updateCalendar(erGetUserAvailabilityRequest, aEvents, true, false, false);
+            aEvents = null;
+            erGetUserAvailabilityRequest = null;
+        }
+        else {
+            for (var index in aEvents) {
+                var item = this.doAvailability(erGetUserAvailabilityRequest.argument.calId, aEvents[index]);
+                items.push(item);
+            }
+
+            if (erGetUserAvailabilityRequest.listener) {
+                erGetUserAvailabilityRequest.listener.onResult(null, items);
+            }
+        }
+    },
+
+    getUserAvailabilityRequestError: function _getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg) {
+        this.saveCredentials(erGetUserAvailabilityRequest.argument);
+
+        if (aCode != -7) {
+            this.notConnected = true;
+        }
+
+        if (this.OnlyShowAvailability) {
+            if (this.debug) this.logInfo("getUserAvailabilityRequestError: this.OnlyShowAvailability:" + this.OnlyShowAvailability);
+            this.OnlyShowAvailability = false;
+        }
+        else {
+            if (erGetUserAvailabilityRequest.listener) {
+                erGetUserAvailabilityRequest.listener.onResult(null, null);
+            }
+        }
+    },
+
+    resetCalendar: function _resetCalendar() {
+        if (this.debug) this.logInfo(" resetCalendar 1a");
+
+        try {
+
+            // Clean the job queue.
+            this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
+            this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
+
+            this.offlineQueue = [];
+
+            this.doReset = true;
+
+            this.resetStart = Date.now();
+
+            this.inboxPoller.cancel();
+
+            if (this.offlineTimer) {
+                this.offlineTimer.cancel();
+            }
+            this.offlineTimer = null;
+
+            if (this.calendarPoller) {
+                this.calendarPoller.cancel();
+            }
+
+            //dump("\resetCalendar\n");
+            var myAuthPrompt2 = Cc["@1st-setup.nl/exchange/authprompt2;1"].getService(Ci.mivExchangeAuthPrompt2);
+            myAuthPrompt2.removeUserCanceled(this.serverUrl);
+        }
+        catch (err) {
+            dump("\n EROROR:" + err + "\n");
+        }
+
+        if (this.getProperty("disabled")) {
+            // Remove all items in cache from calendar.
+            if (this.debug) this.logInfo("Calendar is disabled. So we are done resetting.");
+            for (var index in this.itemCacheById) {
+                if (this.itemCacheById[index]) {
+                    this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
+                }
+            }
+            this.doReset = false;
+        }
+        else {
+            this.performReset();
+        }
+    },
+
+    performReset: function _performReset() {
+        if (this.debug) this.logInfo(" performReset 1");
+
+        if (!this.doReset) {
+            return;
+        }
+
+        this.doReset = false;
+
+        // Clean the job queue again.
+        this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
+
+        this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
+
+        this.offlineQueue = [];
+
+        // Now we can initialize.
+        this.syncState = null;
+        //this.prefs.deleteBranch("syncState");
+        this.removeFile("syncState.txt");
+        if (this.folderBase == "tasks") {
+            this.syncStateInbox = null;
+            this.removeFile("syncStateInbox.txt");
+        }
+        this.weAreSyncing = false;
+        this.firstSyncDone = false;
+
+        // Remove all items in cache from calendar.
+        //this.observers.notify("onStartBatch");
+        for (var index in this.itemCacheById) {
+            if (this.itemCacheById[index]) {
+                this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
+                /*if (this.itemCacheById[index].className) {
+                	this.itemCacheById[index].deleteItem();
+                }
+                this.itemCacheById[index] = null;
+                delete this.itemCacheById[index];*/
+                this.removeItemFromCache(this.itemCacheById[index]);
+
+            }
+        }
+        //this.observers.notify("onEndBatch");
+
+        // Reset caches.
+        this.itemCacheById = {};
+        this.itemCacheByStartDate = {};
+        this.itemCacheByEndDate = {};
+
+        for (var index in this.recurringMasterCache) {
+            if (this.recurringMasterCache[index]) {
+                this.recurringMasterCache[index].deleteItem();
+                this.recurringMasterCache[index] = null;
+                delete this.recurringMasterCache[index];
+            }
+        }
+        this.recurringMasterCache = {};
+        this.recurringMasterCacheById = {};
+
+        if (this.startDate) {
+            var oldBeginDate = this.startDate.clone();
+        }
+        else {
+            if (this.debug) this.logInfo(" THIS IS STRANGE beginDate");
+            var oldBeginDate = now();
+        }
+        if (this.endDate) {
+            var oldEndDate = this.endDate.clone();
+        }
+        else {
+            if (this.debug) this.logInfo(" THIS IS STRANGE endDate");
+            var oldEndDate = now();
+        }
+
+        this.startDate = null;
+        this.endDate = null;
+
+        // Reload calendar on currently known dateRanges.
+        for (var index in this.meetingRequestsCache) {
+            if (this.meetingRequestsCache[index]) {
+                this.notifyTheObservers("onDeleteItem", [this.meetingRequestsCache[index]]);
+                this.removeFromMeetingRequestCache(index);
+                //this.meetingRequestsCache[index] = null;
+                this.meetingrequestAnswered[index] = false;
+            }
+        }
+        this.meetingRequestsCache = [];
+        this.meetingCancelationsCache = [];
+        this.meetingrequestAnswered = [];
+        this.meetingResponsesCache = [];
+        this.syncInboxState = null;
+        //this.prefs.deleteBranch("syncInboxState");
+        this.removeFile("syncInboxState.txt");
+        this.weAreInboxSyncing = false;
+
+        this.supportsTasks = false;
+        this.supportsEvents = false;
+
+        //this.mUseOfflineCache = null;
+
+        this.firstrun = true;
+
+        this.performStartup();
+
+        if (this.debug) this.logInfo("oldBeginDate:" + oldBeginDate.toString() + ", oldEndDate:" + oldEndDate.toString());
+        this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO
+            + Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, oldBeginDate, oldEndDate, null);
+
+        // Make an event for thistory.
+        this.addActivity(calGetString("calExchangeCalendar", "resetEventMessage", [this.name], "exchangecalendar"), "", this.resetStart, Date.now());
+        if (this.debug) this.logInfo(" performReset 2");
+    },
+
+    addActivity: function _addActivity(aTitle, aText, aStartDate, aEndDate) {
+        if (!gActivityManager) {
+            return;
+        }
+
+        let event = Cc["@mozilla.org/activity-event;1"].createInstance(nsIAE);
+
+        event.init(aTitle,
+            null,
+            aText,
+            aStartDate,
+            aEndDate);
+
+        gActivityManager.addActivity(event);
+    },
+
+    makeRecurrenceRule: function _makeRecurrenceRule(aItem, e) {
+        if (!aItem.parentItem) {
+            return;
+        }
+
+        if (!aItem.recurrenceInfo || aItem.parentItem.id != aItem.id) {
+            if (!aItem.recurrenceInfo) {
+                if (this.debug) this.logInfo("makeRecurrenceRule: We have no recurrenceInfo");
+            }
+            if (aItem.parentItem.id != aItem.id) {
+                if (this.debug) this.logInfo("makeRecurrenceRule: We have aItem.parentItem.id != aItem.id");
+            }
+            return;
+        }
+
+        var rrule = null;
+        for each(var ritem in aItem.recurrenceInfo.getRecurrenceItems({})) {
+            if (calInstanceOf(ritem, Ci.calIRecurrenceRule)) {
+                rrule = ritem;
+                if (this.debug) this.logInfo(" ;;;; rrule:" + rrule.icalProperty.icalString);
+                //break;
+            }
+        }
+
+        if (!rrule) {
+            // XXX exception?
+            if (this.debug) this.logInfo("makeRecurrenceRule: We have no rrule");
+            return;
+        }
+
+        var r = e.addChildTag("Recurrence", "nsTypes", null);
+
+        /* can't get parameters of RRULEs... have to do it manually :/ */
+        var prop = {};
+        for each(let ps in rrule.icalProperty.value.split(';')) {
+            let m = ps.split('=');
+            prop[m[0]] = m[1];
+        }
+
+        var startDate;
+        var originalDate;
+        if (isEvent(aItem)) {
+            startDate = aItem.startDate.clone();
+            originalDate = aItem.startDate.clone();
+        }
+        else {
+            if (aItem.entryDate) {
+                startDate = aItem.entryDate.clone();
+                startDate.isDate = false;
+                originalDate = aItem.entryDate.clone();
+            }
+        }
+
+        if (startDate) {
+            var startDate = startDate.clone();
+        }
+        else {
+            var startDate = cal.now();
+        }
+        startDate.isDate = true;
+
+        prop["BYMONTHDAY"] = prop["BYMONTHDAY"] || startDate.day;
+        prop["BYMONTH"] = prop["BYMONTH"] || (startDate.month + 1);
+
+        switch (rrule.type) {
+        case 'YEARLY':
+            if (prop["BYDAY"]) {
+                var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
+                var ryr = r.addChildTag("RelativeYearlyRecurrence", "nsTypes", null);
+                ryr.addChildTag("DaysOfWeek", "nsTypes", dayRevMap[m[2]]);
+                ryr.addChildTag("DayOfWeekIndex", "nsTypes", dayRevMap[m[1]]);
+                ryr.addChildTag("Month", "nsTypes", monthIdxMap[prop["BYMONTH"] - 1]);
+            }
+            else {
+                var ayr = r.addChildTag("AbsoluteYearlyRecurrence", "nsTypes", null);
+                ayr.addChildTag("DayOfMonth", "nsTypes", prop["BYMONTHDAY"]);
+                ayr.addChildTag("Month", "nsTypes", monthIdxMap[prop["BYMONTH"] - 1]);
+            }
+            break;
+        case 'MONTHLY':
+            if (prop["BYDAY"]) {
+                var rmr = r.addChildTag("RelativeMonthlyRecurrence", "nsTypes", null);
+                rmr.addChildTag("Interval", "nsTypes", rrule.interval);
+                var m = prop["BYDAY"].match(/^(-?\d)(..)$/);
+                rmr.addChildTag("DaysOfWeek", "nsTypes", dayRevMap[m[2]]);
+                rmr.addChildTag("DayOfWeekIndex", "nsTypes", weekRevMap[m[1]]);
+            }
+            else {
+                var amr = r.addChildTag("AbsoluteMonthlyRecurrence", "nsTypes", null);
+                amr.addChildTag("Interval", "nsTypes", rrule.interval);
+                amr.addChildTag("DayOfMonth", "nsTypes", prop["BYMONTHDAY"]);
+            }
+            break;
+        case 'WEEKLY':
+            var wr = r.addChildTag("WeeklyRecurrence", "nsTypes", null);
+            wr.addChildTag("Interval", "nsTypes", rrule.interval);
+            var days = [];
+            var daystr = prop["BYDAY"] || dayIdxMap[startDate.weekday];
+            for each(let day in daystr.split(",")) {
+                days.push(dayRevMap[day]);
+            }
+            wr.addChildTag("DaysOfWeek", "nsTypes", days.join(' '));
+            break;
+        case 'DAILY':
+            if (prop["BYDAY"]) {
+                var wr = r.addChildTag("WeeklyRecurrence", "nsTypes", null);
+                wr.addChildTag("Interval", "nsTypes", rrule.interval);
+                var days = [];
+                var daystr = prop["BYDAY"];
+                for each(let day in daystr.split(",")) {
+                    days.push(dayRevMap[day]);
+                }
+                wr.addChildTag("DaysOfWeek", "nsTypes", days.join(' '));
+            }
+            else {
+                var dr = r.addChildTag("DailyRecurrence", "nsTypes", null);
+                dr.addChildTag("Interval", "nsTypes", rrule.interval);
+            }
+            break;
+        }
+
+        if (isEvent(aItem)) {
+            var startDateStr = cal.toRFC3339(startDate.getInTimezone(this.globalFunctions.ecUTC()));
+            //			var startDateStr = cal.toRFC3339(originalDate.getInTimezone(this.globalFunctions.ecUTC()));
+        }
+        else {
+            // We make a non-UTC datetime value for this.globalFunctions.
+            // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+            //LOG("  ==== tmpStart:"+cal.toRFC3339(tmpStart));
+            var startDateStr = cal.toRFC3339(startDate).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
+        }
+
+        if (rrule.isByCount && rrule.count != -1) {
+            var nr = r.addChildTag("NumberedRecurrence", "nsTypes", null);
+            nr.addChildTag("StartDate", "nsTypes", startDateStr);
+            nr.addChildTag("NumberOfOccurrences", "nsTypes", rrule.count);
+        }
+        else if (!rrule.isByCount && rrule.untilDate) {
+
+            var endDate = rrule.untilDate.clone();
+            if (isEvent(aItem)) {
+                endDate.isDate = true;
+                var endDateStr = cal.toRFC3339(endDate.getInTimezone(this.globalFunctions.ecUTC()));
+            }
+            else {
+                if (!endDate.isDate) {
+                    endDate.isDate = true;
+                    endDate.isDate = false;
+                    var tmpDuration = cal.createDuration();
+                    tmpDuration.days = 1;
+                    endDate.addDuration(tmpDuration);
+
+                    endDate.isDate = true;
+                }
+                var endDateStr = cal.toRFC3339(endDate).substr(0, 19); //cal.toRFC3339(tmpEnd).length-6);
+            }
+            var edr = r.addChildTag("EndDateRecurrence", "nsTypes", null);
+            edr.addChildTag("StartDate", "nsTypes", startDateStr);
+            edr.addChildTag("EndDate", "nsTypes", endDateStr);
+        }
+        else {
+            var ner = r.addChildTag("NoEndRecurrence", "nsTypes", null);
+            ner.addChildTag("StartDate", "nsTypes", startDateStr);
+        }
+
+        /* We won't write WKST/FirstDayOfWeek for now because it is Exchange 2010 and up */
+    },
+
+    getAlarmTime: function _getAlarmTime(aItem) {
+        if (!aItem) {
+            return null;
+        }
+
+        var alarms = aItem.getAlarms({});
+        var alarm = alarms[0];
+        if (!alarm) {
+            return null;
+        }
+
+        switch (alarm.related) {
+        case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+            var alarmTime = alarm.alarmDate;
+            break;
+        case Ci.calIAlarm.ALARM_RELATED_START:
+            if (isEvent(aItem)) {
+                var alarmTime = aItem.startDate.clone();
+            }
+            else {
+                var alarmTime = aItem.entryDate.clone();
+            }
+            alarmTime.addDuration(alarm.offset);
+            break;
+        case Ci.calIAlarm.ALARM_RELATED_END:
+            if (isEvent(aItem)) {
+                var alarmTime = aItem.endDate.clone();
+            }
+            else {
+                var alarmTime = aItem.dueDate.clone();
+            }
+            alarmTime.addDuration(alarm.offset);
+            break;
+        }
+
+        alarmTime = alarmTime.getInTimezone(cal.UTC());
+
+        return alarmTime;
+    },
+
+    getSingleSnoozeState: function _getSingleSnoozeState(e, aSingle) {
+        if (this.debug) this.logInfo("getSingleSnoozeState");
+        var tmpStr = null;
+        var mozSnooze = aSingle.getProperty("X-MOZ-SNOOZE-TIME");
+        if (mozSnooze) {
+            if (aSingle.alarmLastAck) {
+                // We have a X-MOZ-SNOOZE and an alarmLastAck. We are going to check if the LastAck is before the X-MOZ-SNOOZE or after
+                if (this.debug) this.logInfo("We have a X-MOZ-SNOOZE and an alarmLastAck. We are going to check if the LastAck is before the X-MOZ-SNOOZE or after.");
+
+                // if mozSnooze < alarmLastAck it means the last alarm has been Acked and it was a dismiss.
+                // if mozSnooze >= alarmLastAck it means the last alarm was snoozed to a new alarm time in the future.
+                var tmpMozSnooze = cal.createDateTime(mozSnooze);
+                if (tmpMozSnooze.compare(aSingle.alarmLastAck) == -1) {
+                    if (this.debug) this.logInfo("The X-MOZ-SNOOZE is before alarmLastAck. The alarm has been dismissed.");
+                    tmpStr = "4501-01-01T00:00:00Z";
+                }
+                else {
+                    if (this.debug) this.logInfo("The X-MOZ-SNOOZE is after or equal to alarmLastAck. The alarm has been snoozed.");
+                    tmpStr = mozSnooze;
+                }
+            }
+            else {
+                // We have a X-MOZ-SNOOZE and no alarmLastAck. This means we use the X-MOZ-SNOOZE as the next reminder time.
+                if (this.debug) this.logInfo("We have a X-MOZ-SNOOZE and no alarmLastAck. This means no snooze or dismiss yet and we use the X-MOZ-SNOOZE as the next reminder time.");
+                tmpStr = mozSnooze;
+            }
+        }
+        else {
+            if (aSingle.alarmLastAck) {
+                // The alarm has been snoozed or dismissed before and we do not have a X-MOZ-SNOOZE. So it is dismissed.
+                if (this.debug) this.logInfo("The alarm has been snoozed or dismissed before and we do not have a X-MOZ-SNOOZE. So it is dismissed.");
+                tmpStr = "4501-01-01T00:00:00Z";
+            }
+            else {
+                // We have no snooze time and no alarmLastAck this means the alarm was never snoozed or dismissed
+                // We set the next reminder to the alarm time.
+                if (this.getAlarmTime(aSingle)) {
+                    if (this.debug) this.logInfo("We have no snooze time and no alarmLastAck this means the alarm was never snoozed or dismissed. We set the next reminder to the alarm time.");
+                    tmpStr = this.getAlarmTime(aSingle).icalString;
+                }
+                else {
+                    if (this.debug) this.logInfo("We have no snooze time and no alarmLastAck this means the alarm was never snoozed or dismissed AND we have no alarm time skipping PidLidReminderSignalTime.");
+                    tmpStr = null;
+                }
+            }
+        }
+
+        if (tmpStr) {
+            if (this.debug) this.logInfo("We have a new PidLidReminderSignalTime:" + tmpStr);
+            var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+            var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extField.setAttribute("DistinguishedPropertySetId", "Common");
+            extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
+            extField.setAttribute("PropertyType", "SystemTime");
+
+            var newSnoozeTime = cal.createDateTime(tmpStr);
+            newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
+            eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
+        }
+
+        if (this.debug) this.logInfo("getSingleSnoozeState END");
+        return tmpStr;
+    },
+
+    getMasterSnoozeStates: function _getMasterSnoozeStates(e, aMaster, aItem) {
+        if (this.debug) this.logInfo("getMasterSnoozeStates");
+        var tmpStr = "";
+
+        if ((aItem) && (aMaster)) {
+            if (this.debug) this.logInfo("getMasterSnoozeStates: We have an item (occurrence/exception) and a master.");
+            if (aMaster.hasProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime)) {
+                tmpStr = aMaster.getProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime);
+                if (this.debug) this.logInfo("getMasterSnoozeStates: Master has a X-MOZ-SNOOZE-TIME value for this occurrence. startDate:" + aItem.startDate.icalString + ", X-MOZ-SNOOZE-TIME:" + tmpStr);
+
+                // What value does alarmLastAck has?? This will determine what to send to 
+            }
+            else {
+                if (this.debug) this.logInfo("getMasterSnoozeStates: Master has NO X-MOZ-SNOOZE-TIME value for this occurrence. startDate:" + aItem.startDate.icalString);
+
+                // If alarmLastAck for this item is null then the item was dismissed.
+                tmpStr = "";
+            }
+        }
+        else {
+            if (aMaster) {
+                if (this.debug) this.logInfo("getMasterSnoozeStates: We only have a master and no item. We are going to see if a X-MOZ-SNOOZE-TIME- is set for a child event.");
+
+                // We need to get the event for which the alarm is active.
+                var props = aMaster.propertyEnumerator;
+                while (props.hasMoreElements()) {
+                    var prop = props.getNext().QueryInterface(Components.interfaces.nsIProperty);
+                    if (prop.name.indexOf("X-MOZ-SNOOZE-TIME-") == 0) {
+                        if (this.debug) this.logInfo("getMasterSnoozeStates: " + prop.name + "=" + prop.value);
+                        tmpStr = prop.value;
+                        if (this.debug) this.logInfo("getMasterSnoozeStates2: Master has a X-MOZ-SNOOZE-TIME- value. " + prop.name + ":" + tmpStr);
+                        break;
+                    }
+                }
+
+                if (tmpStr == "") {
+                    if (this.debug) this.logInfo("We did not find a X-MOZ-SNOOZE-TIME- for one of the children.");
+
+                    // Nothing smoozed we are going to set it to the next alarm.
+                    if (this.debug) this.logInfo("We did not find a childEvent by using the X-MOZ-SNOOZE-TIME-. We are going to find the child by the alarmLastAck of the Master. alarmLastAck:" + aMaster.alarmLastAck);
+                    if (aMaster.alarmLastAck) {
+                        if (this.debug) this.logInfo("Master has an alarmLastAck. We set the alarm to the first child with an alarm after alarmLastAck.");
+                        var prevTime = aMaster.alarmLastAck.clone();
+                    }
+                    else {
+                        if (this.debug) this.logInfo("Master has no alarmLastAck. We set the alarm to the first child with an alarm in the future.");
+                        var prevTime = cal.createDateTime().getInTimezone(cal.UTC());
+                    }
+
+                    var childEvent = null;
+
+                    if (this.debug) this.logInfo("Trying to find a child event with an alarmdate after '" + prevTime.icalString + "'");
+                    var childAlarm = cal.createDateTime("4501-01-01T00:00:00Z");
+                    for (var index in this.itemCacheById) {
+                        if ((this.itemCacheById[index]) && (this.itemCacheById[index].uid == aMaster.uid)) {
+                            var newChildAlarm = this.getAlarmTime(this.itemCacheById[index]);
+                            if ((newChildAlarm) && (newChildAlarm.compare(prevTime) == 1)) {
+                                if (childAlarm.compare(newChildAlarm) == 1) {
+                                    childAlarm = newChildAlarm.clone();
+                                    childEvent = this.itemCacheById[index];
+                                    if (this.debug) this.logInfo("Found child event for which the alarmdate (" + childAlarm.icalString + ") is set after '" + prevTime.icalString + "'");
+                                }
+                            }
+                        }
+                    }
+                    if ((childAlarm) && (childEvent)) {
+                        if (this.debug) this.logInfo("Found a child and we are going to calculate the alarmLastAck based on it.");
+                        tmpStr = this.getAlarmTime(childEvent);
+                        if (tmpStr) {
+                            tmpStr = tmpStr.icalString;
+                            if (this.debug) this.logInfo("This child has the following alarm:" + tmpStr);
+                        }
+                        else {
+                            tmpStr = "";
+                            if (this.debug) this.logInfo("Did not find an alarm time for the child. This is strange..!!");
+                        }
+
+                    }
+                    else {
+                        if (this.debug) this.logInfo("We did not find a child. Unable to set alarmLastAck... Maybe set it to 4501-01-01T00:00:00Z");
+                        tmpStr = "4501-01-01T00:00:00Z";
+                    }
+                }
+            }
+            else {
+                if (this.debug) this.logInfo("Only an item was specified. This is odd this should never happen. Bailing out.");
+                return;
+            }
+        }
+
+        if (tmpStr != "") {
+            var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+
+            var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extField.setAttribute("DistinguishedPropertySetId", "Common");
+            extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
+            extField.setAttribute("PropertyType", "SystemTime");
+
+            var newSnoozeTime = cal.createDateTime(tmpStr);
+            newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
+            eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
+        }
+        if (this.debug) this.logInfo("getMasterSnoozeStates END");
+        return tmpStr;
+    },
+
+    getAlarmLastAck: function _getAlarmLastAck(e, aItem) {
+        if (this.debug) this.logInfo("getAlarmLastAck");
+        var tmpStr = "";
+        return tmpStr;
+    },
+
+    addSnoozeDismissState: function _addSnoozeDismissState(e, aItem, aAlarmTime) {
+        // Check if we have a single item or not
+        var tmpStr = this.getAlarmLastAck(e, aItem);
+
+        if (this.debug) this.logInfo("addSnoozeDismissState: Start1");
+
+        if (aAlarmTime) {
+            if (this.debug) this.logInfo("addSnoozeDismissState: item has alarms");
+
+            var tmpDateTime;
+            var nextReminder = "";
+
+            if ((aItem.id != aItem.parentItem.id) && (aItem.parentItem.recurrenceInfo)) {
+                if (this.debug) this.logInfo("addSnoozeDismissState: Occurrence or Exception");
+                // Find out which one got snoozed/dismisses
+                tmpStr = tmpStr + this.getMasterSnoozeStates(e, aItem.parentItem, aItem);
+            }
+            else {
+                if (aItem.recurrenceInfo) {
+                    if (this.debug) this.logInfo("addSnoozeDismissState: Master");
+                    tmpStr = tmpStr + this.getMasterSnoozeStates(e, aItem, null);
+                }
+                else {
+                    if (this.debug) this.logInfo("addSnoozeDismissState: Single");
+                    nextReminder = this.getSingleSnoozeState(e, aItem)
+                    tmpStr = tmpStr + nextReminder;
+                }
+
+            }
+
+            var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+
+            var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extField.setAttribute("DistinguishedPropertySetId", "Common");
+            extField.setAttribute("PropertyId", MAPI_PidLidReminderSet);
+            extField.setAttribute("PropertyType", "Boolean");
+            //	if (nextReminder.indexOf("4501-01-01T00:00:00Z") > -1) {
+            // Reminder is turned off.
+            //		eprop.nsTypes::Value = "false";
+            //	}
+            //	else {
+            eprop.addChildTag("Value", "nsTypes", "true");
+            //	}
+        }
+        else {
+            if (this.debug) this.logInfo("addSnoozeDismissState: item has no alarms");
+
+            var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+
+            var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extField.setAttribute("DistinguishedPropertySetId", "Common");
+            extField.setAttribute("PropertyId", MAPI_PidLidReminderSet);
+            extField.setAttribute("PropertyType", "Boolean");
+            eprop.addChildTag("Value", "nsTypes", "false");
+        }
+
+        if (this.debug) this.logInfo("addSnoozeDismissState: End:" + tmpStr);
+
+        return tmpStr;
+    },
+
+    convertCalAppointmentToExchangeAppointment: function _convertCalAppointmentToExchangeAppointment(aItem, aAction, isNew) {
+        if (!aAction) {
+            aAction = "modify";
+        }
+
+        // The order in which create items are specified is important.
+        // EWS expects the right order.
+
+        var e = this.globalFunctions.xmlToJxon('<nsTypes:CalendarItem xmlns:nsTypes="' + nsTypesStr + '" xmlns:nsMessages="' + nsMessagesStr + '"/>');
+
+        e.addChildTag("Subject", "nsTypes", aItem.title);
+
+        const privacies = {
+            "PUBLIC": "Normal",
+            "CONFIDENTIAL": "Confidential",
+            "PRIVATE": "Private",
+            null: "Normal"
+        };
+
+        if (privacies[aItem.privacy] == undefined) {
+            e.addChildTag("Sensitivity", "nsTypes", "Normal");
+        }
+        else {
+            e.addChildTag("Sensitivity", "nsTypes", privacies[aItem.privacy]);
+        }
+
+        //var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
+        if (aItem.bodyType == "HTML") {
+            var body = e.addChildTag("Body", "nsTypes", "<html>" + aItem.body + "</html>" || "");
+            body.setAttribute("BodyType", "HTML");
+        }
+        else {
+            var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
+            body.setAttribute("BodyType", "Text");
+        }
+
+        var categories = aItem.getCategories({});
+        var categoriesTag = e.addChildTag("Categories", "nsTypes", null);
+        for each(var category in categories) {
+            categoriesTag.addChildTag("String", "nsTypes", category);
+        }
+
+        var importance = "Normal";
+        if (aItem.priority > 5) {
+            importance = "Low";
+        }
+        if (aItem.priority == 5) {
+            importance = "Normal";
+        }
+        if (aItem.priority < 5) {
+            importance = "High";
+        }
+        if (aItem.priority == 0) {
+            importance = "Normal";
+        }
+        e.addChildTag("Importance", "nsTypes", importance);
+
+        // Precalculate right start and end time for exchange.
+        // If not timezone specified set them to the lightning preference.
+        //		if ((aItem.startDate.timezone.isFloating) && (!aItem.startDate.isDate)) {
+        if (aItem.startDate.timezone.isFloating) {
+            aItem.startDate = aItem.startDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+        }
+
+        //		if ((aItem.endDate.timezone.isFloating) && (!aItem.endDate.isDate)) {
+        if (aItem.endDate.timezone.isFloating) {
+            aItem.endDate = aItem.endDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+        }
+
+        var tmpStart = aItem.startDate.clone();
+        var tmpEnd = aItem.endDate.clone();
+
+        if (aItem.startDate.isDate) {
+            tmpStart.isDate = false;
+            tmpEnd.isDate = false;
+            var tmpDuration = cal.createDuration();
+            tmpDuration.minutes = -1;
+            tmpEnd.addDuration(tmpDuration);
+
+            // We make a non-UTC datetime value for this.globalFunctions.
+            // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+            var exchStart = cal.toRFC3339(tmpStart.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19) + "Z"; //cal.toRFC3339(tmpStart).length-6);
+            var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(this.globalFunctions.ecUTC())).substr(0, 19) + "Z"; //cal.toRFC3339(tmpEnd).length-6);
+        }
+        else {
+            // We set in bias advanced to UCT datetime values for this.globalFunctions.
+            var exchStart = cal.toRFC3339(tmpStart.getInTimezone(cal.UTC()));
+            var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(cal.UTC()));
+        }
+
+        var alarms = aItem.getAlarms({});
+        if (this.debug) this.logInfo("We have '" + alarms.length + "' alarms.");
+        if (alarms.length > 0) {
+
+            // Exchange alarm is always an offset to the start.
+            switch (alarms[0].related) {
+            case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+                if (this.debug) this.logInfo("ALARM_RELATED_ABSOLUTE we are going to calculate a offset from the start.");
+                var newAlarmTime = alarms[0].alarmDate.clone();
+
+                // Calculate offset from start of item.
+                var offset = newAlarmTime.subtractDate(aItem.startDate);
+                break;
+            case Ci.calIAlarm.ALARM_RELATED_START:
+                if (this.debug) this.logInfo("ALARM_RELATED_START this is easy exchange does the same.");
+                var newAlarmTime = aItem.startDate.clone();
+                var offset = alarms[0].offset.clone();
+                break;
+            case Ci.calIAlarm.ALARM_RELATED_END:
+                if (this.debug) this.logInfo("ALARM_RELATED_END we are going to calculate the offset from the start.");
+                var newAlarmTime = aItem.endDate.clone();
+                newAlarmTime.addDuration(alarms[0].offset);
+
+                var offset = newAlarmTime.subtractDate(aItem.startDate);
+                break;
+            }
+
+            e.addChildTag("ReminderIsSet", "nsTypes", "true");
+            if (offset.inSeconds != 0) {
+                e.addChildTag("ReminderMinutesBeforeStart", "nsTypes", String((offset.inSeconds / 60) * -1));
+            }
+            else {
+                e.addChildTag("ReminderMinutesBeforeStart", "nsTypes", "0");
+            }
+
+        }
+        else {
+            e.addChildTag("ReminderIsSet", "nsTypes", "false");
+        }
+
+        // An imported item alreay could have a snooze time set.
+        if (aItem.hasProperty("X-MOZ-SNOOZE-TIME")) {
+            //dump("Item is snoozed. Going to set the snooze time\n");
+            var newSnoozeTime = cal.createDateTime(aItem.getProperty("X-MOZ-SNOOZE-TIME"));
+            newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
+            const MAPI_PidLidReminderSignalTime = "34144";
+
+            var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+            var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extField.setAttribute("DistinguishedPropertySetId", "Common");
+            extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
+            extField.setAttribute("PropertyType", "SystemTime");
+            eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
+
+        }
+
+        if (aItem.uid) {
+            e.addChildTag("UID", "nsTypes", aItem.uid);
+        }
+        else {
+            // TODO: Check if this is still valid..
+            if (aItem.id) {
+                // This is when we accept and an iTIP
+                e.addChildTag("UID", "nsTypes", aItem.id);
+                //aItem.setProperty("X-UID", aItem.id);
+                if (aItem.currenceInfo) {
+                    if (this.debug) this.logInfo("we have recurrence info");
+                    //aItem.setProperty("X-CalendarItemType", "RecurringMaster");
+                    this.recurringMasterCache[aItem.id] = aItem;
+                    this.recurringMasterCacheById[aItem.id] = aItem;
+                }
+                else {
+                    //aItem.setProperty("X-CalendarItemType", "Single");
+                }
+            }
+        }
+
+        const freeBusy = {
+            "TRANSPARENT": "Free",
+            "OPAQUE": "Busy",
+            null: "Busy"
+        };
+
+        const attendeeStatus = {
+            "NEEDS-ACTION": "Unknown",
+            "TENTATIVE": "Tentative",
+            "ACCEPTED": "Accept",
+            "DECLINED": "Decline",
+            null: "Unknown"
+        };
+
+        if (!this.isInvitation(aItem, true)) {
+            if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: Item is not an invitation.\n");
+            e.addChildTag("Start", "nsTypes", exchStart);
+            e.addChildTag("End", "nsTypes", exchEnd);
+
+            e.addChildTag("IsAllDayEvent", "nsTypes", aItem.startDate.isDate);
+
+            e.addChildTag("LegacyFreeBusyStatus", "nsTypes", freeBusy[aItem.getProperty("TRANSP")]);
+
+            e.addChildTag("Location", "nsTypes", aItem.getProperty("LOCATION") || "");
+
+            var attendees = aItem.getAttendees({});
+            var ae;
+
+            for each(var attendee in attendees) {
+                //dump("attendee.role:"+attendee.role+"\n");
+                switch (attendee.role) {
+                case "REQ-PARTICIPANT":
+                    if (!reqAttendees) {
+                        var reqAttendees = e.addChildTag("RequiredAttendees", "nsTypes", null);
+                    }
+                    ae = reqAttendees.addChildTag("Attendee", "nsTypes", null);
+                    break;
+                case "OPT-PARTICIPANT":
+                    if (!optAttendees) {
+                        var optAttendees = e.addChildTag("OptionalAttendees", "nsTypes", null);
+                    }
+                    ae = optAttendees.addChildTag("Attendee", "nsTypes", null);
+                    break;
+                case "CHAIR":
+                    /*					if (!tmpOrganizer) {
+                    						var tmpOrganizer = e.addChildTag("Organizer", "nsTypes", null);
+                    					}
+                    					ae = tmpOrganizer;
+                    					break;*/ // Sadly this is not posible when we create a new item.
+                default:
+                    ae = null;
+                }
+
+                if (ae) {
+                    var mailbox = ae.addChildTag("Mailbox", "nsTypes", null);
+                    mailbox.addChildTag("Name", "nsTypes", attendee.commonName);
+
+                    var tmpEmailAddress = attendee.id.replace(/^mailto:/i, '');
+                    if (tmpEmailAddress.indexOf("@") > 0) {
+                        mailbox.addChildTag("EmailAddress", "nsTypes", tmpEmailAddress);
+                    }
+                    else {
+                        mailbox.addChildTag("EmailAddress", "nsTypes", "unknown@somewhere.com");
+                    }
+                    if (attendee.role != "CHAIR") {
+                        ae.addChildTag("ResponseType", "nsTypes", attendeeStatus[attendee.participationStatus]);
+                    }
+                }
+            }
+
+            this.makeRecurrenceRule(aItem, e);
+
+            if (this.isVersion2007) {
+                e.addChildTag("MeetingTimeZone", "nsTypes", null).setAttribute("TimeZoneName", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
+            }
+            else {
+                e.addChildTag("StartTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
+                e.addChildTag("EndTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpEnd.timezone, tmpEnd));
+            }
+
+        }
+        else {
+            if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: Item is an invitation.\n");
+
+            //return e;
+
+            if ((aItem.hasProperty("X-exchangeITIP1")) && (aItem.getProperty("X-exchangeITIP1") == "true")) {
+                if (this.debug) this.logInfo("This is a message which came from an import or an copy/paste operation or is an invitation from an external party outside our Exchange.");
+
+                e.addChildTag("Start", "nsTypes", exchStart);
+                e.addChildTag("End", "nsTypes", exchEnd);
+
+                e.addChildTag("IsAllDayEvent", "nsTypes", aItem.startDate.isDate);
+
+                e.addChildTag("LegacyFreeBusyStatus", "nsTypes", freeBusy[aItem.getProperty("TRANSP")]);
+
+                e.addChildTag("Location", "nsTypes", aItem.getProperty("LOCATION") || "");
+
+                // Set if the item is from the user itself or not.
+                if (aItem.organizer) {
+                    if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
+                        if (this.debug) this.logInfo(" ## I am the organizer of this meeting.");
+                    }
+                    else {
+                        if (this.debug) this.logInfo(" ## I am NOT the organizer of this meeting.'" + aItem.organizer.id.replace(/^mailto:/i, '') + "' is the organizer.");
+                    }
+                }
+                else {
+                    if (this.debug) this.logInfo(" ## There is not organizer for this meeting.");
+                }
+
+
+                this.makeRecurrenceRule(aItem, e);
+
+                if (this.isVersion2007) {
+                    e.addChildTag("MeetingTimeZone", "nsTypes", null).setAttribute("TimeZoneName", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
+                }
+                else {
+                    e.addChildTag("StartTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpStart.timezone, tmpStart));
+                    e.addChildTag("EndTimeZone", "nsTypes", null).setAttribute("Id", this.getEWSTimeZoneId(tmpEnd.timezone, tmpEnd));
+                }
+
+            }
+        }
+
+        if (this.debug) this.logInfo("convertCalAppointmentToExchangeAppointment: " + String(e));
+
+        return e;
+    },
+
+    convertCalTaskToExchangeTask: function _convertCalTaskToExchangeTask(aItem, aAction) {
+        if (!aAction) {
+            aAction = "modify";
+        }
+
+        var e = this.globalFunctions.xmlToJxon('<nsTypes:Task xmlns:nsTypes="' + nsTypesStr + '" xmlns:nsMessages="' + nsMessagesStr + '"/>');
+
+        e.addChildTag("Subject", "nsTypes", aItem.title);
+
+        const privacies = {
+            "PUBLIC": "Normal",
+            "CONFIDENTIAL": "Confidential",
+            "PRIVATE": "Private",
+            null: "Normal"
+        };
+        if (!aItem.privacy) {
+            e.addChildTag("Sensitivity", "nsTypes", "Normal");
+        }
+        else {
+            e.addChildTag("Sensitivity", "nsTypes", privacies[aItem.privacy]);
+        }
+
+        //var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
+        if (aItem.bodyType == "HTML") {
+            var body = e.addChildTag("Body", "nsTypes", "<html>" + aItem.body + "</html>" || "");
+            body.setAttribute("BodyType", "HTML");
+        }
+        else {
+            var body = e.addChildTag("Body", "nsTypes", aItem.getProperty('DESCRIPTION') || "");
+            body.setAttribute("BodyType", "Text");
+        }
+
+
+        var categories = aItem.getCategories({});
+        var categoriesTag = null;
+        for each(var category in categories) {
+            if (categoriesTag == null) {
+                categoriesTag = e.addChildTag("Categories", "nsTypes", null);
+            }
+            categoriesTag.addChildTag("String", "nsTypes", category);
+        }
+
+        var importance = "Normal";
+        if (aItem.priority > 5) {
+            importance = "Low";
+        }
+        if (aItem.priority == 5) {
+            importance = "Normal";
+        }
+        if (aItem.priority < 5) {
+            importance = "High";
+        }
+        if (aItem.priority == 0) {
+            importance = "Normal";
+        }
+        e.addChildTag("Importance", "nsTypes", importance);
+
+        var alarms = aItem.getAlarms({});
+        if (this.debug) this.logInfo("We have '" + alarms.length + "' alarms.");
+        if (alarms.length > 0) {
+
+            // Exchange alarm for task is always an absolute date and time.
+            switch (alarms[0].related) {
+            case Ci.calIAlarm.ALARM_RELATED_ABSOLUTE:
+                if (this.debug) this.logInfo("ALARM_RELATED_ABSOLUTE.");
+                var newAlarmTime = alarms[0].alarmDate.clone().getInTimezone(cal.UTC());
+                break;
+            case Ci.calIAlarm.ALARM_RELATED_START:
+                if (this.debug) this.logInfo("ALARM_RELATED_START we are going to calculate the absolute.");
+                var newAlarmTime = aItem.entryDate.clone();
+                newAlarmTime.addDuration(alarms[0].offset);
+                break;
+            case Ci.calIAlarm.ALARM_RELATED_END:
+                if (this.debug) this.logInfo("ALARM_RELATED_END we are going to calculate the absolute.");
+                var newAlarmTime = aItem.dueDate.clone();
+                newAlarmTime.addDuration(alarms[0].offset);
+                break;
+            }
+
+            e.addChildTag("ReminderDueBy", "nsTypes", cal.toRFC3339(newAlarmTime));
+            e.addChildTag("ReminderIsSet", "nsTypes", "true");
+        }
+        else {
+            e.addChildTag("ReminderIsSet", "nsTypes", "false");
+        }
+
+
+        /*		// Delegation changes
+        		if (aItem.hasProperty("X-exchWebService-PidLidTaskLastUpdate")) {
+        			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+        			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        			extField.setAttribute("DistinguishedPropertySetId", "Task");
+        			extField.setAttribute("PropertyId", "33045");
+        			extField.setAttribute("PropertyType", "SystemTime");
+        			eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskLastUpdate"));
+        		}
+
+        		if (aItem.hasProperty("X-exchWebService-PidLidTaskHistory")) {
+        			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+        			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        			extField.setAttribute("DistinguishedPropertySetId", "Task");
+        			extField.setAttribute("PropertyId", "33050");
+        			extField.setAttribute("PropertyType", "Integer");
+        			eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskHistory"));
+        		}
+
+        		if (aItem.hasProperty("X-exchWebService-PidLidTaskAccepted")) {
+        			var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+        			var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+        			extField.setAttribute("DistinguishedPropertySetId", "Task");
+        			extField.setAttribute("PropertyId", "33032");
+        			extField.setAttribute("PropertyType", "Boolean");
+        			eprop.addChildTag("Value", "nsTypes", aItem.getProperty("X-exchWebService-PidLidTaskAccepted"));
+        		}
+        */
+
+        // An imported item alreay could have a snooze time set.
+        if (aItem.hasProperty("X-MOZ-SNOOZE-TIME")) {
+            //dump("Item is snoozed. Going to set the snooze time\n");
+            var newSnoozeTime = cal.createDateTime(aItem.getProperty("X-MOZ-SNOOZE-TIME"));
+            newSnoozeTime = newSnoozeTime.getInTimezone(cal.UTC());
+            const MAPI_PidLidReminderSignalTime = "34144";
+
+            var eprop = e.addChildTag("ExtendedProperty", "nsTypes", null);
+            var extField = eprop.addChildTag("ExtendedFieldURI", "nsTypes", null);
+            extField.setAttribute("DistinguishedPropertySetId", "Common");
+            extField.setAttribute("PropertyId", MAPI_PidLidReminderSignalTime);
+            extField.setAttribute("PropertyType", "SystemTime");
+            eprop.addChildTag("Value", "nsTypes", cal.toRFC3339(newSnoozeTime));
+
+        }
+
+        if (aItem.actualWork) {
+            e.addChildTag("ActualWork", "nsTypes", aItem.actualWork);
+        }
+
+        if (aItem.billingInformation) {
+            e.addChildTag("BillingInformation", "nsTypes", aItem.billingInformation);
+        }
+
+        var companiesTag = e.addChildTag("Companies", "nsTypes", null);
+
+        var companies = aItem.getCompanies({});
+        var first = true;
+        for each(var company in companies) {
+            companiesTag.addChildTag("String", "nsTypes", company);
+        }
+
+        if (aItem.completedDate) {
+
+            tmpStart = aItem.completedDate.clone();
+
+            if (tmpStart.timezone.isFloating) {
+                tmpStart = tmpStart.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+            }
+
+            tmpStart = tmpStart.getInTimezone(this.globalFunctions.ecUTC());
+
+            tmpStart.isDate = true;
+            tmpStart.isDate = false;
+            /*	var tmpDuration = cal.createDuration();
+            	tmpDuration.minutes = -1;
+            	tmpStart.addDuration(tmpDuration);*/
+
+            e.addChildTag("CompleteDate", "nsTypes", cal.toRFC3339(tmpStart));
+        }
+
+
+        //		if ((!aItem.parentItem.id) ||
+        //		    (!aItem.recurrenceInfo)) {
+        if (aItem.dueDate) {
+            if (aItem.dueDate.timezone.isFloating) {
+                aItem.dueDate = aItem.dueDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+            }
+
+            e.addChildTag("DueDate", "nsTypes", cal.toRFC3339(aItem.dueDate));
+        }
+
+        if (aItem.mileage) {
+            e.addChildTag("Mileage", "nsTypes", aItem.mileage);
+        }
+
+        if (aItem.percentComplete) {
+            e.addChildTag("PercentComplete", "nsTypes", aItem.percentComplete);
+        }
+        //}
+
+        this.makeRecurrenceRule(aItem, e);
+
+        //		if ((!aItem.parentItem.id) ||
+        //		    (!aItem.recurrenceInfo)) {
+
+        if (aItem.entryDate) {
+            if (aItem.entryDate.timezone.isFloating) {
+                aItem.entryDate = aItem.entryDate.getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+            }
+
+            e.addChildTag("StartDate", "nsTypes", cal.toRFC3339(aItem.entryDate));
+        }
+        //		}
+
+        const statuses = {
+            "NONE": "NotStarted",
+            "IN-PROCESS": "InProgress",
+            "COMPLETED": "Completed",
+            "NEEDS-ACTION": "WaitingOnOthers",
+            "CANCELLED": "Deferred",
+            null: "NotStarted"
+        };
+        if (!statuses[aItem.status]) {
+            e.addChildTag("Status", "nsTypes", "NotStarted");
+        }
+        else {
+            e.addChildTag("Status", "nsTypes", statuses[aItem.status]);
+        }
+
+        if (aItem.totalWork) {
+            e.addChildTag("TotalWork", "nsTypes", aItem.totalWork);
+        }
+
+        if (this.debug) this.logInfo("!!CHANGED:" + String(e));
+
+        return e;
+    },
+
+
+    createItemOk: function _createItemOk(erCreateItemRequest, aId, aChangeKey) {
+        this.notConnected = false;
+        this.saveCredentials(erCreateItemRequest.argument);
+        if (this.debug) this.logInfo("createItemOk 1");
+
+        // Check if we have attachmentsUpdates
+        if ((erCreateItemRequest.argument.attachmentsUpdates) && (erCreateItemRequest.argument.attachmentsUpdates.create.length > 0)) {
+            if (this.debug) this.logInfo("createItemOk We have " + erCreateItemRequest.argument.attachmentsUpdates.create.length + " attachments to create.");
+            var self = this;
+            this.addToQueue(erCreateAttachmentRequest, {
+                    user: this.user,
+                    serverUrl: this.serverUrl,
+                    item: erCreateItemRequest.argument.item,
+                    parentItemId: aId,
+                    parentItemChangeKey: aChangeKey,
+                    attachmentsUpdates: erCreateItemRequest.argument.attachmentsUpdates,
+                    actionStart: Date.now(),
+                    sendto: erCreateItemRequest.argument.sendto
+                },
+                function (erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
+                    self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);
+                },
+                function (erCreateAttachmentRequest, aCode, aMsg) {
+                    self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);
+                },
+                erCreateItemRequest.listener);
+        }
+        else {
+            if (this.debug) this.logInfo("createItemOk We have no attachments to create.");
+
+            if (erCreateItemRequest.listener) {
+                this.notifyOperationComplete(erCreateItemRequest.listener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.ADD,
+                    erCreateItemRequest.argument.item.id,
+                    erCreateItemRequest.argument.item);
+            }
+
+        }
+
+        // Make an event for thistory.
+        if (isEvent(erCreateItemRequest.argument.item)) {
+            this.addActivity(calGetString("calExchangeCalendar", "addCalendarEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erCreateItemRequest.argument.actionStart, Date.now());
+        }
+        else {
+            //this.notifyTheObservers("onAddItem", [newItem]);
+            this.addActivity(calGetString("calExchangeCalendar", "addTaskEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erCreateItemRequest.argument.actionStart, Date.now());
+        }
+
+
+        // We do a refresh to get all details of the new item which EWS added.
+        if ((!erCreateItemRequest.argument.attachmentsUpdates) || (erCreateItemRequest.argument.attachmentsUpdates.create.length == 0)) {
+            this.refresh();
+        }
+    },
+
+    createAttachmentOk: function _createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
+        if (this.debug) this.logInfo("createAttachmentOk");
+        this.notConnected = false;
+
+        if (erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length > 0) {
+            if (this.debug) this.logInfo("We also need to delete some attachments: count=" + erCreateAttachmentRequest.argument.attachmentsUpdates.delete.length);
+            var self = this;
+            this.addToQueue(erDeleteAttachmentRequest, {
+                    user: this.user,
+                    serverUrl: this.serverUrl,
+                    item: erCreateAttachmentRequest.argument.item,
+                    parentItemId: RootItemId,
+                    parentItemChangeKey: RootItemChangeKey,
+                    attachmentsUpdates: erCreateAttachmentRequest.argument.attachmentsUpdates,
+                    sendto: erCreateAttachmentRequest.argument.sendto,
+                    actionStart: Date.now()
+                },
+                function (erDeleteAttachmentRequest, aId, aChangeKey) {
+                    self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);
+                },
+                function (erDeleteAttachmentRequest, aCode, aMsg) {
+                    self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);
+                },
+                erCreateAttachmentRequest.listener);
+            return;
+        }
+        else {
+            if (this.debug) this.logInfo("We have no attachment deletions.");
+            if ((erCreateAttachmentRequest.argument.sendto) && ((erCreateAttachmentRequest.argument.sendto != "sendtonone"))) {
+                // The item we processed was a meeting of which I'm the organiser.
+                // It contained new attachments and we need to send an item update to get it to the invited.
+                if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:" + erCreateAttachmentRequest.argument.sendto);
+                this.doAttachmentUpdatesFinalize(erCreateAttachmentRequest.argument.attachmentsUpdates, erCreateAttachmentRequest.argument.item, RootItemId, RootItemChangeKey, erCreateAttachmentRequest.argument.sendto, erCreateAttachmentRequest.listener);
+                return;
+            }
+            else {
+                if (this.debug) this.logInfo("createAttachmentOk erCreateAttachmentRequest.argument.sendto is not set.");
+                if (erCreateAttachmentRequest.listener) {
+                    this.notifyOperationComplete(erCreateAttachmentRequest.listener,
+                        Cr.NS_OK,
+                        Ci.calIOperationListener.MODIFY,
+                        erCreateAttachmentRequest.argument.item.id,
+                        erCreateAttachmentRequest.argument.item);
+                }
+
+                this.refresh();
+            }
+        }
+    },
+
+    createAttachmentError: function _createAttachmentError(erDeleteAttachmentRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("createAttachmentError: aCode:" + aCode + ", aMsg:" + aMsg);
+        this.notConnected = true;
+
+    },
+
+    deleteAttachmentOk: function _deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey) {
+        if (this.debug) this.logInfo("deleteAttachmentOk");
+        this.notConnected = false;
+
+        // See if we need to update the item when it is an invitation to others
+        // This to get the invitation uncluding the attachments send out.
+        this.addAttachmentsToOfflineCache({
+            man: {
+                calItem: erDeleteAttachmentRequest.argument.item
+            }
+        });
+
+        if ((erDeleteAttachmentRequest.argument.sendto) && ((erDeleteAttachmentRequest.argument.sendto != "sendtonone"))) {
+            // The item we processed was a meeting of which I'm the organiser.
+            // It contained new attachments and we need to send an item update to get it to the invited.
+            if (this.debug) this.logInfo("We had attachment changes and it is a meeting for which we are the organiser send the changed item to the others as specified:" + erDeleteAttachmentRequest.argument.sendto);
+            this.doAttachmentUpdatesFinalize(erDeleteAttachmentRequest.argument.attachmentsUpdates, erDeleteAttachmentRequest.argument.item, aId, aChangeKey, erDeleteAttachmentRequest.argument.sendto, erDeleteAttachmentRequest.listener);
+            return;
+        }
+        else {
+            if (erDeleteAttachmentRequest.listener) {
+                this.notifyOperationComplete(erDeleteAttachmentRequest.listener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.MODIFY,
+                    erDeleteAttachmentRequest.argument.item.id,
+                    erDeleteAttachmentRequest.argument.item);
+            }
+
+            this.refresh();
+        }
+    },
+
+    deleteAttachmentError: function _deleteAttachmentError(erCreateAttachmentRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("deleteAttachmentError");
+        this.notConnected = true;
+    },
+
+    makeUpdateOneItem: function _makeUpdateOneItem(aNewItem, aOldItem, aIndex, aMasterId, aMasterChangeKey, aInvitation) {
+        var upd = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="' + nsTypesStr + '"/>');
+
+        if (!aIndex) {
+            var itemId = upd.addChildTag("ItemId", "nsTypes", null);
+            itemId.setAttribute("Id", aOldItem.id);
+            itemId.setAttribute("ChangeKey", aOldItem.changeKey);
+        }
+        else {
+            var oItemId = upd.addChildTag("OccurrenceItemId", "nsTypes", null);
+            oItemId.setAttribute("RecurringMasterId", aMasterId);
+            oItemId.setAttribute("ChangeKey", aMasterChangeKey);
+            oItemId.setAttribute("InstanceIndex", aIndex);
+        }
+
+        var isInvitation = aInvitation;
+        if (!aInvitation) {
+            isInvitation = false;
+        }
+
+        var onlySnoozeChanged = true;
+
+        var updateObject = aNewItem.updateXML;
+
+        if (updateObject.toString() == '<t:Updates xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"/>') {
+            // Nothing changed
+            return {
+                changes: null,
+                onlySnoozeChanged: false
+            };
+        }
+
+        upd.addChildTagObject(updateObject);
+        updateObject = null;
+        if (aNewItem.nonPersonalDataChanged) {
+            onlySnoozeChanged = false;
+        }
+
+        if (onlySnoozeChanged) {
+            if (this.debug) this.logInfo("onlySnoozeChanged Or reminder time before start.");
+        }
+
+        return {
+            changes: upd,
+            onlySnoozeChanged: onlySnoozeChanged
+        };
+    },
+
+    sendMeetingRespons: function _sendMeetingRespons(aItem, aListener, aItemType, aResponse, aBodyText) {
+        // Check if I'm the organiser. Do not send to myself.
+        if (aItem.organizer) {
+            if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
+                return true;
+            }
+        }
+        var me = this.getInvitedAttendee(aItem);
+        if ((!me) && (!aResponse)) {
+            return false;
+        }
+
+        if (aResponse) {
+            var tmpResponse = aResponse;
+        }
+        else {
+            var tmpResponse = me.participationStatus;
+        }
+
+        var messageDisposition = null;
+
+        // First ask the user if he wants to send a response.
+        // Get the eventsummarywindow to attach dialog to.
+        let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
+            .getService(Ci.nsIWindowMediator);
+        let calWindow = wm.getMostRecentWindow("Calendar:EventSummaryDialog") || cal.getCalendarWindow();
+
+        var preInput = {
+            item: aItem,
+            response: tmpResponse,
+            answer: ""
+        };
+
+        if (calWindow) {
+            calWindow.openDialog("chrome://exchangecalendar/content/preInvitationResponse.xul",
+                "preInvitationResponseId",
+                "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+                preInput);
+        }
+
+        if (preInput.answer != "send") {
+            if (this.debug) this.logInfo("User canceled preInvitationDialog.");
+            return false;
+        }
+
+        var input = {
+            item: aItem,
+            response: tmpResponse,
+            answer: "",
+            proposeStart: "",
+            proposeEnd: "",
+            serverUrl: this.serverUrl,
+            bodyText: ""
+        };
+
+        if (preInput.response == "edit") {
+            // If the user would like to edit his response we show him the window for it.
+            if (this.debug) this.logInfo("User indicated he would like to edit response.");
+            if (aBodyText) {
+                input.bodyText = aBodyText;
+                input.answer = "send";
+            }
+
+            if ((calWindow) && (!aBodyText)) {
+                calWindow.openDialog("chrome://exchangecalendar/content/invitationResponse.xul",
+                    "invitationResponseId",
+                    "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
+                    input);
+            }
+
+            if (input.answer != "send") {
+                if (this.debug) this.logInfo("User canceled invitationDialog.");
+                return false;
+            }
+
+        }
+        else {
+            if (this.debug) this.logInfo("User indicated he does not want to edit the response.");
+            if (preInput.response == "donotsend") {
+                if (this.debug) this.logInfo("User indicated he does not want to send a response.");
+                messageDisposition = "SaveOnly";
+            }
+        }
+        if (this.debug) this.logInfo("  -------------- messageDisposition=" + messageDisposition);
+
+        var proposeStart = this.tryToSetDateValue(input.proposeStart, "");
+        var proposeEnd = this.tryToSetDateValue(input.proposeEnd, "");
+        var proposeNewTime = false;
+
+        if (proposeStart)
+            input.proposeStart = cal.toRFC3339(proposeStart.getInTimezone(this.globalFunctions.ecUTC()));
+        if (proposeEnd)
+            input.proposeEnd = cal.toRFC3339(proposeEnd.getInTimezone(this.globalFunctions.ecUTC()));
+
+        if (input.proposeStart && input.proposeEnd) {
+            proposeNewTime = true;
+        }
+
+        var self = this;
+        this.addToQueue(erSendMeetingResponsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                item: aItem,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                response: input.response,
+                bodyText: input.bodyText,
+                proposeStart: input.proposeStart,
+                proposeEnd: input.proposeEnd,
+                proposeNewTime: proposeNewTime,
+                senderMailbox: this.mailbox,
+                actionStart: Date.now(),
+                itemType: aItemType,
+                messageDisposition: messageDisposition
+            },
+            function (erSendMeetingResponsRequest) {
+                self.sendMeetingResponsOk(erSendMeetingResponsRequest);
+            },
+            function (erSendMeetingResponsRequest, aCode, aMsg) {
+                self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);
+            },
+            aListener);
+        return true;
+    },
+
+    sendMeetingResponsOk: function _sendMeetingResponsOk(erSendMeetingResponsRequest) {
+        if (this.debug) this.logInfo("sendMeetingResponsOk");
+        this.saveCredentials(erSendMeetingResponsRequest.argument);
+        this.notConnected = false;
+
+        if (erSendMeetingResponsRequest.listener) {
+            this.notifyOperationComplete(erSendMeetingResponsRequest.listener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.MODIFY,
+                erSendMeetingResponsRequest.argument.item.id,
+                erSendMeetingResponsRequest.argument.item);
+        }
+
+        if (!erSendMeetingResponsRequest.argument.item.getProperty("X-MEETINGREQUEST")) {
+            //this.notifyTheObservers("onModifyItem", [erSendMeetingResponsRequest.argument.item, this.itemCacheById[erSendMeetingResponsRequest.argument.item.id]]);
+            //this.itemCacheById[erSendMeetingResponsRequest.argument.item.id] = erSendMeetingResponsRequest.argument.item;
+            this.addItemToCache(erSendMeetingResponsRequest.argument.item);
+        }
+        else {
+            // From meetingrequest cache. Do not remove meetingrequest from cache this will be done when invitation is removed
+            //this.removeFromMeetingRequestCache(erSendMeetingResponsRequest.argument.item.uid);
+            //this.meetingrequestAnswered[erSendMeetingResponsRequest.argument.item.uid] = false;
+        }
+
+        this.addActivity(calGetString("calExchangeCalendar", "ewsMeetingResponsEventMessage", [erSendMeetingResponsRequest.argument.item.title, erSendMeetingResponsRequest.argument.response, this.name], "exchangecalendar"), erSendMeetingResponsRequest.argument.bodyText, erSendMeetingResponsRequest.argument.actionStart, Date.now());
+        this.refresh();
+    },
+
+    modifyItemgetOccurrenceIndexOk: function _modifyItemgetOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+        if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk");
+        this.saveCredentials(erGetOccurrenceIndexRequest.argument);
+        this.notConnected = false;
+
+        var changesObj = this.makeUpdateOneItem(erGetOccurrenceIndexRequest.argument.newItem, erGetOccurrenceIndexRequest.argument.masterItem, aIndex, aMasterId, aMasterChangeKey);
+        var changes;
+        if (changesObj) {
+            changes = changesObj.changes;
+        }
+        if (changes) {
+
+            // We remove the item from cache and calendar because the update request will add
+            // it again.
+
+            // bug 13.o when we change an occurrence it will send an updated master
+            //	this.notifyTheObservers("onDeleteItem", [this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
+            //	delete this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id];
+            this.notifyTheObservers("onModifyItem", [erGetOccurrenceIndexRequest.argument.newItem, this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id]]);
+            //this.itemCacheById[erGetOccurrenceIndexRequest.argument.newItem.id] = erGetOccurrenceIndexRequest.argument.newItem;
+            this.addItemToCache(erGetOccurrenceIndexRequest.argument.newItem);
+
+
+            var self = this;
+            if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: changed:" + String(changes));
+            this.addToQueue(erUpdateItemRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    item: erGetOccurrenceIndexRequest.argument.masterItem,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    updateReq: changes,
+                    newItem: erGetOccurrenceIndexRequest.argument.newItem,
+                    actionStart: Date.now(),
+                    attachmentsUpdates: erGetOccurrenceIndexRequest.argument.attachmentsUpdates,
+                    sendto: erGetOccurrenceIndexRequest.argument.sendto
+                },
+                function (erUpdateItemRequest, aId, aChangeKey) {
+                    self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+                },
+                function (erUpdateItemRequest, aCode, aMsg) {
+                    self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+                },
+                erGetOccurrenceIndexRequest.listener);
+            return;
+
+        }
+        else {
+            if (this.doAttachmentUpdates(erGetOccurrenceIndexRequest.argument.attachmentsUpdates, erGetOccurrenceIndexRequest.argument.masterItem, erGetOccurrenceIndexRequest.argument.sendto, erGetOccurrenceIndexRequest.listener)) {
+                if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: Only attachment changes no field changes 3.");
+                return;
+            }
+            else {
+                if (this.debug) this.logInfo("modifyItemgetOccurrenceIndexOk: No changes 3.");
+                if (!this.isInvitation(erGetOccurrenceIndexRequest.argument.newItem, true)) {
+                    this.singleModified(erGetOccurrenceIndexRequest.argument.newItem, true);
+                }
+            }
+        }
+
+        if (erGetOccurrenceIndexRequest.listener) {
+            this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.MODIFY,
+                erGetOccurrenceIndexRequest.argument.newItem.id,
+                erGetOccurrenceIndexRequest.argument.newItem);
+        }
+    },
+
+    whichOccurrencegetOccurrenceIndexError: function _whichOccurrencegetOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("whichOccurrencegetOccurrenceIndexError:(" + aCode + ")" + aMsg);
+        this.notConnected = true;
+        this.saveCredentials(erGetOccurrenceIndexRequest.argument);
+
+        if ((aCode == -8) && (aMsg = "ErrorCalendarIsCancelledForDecline")) {
+            if (erGetOccurrenceIndexRequest.listener) {
+                this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.MODIFY,
+                    erGetOccurrenceIndexRequest.argument.newItem.id,
+                    erGetOccurrenceIndexRequest.argument.newItem);
+            }
+            return;
+        }
+
+        // TODO: We need to retry when we get here from adoptItem.
+        //		if ((aCode == -8) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
+        if ((aCode == erGetOccurrenceIndexRequest.ER_ERROR_ER_ERROR_SOAP_ERROR) && (this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id])) {
+            // Probably the item on the EWS server was changed and that
+            // update was not received by us yet.
+            // Do a refresh en retry modification.
+            if (this.debug) this.logInfo("We have a conflict with the server for this update. We are going to refresh and then retry.");
+            this.refresh();
+            //var newItem = erGetOccurrenceIndexRequest.argument.newItem.clone();
+            var newItem = this.cloneItem(erGetOccurrenceIndexRequest.argument.newItem);
+            //var oldItem = this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id].clone();
+            var oldItem = this.cloneItem(this.itemCacheById[erGetOccurrenceIndexRequest.argument.item.id]);
+            if (erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount")) {
+                oldItem.setProperty("X-RetryCount", erGetOccurrenceIndexRequest.argument.item.getProperty("X-RetryCount") + 1);
+            }
+            else {
+                oldItem.setProperty("X-RetryCount", 1);
+            }
+
+            if (this.debug) this.logInfo("X-RetryCount=" + oldItem.getProperty("X-RetryCount"));
+
+            if (oldItem.getProperty("X-RetryCount") < 25) {
+                this.modifyItem(newItem, oldItem, erGetOccurrenceIndexRequest.listener);
+            }
+            else {
+                if (this.debug) this.logInfo("To many update retries. Giving up.");
+                if (erGetOccurrenceIndexRequest.listener) {
+                    this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+                        Ci.calIErrors.READ_FAILED,
+                        Ci.calIOperationListener.MODIFY,
+                        erGetOccurrenceIndexRequest.argument.newItem.id,
+                        erGetOccurrenceIndexRequest.argument.newItem);
+                }
+            }
+        }
+        else {
+            this.addActivity(calGetString("calExchangeCalendar", "ewsErrorEventMessage", [this.name, aMsg, aCode], "exchangecalendar"), aMsg, erGetOccurrenceIndexRequest.argument.actionStart, Date.now());
+
+            var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                .getService(Components.interfaces.nsIPromptService);
+            if (aMsg.indexOf(":") > -1) {
+                var msgStr = aMsg.substr(aMsg.indexOf(":") + 1);
+                switch (msgStr) {
+                case "ErrorCalendarMeetingRequestIsOutOfDate":
+                    msgStr = "Meeting request is Out Of Date. You cannot use it anymore. (" + msgStr + ")";
+                    break;
+                case "ErrorItemNotFound":
+                    msgStr = "Calendar item is not available anymore in the exchange database. (" + msgStr + ")";
+                    break;
+                }
+                promptService.alert(null, "Info", msgStr);
+            }
+            else {
+                promptService.alert(null, "Info", aMsg);
+            }
+
+            if (erGetOccurrenceIndexRequest.listener) {
+                this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+                    Ci.calIErrors.MODIFICATION_FAILED,
+                    Ci.calIOperationListener.MODIFY,
+                    erGetOccurrenceIndexRequest.argument.newItem.id,
+                    erGetOccurrenceIndexRequest.argument.newItem);
+            }
+        }
+    },
+
+    doAttachmentUpdates: function _doAttachmentUpdates(aAttachmentsUpdates, aItem, aSendTo, aListener) {
+        var result = false;
+        if ((aAttachmentsUpdates) && ((aAttachmentsUpdates.create.length > 0) || (aAttachmentsUpdates.delete.length > 0))) {
+            result = true;
+            if (aAttachmentsUpdates.create.length > 0) {
+                if (this.debug) this.logInfo("doAttachmentUpdates We have " + aAttachmentsUpdates.create.length + " attachments to create.");
+                var self = this;
+                this.addToQueue(erCreateAttachmentRequest, {
+                        user: this.user,
+                        serverUrl: this.serverUrl,
+                        item: aItem,
+                        parentItemId: aItem.id,
+                        parentItemChangeKey: aItem.changeKey,
+                        attachmentsUpdates: aAttachmentsUpdates,
+                        sendto: aSendTo,
+                        actionStart: Date.now()
+                    },
+                    function (erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey) {
+                        self.createAttachmentOk(erCreateAttachmentRequest, attachmentId, RootItemId, RootItemChangeKey);
+                    },
+                    function (erCreateAttachmentRequest, aCode, aMsg) {
+                        self.createAttachmentError(erCreateAttachmentRequest, aCode, aMsg);
+                    },
+                    aListener);
+            }
+            else {
+                if (this.debug) this.logInfo("updateItemOk We have " + aAttachmentsUpdates.delete.length + " attachments to delete.");
+                var self = this;
+                this.addToQueue(erDeleteAttachmentRequest, {
+                        user: this.user,
+                        serverUrl: this.serverUrl,
+                        item: aItem,
+                        parentItemId: aItem.id,
+                        parentItemChangeKey: aItem.changeKey,
+                        attachmentsUpdates: aAttachmentsUpdates,
+                        sendto: aSendTo,
+                        actionStart: Date.now()
+                    },
+                    function (erDeleteAttachmentRequest, aId, aChangeKey) {
+                        self.deleteAttachmentOk(erDeleteAttachmentRequest, aId, aChangeKey);
+                    },
+                    function (erDeleteAttachmentRequest, aCode, aMsg) {
+                        self.deleteAttachmentError(erDeleteAttachmentRequest, aCode, aMsg);
+                    },
+                    aListener);
+            }
+        }
+        return result;
+    },
+
+    doAttachmentUpdatesFinalize: function _doAttachmentUpdatesFinalize(aAttachmentsUpdates, aItem, aId, aChangeKey, aSendTo, aListener) {
+        if (this.debug) this.logInfo("doAttachmentUpdatesFinalize: item:" + aItem.title + ", aSendTo:" + aSendTo);
+
+        /*var req = <nsTypes:ItemChange xmlns:nsTypes="http://schemas.microsoft.com/exchange/services/2006/types">
+        	  <nsTypes:ItemId Id={aId} ChangeKey={aChangeKey}/>
+        	  <nsTypes:Updates>
+        	    <nsTypes:SetItemField>
+        	      <nsTypes:FieldURI FieldURI="item:Subject"/>
+        	      <nsTypes:CalendarItem>
+        		<nsTypes:Subject>{aItem.title}</nsTypes:Subject>
+        	      </nsTypes:CalendarItem>
+        	    </nsTypes:SetItemField>
+        	  </nsTypes:Updates>
+        	</nsTypes:ItemChange>;*/
+
+        var req = this.globalFunctions.xmlToJxon('<nsTypes:ItemChange xmlns:nsTypes="' + nsTypesStr + '"/>');
+        var itemId = req.addChildTag("ItemId", "nsTypes", null);
+        itemId.setAttribute("Id", aId);
+        itemId.setAttribute("ChangeKey", aChangeKey);
+        var setItemField = req.addChildTag("Updates", "nsTypes", null).addChildTag("SetItemField", "nsTypes", null);
+        setItemField.addChildTag("FieldURI", "nsTypes", null).setAttribute("FieldURI", "item:Subject");
+        setItemField.addChildTag("CalendarItem", "nsTypes", null).addChildTag("Subject", "nsTypes", aItem.title);
+
+        var self = this;
+        this.addToQueue(erUpdateItemRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                item: aItem,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                updateReq: req,
+                newItem: aItem,
+                actionStart: Date.now(),
+                attachmentsUpdates: null,
+                sendto: aSendTo
+            },
+            function (erUpdateItemRequest, aId, aChangeKey) {
+                self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+            },
+            function (erUpdateItemRequest, aCode, aMsg) {
+                self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+            },
+            aListener);
+
+    },
+
+    updateItemOk: function _updateItemOk(erUpdateItemRequest, aId, aChangeKey) {
+        if (this.debug) this.logInfo("updateItemOk: aId" + aId);
+
+        this.saveCredentials(erUpdateItemRequest.argument);
+        this.notConnected = false;
+
+        // Make an event for thistory.
+        if (isEvent(erUpdateItemRequest.argument.newItem)) {
+            this.addActivity(calGetString("calExchangeCalendar", "updateCalendarEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
+        }
+        else {
+            this.addActivity(calGetString("calExchangeCalendar", "updateTaskEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
+        }
+
+        if (!this.doAttachmentUpdates(erUpdateItemRequest.argument.attachmentsUpdates, erUpdateItemRequest.argument.item, erUpdateItemRequest.argument.sendto, erUpdateItemRequest.listener)) {
+            if (erUpdateItemRequest.listener) {
+                this.notifyOperationComplete(erUpdateItemRequest.listener,
+                    Cr.NS_OK,
+                    Ci.calIOperationListener.MODIFY,
+                    erUpdateItemRequest.argument.newItem.id,
+                    erUpdateItemRequest.argument.newItem);
+            }
+
+            this.refresh();
+        }
+    },
+
+    getOccurrenceIndexOk: function _getOccurrenceIndexOk(erGetOccurrenceIndexRequest, aIndex, aMasterId, aMasterChangeKey) {
+        if (this.debug) this.logInfo("getOccurrenceIndexOk index=" + aIndex);
+        this.saveCredentials(erGetOccurrenceIndexRequest.argument);
+
+        this.notifyTheObservers("onDeleteItem", [erGetOccurrenceIndexRequest.argument.masterItem]);
+        //this.itemCacheById[erGetOccurrenceIndexRequest.argument.masterItem.id]= null;
+        this.removeItemFromCache(erGetOccurrenceIndexRequest.argument.masterItem);
+
+        this.notConnected = false;
+        var self = this;
+        switch (erGetOccurrenceIndexRequest.argument.action) {
+        case "deleteItem":
+            this.addToQueue(erDeleteItemRequest, {
+                    user: erGetOccurrenceIndexRequest.argument.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: erGetOccurrenceIndexRequest.argument.serverUrl,
+                    item: erGetOccurrenceIndexRequest.argument.item,
+                    folderID: erGetOccurrenceIndexRequest.argument.folderID,
+                    masterID: aMasterId,
+                    masterChangeKey: aMasterChangeKey,
+                    itemIndex: aIndex,
+                    actionStart: Date.now(),
+                    itemType: erGetOccurrenceIndexRequest.argument.itemType,
+                    whichOccurrence: erGetOccurrenceIndexRequest.argument.whichOccurrence
+                },
+                function (erDeleteItemRequest) {
+                    self.deleteItemOk(erDeleteItemRequest);
+                },
+                function (erDeleteItemRequest, aCode, aMsg) {
+                    self.deleteItemError(erDeleteItemRequest, aCode, aMsg);
+                },
+                erGetOccurrenceIndexRequest.listener);
+            break;
+        }
+    },
+
+    getOccurrenceIndexError: function _getOccurrenceIndexError(erGetOccurrenceIndexRequest, aCode, aMsg) {
+        //		if (this.debug) this.logInfo("getOccurrenceIndexError");
+        this.saveCredentials(erGetOccurrenceIndexRequest.argument);
+        this.notConnected = true;
+        switch (erGetOccurrenceIndexRequest.argument.action) {
+        case "deleteItem":
+            if (erGetOccurrenceIndexRequest.listener) {
+                this.notifyOperationComplete(erGetOccurrenceIndexRequest.listener,
+                    Ci.calIErrors.MODIFICATION_FAILED,
+                    Ci.calIOperationListener.DELETE,
+                    null,
+                    aMsg);
+            }
+            break;
+        }
+    },
+
+    deleteItemOk: function _deleteItemOk(erDeleteItemRequest) {
+        this.saveCredentials(erDeleteItemRequest.argument);
+        if (this.debug) this.logInfo("deleteItemOK");
+        this.notConnected = false;
+
+        if (erDeleteItemRequest.listener) {
+            this.notifyOperationComplete(erDeleteItemRequest.listener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.DELETE,
+                erDeleteItemRequest.argument.item.id,
+                erDeleteItemRequest.argument.item);
+        }
+
+        if (this.debug) this.logInfo("itemType:" + erDeleteItemRequest.itemType + ", Subject:" + erDeleteItemRequest.argument.item.title);
+        switch (erDeleteItemRequest.itemType) {
+        case "master":
+            // Also remove the children.
+            // 12-12-2011 Turned this of because this is done when we receive the update from the exchange server.
+            //this.removeChildrenFromMaster(erDeleteItemRequest.argument.item);
+            //delete this.recurringMasterCache[erDeleteItemRequest.argument.item.uid];
+            break;
+        case "single":
+        case "occurrence":
+
+            // This will be done on receiving the update from this.globalFunctions.
+            //this.notifyTheObservers("onDeleteItem", [erDeleteItemRequest.argument.item]);
+            //delete this.itemCacheById[erDeleteItemRequest.argument.item.id];
+            break;
+        }
+
+
+        if (isEvent(erDeleteItemRequest.argument.item)) {
+            this.addActivity(calGetString("calExchangeCalendar", "deleteCalendarEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erDeleteItemRequest.argument.actionStart, Date.now());
+        }
+        else {
+            this.addActivity(calGetString("calExchangeCalendar", "deleteTaskEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erDeleteItemRequest.argument.actionStart, Date.now());
+        }
+
+        //delete erDeleteItemRequest.argument.item;
+        this.refresh();
+    },
+
+    deleteItemError: function _deleteItemError(erDeleteItemRequest, aCode, aMsg) {
+        this.saveCredentials(erDeleteItemRequest.argument);
+        this.notConnected = true;
+        if (this.debug) this.logInfo("deleteItemError msg:" + String(aMsg));
+        if (erDeleteItemRequest.listener) {
+            this.notifyOperationComplete(erDeleteItemRequest.listener,
+                Ci.calIErrors.MODIFICATION_FAILED,
+                Ci.calIOperationListener.DELETE,
+                null,
+                aMsg);
+        }
+    },
+
+    saveCredentials: function _saveCredentials(aCredentials) {
+        if (aCredentials) {
+            if ((aCredentials.user != "") && (aCredentials.user != "\\") && (aCredentials.user != "/")) {
+                this.user = aCredentials.user;
+            }
+        }
+    },
+
+    addToQueue: function _addToQueue(aRequest, aArgument, aCbOk, aCbError, aListener) {
+        if (this.getProperty("disabled")) {
+            if (this.debug) this.logInfo("Not adding to queue because we are disabled.");
+            return;
+        }
+
+        //if (!aArgument["ServerVersion"]) aArgument["ServerVersion"] = this.exchangeStatistics.getServerVersion(this.serverUrl);
+
+        this.loadBalancer.addToQueue({
+            calendar: this,
+            ecRequest: aRequest,
+            arguments: aArgument,
+            cbOk: aCbOk,
+            cbError: aCbError,
+            listener: aListener
+        });
+    },
+
+    findCalendarItemsOK: function _findCalendarItemsOK(erFindCalendarItemsRequest, aIds, aOccurrences, doNotCheckCache) {
+        if (this.debug) this.logInfo("findCalendarItemsOK: aIds.length=" + aIds.length + ", aOccurrences.length=" + aOccurrences.length);
+
+        if (erFindCalendarItemsRequest) this.saveCredentials(erFindCalendarItemsRequest.argument);
+        this.notConnected = false;
+
+        if ((aIds.length == 0) && (aOccurrences.length)) {
+            return;
+        }
+
+        if (doNotCheckCache === undefined) {
+            if (this.useOfflineCache) {
+                doNotCheckCache = false;
+            }
+            else {
+                doNotCheckCache = true;
+            }
+        }
+
+        // Removed Single/Master items in the lists which we already have in memory
+        var newIdList = new Array();
+        //dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
+        for each(var item in aIds) {
+            if (!doNotCheckCache) {
+                var inItemCache = ((this.itemCacheById[item.Id]) && (this.itemCacheById[item.Id].changeKey == item.ChangeKey));
+                if ((!inItemCache) && (this.useOfflineCache)) {
+                    inItemCache = (this.itemIsInOfflineCache(item.Id) == item.ChangeKey);
+                }
+                var inMasterCache = ((item.type == "RecurringMaster") && (this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].changeKey == item.ChangeKey));
+            }
+            else {
+                var inItemCache = false;
+                var inMasterCache = false;
+            }
+            if ((!inItemCache) && (!inMasterCache)) {
+                newIdList.push(item);
+            }
+        }
+
+        // Remove Occurrence/Exception items in the lists which we already have in memory
+        var newOccurrenceList = new Array();
+        //dump("     findCalendarItemsOK: aOccurrences.length:"+aOccurrences.length+"\n");
+        for each(var item in aOccurrences) {
+                if (!this.recurringMasterCache[item.uid]) {
+                    newOccurrenceList.push(item);
+                }
+            }
+            //dump("     findCalendarItemsOK: newOccurrenceList.length:"+newOccurrenceList.length+"\n");
+
+        var self = this;
+
+        // We have single and/or master items. Get full details and cache them.
+        if (newIdList.length > 0) {
+            this.addToQueue(erGetItemsRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    folderBase: this.folderBase,
+                    serverUrl: this.serverUrl,
+                    ids: newIdList,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    occurrences: newOccurrenceList,
+                    folderClass: this.folderClass,
+                    GUID: calExchangeCalendarGUID
+                },
+                function (erGetItemsRequest, aIds, aItemErrors) {
+                    self.getCalendarItemsOK(erGetItemsRequest, aIds, aItemErrors);
+                },
+                function (erGetItemsRequest, aCode, aMsg) {
+                    self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);
+                },
+                null);
+        }
+
+        this.startCalendarPoller();
+    },
+
+    startCalendarPoller: function _startCalendarPoller() {
+        var self = this;
+        var timerCallback = {
+            notify: function setTimeout_notify() {
+                self.refresh();
+            }
+        };
+
+        if (60 > this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 0)) {
+            this.prefs.setIntPref("ecCalendarPollInterval", 60);
+        }
+
+        if (!this.calendarPoller) {
+            // start the calendar poller
+            this.calendarPoller = Cc["@mozilla.org/timer;1"]
+                .createInstance(Ci.nsITimer);
+            this.calendarPoller.initWithCallback(timerCallback, this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 60) * 1000, this.calendarPoller.TYPE_REPEATING_SLACK);
+        }
+        else {
+            this.calendarPoller.initWithCallback(timerCallback, this.globalFunctions.safeGetIntPref(this.prefs, "ecCalendarPollInterval", 60) * 1000, this.calendarPoller.TYPE_REPEATING_SLACK);
+        }
+    },
+
+    findCalendarItemsError: function _findCalendarItemsError(erFindCalendarItemsRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("findCalendarItemsError aCode:" + aCode + ", aMsg:" + aMsg);
+        if ((aCode == -8) && (aMsg == "ErrorCalendarFolderIsInvalidForCalendarView")) {
+            this.supportsEvents = false;
+        }
+        else {
+            this.notConnected = true;
+        }
+        this.saveCredentials(erFindCalendarItemsRequest.argument);
+    },
+
+    /*	findMasterOccurrencesOk: function _findMasterOccurrencesOk(erGetItemsRequest, aIds)
+    	{
+    		if (this.debug) this.logInfo("findMasterOccurrencesOk:Start: aIds.length="+aIds.length);
+
+    		this.saveCredentials(erFindCalendarItemsRequest.argument);
+    		this.notConnected = false;
+
+    		if (aIds.length == 0) {
+    			return;
+    		}
+
+    		// Cache full master details.
+    		this.updateCalendar(erGetItemsRequest, aIds, true);
+    		if (this.debug) this.logInfo("findMasterOccurrencesOk:End: aIds.length="+aIds.length);
+    		erGetItemsRequest= null;
+    		aIds = null;
+
+    	},*/
+
+    findOccurrencesOK: function _findOccurrencesOK(erFindOccurrencesRequest, aIds) {
+        if (this.debug) this.logInfo("findOccurrencesOK: aIds.length=" + aIds.length);
+        //dump("findOccurrencesOK: aIds.length="+aIds.length+"\n");
+        // Get full details of occurrences and exceptions and cache them.
+        this.notConnected = false;
+        this.findCalendarItemsOK(erFindOccurrencesRequest, aIds, []);
+    },
+
+    findFollowupTaskItemsOK: function _findFollowupTaskItemsOK(erFindFollowupItemsRequest, aIds) {
+        if (this.debug) this.logInfo("findFollowupTaskItemsOK: aIds.length:" + aIds.length);
+        this.saveCredentials(erFindFollowupItemsRequest.argument);
+        this.notConnected = false;
+
+        if (aIds.length == 0) {
+            return;
+        }
+
+        var self = this;
+
+        this.addToQueue(erGetItemsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                ids: aIds,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                folderClass: "IPF.Note",
+                GUID: calExchangeCalendarGUID
+            },
+            function (erGetItemsRequest, aIds, aItemErrors) {
+                self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);
+            },
+            function (erGetItemsRequest, aCode, aMsg) {
+                self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);
+            },
+            null);
+
+        this.startCalendarPoller();
+    },
+
+    findFollowupTaskItemsError: function _findFollowupTaskItemsError(erFindFollowupItemsRequest, aCode, aMsg) {
+        this.saveCredentials(erFindFollowupItemsRequest.argument);
+        this.notConnected = true;
+
+    },
+
+    findTaskItemsOK: function _findTaskItemsOK(erFindTaskItemsRequest, aIds, doNotCheckCache) {
+        if (this.debug) this.logInfo("findTaskItemsOK: aIds.length:" + aIds.length);
+        this.saveCredentials(erFindTaskItemsRequest.argument);
+        this.notConnected = false;
+
+        if (aIds.length == 0) {
+            return;
+        }
+
+        if (doNotCheckCache === undefined) {
+            if (this.useOfflineCache) {
+                doNotCheckCache = false;
+            }
+            else {
+                doNotCheckCache = true;
+            }
+        }
+
+        // Removed Single/Master items in the lists which we already have in memory
+        var newIdList = new Array();
+        //dump("     findCalendarItemsOK: aIds.length:"+aIds.length+"\n");
+        for each(var item in aIds) {
+            if (!doNotCheckCache) {
+                var inItemCache = ((this.itemCacheById[item.Id]) && (this.itemCacheById[item.Id].changeKey == item.ChangeKey));
+                if ((!inItemCache) && (this.useOfflineCache)) {
+                    inItemCache = (this.itemIsInOfflineCache(item.Id) == item.ChangeKey);
+                }
+            }
+            else {
+                var inItemCache = false;
+            }
+            if ((!inItemCache)) {
+                newIdList.push(item);
+            }
+        }
+
+        var self = this;
+        this.addToQueue(erGetItemsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                ids: newIdList,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                folderClass: this.folderClass,
+                GUID: calExchangeCalendarGUID
+            },
+            function (erGetItemsRequest, aIds, aItemErrors) {
+                self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);
+            },
+            function (erGetItemsRequest, aCode, aMsg) {
+                self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);
+            },
+            null);
+
+        this.startCalendarPoller();
+    },
+
+    findTaskItemsError: function _findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg) {
+        this.saveCredentials(erFindTaskItemsRequest.argument);
+        this.notConnected = true;
+
+    },
+
+    tryToSetDateValue: function _TryToSetDateValue(ewsvalue, aDefault) {
+        if ((ewsvalue) && (ewsvalue.toString().length)) {
+            return cal.fromRFC3339(ewsvalue, this.globalFunctions.ecTZService().UTC).getInTimezone(this.globalFunctions.ecDefaultTimeZone());
+        }
+
+        return aDefault;
+    },
+
+    tryToSetValue: function _tryToSetValue(ewsvalue, aDefault) {
+        if (ewsvalue) {
+            return ewsvalue;
+        }
+
+        return aDefault;
+    },
+
+    processItemSyncQueue: function _processItemSyncQueue() {
+        if (this.processItemSyncQueueBusy) {
+            return;
+        }
+
+        this.processItemSyncQueueBusy = true;
+
+        // Process this.getItemSyncQueue
+        while (this.getItemSyncQueue.length > 0) {
+            if (this.debug) this.logInfo("processItemSyncQueue: id:" + this.getItemSyncQueue[0].id);
+            this.getItem(this.getItemSyncQueue[0].id, this.getItemSyncQueue[0].listener, true);
+            this.getItemSyncQueue.shift();
+        }
+
+        this.processItemSyncQueueBusy = false;
+
+    },
+
+    getTaskItemsOK: function _getTaskItemsOK(erGetItemsRequest, aItems, aItemErrors) {
+        if (this.debug) this.logInfo("getTaskItemsOK: aItems.length:" + aItems.length);
+
+        this.saveCredentials(erGetItemsRequest.argument);
+        this.notConnected = false;
+
+        if (this.debug) this.logInfo("getTaskItemsOK 2");
+
+        if ((aItemErrors) && (aItemErrors.length > 0)) {
+            // Remove these items as they have an error
+            var i = 0;
+            while (i < aItemErrors.length) {
+                if (this.itemCacheById[aItemErrors[i]]) {
+                    this.removeFromOfflineCache(this.itemCacheById[aItemErrors[i]]);
+                    this.notifyTheObservers("onDeleteItem", [this.itemCacheById[aItemErrors[i]]]);
+                    this.removeItemFromCache(this.itemCacheById[aItemErrors[i]]);
+                }
+                else {
+                    this.removeFromOfflineCache({
+                        id: aItemErrors[i],
+                        title: "from offline"
+                    });
+                }
+                i++;
+            }
+        }
+
+        if (aItems.length == 0) {
+            this.processItemSyncQueue();
+            return;
+        }
+
+        if (this.debug) this.logInfo("getTaskItemsOK 3");
+        this.updateCalendar(erGetItemsRequest, aItems, true);
+
+        if ((erGetItemsRequest.argument) && (erGetItemsRequest.argument.syncState)) {
+            if (this.debug) this.logInfo("getTaskItemsOK: We have a syncState to save.");
+            //this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
+
+            switch (erGetItemsRequest.argument.folderBase) {
+            case "inbox":
+                this.syncStateInbox = erGetItemsRequest.argument.syncState;
+                this.saveToFile("syncStateInbox.txt", erGetItemsRequest.argument.syncState);
+                this.prefs.setCharPref("syncStateInbox", erGetItemsRequest.argument.syncState);
+                break;
+            default:
+                this.syncState = erGetItemsRequest.argument.syncState;
+                this.saveToFile("syncState.txt", erGetItemsRequest.argument.syncState);
+                this.prefs.setCharPref("syncState", erGetItemsRequest.argument.syncState);
+            }
+        }
+
+        aItems = null;
+        erGetItemsRequest = null;
+
+        if (this.debug) this.logInfo("getTaskItemsOK 4");
+
+        this.processItemSyncQueue();
+
+    },
+
+    getTaskItemsError: function _getTaskItemsError(erGetItemsRequest, aCode, aMsg) {
+        //		if (this.debug) this.logInfo("getTaskItemsError: aMsg:"+ aMsg);
+        this.saveCredentials(erGetItemsRequest.argument);
+        this.notConnected = true;
+
+        this.processItemSyncQueue();
+
+    },
+
+    getMeetingRequestFromServer: function _getMeetingRequestFromServer(aItem, aUID, aOperation, aListener) {
+        if (this.debug) this.logInfo("aUID=" + aUID);
+
+        // We do not have a meetingrequest in cache but it is an iTIP.
+        // Is inbox polling off? Or did the inbox polling not yet happen interval to long.
+        // bug 59		if (!this.doPollInbox) {
+        // We are not polling the inbox so treat it as a meetingrespons.
+        if (this.debug) this.logInfo("We get a new calendar item. It looks like an iTIP respons because aItem.id is set. Going to check if we can find it in the users inbox.");
+        // We mis the exchange id and changekey which we need for responding.
+        // We can get these by polling or searching the inbox but this is async. We can do this
+        // because we received a listener. So search inbox for this uid and then use the full exchange message.
+        // We could have multiple meetingrequest with the same uid but different id and changekey. How do we handle those??
+
+        var self = this;
+        this.addToQueue(erGetMeetingRequestByUIDRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: "inbox",
+                serverUrl: this.serverUrl,
+                item: aItem,
+                uid: aUID,
+                actionStart: Date.now(),
+                operation: aOperation,
+                GUID: calExchangeCalendarGUID
+            },
+            function (erGetMeetingRequestByUIDRequest, aMeetingRequests) {
+                self.getMeetingRequestByUIDOk(erGetMeetingRequestByUIDRequest, aMeetingRequests);
+            },
+            function (erGetMeetingRequestByUIDRequest, aCode, aMsg) {
+                self.getMeetingRequestByUIDError(erGetMeetingRequestByUIDRequest, aCode, aMsg);
+            },
+            aListener);
+
+        return;
+        // bug 59		}
+        /* bug 59		else {
+        			if (this.debug) this.logInfo("!! THIS IS A SITUATION WHICH NEVER SHOULD HAPPEN !!");
+        			if (this.debug) this.logInfo("We have an iTIP respons and are polling the inbox but the item is not in the meetingrequestcache.");
+        			if (this.debug) this.logInfo("We see this when someone imports an ICS file or imports a meeting request into another calendar.");
+        			// If it is an ICS we would like it to be added to the calendar as new item
+        			// If is a meeting request then we want it accepted and not added. This must produce an error
+        			// Problem is we cannot identify it as a ICS import or a acceptation of a meeting request.
+        			aItem.id = undefined;
+        			this.adoptItem(aItem, aListener);
+        		/*	// We could do the same as we are not polling inbox..
+        			if (aListener) {
+        				this.notifyOperationComplete(aListener,
+        	        	                             Ci.calIErrors.MODIFICATION_FAILED,
+        	                        	             aOperation,
+        	                        	             aUID,
+        	                        	             aItem);
+        			} */
+        /* bug 59			return;
+        		} */ // bug 59
+    },
+
+    createAttendee: function _createAttendee(aElement, aType, aMyResponseType) {
+        let mbox = aElement.getTag("t:Mailbox");
+        let attendee = cal.createAttendee();
+
+        if (!aType) {
+            aType = "REQ-PARTICIPANT";
+        }
+
+        switch (mbox.getTagValue("t:RoutingType", "unknown")) {
+        case "SMTP":
+            attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress", "unknown");
+            break;
+        case "EX":
+            attendee.id = 'ldap:' + mbox.getTagValue("t:EmailAddress", "unknown");
+            break;
+        default:
+            this.logInfo("createAttendee: Unknown RoutingType:'" + mbox.getTagValue("t:RoutingType") + "'");
+            attendee.id = 'mailto:' + mbox.getTagValue("t:EmailAddress", "unknown");
+            break;
+        }
+        attendee.commonName = mbox.getTagValue("t:Name");
+        attendee.rsvp = "FALSE";
+        attendee.userType = "INDIVIDUAL";
+        attendee.role = aType;
+
+        if (aElement.getTagValue("t:ResponseType", "") != "") {
+            attendee.participationStatus = participationMap[aElement.getTagValue("t:ResponseType")];
+
+            // check if we specified a myResponseType for the complete item and the specified mailbox is equal to the mailbox for the calendar.
+            if ((aMyResponseType) && (mbox.getTagValue("t:EmailAddress", "unknown").toLowerCase() == this.mailbox.toLowerCase())) {
+                attendee.participationStatus = participationMap[aMyResponseType];
+                //if (this.debug) this.logInfo("Setting my response type from the global myresponsetype for the item.");
+            }
+        }
+
+        return attendee;
+    },
+
+    createMeAsAttendee: function _createMeAsAttendee(aMyResponseType) {
+        var attendee = cal.createAttendee();
+
+        attendee.id = 'mailto:' + this.mailbox;
+        attendee.commonName = this.userDisplayName;
+        attendee.rsvp = "FALSE";
+        attendee.userType = "INDIVIDUAL";
+        attendee.role = "REQ-PARTICIPANT";
+
+        attendee.participationStatus = participationMap[aMyResponseType];
+
+        return attendee;
+    },
+
+    get notifyObservers() {
+        return this.observers;
+    },
+
+    notifyTheObservers: function _notifyTheObservers(aCommand, aArray, aFastNotify) {
+        if (aFastNotify) {
+            this.observers.notify(aCommand, aArray);
+        }
+        else {
+            this.lightningNotifier.addToNotifyQueue(this, aCommand, aArray);
+        }
+
+        switch (aCommand) {
+        case "onDeleteItem":
+            if (!this.notConnected) {
+                this.removeFromOfflineCache(aArray[0]);
+            }
+            break;
+        }
+    },
+
+    removeChildrenFromMaster: function _removeChildrenFromMaster(aMaster) {
+        if (this.debug) this.logInfo("removeChildrenFromMaster start. Title:" + aMaster.title);
+        // Remove children of this master. They will be added later.
+        for each(var child in aMaster.getExceptions({})) {
+            this.notifyTheObservers("onDeleteItem", [child]);
+            aMaster.removeException(child);
+            /*if (this.itemCacheById[child.id]) {
 				this.itemCacheById[child.id].deleteItem();
 			}
 else { dump("Exception does not exist in cache anymore.\n");}
 			this.itemCacheById[child.id] = null;
 			delete this.itemCacheById[child.id];*/
-			this.removeItemFromCache(child);
+            this.removeItemFromCache(child);
 
-		}
+        }
 
-		for each(var child in aMaster.getOccurrences({})) {
-			this.notifyTheObservers("onDeleteItem", [child]);
-			aMaster.removeOccurrence(child);
-			/*if (this.itemCacheById[child.id]) {
+        for each(var child in aMaster.getOccurrences({})) {
+            this.notifyTheObservers("onDeleteItem", [child]);
+            aMaster.removeOccurrence(child);
+            /*if (this.itemCacheById[child.id]) {
 				this.itemCacheById[child.id].deleteItem();
 			}
 else { dump("Occurrence does not exist in cache anymore.\n");}
 			this.itemCacheById[child.id] = null;
 			delete this.itemCacheById[child.id];*/
-			this.removeItemFromCache(child);
-		}
-
-		if (this.debug) this.logInfo("removeChildrenFromMaster end.:" + aMaster.title);
-	},
-
-	setStatus: function _setStatus(aItem, aStatus) {
-		switch (aStatus) {
-		case "Unknown":
-			aItem.setProperty("STATUS", "NONE");
-			break;
-		case "Organizer":
-			aItem.setProperty("STATUS", "CONFIRMED");
-			break;
-		case "Tentative":
-			aItem.setProperty("STATUS", "TENTATIVE");
-			break;
-		case "Accept":
-			aItem.setProperty("STATUS", "CONFIRMED");
-			break;
-		case "Decline":
-			aItem.setProperty("STATUS", "CANCELLED");
-			break;
-		case "NoResponseReceived":
-			aItem.setProperty("STATUS", "NONE");
-			break;
-		default:
-			aItem.setProperty("STATUS", "NONE");
-			break;
-		}
-	},
-
-	cloneItem: function _cloneItem(aItem) {
-		var newItem = aItem.clone();
-		/*		if (aItem.id != aItem.parentItem.id) {
-					newItem.parentItem = aItem.parentItem;
-				}*/
-
-		return newItem;
-	},
-
-	addExchangeAttachmentToCal: function _addExchangeAttachmentToCal(aExchangeItem, aItem) {
-		if (aExchangeItem.getTagValue("t:HasAttachments") == "true") {
-			//			if (this.debug) this.logInfo("Title:"+aItem.title+"Attachments:"+aExchangeItem.getTagValue("Attachments"));
-			var fileAttachments = aExchangeItem.XPath("/t:Attachments/t:FileAttachment");
-			for each(var fileAttachment in fileAttachments) {
-				//				if (this.debug) this.logInfo(" -- Attachment: name="+fileAttachment.getTagValue("t:Name"));
-
-				var newAttachment = createAttachment();
-				newAttachment.setParameter("X-AttachmentId", fileAttachment.getAttributeByTag("t:AttachmentId", "Id"));
-				newAttachment.uri = makeURL(this.serverUrl + "/?id=" + encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(fileAttachment.getTagValue("t:Name")) + "&size=" + encodeURIComponent(fileAttachment.getTagValue("t:Size", "")) + "&user=" + encodeURIComponent(this.user));
-
-				if (this.debug) this.logInfo("New attachment URI:" + this.serverUrl + "/?id=" + encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(fileAttachment.getTagValue("t:Name")) + "&size=" + encodeURIComponent(fileAttachment.getTagValue("t:Size", "")) + "&user=" + encodeURIComponent(this.user));
-
-				aItem.addAttachment(newAttachment);
-			}
-			fileAttachments = null;
-		}
-	},
-
-	clearXMozSnoozeTimes: function _clearXMozSnoozeTimes(aItem) {
-		if (!aItem) return;
-
-		if (aItem.propertyEnumerator) {
-			var props = aItem.propertyEnumerator;
-			while (props.hasMoreElements()) {
-				var prop = props.getNext().QueryInterface(Components.interfaces.nsIProperty);
-				if (prop.name.indexOf("X-MOZ-SNOOZE-TIME") > -1) {
-					if (this.debug) this.logInfo("deleting Property:" + prop.name + "=" + prop.value);
-
-					aItem.deleteProperty(prop.name);
-					var props = aItem.propertyEnumerator;
-				}
-			}
-		}
-	},
-
-	setSnoozeTime: function _setSnoozeTime(aItem, aMaster) {
-
-		if (aMaster) {
-			var pidLidReminderSet = aMaster.reminderIsSet;
-			var pidLidReminderSignalTime = aMaster.reminderSignalTime;
-		}
-		else {
-			var pidLidReminderSet = aItem.reminderIsSet;
-			var pidLidReminderSignalTime = aItem.reminderSignalTime;
-		}
-
-		if (this.debug) this.logInfo("-- pidLidReminderSet:" + pidLidReminderSet);
-
-		if (pidLidReminderSet) {
-
-			if (this.debug) this.logInfo("Reminder date is set for item");
-
-			if (aMaster) {
-				// Exchange only has the next reminderSignaltime. This is one value. Lightning can handle multiple.
-				//				this.clearXMozSnoozeTimes(aMaster);
-
-				//				var reminderTime = cal.createDateTime(pidLidReminderSignalTime);
-				var reminderTime = aMaster.reminderSignalTime;
-				if (reminderTime) {
-
-					if (aItem) {
-						if (this.debug) this.logInfo("We have an exception or an occurrence. We are going to use the master to see if it is snoozed or not.");
-
-						// if the master ReminderDueBy is the same as the item Start date then this is the occurrence for which the next alarm is active.
-						var masterReminderDueBy = this.tryToSetDateValue(aMaster.getProperty("X-ReminderDueBy"), null);
-						if (masterReminderDueBy) {
-							switch (masterReminderDueBy.compare(aItem.startDate)) {
-							case -1:
-								if (this.debug) this.logInfo("The ReminderDueBy date of the master is before the item's startdate. This alarm has not been snoozed or dismissed.");
-								aItem.alarmLastAck = null;
-								break;
-							case 0:
-								if (this.debug) this.logInfo("The ReminderDueBy date of the master is equal to the item's startdate. We found the occurrence for which the alarm is active or dismissed or snoozed.");
-								// We need to find out if it snoozed or dismissed.
-								this.clearXMozSnoozeTimes(aMaster);
-								if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime + "=" + reminderTime.icalString);
-								aMaster.setProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime, reminderTime.icalString);
-
-								var lastAck = reminderTime.clone();
-								lastAck.addDuration(cal.createDuration('-PT1S'));
-								aItem.alarmLastAck = lastAck;
-								aMaster.alarmLastAck = lastAck;
-								if (this.debug) this.logInfo("Set alarmLastAck:" + lastAck.icalString);
-								break;
-							case 1:
-								if (this.debug) this.logInfo("The ReminderDueBy date of the master is after the item's startdate. This alarm has been dismissed.");
-								var lastAck = aItem.startDate.clone();
-								//lastAck.addDuration(cal.createDuration('-PT1S'));
-								aItem.alarmLastAck = lastAck;
-								if (this.debug) this.logInfo("Set alarmLastAck:" + lastAck.icalString);
-								break;
-							}
-						}
-						else {
-							// Cannot determine for which alarm the next reminder is set. Bailing out.
-							if (this.debug) this.logInfo("Cannot determine for which alarm the next reminder is set. Bailing out.");
-							return;
-						}
-
-
-					}
-					else {
-						// We have a master only. Check for which of its occurrences/exceptions the X-MOZ-SNOOZE_TIME- needs to be set.
-						// Easyest way for now is loop through it's children and call this function again with the child as item.
-						// This can probably be optimized.
-						if (this.debug) this.logInfo("A master. Will try to set snooze time on right occurrenceid");
-						for (var index in this.itemCacheById) {
-
-							if ((this.itemCacheById[index])
-								&& (isEvent(this.itemCacheById[index]))
-								&& ((this.itemCacheById[index].calendarItemType == "Occurrence")
-									|| (this.itemCacheById[index].calendarItemType == "Exception"))
-								&& (this.itemCacheById[index].uid == aMaster.uid)
-								&& (this.itemCacheById[index].parentItem.id == aMaster.id)) {
-								this.setSnoozeTime(this.itemCacheById[index], aMaster);
-							}
-						}
-					}
-				}
-				else {
-					if (this.debug) this.logInfo("Received pidLidReminderSignalTime is invalid:" + pidLidReminderSignalTime);
-				}
-			}
-			else {
-				// aItem is a Single
-				/*				this.clearXMozSnoozeTimes(aItem);
-								var reminderTime = pidLidReminderSignalTime;
-								if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME="+reminderTime.icalString);
-								aItem.setProperty("X-MOZ-SNOOZE-TIME", reminderTime.icalString);
-
-								var lastAck = reminderTime.clone();
-								lastAck.addDuration(cal.createDuration('-PT1S'));
-								aItem.alarmLastAck = lastAck;
-								if (this.debug) this.logInfo("Set alarmLastAck:"+lastAck.icalString);
-				 */
-			}
-		}
-		else {
-			// Remove any snooze states according http://msdn.microsoft.com/en-us/library/cc765589.aspx
-			if (this.debug) this.logInfo("Item has no snooze date set.");
-			aItem.alarmLastAck = null;
-		}
-	},
-
-	setAlarm: function _setAlarm(aItem, aCalendarItem) {
-		if ((aCalendarItem.getTagValue("t:ReminderIsSet") == "true")) {
-			var alarm = cal.createAlarm();
-			alarm.action = "DISPLAY";
-			alarm.repeat = 0;
-
-			var alarmOffset = cal.createDuration();
-			alarmOffset.minutes = -1 * aCalendarItem.getTagValue("t:ReminderMinutesBeforeStart");
-
-			// This is a bug fix for when the offset is more than a year)
-			if (alarmOffset.minutes < (-60 * 24 * 365)) {
-				alarmOffset.minutes = -5;
-			}
-			alarmOffset.normalize();
-
-			alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
-			alarm.offset = alarmOffset;
-
-			if (this.debug) this.logInfo("Alarm set with an offset of " + alarmOffset.minutes + " minutes from the start");
-			aItem.setProperty("X-ReminderDueBy", aCalendarItem.getTagValue("t:ReminderDueBy"));
-
-			aItem.addAlarm(alarm);
-		}
-	},
-
-	getMasterByItem: function _getMasterByItem(aItem) {
-		if (this.debug) this.logInfo("getMasterByItem for item:" + aItem.title + ", startdate:" + aItem.startDate + ", uid:" + aItem.uid);
-		var self = this;
-		this.addToQueue(erGetMasterOccurrenceIdRequest, {
-				user: this.user,
-				serverUrl: this.serverUrl,
-				item: aItem,
-				folderID: this.folderID,
-				changeKey: this.changeKey,
-				getType: "lightning"
-			},
-			function (erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
-				self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aItem.uid);
-			},
-			function (erGetMasterOccurrenceIdRequest, aCode, aMsg) {
-				self.getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg);
-			},
-			null);
-	},
-
-	getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aUID) {
-		if (this.debug) this.logInfo("getMasterOk aId:" + aId + ", aChangeKey:" + aChangeKey + ", uid:" + aUID);
-		var ids = [{
-			Id: aId,
-			ChangeKey: aChangeKey,
-			type: "RecurringMaster",
-			uid: aUID,
-			start: null,
-			end: null
-		}];
-
-		this.findCalendarItemsOK(erGetMasterOccurrenceIdRequest, ids, [])
-	},
-
-	getMasterError: function _getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("getMasterError aCode:" + aCode + ", aMsg:" + aMsg);
-		this.saveCredentials(erGetMasterOccurrenceIdRequest.argument);
-	},
-
-	convertExchangeItemtoCalItem: function _convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest) {
-		//dump("1. uid:"+item.uid+", it:"+item.calendarItemType+", t:"+item.title+", sd:"+item.startDate+"\n");
-		var uid = item.uid;
-		//		if ((item.className == "mivExchangeEvent") && (!uid)) return null;
-
-		if (this.itemCacheById[item.id]) {
-			if (this.itemCacheById[item.id].changeKey == item.changeKey) {
-				//if (this.debug) this.logInfo("Item is allready in cache and the id and changeKey are the same. Skipping it.");
-				//dump("convertExchangeAppointmentToCalAppointment. Item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", startDate"+item.startDate+"\n");
-				this.itemCacheById[item.id].occurrenceIndex = item.occurrenceIndex
-				item.deleteItem();
-				item = null;
-				return null;
-			}
-		}
-		else {
-			if ((uid) && (this.recurringMasterCache[uid])) {
-				if ((this.recurringMasterCache[uid].changeKey == xml2json.getAttributeByTag(aCalendarItem, "t:ItemId", "ChangeKey")) && (this.recurringMasterCache[uid].id == item.id)) {
-					//if (this.debug) this.logInfo("Master item is allready in cache and the id and changeKey are the same. Skipping it.");
-					//dump("convertExchangeAppointmentToCalAppointment. Master item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", item.calendarItemType:"+item.calendarItemType+"\n");
-					item.deleteItem();
-					item = null;
-					return null;
-				}
-			}
-		}
-
-		item.setProperty("DTSTAMP", this.tryToSetDateValue(xml2json.getTagValue(aCalendarItem, "t:DateTimeReceived")));
-		if (!isMeetingRequest) {
-			//if (this.debug) this.logInfo(" == item.title:"+item.title+", calendarItemType:"+aCalendarItem.getTagValue("t:CalendarItemType"));
-			switch (item.calendarItemType) {
-			case "Single":
-				// Check if this item.id has existed as master. This could be a change from master to single.
-				var offlineMasterData = null;
-				if (!fromOfflineCache) {
-					offlineMasterData = this.masterIsInOfflineCache(item.id);
-				}
-
-				if ((this.recurringMasterCacheById[item.id]) || (offlineMasterData)) {
-					if (this.debug) this.logInfo("Item has changed from master into single. Going to remove it and it's children.");
-
-					let masterUID = null;
-					if (offlineMasterData) {
-						masterUID = offlineMasterData.uid;
-					}
-					else {
-						masterUID = this.recurringMasterCacheById[item.id].uid;
-					}
-
-					this.removeChildrenFromMaster(this.recurringMasterCache[masterUID]);
-
-					this.removeFromOfflineCache(this.recurringMasterCache[masterUID]);
-					delete this.recurringMasterCacheById[item.id];
-					delete this.recurringMasterCache[masterUID];
-				}
-				break;
-			case "Exception":
-				if (this.debug) this.logInfo("@1:" + (item.startDate || item.entryDate) + ":IsException");
-				item.setProperty("X-RecurringType", "RE");
-				var master = this.recurringMasterCache[uid];
-				if (master) {
-					// We allready have a master in Cache.
-					if (this.debug) this.logInfo("Found master for exception:" + master.title + ", date:" + (master.startDate || master.entryDate));
-					master.addException(item);
-				}
-				else {
-					//if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Exception:"+item.title);
-					// We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
-					this.parentLessItems[item.id] = item;
-					if (!this.newMasters[item.uid]) {
-						this.newMasters[item.uid] = true;
-						this.getMasterByItem(item);
-					}
-					//this.itemCacheById[item.id] = item;
-					this.addItemToCache(item);
-
-					if ((this.useOfflineCache) && (!fromOfflineCache)) {
-						let cacheItem = {};
-						cacheItem[item.id] = {
-							calItem: item,
-							exchangeItemXML: xml2json.toString(aCalendarItem)
-						};
-						this.addToOfflineCache(cacheItem);
-					}
-
-					return null;
-				}
-
-				break;
-			case "Occurrence":
-				if (this.debug) this.logInfo("@1:" + (item.startDate || item.entryDate) + ":IsOccurrence");
-				item.setProperty("X-RecurringType", "RO");
-				// This is a occurrence. Try to find the master and link recurrenceinfo.
-				var master = this.recurringMasterCache[uid];
-				if (master) {
-					// We allready have a master in Cache.
-					if (this.debug) this.logInfo("Found master for occurrence:" + master.title + ", date:" + (master.startDate || master.entryDate));
-
-					master.addOccurrence(item);
-				}
-				else {
-					//if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Occurrence:"+item.title);
-					// We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
-					this.parentLessItems[item.id] = item;
-					if (!this.newMasters[item.uid]) {
-						this.newMasters[item.uid] = true;
-						this.getMasterByItem(item);
-					}
-					//this.itemCacheById[item.id] = item;
-					this.addItemToCache(item);
-
-					if ((this.useOfflineCache) && (!fromOfflineCache)) {
-						let cacheItem = {};
-						cacheItem[item.id] = {
-							calItem: item,
-							exchangeItemXML: xml2json.toString(aCalendarItem)
-						};
-						this.addToOfflineCache(cacheItem);
-					}
-
-					return null;
-				}
-
-				break;
-			case "RecurringMaster":
-
-				//					if (this.debug) this.logInfo(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache);
-				//dump(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache+"\n");
-
-				// Check if this item existed previously as a Single item and is not converted into a master.
-				if (this.itemCacheById[item.id]) {
-					if (this.debug) this.logInfo("We allready have this master in the single itemcache. single changed into master. Removing ");
-					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
-					this.removeFromOfflineCache(item);
-					this.removeItemFromCache(this.itemCacheById[item.id]);
-				}
-
-				//					if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].id == item.id) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
-				if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
-					if (this.debug) this.logInfo("We allready have this master in cache but the changeKey changed.");
-					if (this.recurringMasterCache[item.uid].id != item.id) {
-						dump(" @#@# THIS IS WEARD id do not match. @@@!!\n");
-						dump(" item.title:" + item.title + ", startDate:" + item.startDate + ", calendarItemType:" + item.calendarItemType + "\n");
-						dump(" this.recurringMasterCache[item.uid].title:" + this.recurringMasterCache[item.uid].title + ", startDate:" + this.recurringMasterCache[item.uid].startDate + ", calendarItemType:" + this.recurringMasterCache[item.uid].calendarItemType + "\n");
-					}
-					//dump("We allready have this master in cache but the changeKey changed.\n");
-
-					let ids = [];
-					let myExceptions = this.recurringMasterCache[item.uid].getExceptions({});
-					for each(var tmpException in myExceptions) {
-						ids.push({
-							Id: tmpException.id,
-							type: "Exception",
-							uid: item.uid,
-							start: null,
-							end: null
-						});
-					}
-					let myOccurrences = this.recurringMasterCache[item.uid].getOccurrences({});
-					for each(var tmpOccurrence in myOccurrences) {
-						ids.push({
-							Id: tmpOccurrence.id,
-							type: "Occurrence",
-							uid: item.uid,
-							start: null,
-							end: null
-						});
-					}
-
-					if (this.debug) this.logInfo("Going to request '" + ids.length + "' children to see if they are updated.");
-					//dump("Going to request '"+ids.length+"' memorycache children to see if they are updated.\n");
-
-					// Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
-					while (ids.length > 0) {
-						let req = [];
-						for (var counter = 0;
-							((counter < 10) && (ids.length > 0)); counter++) {
-							req.push(ids.pop());
-						}
-						this.findCalendarItemsOK(null, req, [], true);
-					}
-				}
-
-				if (!fromOfflineCache) {
-					let changeKey = this.itemIsInOfflineCache(item.id);
-					if ((changeKey) && (item.changeKey != changeKey)) {
-						//dump("Master is in offline cache and changeKey is different. Going to see if children have changed.\n");
-						let inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RO");
-						let i = 0;
-						let ids = [];
-						while (i < inOfflineCache.length) {
-							ids.push({
-								Id: inOfflineCache[i],
-								type: "Occurrence",
-								uid: item.uid,
-								start: null,
-								end: null
-							});
-							i++;
-						}
-
-						inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RE");
-						i = 0;
-						while (i < inOfflineCache.length) {
-							ids.push({
-								Id: inOfflineCache[i],
-								type: "Exception",
-								uid: item.uid,
-								start: null,
-								end: null
-							});
-							i++;
-						}
-
-						if (this.debug) this.logInfo("Going to request '" + ids.length + "' offline children to see if they are updated.");
-						//dump("Going to request '"+ids.length+"' offline children to see if they are updated.\n");
-
-						// Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
-						while (ids.length > 0) {
-							let req = [];
-							for (var counter = 0;
-								((counter < 10) && (ids.length > 0)); counter++) {
-								req.push(ids.pop());
-							}
-							this.findCalendarItemsOK(null, req, [], true);
-						}
-					}
-				}
-
-				if (this.debug) this.logInfo("Trying to see if there are parentless items for this master:" + item.title + ".");
-				//this.observers.notify("onStartBatch");
-				var parentLessCounter = 0;
-				for (var itemId in this.parentLessItems) {
-					parentLessCounter++;
-					if ((this.parentLessItems[itemId])
-						&& (isEvent(this.parentLessItems[itemId]))
-						&& ((this.parentLessItems[itemId].calendarItemType == "Occurrence")
-							|| (this.parentLessItems[itemId].calendarItemType == "Exception"))
-						&& (this.parentLessItems[itemId].uid == item.uid)
-						&& (this.parentLessItems[itemId].parentItem.id != item.id)) {
-						if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment: Found item without parent:" + this.parentLessItems[itemId] + ", going to set parent.");
-						//this.itemCacheById[index].parentItem = item;
-						if (this.parentLessItems[itemId].calendarItemType == "Exception") {
-							item.addException(this.parentLessItems[itemId]);
-						}
-						if (this.parentLessItems[itemId].calendarItemType == "Occurrence") {
-							item.addOccurrence(this.parentLessItems[itemId]);
-						}
-
-						this.notifyTheObservers("onAddItem", [this.parentLessItems[itemId]]);
-						this.parentLessItems[itemId] = null;
-						delete this.parentLessItems[itemId];
-					}
-
-				}
-				//this.observers.notify("onEndBatch");
-
-				if (!fromOfflineCache) {
-					let cacheItem = {};
-					cacheItem[item.id] = {
-						calItem: item,
-						exchangeItemXML: xml2json.toString(aCalendarItem)
-					};
-					this.addToOfflineCache(cacheItem);
-				}
-
-				if (this.recurringMasterCache[uid]) {
-					if (this.recurringMasterCache[uid].recurrenceInfo.toString() != item.recurrenceInfo.toString()) {
-						// Recurrence info change. We are going to request all children in a known period.
-						if (this.debug) this.logInfo(this.name + ": (" + item.title + ") Recurrence info change for master. We are going to request all children in a known period..");
-						this.masterCount--;
-						//dump("   xx MasterCount:"+this.masterCount+"\n");
-						this.recurringMasterCache[uid].deleteItem();
-						this.recurringMasterCache[uid] = null;
-						this.recurringMasterCacheById[item.id] = null;
-						var self = this;
-						var tmpItem = {
-							Id: item.id,
-							ChangeKey: item.changeKey,
-							type: "RecurringMaster"
-						};
-						this.addToQueue(erFindOccurrencesRequest, {
-								user: this.user,
-								mailbox: this.mailbox,
-								folderBase: this.folderBase,
-								serverUrl: this.serverUrl,
-								masterItem: tmpItem,
-								folderID: this.folderID,
-								changeKey: this.changeKey,
-								startDate: this.startDate || this.entryDate,
-								endDate: this.endDate || this.dueDate,
-								GUID: calExchangeCalendarGUID
-							},
-							function (erGetItemsRequest, aIds) {
-								self.findOccurrencesOK(erGetItemsRequest, aIds);
-							},
-							function (erGetItemsRequest, aCode, aMsg) {
-								self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);
-							},
-							null);
-					}
-					/*						this.masterCount--;
-											//dump("   xx MasterCount:"+this.masterCount+"\n");
-											this.recurringMasterCache[uid].deleteItem();
-											this.recurringMasterCache[uid] = null;*/
-				}
-				else {
-					if ((parentLessCounter == 0) && (!fromOfflineCache) && (this.syncState)) {
-						if (this.debug) this.logInfo("We have a new master without children. Most of the times this means we nead to request the children separately.");
-						//dump(this.name+": ("+item.title+") We have a new master without children. Most of the times this means we nead to request the children separately.\n");
-						//dump("     -- this.startDate:"+this.startDate+", this.endDate:"+this.endDate+"\n");
-
-						this.requestPeriod(this.startDate || this.entryDate, this.endDate || this.dueDate, Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, false, item.uid);
-					}
-				}
-
-				this.masterCount++;
-				this.recurringMasterCache[uid] = item;
-				//dump("** Add to this.recurringMasterCache: title:"+item.title+", item.startDate:"+item.startDate+"\n");
-				this.recurringMasterCacheById[item.id] = item;
-				//dump("   :: MasterCount:"+this.masterCount+"\n");
-
-				if (this.debug) this.logInfo("This is a master it will not be put into the normal items cache list.");
-				//dump("convertExchangeAppointmentToCalAppointment. The master will not be visible:"+item.title+"\n");
-				return null; // The master will not be visible
-
-				break;
-			default:
-				//this.setSnoozeTime(item, null);
-			}
-		}
-
-		return item;
-	},
-
-	convertExchangeAppointmentToCalAppointment: function _convertExchangeAppointmentToCalAppointment(aCalendarItem, isMeetingRequest, erGetItemsRequest, doNotify, fromOfflineCache) {
-		if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment:" + xml2json.toString(aCalendarItem), 2);
-
-		//var item = createEvent();
-		//		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-		//				.createInstance(Ci.mivExchangeEvent, this);
-
-		var item = new mivExchangeEvent();
-
-		item.addMailboxAlias(this.mailbox);
-		item.calendar = this.superCalendar;
-		item.exchangeData = aCalendarItem;
-
-		//		item.calendar = this;
-
-		//return item;
-
-		if (!doNotify) {
-			doNotify = false;
-		}
-
-		//item.id = this.tryToSetValue(aCalendarItem.getAttributeByTag("t:ItemId", "Id"), item.id);
-		if (!item.id) {
-			if (this.debug) this.logInfo("Item.id is missing. this is a required field.");
-			item.deleteItem();
-			item = null;
-			//dump("convertExchangeAppointmentToCalAppointment. Item.id is missing. this is a required field.\n");
-			return null;
-		}
-		//item.setProperty("X-ChangeKey", aCalendarItem.getAttributeByTag("t:ItemId", "ChangeKey"));
-		if ((erGetItemsRequest) && (erGetItemsRequest.argument.occurrenceIndexes) && (erGetItemsRequest.argument.occurrenceIndexes[item.id])) {
-			if (this.debug) this.logInfo(" Muriel:" + erGetItemsRequest.argument.occurrenceIndexes[item.id] + ", title:" + item.title);
-			item.occurrenceIndex = erGetItemsRequest.argument.occurrenceIndexes[item.id];
-			//setProperty("X-OccurrenceIndex", erGetItemsRequest.argument.occurrenceIndexes[item.id]+"");
-		}
-
-		if (!item.startDate) {
-			if (this.debug) this.logInfo("We have an empty startdate. Skipping this item.");
-			item.deleteItem();
-			item = null;
-			//dump("convertExchangeAppointmentToCalAppointment. We have an empty startdate. Skipping this item.\n");
-			return null;
-		}
-
-		if (!item.endDate) {
-			if (this.debug) this.logInfo("We have an empty enddate. Skipping this item.");
-			item.deleteItem();
-			item = null;
-			//dump("convertExchangeAppointmentToCalAppointment. We have an empty enddate. Skipping this item.\n");
-			return null;
-		}
-
-		if (item.startDate.compare(item.endDate) > 0) {
-			if (this.debug) this.logInfo("Startdate (" + item.startDate + ") is after enddate (" + item.endDate + ")? Skipping this item.");
-			item.deleteItem();
-			item = null;
-			//dump("convertExchangeAppointmentToCalAppointment. Startdate ("+item.startDate+") is after enddate ("+item.endDate+")? Skipping this item.\n");
-			return null;
-		}
-
-		return this.convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest);
-	},
-
-	convertExchangeTaskToCalTask: function _convertExchangeTaskToCalTask(aTask, erGetItemsRequest, fromOfflineCache) {
-		//if (this.debug) this.logInfo("convertExchangeTaskToCalTask:"+xml2json.toString(aTask), 2);
-		//var item = createTodo();
-		//		var item = Cc["@1st-setup.nl/exchange/calendartodo;1"]
-		//				.createInstance(Ci.mivExchangeTodo, this);
-
-		var item = new mivExchangeTodo();
-
-		item.addMailboxAlias(this.mailbox);
-		item.calendar = this.superCalendar;
-		item.exchangeData = aTask;
-
-		return this.convertExchangeItemtoCalItem(aTask, item, fromOfflineCache, false);
-
-		// See if this is a delegated task.
-		/*		var isNotAccepted = 0;
-
-				for each (var extendedProperty in aTask.getTagValue("t:ExtendedProperty")) {
-
-					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33032") {
-						item.setProperty("X-exchWebService-PidLidTaskAccepted",extendedProperty.getTagValue("t:Value"));
-						// TRUE means accepted or rejected.
-						if (extendedProperty.getTagValue("t:Value") == "false") isNotAccepted++;
-					}
-					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33045") {
-						item.setProperty("X-exchWebService-PidLidTaskLastUpdate",extendedProperty.getTagValue("t:Value"));
-						// Date of last update. 
-					}
-					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33066") {
-						item.setProperty("X-exchWebService-PidLidTaskAcceptanceState",extendedProperty.getTagValue("t:Value"));
-						// Only visible on the Owner task item. Otherwise value == NoMatch
-						//0x00000000 The task is not assigned.
-						//0x00000001 The task’s acceptance status is unknown.
-						//0x00000002 The task assignee accepted the task. This value is set when the client processes a task acceptance.
-						//0x00000003 The task assignee rejected the task. This value is set when the client processes a task rejection.
-						if (extendedProperty.getTagValue("t:Value") == "NoMatch") isNotAccepted++;
-					}
-					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33050") {
-						item.setProperty("X-exchWebService-PidLidTaskHistory",extendedProperty.getTagValue("t:Value"));
-						// Specifies last change to record. PidLidTaskLastUpdate shows date of this change.
-						//0x00000004 The dispidTaskDueDate (PidLidTaskDueDate) property changed.
-						//0x00000003 Another property was changed.
-						//0x00000001 The task assignee accepted this task.
-						//0x00000002 The task assignee rejected this task.
-						//0x00000005 The task was assigned to a task assignee.
-						//0x00000000 No changes were made.
-						if (extendedProperty.getTagValue("t:Value") == "5") isNotAccepted++;
-					}
-					if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33065") {
-						item.setProperty("X-exchWebService-PidLidTaskOwnership",extendedProperty.getTagValue("t:Value"));
-					}
-				}
-				if (aTask.getTagValue("t:Delegator") != "") {
-					item.setProperty("X-exchWebService-Delegator",aTask.getTagValue("t:Delegator"));
-					item.setProperty("X-exchWebService-Owner",aTask.getTagValue("t:Owner"));
-					item.setProperty("X-exchWebService-IsTeamTask",aTask.getTagValue("t:IsTeamTask"));
-				}
-		*/
-	},
-
-	convertExchangeUserAvailabilityToCalAppointment: function _convertExchangeUserAvailabilityToCalAppointment(aCalendarEvent) {
-		//		if (aCalendarEvent.getTagValue("t:BusyType") == "Free") {
-		/*			var startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
-					var endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
-
-					// Cleanup items that were busy but are now free.
-		dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
-					for (var index in this.itemCacheById) {
-						if ((startDate.compare(this.itemCacheById[index].endDate) < 0) && (endDate.compare(this.itemCacheById[index].startDate) > 0)) {
-							this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
-							delete this.itemCacheById[index];
-						}
-					}*/
-
-		//			return null;
-		//		}
-
-		var item = createEvent();
-		//		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
-		//				.createInstance(Ci.mivExchangeEvent);
-		item.calendar = this.superCalendar;
-
-		if (xml2json.getTagValue(aCalendarEvent, "t:BusyType") == "Free") {
-			item.setProperty("TRANSP", "TRANSPARENT");
-		}
-		else {
-			item.setProperty("TRANSP", "OPAQUE");
-		}
-
-		item.title = this.tryToSetValue(xml2json.getTagValue(aCalendarEvent, "t:BusyType"), "");
-		if (!item.title) {
-			item.title = "";
-		}
-
-		if (xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails")) {
-			item.title = this.tryToSetValue(xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Subject"), "") + " (" + item.title + ")";
-
-			item.setProperty("LOCATION", xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Location"));
-		}
-		else {
-			item.title = " (" + item.title + ")";
-		}
-
-		//		item.setProperty("DESCRIPTION", aCalendarItem.getTagValue("t:Body"));
-
-		item.startDate = null;
-		if (xml2json.getTagValue(aCalendarEvent, "t:StartTime", null)) {
-			if (this.isVersion2007) {
-				item.startDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:StartTime", null), this.globalFunctions.ecUTC());
-			}
-			else {
-				item.startDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:StartTime", null), this.globalFunctions.ecDefaultTimeZone());
-			}
-		}
-
-		//		item.startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
-		if (!item.startDate) {
-			if (this.debug) this.logInfo("We have an empty startdate. Skipping this item.");
-			item = null;
-			return null;
-		}
-
-		item.endDate = null;
-		if (xml2json.getTagValue(aCalendarEvent, "t:EndTime", null)) {
-			if (this.isVersion2007) {
-				item.endDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:EndTime", null), this.globalFunctions.ecUTC());
-			}
-			else {
-				item.endDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:EndTime", null), this.globalFunctions.ecDefaultTimeZone());
-			}
-		}
-
-		//item.endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
-		if (!item.endDate) {
-			if (this.debug) this.logInfo("We have an empty enddate. Skipping this item.");
-			return null;
-		}
-
-
-		var startDateStr = xml2json.getTagValue(aCalendarEvent, "t:StartTime", "");
-		var endDateStr = xml2json.getTagValue(aCalendarEvent, "t:EndTime", "");
-		item.id = this.md5(startDateStr + endDateStr);
-		if (this.itemCacheById[item.id]) {
-			//dump("\n-- we already know this one --:"+xml2json.toString(aCalendarEvent)+"\n");
-			//item = null;
-			return this.itemCacheById[item.id];
-		}
-
-		// Try to see if it is an all day event. Only to see if all hours, minutes and seconds are 0 (zero)
-		if ((item.startDate.hour == 0) && (item.startDate.minute == 0) && (item.startDate.second == 0)
-			&& (item.endDate.hour == 0) && (item.endDate.second == 0) && (item.endDate.second == 0)) {
-			item.startDate.isDate = true;
-			item.endDate.isDate = true;
-		}
-
-		//dump("\n-- added --:"+xml2json.toString(aCalendarEvent)+"\n");
-		return item;
-	},
-
-	convertExchangeToCal: function _convertExchangeToCal(aExchangeItem, erGetItemsRequest, doNotify, fromOfflineCache) {
-		//		if (this.debug) this.logInfo("convertExchangeToCal:"+aExchangeItem, 2);
-		if (!aExchangeItem) {
-			if (this.debug) this.logInfo("convertExchangeToCal: !aExchangeItem", 2);
-			//dump("convertExchangeToCal. !aExchangeItem\n");
-			return;
-		}
-
-		var switchValue = xml2json.getTagValue(aExchangeItem, "t:ItemClass", "");
-		if (switchValue.indexOf(".{") > -1) {
-			switchValue = switchValue.substr(0, switchValue.indexOf(".{"));
-		}
-
-		if (switchValue.indexOf("IPM.Appointment") == 0) {
-
-			if (this.debug) this.logInfo("INFO: convertExchangeToCal: ItemClass = '" + switchValue + "'", 2);
-			switchValue = "IPM.Appointment";
-		}
-
-		switch (switchValue) {
-		case "IPM.Appointment":
-		case "IPM.Appointment.Occurrence":
-		case "IPM.Appointment.MP":
-		case "IPM.Appointment.Live Meeting Request":
-		case "IPM.OLE.CLASS":
-		case "IPM.Schedule.Meeting.Request":
-		case "IPM.Schedule.Meeting.Canceled":
-			return this.convertExchangeAppointmentToCalAppointment(aExchangeItem, false, erGetItemsRequest, doNotify, fromOfflineCache);
-			break;
-		case "IPM.Task":
-			return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
-			break;
-		case "IPM.Note":
-			return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
-			break;
-		default:
-			if (aExchangeItem.tagName == "CalendarEvent") {
-				return this.convertExchangeUserAvailabilityToCalAppointment(aExchangeItem);
-			}
-			if (this.debug) this.logInfo("WARNING: convertExchangeToCal: unknown ItemClass = '" + switchValue + "'");
-		}
-	},
-
-	updateCalendar: function _updateCalendar(erGetItemsRequest, aItems, doNotify, fromOfflineCache, processInParts) {
-		if (!processInParts) {
-			this.updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache);
-			return;
-		}
-
-		if (this.debug) this.logInfo("updateCalendar: We have '" + aItems.length + "' items to update in calendar in parts. fromOfflineCache:" + fromOfflineCache);
-
-		for (var index in aItems) {
-			this.updateCalendarItems.push({
-				request: erGetItemsRequest,
-				item: aItems[index],
-				doNotify: doNotify,
-				fromOfflineCache: fromOfflineCache
-			});
-			aItems[index] = null;
-		}
-
-		this.doUpdateCalendarItem();
-
-		if ((this.updateCalendarItems.length > 0) && (!this.updateCalendarTimerRunning)) {
-			this.updateCalendarTimerRunning = true;
-			let self = this;
-			//this.observerService.notifyObservers(this, "onExchangeProgressChange", "2");
-			this.updateCalendarTimer.initWithCallback({
-				notify: function setTimeout_notify() {
-					self.doUpdateCalendarItem();
-				}
-			}, 20, this.updateCalendarTimer.TYPE_REPEATING_SLACK);
-		}
-	},
-
-	doUpdateCalendarItem: function _doUpdateCalendarItem() {
-		if (this.updateCalendarItems.length > 0) {
-			var tmpItems = [];
-
-			let counter = 5;
-			while ((counter > 0) && (this.updateCalendarItems.length > 0)) {
-				var updateRecord = this.updateCalendarItems.shift();
-				tmpItems.push(updateRecord.item);
-				counter--;
-			}
-
-			this.updateCalendar2(updateRecord.request, tmpItems, false, true);
-			tmpItems = null;
-			updateRecord.item = null;
-			updateRecord.request = null;
-			updateRecord = null;
-		}
-
-		if (this.updateCalendarItems.length == 0) {
-			//this.observerService.notifyObservers(this, "onExchangeProgressChange", "-2");
-			this.updateCalendarTimer.cancel();
-			this.updateCalendarTimerRunning = false;
-		}
-	},
-
-	updateCalendar2: function _updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache) {
-		if (this.debug) this.logInfo("updateCalendar2: We have '" + aItems.length + "' items to update in calendar. fromOfflineCache:" + fromOfflineCache);
-
-		let cacheItem = {};
-
-		for (var index = 0; index < aItems.length; index++) {
-
-			this.itemsFromExchange++;
-
-			var item = this.convertExchangeToCal(aItems[index], erGetItemsRequest, doNotify, fromOfflineCache);
-
-			if (item) {
-				if (item.isCancelled && item.reminderIsSet && isEvent(item)) {
-					var aNewItem = item.QueryInterface(Ci.mivExchangeEvent);
-					if (this.debug) this.logInfo("updateCalendar2: This item is Cancelled resetting reminder to false :  " + aNewItem.title);
-					this.itemCount++;
-					aNewItem._reminderIsSet = false;
-					aNewItem._newAlarm = null;
-					this.modifyItem(aNewItem, item);
-					if (this.debug) this.logInfo("updateCalendar2: hope! reminder is set  for item " + aNewItem.title + " going to modify next item");
-				}
-				//convertedItems.push(item);
-				else if (!this.itemCacheById[item.id]) {
-					// This is a new unknown item
-					//this.itemCacheById[item.id] = item;  
-					if ((this.isEmailTodo(item, aItems[index]) === false) && (this.isEmail(item) === true)) {
-						//We are not adding this item because its no longer email followup
-					}
-					else {
-						this.addItemToCache(item);
-						this.itemCount++;
-
-						if (isEvent(item) && this.markEventasTentative) {
-							var isOldCacheItem = false;
-							var aItem = item.QueryInterface(Ci.mivExchangeEvent);
-
-							if (this.debug) this.logInfo("updateCalendar2: proceed setTentative:" + item.title);
-							this.setTentative(aItem, aItems[index], isOldCacheItem);
-						}
-
-						if (this.debug) this.logInfo("updateCalendar2: onAddItem:" + item.title);
-						if (doNotify) {
-							this.notifyTheObservers("onAddItem", [item]);
-						}
-
-						if ((this.useOfflineCache) && (!fromOfflineCache)) {
-							cacheItem[item.id] = {
-								calItem: item,
-								exchangeItemXML: xml2json.toString(aItems[index])
-							};
-							//this.addToOfflineCache(item, xml2json.toString(aItems[index]));
-						}
-					}
-				}
-				else {
-					// I Allready known this one.
-					if (this.debug) this.logInfo("updateCalendar2: onModifyItem:" + item.title);
-					//dump("updateCalendar: onModifyItem:"+ item.title);
-
-					if ((this.isEmail(item) === true) && (this.isEmailTodo(item, aItems[index]) === false)) {
-						//We are removing this item from cache because its no longer email followup  
-						this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
-						this.removeFromOfflineCache(item);
-						this.removeItemFromCache(this.itemCacheById[item.id]);
-					}
-					else {
-						this.singleModified(item, doNotify);
-
-						if ((this.useOfflineCache) && (!fromOfflineCache)) {
-							cacheItem[item.id] = {
-								calItem: item,
-								exchangeItemXML: xml2json.toString(aItems[index])
-							};
-							//this.addToOfflineCache(item, xml2json.toString(aItems[index]));
-						}
-					}
-				}
-			}
-
-			aItems[index] = null;
-
-		}
-
-		if ((this.useOfflineCache) && (!fromOfflineCache)) {
-			this.addToOfflineCache(cacheItem);
-		}
-	},
-
-	isEmailTodo: function _isEmailTodo(item, exchangeData) {
-		if (this.isEmail(item)) {
-			var tmpObject = xml2json.XPath(exchangeData, "/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1090']");
-
-			if (tmpObject.length > 0) {
-				let ext_val = xml2json.getTagValue(tmpObject[0], "t:Value", "0");
-				if ((ext_val === "1") || (ext_val === "2")) {
-					return true;
-				}
-				else {
-					return false;
-				}
-			}
-			else {
-				return false;
-			}
-		}
-		return false;
-	},
-
-	isEmail: function _isEmail(item) {
-		if (item) {
-			if (item.itemClass == "IPM.Note") return true;
-		}
-		return false;
-	},
-
-	setTentative: function _setTentative(aItem, exchangeItem, isOldCacheItem) {
-		//Return when item already in cache
-		if (!aItem || !exchangeItem || !isEvent(aItem)) {
-			if (this.debug) this.logInfo("setTentative");
-			return;
-		}
-
-		if (this.newCalendar) {
-			if (this.debug) this.logInfo("setTentative : calendar is creating so no setTentative will not proceed");
-			return;
-		}
-
-		if (isOldCacheItem) {
-			//NoResponseReceived
-			//t:MyResponseType 
-			if (this.debug) this.logInfo("setTentative 2: This item : " + aItem.title + " is Old and responded with - " + xml2json.getTagValue(exchangeItem, "t:MyResponseType"));
-			return;
-		}
-		else {
-			var aNewItem = aItem.QueryInterface(Ci.mivExchangeEvent);
-			var aOldItem = aItem.QueryInterface(Ci.mivExchangeEvent);
-
-			var aNewItem = this.cloneItem(aItem);
-			var aOldItem = this.cloneItem(aItem);
-
-			var itemResponse = xml2json.getTagValue(exchangeItem, "t:MyResponseType");
-			if (itemResponse == "NoResponseReceived") {
-				var meNew = this.getInvitedAttendee(aNewItem);
-				var meOld = this.getInvitedAttendee(aOldItem);
-				//Assuming items already marked as tentaive in auto processing settings in ews server
-				if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + " stauts: " + meNew.participationStatus + " :: " + meOld.participationStatus + " - " + aItem.title + " Responded : " + itemResponse);
-				//aNewItem.setProperty("STATUS", "TENTATIVE");
-
-				meNew.participationStatus = "TENTATIVE";
-
-				if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + meNew.participationStatus + " :: " + meOld.participationStatus);
-				this.modifyEventImmediate(aNewItem, aOldItem);
-			}
-			else {
-				if (this.debug) this.logInfo("setTentative 2: This item is found in cache " + aItem.title + " Responded : " + itemResponse);
-				return;
-			}
-		}
-	},
-
-	modifyEventImmediate: function _modifyItemImmediate(aNewItem, aOldItem, aListener) {
-
-		if (this.debug) this.logInfo("modifyEventImmediate");
-		var result = Ci.calIErrors.MODIFICATION_FAILED;
-
-		if (this.OnlyShowAvailability) {
-			this.readOnlyInternal = true;
-			this.notifyOperationComplete(aListener,
-				Ci.calIErrors.OPERATION_CANCELLED,
-				Ci.calIOperationListener.MODIFY,
-				aNewItem.id,
-				aNewItem);
-			return null;
-		}
-
-		if (this.readOnly) {
-			// When we hit this it probably is the change on a alarm. We will process this only in the local cache.
-			if (this.debug) this.logInfo("modifyEventImmediate: modifyItem and this calendar is ReadOnly");
-			this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.MODIFY,
-				aNewItem.id,
-				aNewItem);
-			return null;
-		}
-
-		if ((aOldItem.className) && (!aOldItem.canModify)) {
-			if (this.debug) this.logInfo("modifyEventImmediate: modifyItem and this item is ReadOnly for this user.");
-			this.notifyOperationComplete(aListener,
-				Cr.NS_OK,
-				Ci.calIOperationListener.MODIFY,
-				aOldItem.id,
-				aOldItem);
-			return null;
-		}
-
-		if (this.debug) this.logInfo("modifyEventImmediate: 1 -- aOldItem.recurrenceInfo:" + aOldItem.recurrenceInfo + ", aNewItem.recurrenceInfo:" + aNewItem.recurrenceInfo);
-		if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aOldItem.recurrenceInfo.toString():" + aOldItem.recurrenceInfo.toString());
-		if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aNewItem.recurrenceInfo.toString():" + aNewItem.recurrenceInfo.toString());
-
-		if (!aNewItem) {
-			throw Cr.NS_ERROR_INVALID_ARG;
-		}
-
-		var this_ = this;
-
-		function reportError(errStr, errId) {
-			this_.notifyOperationComplete(aListener,
-				errId ? errId : Cr.NS_ERROR_FAILURE,
-				Ci.calIOperationListener.MODIFY,
-				aNewItem.id,
-				errStr);
-			return null;
-		}
-
-		if (aNewItem.id == null) {
-			// this is definitely an error
-			return reportError("modifyEventImmediate: ID for modifyItem item is null");
-		}
-
-		// See if attachments changed.
-		var newAttachments = aNewItem.getAttachments({});
-		var attachments = {};
-
-		var attachmentsUpdates = {
-			create: [],
-			delete: []
-		};
-		if (newAttachments.length > 0) {
-			if (this.debug) this.logInfo("modifyEventImmediate:   -- We have newAttachments:" + newAttachments.length);
-			for (var index in newAttachments) {
-				if (newAttachments[index].getParameter("X-AttachmentId")) {
-					attachments[newAttachments[index].getParameter("X-AttachmentId")] = newAttachments[index];
-				}
-				else {
-					attachmentsUpdates.create.push(newAttachments[index]);
-					if (this.debug) this.logInfo("modifyEventImmediate: newAttachment:" + newAttachments[index].uri.spec);
-				}
-			}
-		}
-		// Check which have been removed.
-		var oldAttachments = aOldItem.getAttachments({});
-		for (var index in oldAttachments) {
-			if (!attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
-				attachmentsUpdates.delete.push(oldAttachments[index]);
-				if (this.debug) this.logInfo("modifyEventImmediate: removedAttachment:" + oldAttachments[index].uri.spec);
-			}
-		}
-
-
-		if (isEvent(aNewItem)) {
-			if (this.debug) this.logInfo("modifyEventImmediate:  it is an event.");
-			var doSendMeetingRespons = false;
-			var meOld = this.getInvitedAttendee(aOldItem);
-			if (!meOld) {
-				if (this.debug) this.logInfo("modifyEventImmediate: Did not find meOld");
-				meOld = cal.createAttendee();
-				meOld.participationStatus = "NEEDS-ACTION";
-			}
-
-			var meNew = this.getInvitedAttendee(aNewItem);
-			if (!meNew) {
-				if (this.debug) this.logInfo("modifyEventImmediate: Did not find meNew");
-				meNew = cal.createAttendee();
-				meNew.participationStatus = "NEEDS-ACTION";
-			}
-
-			if (aOldItem.isInvitation) {
-
-				if (this.debug) this.logInfo("modifyEventImmediate: 1 meOld.participationStatus=" + meOld.participationStatus + ", meNew.participationStatus=" + meNew.participationStatus);
-				if (this.debug) this.logInfo("modifyEventImmediate: 1 aOldItem.status=" + aOldItem.getProperty("STATUS") + ", aNewItem.status=" + aNewItem.getProperty("STATUS"));
-
-				if ((meOld) && (meNew) && (meOld.participationStatus != meNew.participationStatus)) {
-					doSendMeetingRespons = true;
-				}
-
-				if ((meNew) && (meNew.participationStatus == "NEEDS-ACTION") && (meOld.participationStatus != meNew.participationStatus)) {
-					// They choose to confirm at a later state. Do not change this item.
-					this.notifyOperationComplete(aListener,
-						Cr.NS_OK,
-						Ci.calIOperationListener.MODIFY,
-						aNewItem.id,
-						aNewItem);
-
-					return null;
-				}
-
-				if ((meOld) && (meNew) && (aOldItem.getProperty("STATUS") != aNewItem.getProperty("STATUS")) && (!doSendMeetingRespons)) {
-					switch (aNewItem.getProperty("STATUS")) {
-					case "CONFIRMED":
-						meNew.participationStatus = "ACCEPTED";
-						break;
-					case null:
-					case "TENTATIVE":
-						meNew.participationStatus = "TENTATIVE";
-						break;
-					case "CANCELLED":
-						meNew.participationStatus = "DECLINED";
-						break;
-					}
-					doSendMeetingRespons = true;
-				}
-
-			}
-
-			if (this.debug) this.logInfo("modifyEventImmediate:  doSendMeetingRespons " + doSendMeetingRespons);
-
-			if (doSendMeetingRespons) {
-				// The item is an invitation.
-				// My status has changed. Send to this.globalFunctions.
-				if (this.debug) this.logInfo("modifyEventImmediate: 2 aOldItem.participationStatus=" + meOld.participationStatus + ", aNewItem.participationStatus=" + (meNew ? meNew.participationStatus : ".."));
-				if (this.debug) this.logInfo("modifyEventImmediate: 3a aOldItem.id=" + aOldItem.id);
-				if (this.debug) this.logInfo("modifyEventImmediate: 3b aNewItem.id=" + aNewItem.id);
-
-				var requestResponseItem = aNewItem;
-				requestResponseItem.setProperty("X-MEETINGREQUEST", true);
-				var aResponse = null;
-
-				// Loop through meetingRequestsCache to find it.
-				var cachedItem = null;
-				for (var index in this.meetingRequestsCache) {
-					if (this.meetingRequestsCache[index]) {
-						if (this.meetingRequestsCache[index].uid == aNewItem.id) {
-							cachedItem = this.meetingRequestsCache[index];
-							break;
-						}
-					}
-				}
-
-				if (cachedItem) {
-					if (this.debug) this.logInfo("modifyEventImmediate: ___________ Found in meeting request cache.");
-					var tmpItem = cachedItem;
-					var tmpUID = aNewItem.id;
-					requestResponseItem = this.cloneItem(aNewItem);
-					requestResponseItem.id = tmpItem.id;
-					//requestResponseItem.setProperty("X-UID",  tmpItem.uid);
-					//requestResponseItem.setProperty("X-ChangeKey",  tmpItem.changeKey);
-				}
-				else {
-					if (this.debug) this.logInfo("modifyEventImmediate: ___________ NOT Found in meeting request cache. X-UID:" + aNewItem.uid);
-
-					if (aNewItem.id == aNewItem.parentItem.id) {
-						if (this.debug) this.logInfo("modifyEventImmediate: _________ it is a master.");
-					}
-
-					if ((!this.itemCacheById[aNewItem.id]) && (!this.recurringMasterCache[aNewItem.uid])) {
-						this.getMeetingRequestFromServer(aNewItem, aOldItem.uid, Ci.calIOperationListener.MODIFY, aListener);
-						return;
-					}
-
-				}
-
-				if (this.sendMeetingResponsImmediate(requestResponseItem, null, "exisiting", aResponse)) {
-					//return;
-					result = Cr.NS_OK;
-				}
-				else {
-					if (this.debug) this.logInfo("modifyEventImmediate : canceled by user.");
-					result = Cr.NS_OK;
-				}
-			}
-			else {
-
-				var input = {
-					item: aNewItem,
-					response: "sendtonone"
-				};
-
-				if (aNewItem.organizer) {
-					if (this.debug) this.logInfo("The organizer is:" + aNewItem.organizer.id);
-				}
-				else {
-					if (this.debug) this.logInfo("We have no organizer!");
-				}
-
-
-				var changesObj = this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation);
-				var changes;
-				if (changesObj) {
-					changes = changesObj.changes;
-				}
-				var weHaveChanges = (changes || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
-				//				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
-
-				var iAmOrganizer = ((aNewItem.organizer) && (aNewItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
-				//if (iAmOrganizer) {}
-
-				if (this.debug) this.logInfo("modifyEventImmediate:  it is a event. aOldItem.CalendarItemType=:" + aOldItem.calendarItemType);
-
-				// We have a Single or master
-				if (aOldItem.calendarItemType == "RecurringMaster") {
-					if (this.debug) this.logInfo(" Master changed:" + aNewItem.title);
-					// See if the aNewItem is also the master record.
-					var masterChanged = (aNewItem.parentItem.id == aNewItem.id);
-
-					// We need to find out wat has changed;
-					if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite=" + aOldItem.isInvitation);
-
-					if (changes) {
-						if (this.debug) this.logInfo("modifyEventImmediate: changed:" + String(changes));
-
-						var self = this;
-						this.addToQueue(erUpdateItemRequest, {
-								user: this.user,
-								mailbox: this.mailbox,
-								folderBase: this.folderBase,
-								serverUrl: this.serverUrl,
-								item: aOldItem,
-								folderID: this.folderID,
-								changeKey: this.changeKey,
-								updateReq: changes,
-								newItem: aNewItem,
-								actionStart: Date.now(),
-								attachmentsUpdates: attachmentsUpdates,
-								sendto: input.response
-							},
-							function (erUpdateItemRequest, aId, aChangeKey) {
-								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-							},
-							function (erUpdateItemRequest, aCode, aMsg) {
-								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-							},
-							aListener);
-						return;
-					}
-					else {
-						if (this.debug) this.logInfo("modifyEventImmediate:  No changes for master.");
-						// No changes to a master could means that one of the occurrences
-						// was deleted. 
-						var removedOccurrence = this.getRemovedOccurrence(aOldItem, aNewItem);
-						if (removedOccurrence) {
-							// Delete this occurrence; multi
-							this.notifyTheObservers("onDeleteItem", [removedOccurrence], true);
-							this.deleteItem(removedOccurrence);
-							result = Cr.NS_OK;
-						}
-						else {
-							// Could be an alarm dismiss or snooze
-							dump("IF YOU SEE THIS PLEASE REPORT..(CODE1)\n");
-							this.masterModified(aNewItem);
-						}
-						result = Cr.NS_OK;
-					}
-				}
-				else {
-					if (this.debug) this.logInfo("modifyEventImmediate: '" + aOldItem.calendarItemType + "' event modification");
-					// We need to find out wat has changed;
-					if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite=" + aOldItem.isInvitation);
-
-					if (changes) {
-						if (this.debug) this.logInfo("modifyEventImmediate:  changed:" + String(changes));
-
-						var self = this;
-						this.addToQueue(erUpdateItemRequest, {
-								user: this.user,
-								mailbox: this.mailbox,
-								folderBase: this.folderBase,
-								serverUrl: this.serverUrl,
-								item: aOldItem,
-								folderID: this.folderID,
-								changeKey: this.changeKey,
-								updateReq: changes,
-								newItem: aNewItem,
-								actionStart: Date.now(),
-								attachmentsUpdates: attachmentsUpdates,
-								sendto: input.response
-							},
-							function (erUpdateItemRequest, aId, aChangeKey) {
-								self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
-							},
-							function (erUpdateItemRequest, aCode, aMsg) {
-								self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
-							},
-							aListener);
-						this.singleModified(aNewItem, true, true);
-						return;
-					}
-					else {
-						if (this.doAttachmentUpdates(attachmentsUpdates, aOldItem, input.response, aListener)) {
-							// We are done
-							if (this.debug) this.logInfo("modifyEventImmediate:  No only attachment changes no other fields.");
-							return;
-						}
-						else {
-							if (this.debug) this.logInfo("modifyEventImmediate:  No changes 1.");
-							if (!aOldItem.isInvitation) {
-								//aNewItem.parentItem = aNewItem; move to storagecalendar
-								this.singleModified(aNewItem, true, true);
-							}
-							result = Cr.NS_OK;
-						}
-					}
-				}
-			}
-		}
-		//this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]); 
-		this.notifyOperationComplete(aListener,
-			result,
-			Ci.calIOperationListener.MODIFY,
-			aNewItem.id,
-			aNewItem);
-
-		return null;
-	},
-
-	sendMeetingResponsImmediate: function _sendMeetingResponsImmediate(aItem, aListener, aItemType, aResponse, aBodyText) {
-		if (this.debug) this.logInfo("sendMeetingResponsImmediate");
-
-		// Check if I'm the organiser. Do not send to myself.
-		if (aItem.organizer) {
-			if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
-				return true;
-			}
-		}
-		var me = this.getInvitedAttendee(aItem);
-		if ((!me) && (!aResponse)) {
-			return false;
-		}
-
-		if (aResponse) {
-			var tmpResponse = aResponse;
-		}
-		else {
-			var tmpResponse = me.participationStatus;
-		}
-
-		var messageDisposition = "SendOnly";
-
-		var input = {
-			item: aItem,
-			response: tmpResponse,
-			answer: "",
-			bodyText: ""
-		};
-
-		if (this.debug) this.logInfo("sendMeetingResponsImmediate:  -------------- messageDisposition=" + messageDisposition);
-
-		var self = this;
-		this.addToQueue(erSendMeetingResponsRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				folderBase: this.folderBase,
-				serverUrl: this.serverUrl,
-				item: aItem,
-				folderID: this.folderID,
-				changeKey: this.changeKey,
-				response: input.response,
-				bodyText: input.bodyText,
-				senderMailbox: this.mailbox,
-				actionStart: Date.now(),
-				itemType: aItemType,
-				messageDisposition: messageDisposition
-			},
-			function (erSendMeetingResponsRequest) {
-				self.sendMeetingResponsOk(erSendMeetingResponsRequest);
-			},
-			function (erSendMeetingResponsRequest, aCode, aMsg) {
-				self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);
-			},
-			aListener);
-		return true;
-	},
-
-
-	getCalendarItemsOK: function _getCalendarItemsOK(erGetItemsRequest, aItems, aItemErrors) {
-		if (this.debug) this.logInfo("getCalendarItemsOK: aItems.length=" + aItems.length);
-		this.saveCredentials(erGetItemsRequest.argument);
-		this.notConnected = false;
-
-		if ((aItemErrors) && (aItemErrors.length > 0)) {
-			// Remove these items as they have an error
-			var i = 0;
-			while (i < aItemErrors.length) {
-				if (this.itemCacheById[aItemErrors[i]]) {
-					this.removeFromOfflineCache(this.itemCacheById[aItemErrors[i]]);
-					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[aItemErrors[i]]]);
-					this.removeItemFromCache(this.itemCacheById[aItemErrors[i]]);
-				}
-				else {
-					this.removeFromOfflineCache({
-						id: aItemErrors[i],
-						title: "from offline"
-					});
-				}
-				i++;
-			}
-
-		}
-
-		if (aItems.length == 0) {
-			return;
-		}
-
-		this.updateCalendar(erGetItemsRequest, aItems, true);
-		aItems = null;
-		erGetItemsRequest = null;
-	},
-
-	getCalendarItemsError: function _getCalendarItemsError(erGetItemsRequest, aCode, aMsg) {
-		this.saveCredentials(erGetItemsRequest.argument);
-		this.notConnected = true;
-
-	},
-
-	get isVersion2013() {
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2013") > -1) {
-			return true;
-		}
-
-		return false;
-	},
-
-	get isVersion2010() {
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010") > -1) {
-			return true;
-		}
-
-		return false;
-	},
-
-	get isVersion2007() {
-		if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") > -1) {
-			return true;
-		}
-
-		return false;
-	},
-
-	set weAreSyncing(aValue) {
-		if (aValue != this._weAreSyncing) {
-			if (this.debug) this.logInfo("this._weAreSyncing changed from '" + this._weAreSyncing + "' to '" + aValue + "'");
-		}
-		this._weAreSyncing = aValue;
-	},
-
-	get weAreSyncing() {
-		return this._weAreSyncing;
-	},
-
-	getSyncState: function _getSyncState() {
-		if (this.isOffline) return;
-
-		if (!this.weAreSyncing) {
-			// We do not yet have a syncState. Get it first.
-			if (this.debug) this.logInfo("getSyncState: Creating erSyncFolderItemsRequest");
-			var self = this;
-			this.weAreSyncing = true;
-			switch (this.folderBase) {
-			case "tasks":
-				if (!this.deactivateTaskFollowup) {
-					this.logInfo("getSyncState: this.syncStateInbox - " + this.syncStateInbox);
-					this.addToQueue(erSyncFolderItemsRequest, {
-							user: this.user,
-							mailbox: this.mailbox,
-							serverUrl: this.serverUrl,
-							folderBase: "inbox",
-							syncState: this.syncStateInbox,
-							actionStart: Date.now()
-						},
-						function (erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
-							self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);
-						},
-						function (erSyncFolderItemsRequest, aCode, aMsg) {
-							self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);
-						},
-						null);
-				}
-				//Donot  break because we neet to call below section by default..
-			default:
-				this.logInfo("getSyncState: this.syncState - " + this.syncState);
-
-				this.addToQueue(erSyncFolderItemsRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl,
-						folderBase: this.folderBase,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						syncState: this.syncState,
-						actionStart: Date.now()
-					},
-					function (erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
-						self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);
-					},
-					function (erSyncFolderItemsRequest, aCode, aMsg) {
-						self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);
-					},
-					null);
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("getSyncState: not creating erSyncFolderItemsRequest because we are allready syncing");
-		}
-	},
-
-	syncFolderItemsOK: function _syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
-		this.folderPathStatus = 0;
-		this.saveCredentials(erSyncFolderItemsRequest.argument);
-		this.notConnected = false;
-		if (this.debug) this.logInfo("syncFolderItemsOK: Folderbase: " + erSyncFolderItemsRequest.folderBase + ", Creation:" + creations.length + ", Updates:" + updates.length + ", Deletions:" + deletions.length + ", syncState:" + syncState);
-
-		if ((creations.length > 0) || (updates.length > 0) || (deletions.length > 0)) {
-			this.addActivity(calGetString("calExchangeCalendar", "syncFolderEventMessage", [creations.length, updates.length, deletions.length, this.name], "exchangecalendar"), "", erSyncFolderItemsRequest.argument.actionStart, Date.now());
-		}
-
-		if (syncState) {
-
-			if ((this.syncState) && (syncState == this.syncState || syncState == this.syncStateInbox)) {
-				this.logError("Same syncState received.");
-			}
-
-			// This was the first time. we now save the syncState;
-			if (erSyncFolderItemsRequest.folderBase == "inbox") {
-				this.syncStateInbox = syncState;
-				this.prefs.deleteBranch("syncStateInbox");
-				this.prefs.setCharPref("syncStateInbox", syncState);
-				this.saveToFile("syncStateInbox.txt", syncState);
-			}
-			else {
-				this.syncState = syncState;
-				this.prefs.deleteBranch("syncState");
-				this.prefs.setCharPref("syncState", syncState);
-				this.saveToFile("syncState.txt", syncState);
-			}
-			this.weAreSyncing = false;
-		}
-
-		var self = this;
-
-		var changes = [];
-		for each(var creation in creations) {
-			changes.push(creation);
-		}
-		for each(var update in updates) {
-			changes.push(update);
-		}
-		if (changes.length > 0) {
-			switch (erSyncFolderItemsRequest.folderBase) {
-			case "tasks":
-				this.findTaskItemsOK(erSyncFolderItemsRequest, changes);
-				break;
-			case "calendar":
-				this.findCalendarItemsOK(erSyncFolderItemsRequest, changes, []);
-				break;
-			case "inbox":
-				this.findFollowupTaskItemsOK(erSyncFolderItemsRequest, changes);
-				break;
-			default:
-				this.logError("Changes could not be made." + erSyncFolderItemsRequest.folderBase);
-			}
-
-			/*			this.addToQueue( erGetItemsRequest, 
-							{user: this.user, 
-							 mailbox: this.mailbox,
-							 folderBase: this.folderBase,
-							 serverUrl: this.serverUrl,
-							 ids: changes,
-							 folderID: this.folderID,
-							 changeKey: this.changeKey,
-							 folderClass: this.folderClass,
-							 GUID: calExchangeCalendarGUID,
-							 syncState: syncState }, 
-							function(erGetItemsRequest, aIds, aItemErrors) { self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
-							function(erGetItemsRequest, aCode, aMsg) { self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);},
-							null);
-							*/
-		}
-
-		if (!syncState) return;
-
-		if (deletions.length > 0) {
-			for each(var deleted in deletions) {
-				var item = this.itemCacheById[deleted.Id];
-				if ((!item) && (this.useOfflineCache)) {
-					// It could be that the item is not yet loaded from offlineCache. We do this now.
-					item = this.getItemFromOfflineCache(deleted.Id);
-				}
-				if ((item) && (item.calendarItemType != "RecurringMaster")) {
-					// We have this one. Remove it.
-					if (this.debug) this.logInfo("Going to remove an item");
-					// Single item or occurrence.
-					if (item.parentItem.id == item.id) {
-						if (this.debug) this.logInfo("This is a Single to delete. Title:" + item.title + ", calendarItemType:" + item.calendarItemType);
-					}
-					else {
-						if (this.debug) this.logInfo("This is a Occurrence or Exception to delete. THIS SHOULD NEVER HAPPEN.");
-					}
-					this.notifyTheObservers("onDeleteItem", [item]);
-					/*this.itemCacheById[item.id].deleteItem();
-					this.itemCacheById[item.id] = null;
-					delete this.itemCacheById[item.id];*/
-					this.removeItemFromCache(item);
-					this.removeFromOfflineCache(item);
-				}
-				else {
-					// Find matching master record.
-					var master;
-					for (var index in this.recurringMasterCache) {
-						if ((this.recurringMasterCache[index]) && (this.recurringMasterCache[index].id == deleted.Id)) {
-							master = this.recurringMasterCache[index]
-						}
-					}
-					if (master) {
-						// This is a master recurrence. Also remove children.
-						if (this.debug) this.logInfo("This is Master to delete");
-						this.removeChildrenFromMaster(master);
-
-						this.removeFromOfflineCache(master);
-						//this.notifyTheObservers("onDeleteItem", [master]);
-						delete this.recurringMasterCache[master.uid];
-						delete this.recurringMasterCacheById[master.id];
-					}
-					else {
-						if (this.debug) this.logInfo("Do not know what you are trying to delete !!!");
-					}
-				}
-			}
-		}
-
-		if (!this.firstSyncDone) {
-			this.firstSyncDone = true;
-			if (this.debug) this.logInfo("First sync is done. Normal operation is starting.");
-
-			while (this.getItemsSyncQueue.length > 0) {
-				let getItemsReq = this.getItemsSyncQueue.shift();
-				this.getItems(getItemsReq.itemFilter, getItemsReq.count, getItemsReq.rangeStart, getItemsReq.rangeEnd, getItemsReq.listener);
-			}
-			if (this.debug) this.logInfo("First sync is done. Processed getItemsSyncQueue.");
-		}
-
-		if (this.getItemSyncQueue.length > 0) {
-			if (this.debug) this.logInfo("We have " + this.getItemSyncQueue.length + " items in this.getItemSyncQueue");
-			this.processItemSyncQueue();
-		}
-	},
-
-	syncFolderItemsError: function _syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg) {
-		if (this.debug) this.logInfo("syncFolderItemsError");
-		this.folderPathStatus = -1;
-		this.saveCredentials(erSyncFolderItemsRequest.argument);
-		this.notConnected = true;
-		this.weAreSyncing = false;
-		this.processItemSyncQueue();
-	},
-
-	// Check if specified folder still exists. If so get new id and changekey.
-	checkFolderPath: function _checkFolderPath() {
-		// We first restore from prefs.js file from the last time.
-		var tmpFolderClass = this.globalFunctions.safeGetCharPref(this.prefs, "folderClass", null);
-		if (tmpFolderClass) {
-			if (this.debug) this.logInfo("Restore folderClass from prefs.js:" + tmpFolderClass);
-			this.setSupportedItems(tmpFolderClass);
-
-			var tmpFolderProperties = this.globalFunctions.safeGetCharPref(this.prefs, "folderProperties", null);
-			if (tmpFolderProperties) {
-				this.saveToFile("folderProperties.txt", tmpFolderProperties);
-				this.prefs.deleteBranch("folderProperties");
-			}
-
-			if (tmpFolderProperties) {
-				//if (this.debug) this.logInfo("Restore folderProperties from prefs.js:"+tmpFolderProperties);
-				var tmpXML = this.globalFunctions.xmlToJxon(tmpFolderProperties);
-				this.folderProperties = tmpXML;
-
-				this.folderIsNotAvailable = true;
-
-				this.setFolderProperties(tmpXML, tmpFolderClass);
-				tmpXML = null;
-			}
-		}
-
-		this.setServerVersion();
-
-		if (this.isOffline) return;
-
-		if (this.folderPath != "/") {
-			if (this.debug) this.logInfo("checkFolderPath 1");
-			this.folderPathStatus = 1;
-			var self = this;
-
-			this.addToQueue(erFindFolderRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					serverUrl: this.serverUrl,
-					folderBase: this.folderBase,
-					folderPath: this.folderPath,
-					actionStart: Date.now()
-				},
-				function (erFindFolderRequest, aId, aChangeKey, aFolderClass) {
-					self.checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass);
-				},
-				function (erFindFolderRequest, aCode, aMsg) {
-					self.checkFolderPathError(erFindFolderRequest, aCode, aMsg);
-				},
-				null);
-		}
-		else {
-			if (this.folderIDOfShare != "") {
-				// Get Folder Properties.
-				var self = this;
-
-				this.addToQueue(erGetFolderRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl,
-						folderID: this.folderID,
-						changeKey: this.changeKey,
-						actionStart: Date.now()
-					},
-					function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
-						self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
-					},
-					function (erGetFolderRequest, aCode, aMsg) {
-						self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
-					},
-					null);
-			}
-			else {
-				if (this.debug) this.logInfo("checkFolderPath 2");
-				this.folderPathStatus = 1;
-				var self = this;
-
-				this.addToQueue(erGetFolderRequest, {
-						user: this.user,
-						mailbox: this.mailbox,
-						serverUrl: this.serverUrl,
-						folderBase: this.folderBase,
-						folderPath: this.folderPath,
-						actionStart: Date.now()
-					},
-					function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
-						self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
-					},
-					function (erGetFolderRequest, aCode, aMsg) {
-						self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
-					},
-					null);
-			}
-		}
-	},
-
-	setSupportedItems: function _setSupportedItems(aFolderClass) {
-		this.folderClass = aFolderClass;
-		if (this.debug) this.logInfo("Set folderClass=" + this.folderClass.toString());
-		this.prefs.setCharPref("folderClass", aFolderClass);
-		var itemType = Ci.calICalendar.ITEM_FILTER_TYPE_EVENT;
-
-		switch (aFolderClass.toString()) {
-		case "IPF.Appointment":
-			this.supportsEvents = true;
-			this.supportsTasks = false;
-			if (this.debug) this.logInfo("This folder supports only events.");
-			//this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, this.startCacheDate, this.endCacheDate, null);
-			break;
-		case "IPF.Task":
-			this.supportsEvents = false;
-			this.supportsTasks = true;
-			if (this.debug) this.logInfo("This folder supports only tasks.");
-			itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
-			// Get the tasks for the current know time frame
-			//this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO, 0, this.startCacheDate, this.endCacheDate, null);
-			break;
-		case "IPF.Note":
-			this.supportsEvents = false;
-			this.supportsTasks = true;
-			if (this.debug) this.logInfo("This folder supports only tasks.");
-			itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
-			break;
-		default:
-			this.supportsEvents = false;
-			this.supportsTasks = false;
-			if (this.debug) this.logInfo("Unknown folderclass. We do not know if it supports events or tasks so turning it off.");
-			break;
-		}
-
-	},
-
-	checkFolderPathOk: function _checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass) {
-		this.saveCredentials(erFindFolderRequest.argument);
-		if (this.debug) this.logInfo("checkFolderPathOk: aId" + aId + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
-		this.notConnected = false;
-
-		this.folderID = aId;
-		this.changeKey = aChangeKey;
-
-		this.setSupportedItems(aFolderClass);
-
-		// Get Folder Properties.
-		var self = this;
-
-		this.addToQueue(erGetFolderRequest, {
-				user: this.user,
-				mailbox: this.mailbox,
-				serverUrl: this.serverUrl,
-				folderID: aId,
-				changeKey: aChangeKey,
-				actionStart: Date.now()
-			},
-			function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
-				self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
-			},
-			function (erGetFolderRequest, aCode, aMsg) {
-				self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
-			},
-			null);
-
-	},
-
-	get canCreateContent() {
-		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
-			return false;
-		}
-		return this._canCreateContent;
-	},
-
-	get canDelete() {
-		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
-			return false;
-		}
-		return this._canDelete;
-	},
-
-	get canRead() {
-		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
-			return true;
-		}
-		return this._canRead;
-	},
-
-	get canModify() {
-		if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
-			return false;
-		}
-		return this._canModify;
-	},
-
-	setFolderProperties: function _setFolderProperties(aFolderProperties, aFolderClass) {
-		//BUG 111
-		// When the user only has permissions to see free/busy info and also permissions to read the folder
-		// properties we should activate OnlyShowAvailability variable.
-		// Problem is when is this condition true
-		// For now we will set OnlyShowAvailability = true when EffectiveRights.Read == false
-		if (this.debug) this.logInfo(" >>>>>>>>>>>>>>MIV>:" + aFolderClass.toString());
-		var rm = aFolderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/*/t:EffectiveRights");
-		if (rm.length > 0) {
-			this._effectiveRights = rm[0];
-			if (this._effectiveRights) {
-				this._canDelete = (this._effectiveRights.getTagValue("t:Delete", "false") == "true");
-				this._canModify = (this._effectiveRights.getTagValue("t:Modify", "false") == "true");
-				this._canRead = (this._effectiveRights.getTagValue("t:Read", "false") == "true");
-				this._canCreateContent = (this._effectiveRights.getTagValue("t:CreateContents", "false") == "true");
-			}
-		}
-		else {
-			this._effectiveRights = null;
-			this._canDelete = false;
-			this._canModify = false;
-			this._canRead = false;
-			this._canCreateContent = false;
-		}
-		rm = null;
-
-		var rm = aFolderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/*/t:EffectiveRights[t:Read='true']");
-		this.folderIsNotAvailable = false;
-
-		if (rm.length == 0) {
-			if (this.debug) this.logInfo("getFolderOk: but EffectiveRights.Read == false. Only getting Free/Busy information.");
-			if (!this.OnlyShowAvailability) {
-				this.OnlyShowAvailability = true;
-				this.useOfflineCache = false;
-				this.firstSyncDone = true;
-				this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
-				this.startCalendarPoller();
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("getFolderOk: but EffectiveRights.Read != false. Trying to get all event information.");
-			this.readOnlyInternal = false;
-
-			this.setSupportedItems(aFolderClass);
-		}
-		rm = null;
-
-		this.getTimeZones();
-
-	},
-
-	getFolderOk: function _getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass) {
-		this.saveCredentials(erGetFolderRequest.argument);
-		if (this.debug) this.logInfo("getFolderOk: aId" + aId + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
-		this.notConnected = false;
-
-		this.folderProperties = erGetFolderRequest.properties;
-		this.saveToFile("folderProperties.txt", this.folderProperties.toString());
-		//this.prefs.setCharPref("folderProperties", this.folderProperties.toString());
-
-		this.prefs.setCharPref("lastServerVersion", this.exchangeStatistics.getServerVersion(this.serverUrl));
-		this.prefs.setCharPref("lastMajorVersion", this.exchangeStatistics.getMajorVersion(this.serverUrl));
-		this.prefs.setCharPref("lastMinorVersion", this.exchangeStatistics.getMinorVersion(this.serverUrl));
-
-		this.folderIsNotAvailable = true;
-
-		this.setFolderProperties(this.folderProperties, aFolderClass);
-
-		if (this.newCalendar) {
-			this.newCalendar = false;
-			if (this.supportsEvents) {
-				this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, this.newCalRangeStartEvents, this.newCalRangeEndEvents, null);
-			}
-			if (this.supportsTasks) {
-				this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO, 0, this.newCalRangeStartTodos, this.newCalRangeEndTodos, null);
-			}
-		}
-	},
-
-	checkFolderPathError: function _checkFolderPathError(erFindFolderRequest, aCode, aMsg) {
-		this.folderPathStatus = -1;
-		if (this.debug) this.logInfo("checkFolderPathError: Code:" + aCode + ", Msg:" + aMsg);
-		// We could not get the specified folder anymore. Stop working.
-		// 21-03-2012 Try to get Free/Busy/Tentative information and show that.
-
-		if (aCode == -10) {
-			this.notConnected = true;
-		}
-		else {
-
-			if (this.debug) this.logInfo("Going to check if we should show free/busy data.");
-			if (!this.OnlyShowAvailability) {
-				if (this.debug) this.logInfo("Turning on the showing of only free/busy data.");
-				this.OnlyShowAvailability = true;
-				this.useOfflineCache = false;
-				this.firstSyncDone = true;
-				this.folderIsNotAvailable = true;
-				this.folderProperties = null;
-				//this.prefs.deleteBranch("folderProperties");
-				this.removeFile("folderProperties.txt");
-				this.readOnlyInternal = true;
-				this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
-				this.startCalendarPoller();
-			}
-		}
-	},
-
-	getOnlyFreeBusyInformation: function _getOnlyFreeBusyInformation(aRangeStart, aRangeEnd) {
-		if ((!aRangeStart) && (!aRangeEnd)) {
-			if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart and aRangeEnd missing. Going to set start to 20 days before and end to 20 days after now.");
-			var offset = cal.createDuration();
-			offset.days = -20;
-			//offset.normalize();
-			aRangeStart = cal.now();
-			aRangeStart.addDuration(offset);
-			var offset = cal.createDuration();
-			offset.days = 20;
-			//offset.normalize();
-			aRangeEnd = cal.now();
-			aRangeEnd.addDuration(offset);
-		}
-
-		if ((aRangeStart) && (!aRangeEnd)) {
-			if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeEnd missing. Going to set end to 40 days after start.");
-			var offset = cal.createDuration();
-			offset.days = 40;
-			//offset.normalize();
-			aRangeEnd = aRangeStart.clone();
-			aRangeEnd.addDuration(offset);
-		}
-
-		if ((!aRangeStart) && (aRangeEnd)) {
-			if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart missing. Going to set start to 40 days before end.");
-			var offset = cal.createDuration();
-			offset.days = -40;
-			//offset.normalize();
-			aRangeStart = aRangeEnd.clone();
-			aRangeStart.addDuration(offset);
-		}
-
-		if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart:" + aRangeStart + ", aRangeEnd:" + aRangeEnd);
-
-		var tmpStartDate = aRangeStart.clone();
-		tmpStartDate.isDate = false;
-		var tmpEndDate = aRangeEnd.clone();
-		tmpEndDate.isDate = false;
-
-		if (tmpStartDate.year == 1970) {
-			if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart is 1970. To big a range. Setting startrange to 40 days before endrange.");
-			var offset = cal.createDuration();
-			offset.days = -40;
-			offset.normalize();
-			tmpStartDate = tmpEndDate.clone();
-			tmpStartDate.addDuration(offset);
-		}
-		else {
-			var offset = tmpEndDate.subtractDate(tmpStartDate);
-			if (offset.days > 40) {
-				if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart is more than 40 days before endrange. Setting startrange to 40 days before endrange.");
-				var offset = cal.createDuration();
-				offset.days = -40;
-				offset.normalize();
-				tmpStartDate = tmpEndDate.clone();
-				tmpStartDate.addDuration(offset);
-			}
-		}
-
-		var self = this;
-		this.addToQueue(erGetUserAvailabilityRequest, {
-				user: this.user,
-				folderBase: "calendar",
-				serverUrl: this.serverUrl,
-				email: this.mailbox.replace(/^mailto:/i, ""),
-				attendeeType: 'Required',
-				start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
-				end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
-				folderID: this.folderID,
-				changeKey: this.changeKey
-			},
-			function (erGetUserAvailabilityRequest, aEvents) {
-				self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);
-			},
-			function (erGetUserAvailabilityRequest, aCode, aMsg) {
-				self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);
-			},
-			null);
-	},
-
-	setServerVersion: function _setServerVersion() {
-		this.prefServerVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastServerVersion", null);
-		this.prefMajorVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastMajorVersion", null);
-		this.prefMinorVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastMinorVersion", null);
-		if (this.prefServerVersion) {
-			if (this.debug) this.logInfo("Restored prefServerVersion from prefs.js:" + this.prefServerVersion + " (" + this.prefMajorVersion + "." + this.prefMinorVersion + ")");
-			this.exchangeStatistics.setServerVersion(this.serverUrl, this.prefServerVersion, this.prefMajorVersion, this.prefMinorVersion);
-		}
-	},
-
-	getTimeZones: function _getTimeZones() {
-		this.setServerVersion();
-
-		this.timeZones.addURL(this.serverUrl, this.user, this);
-	},
-
-	getEWSTimeZoneId: function _getEWSTimeZoneId(aCalTimeZone, aDate) {
-		if (this.debug) this.logInfo("getEWSTimeZoneId:" + aCalTimeZone.tzid);
-
-		return this.timeZones.getExchangeTimeZoneIdByCalTimeZone(aCalTimeZone, this.serverUrl, aDate);
-	},
-
-	doDeleteCalendar: function _doDeleteCalendar() {
-		this.doShutdown();
-
-		// Remove the offline cache database when we delete the calendar.
-		if (this.dbFile) {
-			this.dbFile.remove(true);
-			this.offlineCacheDB = null;
-		}
-	},
-
-	addItemToCache: function _addItemToCache(item) {
-		if (!item) {
-			//dump("addItemToCache: item is null.\n");
-			return;
-		}
-
-		var itemStartDate = item.startDate || item.entryDate;
-		var itemEndDate = item.endDate || item.dueDate;
-
-		/*if (this.itemCacheById[item.id]) { 
-			dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+". IS AL READY IN CACHE.\n");
-		}
-		else {
-			dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
-		}*/
-		if (this.debug) this.logInfo("addItemToCache ById: item.title:" + item.title + ", startDate:" + itemStartDate + ", endDate:" + itemEndDate + " | " + item.id + ".");
-		//dump("addItemToCache ById: item.title:"+item.title+", startDate:"+itemStartDate+", endDate:"+itemEndDate+" | "+item.id+".\n");
-
-		// Add to Id index.
-		this.itemCacheById[item.id] = item;
-
-		// Add to startDate index.
-		if ((itemStartDate) && (itemEndDate)) {
-			itemStartDate = itemStartDate.getInTimezone(this.globalFunctions.ecUTC());
-			itemEndDate = itemEndDate.getInTimezone(this.globalFunctions.ecUTC());
-			var startYear = itemStartDate.year;
-			var startYearDay = itemStartDate.yearday;
-			var endYear = itemEndDate.year;
-			var endYearDay = itemEndDate.yearday;
-			var doStop = false;
-
-			while (!doStop) {
-
-				if ((startYear == endYear) && (startYearDay == endYearDay)) {
-					doStop = true;
-				}
-				if (!this.itemCacheByStartDate) this.itemCacheByStartDate = {};
-				if (!this.itemCacheByStartDate[startYear]) this.itemCacheByStartDate[startYear] = {};
-				if (!this.itemCacheByStartDate[startYear][startYearDay]) this.itemCacheByStartDate[startYear][startYearDay] = [];
-				if (this.debug) this.logInfo(" -- addItemToCache ByStartDate: item.title:" + item.title + ", startYear:" + startYear + ", startYearDay:" + startYearDay + " | " + item.id + ".", 2);
-				//dump(" -- addItemToCache ByStartDate: item.title:"+item.title+", startYear:"+startYear+", startYearDay:"+startYearDay+" | "+item.id+".\n");
-				this.itemCacheByStartDate[startYear][startYearDay][item.id] = true;
-
-				startYearDay++;
-				if (startYearDay > 366) {
-					startYearDay = 1;
-					startYear++;
-				}
-			}
-		}
-
-	},
-
-	removeItemFromCache: function _removeItemFromCache(item) {
-		if (!item) {
-			//dump("removeItemFromCache: item is null.\n");
-			return;
-		}
-
-		var itemStartDate = item.startDate || item.entryDate;
-		var itemEndDate = item.endDate || item.dueDate;
-		// Remove from startDate index.
-		if ((itemStartDate) && (itemEndDate) && (this.itemCacheByStartDate)) {
-			var startYear = itemStartDate.year;
-			var startYearDay = itemStartDate.yearday;
-			var endYear = itemEndDate.year;
-			var endYearDay = itemEndDate.yearday;
-			var doStop = false;
-
-			while (!doStop) {
-
-				if ((startYear >= endYear) && (startYearDay >= endYearDay)) {
-					doStop = true;
-				}
-
-				if ((this.itemCacheByStartDate[startYear]) && (this.itemCacheByStartDate[startYear][startYearDay])) {
-					if (this.itemCacheByStartDate[startYear][startYearDay][item.id]) {
-						this.itemCacheByStartDate[startYear][startYearDay][item.id] = null;
-						delete this.itemCacheByStartDate[startYear][startYearDay][item.id];
-					}
-				}
-
-				startYearDay++;
-				if (startYearDay > 366) {
-					startYearDay = 1;
-					startYear++;
-				}
-			}
-		}
-
-		if (this.itemCacheById[item.id]) {
-			if (this.itemCacheById[item.id].className) {
-				this.itemCacheById[item.id].deleteItem();
-			}
-			this.itemCacheById[item.id] = null;
-			delete this.itemCacheById[item.id];
-			//			var itemDate = item.startDate || item.entryDate;
-			//dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
-		}
-		else {
-			//			var itemDate = item.startDate || item.entryDate;
-			//dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+". is not in itemCache. | "+item.id+"\n");
-		}
-	},
-
-	doShutdown: function _doShutdown() {
-		if (this.shutdown) {
-			return;
-		}
-
-		this.shutdown = true;
-		this.inboxPoller.cancel();
-
-		if (this.offlineTimer) {
-			this.offlineTimer.cancel();
-		}
-
-		if (this.calendarPoller) {
-			this.calendarPoller.cancel();
-		}
-
-		this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
-
-		this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
-		this.offlineQueue = [];
-
-		// Now we can initialize.
-		this.syncState = null;
-		this.syncStateInbox = null;
-		this.weAreSyncing = false;
-
-		// Remove all items in cache from calendar.
-		for (var index in this.itemCacheById) {
-			if (this.itemCacheById[index]) {
-				//this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
-				/*if (this.itemCacheById[index].className) {
-					this.itemCacheById[index].deleteItem();
-				}
-				this.itemCacheById[index] = null;
-				delete this.itemCacheById[index];*/
-				this.removeItemFromCache(this.itemCacheById[index]);
-			}
-		}
-
-		// Reset caches.
-		this.itemCacheById = {};
-		this.itemCacheByStartDate = {};
-		this.itemCacheByEndDate = {};
-
-		for (var index in this.recurringMasterCache) {
-			if (this.recurringMasterCache[index]) {
-				//this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
-				this.recurringMasterCache[index].deleteItem();
-				this.recurringMasterCache[index] = null;
-				delete this.recurringMasterCache[index];
-			}
-		}
-		this.recurringMasterCache = {};
-		this.recurringMasterCacheById = {};
-
-		this.meetingRequestsCache = [];
-		this.meetingCancelationsCache = [];
-		this.meetingrequestAnswered = [];
-		this.meetingResponsesCache = [];
-
-		if (this.offlineCacheDB) {
-			try {
-				if (this.offlineCacheDB) this.offlineCacheDB.close();
-				this.offlineCacheDB = null;
-			}
-			catch (exc) {}
-		}
-	},
-
-	removeFromMeetingRequestCache: function _removeFromMeetingRequestCache(aID) {
-		//if (this.debug) this.logInfo("removeFromMeetingRequestCache:"+aUID);
-		//		this.meetingRequestsCache[aUID] == null;
-		delete this.meetingRequestsCache[aID];
-	},
-
-	findItemInListByDatesAndID: function _findItemInListByDates(aList, aItem) {
-		var result = null;
-		for each(var listItem in aList) {
-			if ((aItem.getProperty("UID") == listItem.uid)
-				&& (listItem.startDate.compare(aItem.startDate) == 0)
-				&& (listItem.endDate.compare(aItem.endDate) == 0)) {
-				if (this.debug) this.logInfo("Found matching item in list.");
-				result = listItem;
-			}
-		}
-
-		return result;
-	},
-
-	updateVersionInfoCache: function _updateVersionInfoCache(self, Addon) {
-		this.logInfo("updateVersionInfoCache  : ");
-
-		if (this.noDB) return;
-		if (!Addon) return;
-		var version = Addon.version;
-
-		var sqlStr2 = "DELETE FROM version";
-		try {
-			if (!this.executeQuery(sqlStr2)) {
-				if (this.debug) this.logInfo("removeExchCalDbCache : Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("removeExchCalDbCache: Removed version from offlineCacheDB. ");
-			}
-
-			var sqlStr = "INSERT INTO version VALUES ('" + version + "')";
-			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("removeExchCalDbCache : Error inserting attachments_per_item into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("removeExchCalDbCache: Inserted attachments_per_item into offlineCacheDB. Name:" + version);
-			}
-		}
-		catch (ex) {
-			this.logInfo("updateVersionInfoCache: excepetion occured ");
-
-		}
-		this.logInfo("updateVersionInfoCache 21 : Done");
-
-		return true;
-
-	},
-
-	checkExchCalAddonVerion: function _checkExchCalAddonVersion() {
-
-		try {
-			this.logInfo("checkExchCalAddonVerion: ");
-			Cu.import("resource://gre/modules/AddonManager.jsm");
-			var self = this;
-			AddonManager.getAddonByID("exchangecalendar@extensions.1st-setup.nl", function (Addon) {
-				self.removeExchCalDbCache(self, Addon);
-			});
-		}
-		catch (ex) {
-			this.logInfo("checkExchCalAddonVerion:  Exception occured ");
-		}
-	},
-
-	removeExchCalDbCache: function _removeExchCalDbCache(self, Addon) {
-		var currentAddonVersion = Addon.version;
-		var OldAddonversion = null;
-		var result = null;
-
-		this.logInfo("removeExchCalDbCache");
-
-		var sqlStr = "SELECT name FROM version limit 1";
-
-		if (this.debug) this.logInfo("removeExchCalDbCache sql-query:" + sqlStr, 2);
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("removeExchCalDbCache Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
-			return null;
-		}
-
-		var doContinue = true;
-		try {
-			while (doContinue) {
-				doContinue = sqlStatement.executeStep();
-
-				if (doContinue) {
-					if (this.debug) this.logInfo("removeExchCalDbCache Found item in offline Cache.");
-					OldAddonversion = sqlStatement.row.name;
-				}
-			}
-		}
-		finally {
-			sqlStatement.reset();
-		}
-
-		if (OldAddonversion) {
-			if (OldAddonversion != currentAddonVersion) {
-				if (this.offlineCacheDB.connectionReady && this.offlineCacheDB.tableExists("items")) {
-					this.logInfo("removeExchCalDbCache clearCachedData - " + " NewVersion: " + currentAddonVersion + " OldVersion: " + OldAddonversion);
-					let statement = this.offlineCacheDB.createStatement("DELETE FROM items");
-					let statement1 = this.offlineCacheDB.createStatement("DELETE FROM attachments");
-					let statement2 = this.offlineCacheDB.createStatement("DELETE FROM attachments_per_item");
-
-					try {
-						statement.executeStep();
-						statement1.executeStep();
-						statement2.executeStep();
-
-						statement.finalize();
-						statement1.finalize();
-						statement2.finalize();
-					}
-					catch (e) {
-						this.logInfo("removeExchCalDbCache 41: unable to clear tables" + e);
-					}
-					this.logInfo("removeExchCalDbCache cache cleared! current version : " + currentAddonVersion + " resetting calendar: " + this.id);
-					var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-					observerService.notifyObservers(this, "onCalReset", this.id);
-				}
-
-				if (this.updateVersionInfoCache(self, Addon)) {
-					if (this.debug) this.logInfo("removeExchCalDbCache 21: new version updated in cache: " + currentAddonVersion);
-				}
-				else {
-					if (this.debug) this.logInfo("removeExchCalDbCache 22: failed! New version not updated in cache");
-				}
-
-				if (this.debug) this.logInfo("removeExchCalDbCache 31: removing offlineCacheDB new/old wVersion found");
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("removeExchCalDbCache 26: not removing offlineCacheDB new/old Version not found: " + currentAddonVersion);
-
-			if (this.updateVersionInfoCache(self, Addon)) {
-				if (this.debug) this.logInfo("removeExchCalDbCache 32: new version updated in cache: " + currentAddonVersion);
-			}
-			else {
-				if (this.debug) this.logInfo("removeExchCalDbCache 35: failed! New version not updated in cache");
-			}
-		}
-
-	},
-
-	createOfflineCacheDB: function _createOfflineCacheDB() {
-
-		if ((this.mUseOfflineCache) && (!this.offlineCacheDB)) {
-			this.noDB = true;
-			this.dbInit = true;
-			this.dbFile = Cc["@mozilla.org/file/directory_service;1"]
-				.getService(Components.interfaces.nsIProperties)
-				.get("ProfD", Components.interfaces.nsIFile);
-			this.dbFile.append("exchange-data");
-			if (!this.dbFile.exists() || !this.dbFile.isDirectory()) {
-				this.dbFile.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
-			}
-
-			this.dbFile.append(this.id + ".offlineCache.sqlite");
-
-			var dbExists = false;
-			if (this.dbFile.exists()) {
-				dbExists = true;
-			}
-
-			try {
-				this.offlineCacheDB = Services.storage.openUnsharedDatabase(this.dbFile); // Will also create the file if it does not exist
-			}
-			catch (exc) {
-				this.offlineCacheDB = null;
-				if (this.debug) this.logInfo("Could not open offlineCache database.");
-				return;
-			}
-
-			if (!this.offlineCacheDB.connectionReady) {
-				this.offlineCacheDB = null;
-				if (this.debug) this.logInfo("connectionReady for offlineCache database.");
-				return;
-			}
-
-			var latestDBVersion = 1;
-			var dbVersion = 0;
-			if (dbExists) {
-				dbVersion = this.globalFunctions.safeGetIntPref(this.prefs, "dbVersion", 0);
-			}
-
-			//Check exchange calendar version clear cache
-			if (!this.mIsOffline) this.checkExchCalAddonVerion();
-
-			//			if (dbVersion < latestDBVersion) {
-			if (!this.offlineCacheDB.tableExists("version")) {
-				if (this.debug) this.logInfo("Table 'version' does not yet exist. We are going to create it.");
-				try {
-					this.offlineCacheDB.createTable("version", "name STRING");
-				}
-				catch (exc) {
-					if (this.debug) this.logInfo("Could not create table 'version'. Error:" + exc);
-					return;
-				}
-
-				var sqlStr = "CREATE UNIQUE INDEX idx_ver_id ON version (name)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_ver_id'");
-					this.offlineCacheDB = null;
-					return;
-				}
-			}
-
-			if (!this.offlineCacheDB.tableExists("items")) {
-				if (this.debug) this.logInfo("Table 'items' does not yet exist. We are going to create it.");
-				try {
-					this.offlineCacheDB.createTable("items", "event STRING, id STRING, changeKey STRING, startDate STRING, endDate STRING, uid STRING, type STRING, parentItem STRING, item STRING");
-				}
-				catch (exc) {
-					if (this.debug) this.logInfo("Could not create table 'items'. Error:" + exc);
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_id ON items (id)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_id'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_type ON items (type)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_type'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE UNIQUE INDEX idx_items_id_changekey ON items (id, changeKey)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_id_changekey'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_type_uid ON items (type ASC, uid)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_type_uid'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_uid ON items (uid)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_uid'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_uid_startdate_enddate ON items (uid, startDate ASC, endDate)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_uid_startdate_enddate'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_startdate_enddate ON items (startDate ASC, endDate)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_parentitem_startdate_enddate ON items (parentitem, startDate ASC, endDate)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_items_type_startdate_enddate ON items (type, startDate ASC, endDate)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_items_type_startdate_enddate'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-			}
-
-			if (!this.offlineCacheDB.tableExists("attachments")) {
-				if (this.debug) this.logInfo("Table 'attachments' does not yet exist. We are going to create it.");
-				try {
-					this.offlineCacheDB.createTable("attachments", "id STRING, name STRING, size INTEGER, cachePath STRING");
-				}
-				catch (exc) {
-					if (this.debug) this.logInfo("Could not create table 'attachments'. Error:" + exc);
-					return;
-				}
-
-				var sqlStr = "CREATE UNIQUE INDEX idx_att_id ON attachments (id)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_att_id'");
-					this.offlineCacheDB = null;
-					return;
-				}
-
-			}
-
-			if (!this.offlineCacheDB.tableExists("attachments_per_item")) {
-				if (this.debug) this.logInfo("Table 'attachments_per_item' does not yet exist. We are going to create it.");
-				try {
-					this.offlineCacheDB.createTable("attachments_per_item", "itemId STRING, attId STRING");
-				}
-				catch (exc) {
-					if (this.debug) this.logInfo("Could not create table 'attachments_per_item'. Error:" + exc);
-					return;
-				}
-
-				var sqlStr = "CREATE INDEX idx_attitem_itemid ON attachments_per_item (itemId)";
-				if (!this.executeQuery(sqlStr)) {
-					if (this.debug) this.logInfo("Could not create index 'idx_attitem_itemid'");
-					this.offlineCacheDB = null;
-					return;
-				}
-			}
-
-			if (this.debug) this.logInfo("Created/opened offlineCache database.");
-			// Fix the database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4) 26-05-2012
-			if (dbVersion < latestDBVersion) {
-				if (this.debug) this.logInfo("Running fix for database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4)");
-				var masters = this.executeQueryWithResults("SELECT uid FROM items WHERE type='M'", ["uid"]);
-				if ((masters) && (masters.length > 0)) {
-					for (var index in masters) {
-						var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='" + masters[index].uid + "'", ["newEndDate"]);
-						if ((newMasterEndDate) && (newMasterEndDate.length > 0)) {
-							if (this.debug) this.logInfo("newMasterEndDate:" + newMasterEndDate[0].newEndDate);
-							var endDateStr = newMasterEndDate[0].newEndDate;
-							if (endDateStr) {
-								if (endDateStr.length == 10) {
-									endDateStr += "T23:59:59Z";
-								}
-								if (this.debug) this.logInfo("newEndDate for master setting it to:" + endDateStr);
-								this.executeQuery("UPDATE items set endDate='" + endDateStr + "' where type='M' AND uid='" + masters[index].uid + "'");
-							}
-							else {
-								if (this.debug) this.logInfo("newEndDate for master is null not going to use this. Strange!!");
-							}
-						}
-						else {
-							if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!");
-						}
-					}
-				}
-				this.prefs.setIntPref("dbVersion", latestDBVersion);
-			}
-			//this.executeQuery("UPDATE items set event='y' where event='y_'"); // Turned of 2013-11-19. Items will always be read from offline cache even if they have already been read
-			//this.executeQuery("UPDATE items set event='n' where event='n_'");
-
-			this.dbInit = false;
-			this.noDB = false;
-		}
-		else {
-			this.noDB = true;
-			var tryCount = 0;
-			while ((this.offlineCacheDB) && (tryCount < 3)) {
-				try {
-					if (this.offlineCacheDB) this.offlineCacheDB.close();
-					this.offlineCacheDB = null;
-				}
-				catch (exc) {
-					dump("\nUnable to close offlineCache database connection:" + exc + "\n");
-					//					if (this.debug) this.logInfo("Unable to close offlineCache database connection:"+exc);
-					tryCount++;
-				}
-			}
-			this.offlineCacheDB = null;
-		}
-	},
-
-	get useOfflineCache() {
-		if (this.mUseOfflineCache) {
-			return this.mUseOfflineCache;
-		}
-		else {
-			this.mUseOfflineCache = this.globalFunctions.safeGetBoolPref(this.prefs, "useOfflineCache", true);
-			this.createOfflineCacheDB();
-			return this.mUseOfflineCache;
-		}
-	},
-
-	set useOfflineCache(aValue) {
-		var oldValue = this.mUseOfflineCache;
-		this.mUseOfflineCache = aValue;
-		this.prefs.setBoolPref("useOfflineCache", aValue);
-		this.createOfflineCacheDB();
-
-		if ((oldValue != aValue) && (aValue)) {
-			//this.syncExchangeToOfflineCache();
-		}
-	},
-
-	getItemType: function _getItemType(aCalItem) {
-		if (aCalItem.id == aCalItem.parentItem.id) {
-			// Master or Single
-			if (aCalItem.recurrenceInfo) {
-				return "M";
-			}
-			else {
-				return "S";
-			}
-		}
-		else {
-			return aCalItem.getProperty("X-RecurringType");
-		}
-	},
-
-	executeQuery: function _executeQuery(aQuery) {
-		if (this.debug) this.logInfo("sql-query:" + aQuery, 2);
-		if ((this.noDB) && (!this.dbInit)) return false;
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(aQuery);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + aQuery + ")");
-			return false;
-		}
-
-		if ((this.noDB) && (!this.dbInit)) return false;
-		try {
-			sqlStatement.executeStep();
-		}
-		catch (err) {
-			this.logInfo("executeQuery: Error:" + err);
-		}
-		finally {
-			if ((this.noDB) && (!this.dbInit)) return false;
-			sqlStatement.finalize();
-		}
-
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
-			return true;
-		}
-		else {
-			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return false;
-		}
-	},
-
-	executeQueryWithResults: function _executeQueryWithResults(aQuery, aFieldArray) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return null;
-		}
-
-		if (this.debug) this.logInfo("sql-query:" + aQuery, 2);
-		if ((this.noDB) && (!this.dbInit)) return [];
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(aQuery);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + aQuery + ")");
-			return null;
-		}
-
-		var results = [];
-		if ((this.noDB) && (!this.dbInit)) return [];
-		try {
-			while (sqlStatement.executeStep()) {
-				var tmpResult = {};
-				for (var index in aFieldArray) {
-					try {
-						tmpResult[aFieldArray[index]] = sqlStatement.row[aFieldArray[index]];
-					}
-					catch (exc) {
-						if (this.debug) this.logInfo("Error on getting field '" + aFieldArray[index] + "' from query '" + aQuery + "' result.(" + exc + ")");
-					}
-				}
-				results.push(tmpResult);
-				if ((this.noDB) && (!this.dbInit)) return [];
-			}
-		}
-		finally {
-			if ((this.noDB) && (!this.dbInit)) return [];
-			sqlStatement.finalize();
-		}
-
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
-			return results;
-		}
-		else {
-			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return null;
-		}
-	},
-
-	addAttachmentsToOfflineCache: function _addAttachmentsToOfflineCache(aList) {
-		for each(var item in aList) {
-			var attachments = item.calItem.getAttachments({});
-			this.removeAttachmentsFromOfflineCache(item.calItem);
-			for (var index in attachments) {
-				this.addAttachmentToOfflineCache(item.calItem, attachments[index]);
-			}
-		}
-	},
-
-	addAttachmentToOfflineCache: function _addAttachmentToOfflineCache(aCalItem, aCalAttachment) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		var attParams = this.globalFunctions.splitUriGetParams(aCalAttachment.uri);
-
-		if (attParams) {
-
-			var sqlStr = "SELECT COUNT() as attcount from attachments WHERE id='" + attParams.id + "'";
-			if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-			if (this.noDB) return;
-			sqlStatement.executeStep();
-			if (sqlStatement.row.attcount > 0) {
-				if (this.debug) this.logInfo("Going to update the attachment because it all ready exist.");
-				this.updateAttachmentInOfflineCache(aCalItem, aCalAttachment);
-				sqlStatement.finalize();
-				return;
-			}
-			sqlStatement.finalize();
-
-			var sqlStr = "INSERT INTO attachments VALUES ('" + attParams.id + "', '" + attParams.name.replace(/\x27/g, "''") + "', '" + attParams.size + "', '')";
-			if (this.noDB) return;
-			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error inserting attachment into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("Inserted attachment into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
-			}
-
-			var sqlStr = "INSERT INTO attachments_per_item VALUES ('" + aCalItem.id + "','" + attParams.id + "')";
-			if (this.noDB) return;
-			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error inserting attachments_per_item into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("Inserted attachments_per_item into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
-			}
-
-		}
-	},
-
-	updateAttachmentInOfflineCache: function _updateAttachmentInOfflineCache(aCalItem, aCalAttachment) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		var attParams = this.globalFunctions.splitUriGetParams(aCalAttachment.uri);
-
-		if (attParams) {
-
-			var sqlStr = "UPDATE attachments SET id='" + attParams.id + "', name='" + attParams.name.replace(/\x27/g, "''") + "', size='" + attParams.size + "', cachePath='' WHERE id='" + attParams.id + "'";
-			if (this.noDB) return;
-			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error updating attachment into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("Updated attachment into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
-			}
-		}
-	},
-
-	removeAttachmentsFromOfflineCache: function _removeAttachmentsFromOfflineCache(aCalItem) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		var sqlStr = "SELECT attId FROM attachments_per_item WHERE itemId='" + aCalItem.id + "'";
-
-		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
-			return false;
-		}
-
-		var doContinue = true;
-		try {
-			while (doContinue) {
-				if (this.noDB) return;
-				doContinue = sqlStatement.executeStep();
-
-				if (doContinue) {
-					var sqlStr2 = "DELETE FROM attachments WHERE id='" + sqlStatement.row.attId + "'";
-					if (this.noDB) return;
-					if (!this.executeQuery(sqlStr2)) {
-						if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-					}
-					else {
-						if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Title:" + aCalItem.title);
-					}
-				}
-			}
-		}
-		finally {
-			sqlStatement.finalize();
-		}
-
-		if ((this.offlineCacheDB.lastError != 0) && (this.offlineCacheDB.lastError != 100) && (this.offlineCacheDB.lastError != 101)) {
-			if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return false;
-		}
-
-		var sqlStr2 = "DELETE FROM attachments_per_item WHERE itemId='" + aCalItem.id + "'";
-		if (this.noDB) return;
-		if (!this.executeQuery(sqlStr2)) {
-			if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-		}
-		else {
-			if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Title:" + aCalItem.title);
-		}
-
-		return true;
-	},
-
-	removeAttachmentFromOfflineCache: function _removeAttachmentFromOfflineCache(aCalItem, aCalAttachment) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		var attParams = this.globalFunctions.splitUriGetParams(aCalAttachment.uri);
-
-		if (attParams) {
-
-			var sqlStr = "DELETE FROM attachments WHERE id='" + attParams.id + "'";
-			if (this.noDB) return;
-			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
-			}
-
-			var sqlStr = "DELETE FROM attachments_per_item WHERE itemId='" + aCalItem.id + "' AND attId='" + attParams.id + "'";
-			if (this.noDB) return;
-			if (!this.executeQuery(sqlStr)) {
-				if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
-			}
-			else {
-				if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
-			}
-		}
-	},
-
-	addToOfflineCache: function _addToOfflineCache(aList) {
-
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		//dump(this.name+":addToOfflineCache 1\n");
-		var sqlQueries = [];
-
-		for each(var item in aList) {
-
-			if (isEvent(item.calItem)) {
-				var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
-				var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
-				var eventField = "y";
-			}
-			else {
-				if (item.calItem.entryDate) {
-					var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
-				}
-				else {
-					var startDate = "";
-				};
-
-				if (((item.calItem.completedDate) && (item.calItem.dueDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) || ((item.calItem.completedDate) && (!item.calItem.dueDate))) {
-					var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
-				}
-				else {
-					if (item.calItem.dueDate) {
-						var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
-					}
-					else {
-						var endDate = "";
-					}
-				}
-				var eventField = "n";
-			}
-
-			var sqlStr = "SELECT '" + item.calItem.id + "' as realid, id, changeKey, COUNT() as itemcount from items WHERE id='" + item.calItem.id + "'";
-			//dump(this.name+":addToOfflineCache: sqlStr:"+sqlStr+"\n");
-			if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-
-			sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
-		}
-
-		if (sqlQueries.length == 0) {
-			//dump(this.name+":addToOfflineCache: No items in aList to be added to offlinecache.\n");
-			return;
-		}
-
-		//dump(this.name+":addToOfflineCache: Going to execute '"+sqlQueries.length+"' queries\n");
-
-		var self = this;
-		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
-			toBeInserted: [],
-			toBeUpdated: [],
-			list: aList,
-			handleCompletion: function _handleCompletion(aReason) {
-				if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
-					// Finished looking up items in offline cache. Now insert or update the items.
-					//dump(self.name+":Finished looking up items in offline cache. Now insert or update the items.\n");
-					if (this.toBeInserted.length > 0) {
-						self.insertToOfflineCache(this.toBeInserted);
-					}
-					if (this.toBeUpdated.length > 0) {
-						self.updateInOfflineCache(this.toBeUpdated);
-					}
-				}
-				else {
-					//dump(self.name+":addToOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
-					/*if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_CANCELED) {
-						dump("  -- It was canceled.\n");
-					}
-					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_ERROR) {
-						dump("  -- It was an error.\n");
-					}*/
-				}
-			},
-
-			handleError: function _handleError(aError) {
-				dump(self.name + ":addToOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
-			},
-
-			handleResult: function _handleResult(aResultSet) {
-				if (self.debug) self.logInfo("Found item in offline Cache.");
-				var row = aResultSet.getNextRow();
-				while (row) {
-
-					if (row) {
-						if (row.getResultByName('itemcount') > 0) {
-							if (row.getResultByName('changeKey') != this.list[row.getResultByName('id')].calItem.changeKey) {
-								//dump(self.name+":Item will be updated id:"+row.getResultByName('id')+"\n");
-								this.toBeUpdated.push(this.list[row.getResultByName('id')]);
-							}
-							else {
-								if (this.debug)
-									this.logInfo("This item '" + this.list[row.getResultByName('id')] + "' is allready in offlineCache database. id and changeKey are the same. Not going to update it.");
-								//dump(self.name+":This item '"+this.list[row.getResultByName('id')]+"' is allready in offlineCache database. id and changeKey are the same. Not going to update it.\n");
-							}
-						}
-						else {
-							//dump(self.name+":Item will be inserted id 1:"+row.getResultByName('realid')+"\n");
-							//dump("Item will be inserted id 2:"+row.getResultByName('id')+"\n");
-							//dump("Item will be inserted id 3:"+row.getResultByIndex(0)+"\n");
-							this.toBeInserted.push(this.list[row.getResultByName('realid')]);
-						}
-					}
-					row = aResultSet.getNextRow();
-				}
-			}
-		});
-
-	},
-
-	insertToOfflineCache: function _insertToOfflineCache(aList) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			//dump(this.name+":NO Offline Cache DB: insertToOfflineCache 1\n");
-			return;
-		}
-
-		try {
-			//dump(this.name+":insertToOfflineCache 1\n");
-			var sqlQueries = [];
-			var mastersToBeUpdated = [];
-
-			for each(var item in aList) {
-
-				if (isEvent(item.calItem)) {
-					var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
-					var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
-					var eventField = "y";
-				}
-				else {
-					if (item.calItem.entryDate) {
-						var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
-					}
-					else {
-						var startDate = "";
-					};
-
-					if (((item.calItem.completedDate) && (item.calItem.dueDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) || ((item.calItem.completedDate) && (!item.calItem.dueDate))) {
-						var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
-					}
-					else {
-						if (item.calItem.dueDate) {
-							var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
-						}
-						else {
-							var endDate = "";
-						}
-					}
-					var eventField = "n";
-				}
-
-				if (isEvent(item.calItem)) {
-					if (this.getItemType(item.calItem) == "M") {
-						// Lets find the real end date.
-						for (var childIndex in this.itemCacheById) {
-							if ((this.itemCacheById[childIndex]) && (item.calItem.uid == this.itemCacheById[childIndex].uid)) {
-								var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
-								if (childEnd > endDate) {
-									endDate = childEnd;
-								}
-							}
-						}
-					}
-					else {
-						if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
-							mastersToBeUpdated.push(item.calItem.parentItem);
-						}
-					}
-				}
-
-				var sqlStr = "INSERT INTO items VALUES ('" + eventField + "','" + item.calItem.id + "', '" + item.calItem.changeKey + "', '" + startDate + "', '" + endDate + "', '" + item.calItem.uid + "', '" + this.getItemType(item.calItem) + "', '" + item.calItem.parentItem.id + "', '" + item.exchangeItemXML.replace(/\x27/g, "''") + "')";
-
-				sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
-			}
-
-			//dump(this.name+":insertToOfflineCache 2\n");
-			if (mastersToBeUpdated.length > 0) {
-				this.updateMasterInOfflineCache(mastersToBeUpdated);
-			}
-
-			//dump(this.name+":insertToOfflineCache 3\n");
-			if (sqlQueries.length == 0) {
-				//dump(this.name+":insertToOfflineCache: No items in aList to be inserted to offlinecache.\n");
-				return;
-			}
-
-			//dump(this.name+":insertToOfflineCache: Going to insert '"+sqlQueries.length+"' items to offlinecache.\n");
-
-			var self = this;
-			var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
-				handleCompletion: function _handleCompletion(aReason) {
-					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
-						// Finished looking up items in offline cache. Now insert or update the items.
-						//dump(self.name+":updateInOfflineCache: handleCompletion: items were inserted ok.\n");
-						self.addAttachmentsToOfflineCache(aList);
-					}
-					else {
-						//dump(self.name+":updateInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
-					}
-				},
-
-				handleError: function _handleError(aError) {
-					dump(self.name + ":updateInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
-				},
-
-				handleResult: function _handleResult(aResultSet) {
-					//dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
-				}
-			});
-		}
-		catch (err) {
-			dump(this.name + ":insertToOfflineCache: err:" + err + "\n");
-		}
-	},
-
-	updateInOfflineCache: function _updateInOfflineCache(aList) //aCalItem, aExchangeItemXML)
-	{
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		//dump(this.name+":updateInOfflineCache:\n");
-
-		var sqlQueries = [];
-		var mastersToBeUpdated = [];
-
-		for each(var item in aList) {
-
-			if (isEvent(item.calItem)) {
-				var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
-				var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
-				var eventField = "y";
-			}
-			else {
-				if (item.calItem.entryDate) {
-					var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
-				}
-				else {
-					var startDate = "";
-				};
-
-				if ((item.calItem.completedDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) {
-					var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
-				}
-				else {
-					if (item.calItem.dueDate) {
-						var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
-					}
-					else {
-						var endDate = "";
-					}
-				}
-				var eventField = "n";
-			}
-
-			if (isEvent(item.calItem)) {
-				if (this.getItemType(item.calItem) == "M") {
-					// Lets find the real end date.
-					if (this.noDB) return;
-					var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='" + item.calItem.uid + "'", ["newEndDate"]);
-					if ((newMasterEndDate) && (newMasterEndDate.length > 0)) {
-						if (this.debug) this.logInfo("newMasterEndDate:" + newMasterEndDate[0].newEndDate);
-						var endDateStr = newMasterEndDate[0].newEndDate;
-						if (endDateStr) {
-							if (endDateStr.length == 10) {
-								endDateStr += "T23:59:59Z";
-							}
-							if (this.debug) this.logInfo("newEndDate for master setting it to:" + endDateStr);
-							endDate = endDateStr;
-						}
-						else {
-							if (this.debug) this.logInfo("newEndDate for master is null not going to use this. Strange!!");
-						}
-					}
-					else {
-						if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!");
-					}
-
-				}
-				else {
-					if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
-						mastersToBeUpdated.push(item.calItem.parentItem);
-					}
-				}
-			}
-
-			let sqlStr = "UPDATE items SET event='" + eventField + "', id='" + item.calItem.id + "', changeKey='" + item.calItem.changeKey + "', startDate='" + startDate + "', endDate='" + endDate + "', uid='" + item.calItem.uid + "', type='" + this.getItemType(item.calItem) + "', parentItem='" + item.calItem.parentItem.id + "', item='" + item.exchangeItemXML.replace(/\x27/g, "''") + "' WHERE id='" + item.calItem.id + "'";
-
-			sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
-		}
-
-		if (mastersToBeUpdated.length > 0) {
-			this.updateMasterInOfflineCache(mastersToBeUpdated);
-		}
-
-		if (sqlQueries.length == 0) {
-			//dump(this.name+":updateInOfflineCache: No items in aList to be updated in offlinecache.\n");
-			return;
-		}
-
-		//dump(this.name+":updateInOfflineCache: Going to update '"+sqlQueries.length+"' items to offlinecache.\n");
-
-		var self = this;
-		var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
-			handleCompletion: function _handleCompletion(aReason) {
-				if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
-					// Finished looking up items in offline cache. Now insert or update the items.
-					//dump(self.name+":updateInOfflineCache: handleCompletion: items were updated ok.\n");
-					self.addAttachmentsToOfflineCache(aList);
-				}
-				else {
-					//dump(self.name+":updateInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
-				}
-			},
-
-			handleError: function _handleError(aError) {
-				dump(self.name + ":updateInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
-			},
-
-			handleResult: function _handleResult(aResultSet) {
-				//dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
-			}
-		});
-
-	},
-
-	updateMasterInOfflineCache: function _updateMasterInOfflineCache(aList) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		try {
-			//dump(this.name+":updateMasterInOfflineCache:\n");
-
-			var sqlQueries = [];
-			var mastersToBeUpdated = [];
-
-			for each(var item in aList) {
-
-
-				var endDate = cal.toRFC3339(item.endDate.getInTimezone(this.globalFunctions.ecUTC()));
-
-				if (this.getItemType(item) == "M") {
-					// Lets find the real end date.
-					for (var childIndex in this.itemCacheById) {
-						if ((this.itemCacheById[childIndex]) && (item.uid == this.itemCacheById[childIndex].uid)) {
-							var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
-							if (childEnd > endDate) {
-								endDate = childEnd;
-							}
-						}
-					}
-				}
-				else {
-					if ((this.getItemType(item) == "RO") || (this.getItemType(item) == "RE")) {
-						mastersToBeUpdated.push(item.parentItem);
-					}
-				}
-
-				let sqlStr = "UPDATE items SET endDate='" + endDate + "' WHERE id='" + item.id + "'";
-				sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
-			}
-
-			if (mastersToBeUpdated.length > 0) {
-				this.updateMasterInOfflineCache(mastersToBeUpdated);
-			}
-
-			if (sqlQueries.length == 0) {
-				//dump(this.name+":updateMasterInOfflineCache: No masters in aList to be updated in offlinecache.\n");
-				return;
-			}
-
-			//dump(this.name+":updateMasterInOfflineCache: '"+sqlQueries.length+"' masters will be updated in offlinecache.\n");
-
-			var self = this;
-			var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
-				handleCompletion: function _handleCompletion(aReason) {
-					if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
-						// Finished looking up items in offline cache. Now insert or update the items.
-						//dump(self.name+":updateMasterInOfflineCache: handleCompletion: masters were updated ok.\n");
-					}
-					else {
-						//dump(self.name+":updateMasterInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
-					}
-				},
-
-				handleError: function _handleError(aError) {
-					dump(self.name + ":updateMasterInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
-				},
-
-				handleResult: function _handleResult(aResultSet) {
-					//dump(self.name+":updateMasterInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
-				}
-			});
-
-		}
-		catch (err) {
-			dump(this.name + ":updateMasterInOfflineCache: err:" + err + "\n");
-		}
-	},
-
-	removeFromOfflineCache: function _removeFromOfflineCache(aCalItem) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		var sqlStr = "DELETE FROM items WHERE id='" + aCalItem.id + "'";
-		if (this.noDB) return;
-		if (!this.executeQuery(sqlStr)) {
-			if (this.debug) this.logInfo("Error deleting item from offlineCacheDB. Error:" + this.offlineCacheDB.lastErrorString);
-		}
-		else {
-			if (this.debug) this.logInfo("Removed item from offlineCacheDB. Title:" + aCalItem.title);
-		}
-		this.removeAttachmentsFromOfflineCache(aCalItem);
-	},
-
-	removeChildrenFromMasterInOfflineCache: function _removeChildrenFromMasterInOfflineCache(aMaster) {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		var sqlStr = "DELETE FROM items WHERE uid='" + aMaster.uid + "' and type <> 'M'";
-		if (this.noDB) return;
-		if (!this.executeQuery(sqlStr)) {
-			if (this.debug) this.logInfo("Error deleting children from offlineCacheDB. Error:" + this.offlineCacheDB.lastErrorString);
-		}
-		else {
-			if (this.debug) this.logInfo("Removed children from offlineCacheDB. Title:" + aMaster.title);
-		}
-
-		// We have to remove the attachments from offline cache for each child.
-		this.removeAttachmentsFromOfflineCache(aMaster);
-
-	},
-
-	syncExchangeToOfflineCache: function _syncExchangeToOfflineCache() {
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB) || (this.mIsOffline) || (this.weAreSyncing)) {
-			if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are offline or already syncing or no cache enabled! ");
-			return;
-		}
-		if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are online syncing  ");
-		// This will sync the specified period from Exchange to offlineCache.
-		var monthsAfter = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsAfterToday", 1, true) * 31;
-		var monthsBefore = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsBeforeToday", 1, true) * 31;
-
-		var monthAfterDurarion = cal.createDuration("P" + monthsAfter + "D");
-		var monthsBeforeDurarion = cal.createDuration("-P" + monthsBefore + "D");
-
-		var startDate = cal.now();
-		var endDate = cal.now();
-		startDate.addDuration(monthsBeforeDurarion);
-		endDate.addDuration(monthAfterDurarion);
-
-		// Check what is missing for minimal time period.
-		var filter = 0;
-		if (this.supportsEvents) filter |= Ci.calICalendar.ITEM_FILTER_TYPE_EVENT;
-		if (this.supportsTasks) filter |= Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
-
-		// Reset memory caches.
-		this.itemCacheById = {};
-		this.itemCacheByStartDate = {};
-		this.itemCacheByEndDate = {};
-		this.recurringMasterCache = {};
-		this.recurringMasterCacheById = {};
-
-		if (this.supportsEvents) {
-			if ((!this.startDate) && (!this.endDate)) {
-				if (this.debug) this.logInfo("Going to request events in the period of '" + startDate.toString() + "' until '" + endDate.toString() + "' from the exchange server to fill offlinecache.");
-				//this.getItems(filter, 0, startDate, endDate, null);
-				this.requestPeriod(startDate, endDate, filter, {}, false);
-
-			}
-			else {
-				if (this.debug) this.logInfo("Going to request events in the period of '" + this.startDate + "' until '" + this.endDate + "' from the exchange server to fill offlinecache.");
-				this.requestPeriod(this.startDate, this.endDate, filter, {}, false);
-
-				if ((this.startDate) && (startDate.compare(this.startDate)) < 0) {
-					if (this.debug) this.logInfo("Going to request events in the period of '" + startDate.toString() + "' until '" + this.startDate.toString() + "' from the exchange server to fill offlinecache.");
-					//this.getItems(filter, 0, startDate, this.startDate, null);
-					this.requestPeriod(startDate, this.startDate, filter, {}, false);
-				}
-				if ((this.endDate) && (endDate.compare(this.endDate) > 0)) {
-					if (this.debug) this.logInfo("Going to request events in the period of '" + this.endDate.toString() + "' until '" + endDate.toString() + "' from the exchange server to fill offlinecache.");
-					//this.getItems(filter, 0, this.endDate, endDate, null);
-					this.requestPeriod(this.endDate, endDate, filter, {}, false);
-				}
-			}
-		}
-
-		var self = this;
-		if (this.supportsTasks) {
-			if (this.debug) this.logInfo("Requesting tasks from exchange server.");
-			this.addToQueue(erFindTaskItemsRequest, {
-					user: this.user,
-					mailbox: this.mailbox,
-					serverUrl: this.serverUrl,
-					folderBase: this.folderBase,
-					itemFilter: filter,
-					folderID: this.folderID,
-					changeKey: this.changeKey,
-					actionStart: Date.now()
-				},
-				function (erFindTaskItemsRequest, aIds) {
-					self.findTaskItemsOK(erFindTaskItemsRequest, aIds);
-				},
-				function (erFindTaskItemsRequest, aCode, aMsg) {
-					self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);
-				},
-				null);
-		}
-
-	},
-
-	masterIsInOfflineCache: function _masterIsInOfflineCache(aId) {
-		if (this.debug) this.logInfo("masterIsInOfflineCache: aId:" + aId);
-		if (!aId) return null;
-
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return null;
-		}
-
-		var result = null;
-
-		var sqlStr = "SELECT id, uid, changeKey FROM items WHERE id = '" + aId + "' AND type='M'";
-
-		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
-			return null;
-		}
-
-		var doContinue = true;
-		try {
-			while (doContinue) {
-				doContinue = sqlStatement.executeStep();
-
-				if (doContinue) {
-					if (this.debug) this.logInfo("Found item in offline Cache.");
-
-					// Check if this item is not in the itemCache already.
-					result = {
-						changeKey: sqlStatement.row.changeKey,
-						uid: sqlStatement.row.uid
-					};
-				}
-			}
-		}
-		finally {
-			sqlStatement.reset();
-		}
-
-		if ((this.debug) && (result)) this.logInfo("masterIsInOfflineCache: Retreived uid:'" + result.uid + "', changeKey:'" + result.changeKey + "' from offline cache.");
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
-
-			if (result) {
-				if (this.debug) this.logInfo("masterIsInOfflineCache: found in offline cache aId:" + aId + ", changeKey:" + result.changeKey);
-				return result;
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("masterIsInOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return null;
-		}
-		return null;
-	},
-
-
-	itemIsInOfflineCache: function _itemIsInOfflineCache(aId) {
-		if (this.debug) this.logInfo("itemIsInOfflineCache: aId:" + aId);
-		if (!aId) return null;
-
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return null;
-		}
-
-		var result = null;
-
-		var sqlStr = "SELECT id, changeKey FROM items WHERE id = '" + aId + "'";
-
-		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
-			return null;
-		}
-
-		var doContinue = true;
-		try {
-			while (doContinue) {
-				doContinue = sqlStatement.executeStep();
-
-				if (doContinue) {
-					if (this.debug) this.logInfo("Found item in offline Cache.");
-
-					// Check if this item is not in the itemCache already.
-					result = sqlStatement.row.changeKey;
-				}
-			}
-		}
-		finally {
-			sqlStatement.reset();
-		}
-
-		if (this.debug) this.logInfo("itemIsInOfflineCache: Retreived changeKey:'" + result + "' from offline cache.");
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
-
-			if (result) {
-				dump("itemIsInOfflineCache: found:" + result + "\n");
-				return result;
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("itemIsInOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return null;
-		}
-		return null;
-	},
-
-	getOccurrencesFromOfflineCache: function _getOccurrencesFromOfflineCache(aMaster, aType) {
-		if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: aMaster.title:" + aMaster.title);
-		if (!aMaster) return [];
-
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return [];
-		}
-
-		var result = [];
-
-		var sqlStr = "SELECT id FROM items";
-		var whereStr = "";
-		if ((this.supportsEvents) && (!this.supportsTasks)) {
-			whereStr = " WHERE event = 'y' AND type = '" + aType + "' AND uid = '" + aMaster.uid + "'";
-			sqlStr += whereStr;
-		}
-		else {
-			if ((!this.supportsEvents) && (this.supportsTasks)) {
-				whereStr = " WHERE event = 'n' AND type = '" + aType + "' AND uid = '" + aMaster.uid + "'";
-				sqlStr += whereStr;
-			}
-		}
-
-		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
-			return [];
-		}
-
-		var doContinue = true;
-		try {
-			while (doContinue) {
-				doContinue = sqlStatement.executeStep();
-
-				if (doContinue) {
-					if (this.debug) this.logInfo("Found item in offline Cache.");
-
-					// Check if this item is not in the itemCache already.
-					if (!this.itemCacheById[sqlStatement.row.id]) {
-						result.push(sqlStatement.row.id);
-						cachedItem = null;
-					}
-				}
-			}
-		}
-		finally {
-			sqlStatement.reset();
-		}
-
-		if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Retreived '" + result.length + "' records from offline cache.");
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
-
-			if (result.length > 0) {
-				dump("getOccurrencesFromOfflineCache: found:" + result.length + "\n");
-				return result;
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return [];
-		}
-		return [];
-	},
-
-	getItemsFromOfflineCache: function _getItemsFromOfflineCache(aStartDate, aEndDate) {
-		this.logInfo("getItemsFromOfflineCache: startDate:" + aStartDate + ", endDate:" + aEndDate);
-
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return;
-		}
-
-		let result = [];
-
-		let utcStartDate = cal.createDateTime("1900-01-01");
-		let utcEndDate = cal.createDateTime("3500-01-01");
-
-		if (aStartDate) {
-			utcStartDate = aStartDate.clone();
-			utcStartDate.isDate = false;
-			utcStartDate = utcStartDate.getInTimezone(cal.UTC());
-			utcStartDate.isDate = true;
-		}
-
-		if (aEndDate) {
-			utcEndDate = aEndDate.clone();
-			utcEndDate.isDate = false;
-			utcEndDate = utcEndDate.getInTimezone(cal.UTC());
-			utcEndDate.isDate = true;
-		}
-
-		let startDate = cal.toRFC3339(utcStartDate);
-		let endDate = cal.toRFC3339(utcEndDate);
-
-		let sqlStr = "SELECT item FROM items";
-		let whereStr = "";
-
-		if (this.supportsEvents
-			&& !this.supportsTasks) {
-			whereStr = " WHERE event = 'y' AND "
-				+ "startDate <= '" + endDate + "' AND endDate >= '" + startDate + "'";
-		}
-		else if (!this.supportsEvents
-			&& this.supportsTasks) {
-			whereStr = " WHERE event = 'n' AND ("
-				+ "(startDate = '' AND endDate >= '" + startDate + "' AND endDate <= '" + endDate + "')"
-				+ "OR (endDate = '' AND startDate >= '" + startDate + "' AND startDate <= '" + endDate + "')"
-				+ "OR (startDate <= '" + endDate + "' AND endDate >= '" + startDate + "')"
-				+ "OR (startDate = '' AND endDate = '')"
-				+ ")";
-		}
-
-		sqlStr += whereStr + " ORDER BY type ASC";
-
-		this.logInfo("getItemsFromOfflineCache: sql-query:" + sqlStr, 2);
-
-		let sqlStatement;
-
-		try {
-			sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			this.logInfo("getItemsFromOfflineCache: Error on SQL statement creation: " + this.offlineCacheDB.lastError
-				+ ", Msg:" + this.offlineCacheDB.lastErrorString
-				+ ", Exception:" + exc + ". (SQL source: " + sqlStr + ")");
-
-			return false;
-		}
-
-		try {
-			while (sqlStatement.executeStep()) {
-				this.logInfo("getItemsFromOfflineCache: Found item in offline Cache.");
-
-				let root = xml2json.newJSON();
-				xml2json.parseXML(root, sqlStatement.row.item);
-
-				let cachedItem = root[telements][0];
-
-				result.push(cachedItem);
-			}
-		}
-		finally {
-			sqlStatement.reset();
-		}
-
-		this.logInfo("getItemsFromOfflineCache: retrieved '" + result.length
-			+ "' records from offline cache. "
-			+ "startDate:" + startDate + ", endDate:" + endDate);
-
-		let sqliteSuccessCode = [0, 100, 101];
-
-		if (sqliteSuccessCode.indexOf(this.offlineCacheDB.lastError) > -1) {
-			if (result.length > 0) {
-				// Turned off so items are always requested from offline cache. Even if they have been requested already.
-				//this.executeQuery("UPDATE items set event=(event || '_')"+whereStr);
+            this.removeItemFromCache(child);
+        }
+
+        if (this.debug) this.logInfo("removeChildrenFromMaster end.:" + aMaster.title);
+    },
+
+    setStatus: function _setStatus(aItem, aStatus) {
+        switch (aStatus) {
+        case "Unknown":
+            aItem.setProperty("STATUS", "NONE");
+            break;
+        case "Organizer":
+            aItem.setProperty("STATUS", "CONFIRMED");
+            break;
+        case "Tentative":
+            aItem.setProperty("STATUS", "TENTATIVE");
+            break;
+        case "Accept":
+            aItem.setProperty("STATUS", "CONFIRMED");
+            break;
+        case "Decline":
+            aItem.setProperty("STATUS", "CANCELLED");
+            break;
+        case "NoResponseReceived":
+            aItem.setProperty("STATUS", "NONE");
+            break;
+        default:
+            aItem.setProperty("STATUS", "NONE");
+            break;
+        }
+    },
+
+    cloneItem: function _cloneItem(aItem) {
+        var newItem = aItem.clone();
+        /*		if (aItem.id != aItem.parentItem.id) {
+        			newItem.parentItem = aItem.parentItem;
+        		}*/
+
+        return newItem;
+    },
+
+    addExchangeAttachmentToCal: function _addExchangeAttachmentToCal(aExchangeItem, aItem) {
+        if (aExchangeItem.getTagValue("t:HasAttachments") == "true") {
+            //			if (this.debug) this.logInfo("Title:"+aItem.title+"Attachments:"+aExchangeItem.getTagValue("Attachments"));
+            var fileAttachments = aExchangeItem.XPath("/t:Attachments/t:FileAttachment");
+            for each(var fileAttachment in fileAttachments) {
+                //				if (this.debug) this.logInfo(" -- Attachment: name="+fileAttachment.getTagValue("t:Name"));
+
+                var newAttachment = createAttachment();
+                newAttachment.setParameter("X-AttachmentId", fileAttachment.getAttributeByTag("t:AttachmentId", "Id"));
+                newAttachment.uri = makeURL(this.serverUrl + "/?id=" + encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(fileAttachment.getTagValue("t:Name")) + "&size=" + encodeURIComponent(fileAttachment.getTagValue("t:Size", "")) + "&user=" + encodeURIComponent(this.user));
+
+                if (this.debug) this.logInfo("New attachment URI:" + this.serverUrl + "/?id=" + encodeURIComponent(fileAttachment.getAttributeByTag("t:AttachmentId", "Id")) + "&name=" + encodeURIComponent(fileAttachment.getTagValue("t:Name")) + "&size=" + encodeURIComponent(fileAttachment.getTagValue("t:Size", "")) + "&user=" + encodeURIComponent(this.user));
+
+                aItem.addAttachment(newAttachment);
+            }
+            fileAttachments = null;
+        }
+    },
+
+    clearXMozSnoozeTimes: function _clearXMozSnoozeTimes(aItem) {
+        if (!aItem) return;
+
+        if (aItem.propertyEnumerator) {
+            var props = aItem.propertyEnumerator;
+            while (props.hasMoreElements()) {
+                var prop = props.getNext().QueryInterface(Components.interfaces.nsIProperty);
+                if (prop.name.indexOf("X-MOZ-SNOOZE-TIME") > -1) {
+                    if (this.debug) this.logInfo("deleting Property:" + prop.name + "=" + prop.value);
+
+                    aItem.deleteProperty(prop.name);
+                    var props = aItem.propertyEnumerator;
+                }
+            }
+        }
+    },
+
+    setSnoozeTime: function _setSnoozeTime(aItem, aMaster) {
+
+        if (aMaster) {
+            var pidLidReminderSet = aMaster.reminderIsSet;
+            var pidLidReminderSignalTime = aMaster.reminderSignalTime;
+        }
+        else {
+            var pidLidReminderSet = aItem.reminderIsSet;
+            var pidLidReminderSignalTime = aItem.reminderSignalTime;
+        }
+
+        if (this.debug) this.logInfo("-- pidLidReminderSet:" + pidLidReminderSet);
+
+        if (pidLidReminderSet) {
+
+            if (this.debug) this.logInfo("Reminder date is set for item");
+
+            if (aMaster) {
+                // Exchange only has the next reminderSignaltime. This is one value. Lightning can handle multiple.
+                //				this.clearXMozSnoozeTimes(aMaster);
+
+                //				var reminderTime = cal.createDateTime(pidLidReminderSignalTime);
+                var reminderTime = aMaster.reminderSignalTime;
+                if (reminderTime) {
+
+                    if (aItem) {
+                        if (this.debug) this.logInfo("We have an exception or an occurrence. We are going to use the master to see if it is snoozed or not.");
+
+                        // if the master ReminderDueBy is the same as the item Start date then this is the occurrence for which the next alarm is active.
+                        var masterReminderDueBy = this.tryToSetDateValue(aMaster.getProperty("X-ReminderDueBy"), null);
+                        if (masterReminderDueBy) {
+                            switch (masterReminderDueBy.compare(aItem.startDate)) {
+                            case -1:
+                                if (this.debug) this.logInfo("The ReminderDueBy date of the master is before the item's startdate. This alarm has not been snoozed or dismissed.");
+                                aItem.alarmLastAck = null;
+                                break;
+                            case 0:
+                                if (this.debug) this.logInfo("The ReminderDueBy date of the master is equal to the item's startdate. We found the occurrence for which the alarm is active or dismissed or snoozed.");
+                                // We need to find out if it snoozed or dismissed.
+                                this.clearXMozSnoozeTimes(aMaster);
+                                if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime + "=" + reminderTime.icalString);
+                                aMaster.setProperty("X-MOZ-SNOOZE-TIME-" + aItem.recurrenceId.nativeTime, reminderTime.icalString);
+
+                                var lastAck = reminderTime.clone();
+                                lastAck.addDuration(cal.createDuration('-PT1S'));
+                                aItem.alarmLastAck = lastAck;
+                                aMaster.alarmLastAck = lastAck;
+                                if (this.debug) this.logInfo("Set alarmLastAck:" + lastAck.icalString);
+                                break;
+                            case 1:
+                                if (this.debug) this.logInfo("The ReminderDueBy date of the master is after the item's startdate. This alarm has been dismissed.");
+                                var lastAck = aItem.startDate.clone();
+                                //lastAck.addDuration(cal.createDuration('-PT1S'));
+                                aItem.alarmLastAck = lastAck;
+                                if (this.debug) this.logInfo("Set alarmLastAck:" + lastAck.icalString);
+                                break;
+                            }
+                        }
+                        else {
+                            // Cannot determine for which alarm the next reminder is set. Bailing out.
+                            if (this.debug) this.logInfo("Cannot determine for which alarm the next reminder is set. Bailing out.");
+                            return;
+                        }
+
+
+                    }
+                    else {
+                        // We have a master only. Check for which of its occurrences/exceptions the X-MOZ-SNOOZE_TIME- needs to be set.
+                        // Easyest way for now is loop through it's children and call this function again with the child as item.
+                        // This can probably be optimized.
+                        if (this.debug) this.logInfo("A master. Will try to set snooze time on right occurrenceid");
+                        for (var index in this.itemCacheById) {
+
+                            if ((this.itemCacheById[index])
+                                && (isEvent(this.itemCacheById[index]))
+                                && ((this.itemCacheById[index].calendarItemType == "Occurrence")
+                                    || (this.itemCacheById[index].calendarItemType == "Exception"))
+                                && (this.itemCacheById[index].uid == aMaster.uid)
+                                && (this.itemCacheById[index].parentItem.id == aMaster.id)) {
+                                this.setSnoozeTime(this.itemCacheById[index], aMaster);
+                            }
+                        }
+                    }
+                }
+                else {
+                    if (this.debug) this.logInfo("Received pidLidReminderSignalTime is invalid:" + pidLidReminderSignalTime);
+                }
+            }
+            else {
+                // aItem is a Single
+                /*				this.clearXMozSnoozeTimes(aItem);
+                				var reminderTime = pidLidReminderSignalTime;
+                				if (this.debug) this.logInfo("Set snooze time: X-MOZ-SNOOZE-TIME="+reminderTime.icalString);
+                				aItem.setProperty("X-MOZ-SNOOZE-TIME", reminderTime.icalString);
+
+                				var lastAck = reminderTime.clone();
+                				lastAck.addDuration(cal.createDuration('-PT1S'));
+                				aItem.alarmLastAck = lastAck;
+                				if (this.debug) this.logInfo("Set alarmLastAck:"+lastAck.icalString);
+                 */
+            }
+        }
+        else {
+            // Remove any snooze states according http://msdn.microsoft.com/en-us/library/cc765589.aspx
+            if (this.debug) this.logInfo("Item has no snooze date set.");
+            aItem.alarmLastAck = null;
+        }
+    },
+
+    setAlarm: function _setAlarm(aItem, aCalendarItem) {
+        if ((aCalendarItem.getTagValue("t:ReminderIsSet") == "true")) {
+            var alarm = cal.createAlarm();
+            alarm.action = "DISPLAY";
+            alarm.repeat = 0;
+
+            var alarmOffset = cal.createDuration();
+            alarmOffset.minutes = -1 * aCalendarItem.getTagValue("t:ReminderMinutesBeforeStart");
+
+            // This is a bug fix for when the offset is more than a year)
+            if (alarmOffset.minutes < (-60 * 24 * 365)) {
+                alarmOffset.minutes = -5;
+            }
+            alarmOffset.normalize();
+
+            alarm.related = Ci.calIAlarm.ALARM_RELATED_START;
+            alarm.offset = alarmOffset;
+
+            if (this.debug) this.logInfo("Alarm set with an offset of " + alarmOffset.minutes + " minutes from the start");
+            aItem.setProperty("X-ReminderDueBy", aCalendarItem.getTagValue("t:ReminderDueBy"));
+
+            aItem.addAlarm(alarm);
+        }
+    },
+
+    getMasterByItem: function _getMasterByItem(aItem) {
+        if (this.debug) this.logInfo("getMasterByItem for item:" + aItem.title + ", startdate:" + aItem.startDate + ", uid:" + aItem.uid);
+        var self = this;
+        this.addToQueue(erGetMasterOccurrenceIdRequest, {
+                user: this.user,
+                serverUrl: this.serverUrl,
+                item: aItem,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                getType: "lightning"
+            },
+            function (erGetMasterOccurrenceIdRequest, aId, aChangeKey) {
+                self.getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aItem.uid);
+            },
+            function (erGetMasterOccurrenceIdRequest, aCode, aMsg) {
+                self.getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    getMasterOk: function _getMasterOk(erGetMasterOccurrenceIdRequest, aId, aChangeKey, aUID) {
+        if (this.debug) this.logInfo("getMasterOk aId:" + aId + ", aChangeKey:" + aChangeKey + ", uid:" + aUID);
+        var ids = [{
+            Id: aId,
+            ChangeKey: aChangeKey,
+            type: "RecurringMaster",
+            uid: aUID,
+            start: null,
+            end: null
+        }];
+
+        this.findCalendarItemsOK(erGetMasterOccurrenceIdRequest, ids, [])
+    },
+
+    getMasterError: function _getMasterError(erGetMasterOccurrenceIdRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("getMasterError aCode:" + aCode + ", aMsg:" + aMsg);
+        this.saveCredentials(erGetMasterOccurrenceIdRequest.argument);
+    },
+
+    convertExchangeItemtoCalItem: function _convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest) {
+        //dump("1. uid:"+item.uid+", it:"+item.calendarItemType+", t:"+item.title+", sd:"+item.startDate+"\n");
+        var uid = item.uid;
+        //		if ((item.className == "mivExchangeEvent") && (!uid)) return null;
+
+        if (this.itemCacheById[item.id]) {
+            if (this.itemCacheById[item.id].changeKey == item.changeKey) {
+                //if (this.debug) this.logInfo("Item is allready in cache and the id and changeKey are the same. Skipping it.");
+                //dump("convertExchangeAppointmentToCalAppointment. Item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", startDate"+item.startDate+"\n");
+                this.itemCacheById[item.id].occurrenceIndex = item.occurrenceIndex
+                item.deleteItem();
+                item = null;
+                return null;
+            }
+        }
+        else {
+            if ((uid) && (this.recurringMasterCache[uid])) {
+                if ((this.recurringMasterCache[uid].changeKey == xml2json.getAttributeByTag(aCalendarItem, "t:ItemId", "ChangeKey")) && (this.recurringMasterCache[uid].id == item.id)) {
+                    //if (this.debug) this.logInfo("Master item is allready in cache and the id and changeKey are the same. Skipping it.");
+                    //dump("convertExchangeAppointmentToCalAppointment. Master item is allready in cache and the id and changeKey are the same. Skipping it:"+item.title+", item.calendarItemType:"+item.calendarItemType+"\n");
+                    item.deleteItem();
+                    item = null;
+                    return null;
+                }
+            }
+        }
+
+        item.setProperty("DTSTAMP", this.tryToSetDateValue(xml2json.getTagValue(aCalendarItem, "t:DateTimeReceived")));
+        if (!isMeetingRequest) {
+            //if (this.debug) this.logInfo(" == item.title:"+item.title+", calendarItemType:"+aCalendarItem.getTagValue("t:CalendarItemType"));
+            switch (item.calendarItemType) {
+            case "Single":
+                // Check if this item.id has existed as master. This could be a change from master to single.
+                var offlineMasterData = null;
+                if (!fromOfflineCache) {
+                    offlineMasterData = this.masterIsInOfflineCache(item.id);
+                }
+
+                if ((this.recurringMasterCacheById[item.id]) || (offlineMasterData)) {
+                    if (this.debug) this.logInfo("Item has changed from master into single. Going to remove it and it's children.");
+
+                    let masterUID = null;
+                    if (offlineMasterData) {
+                        masterUID = offlineMasterData.uid;
+                    }
+                    else {
+                        masterUID = this.recurringMasterCacheById[item.id].uid;
+                    }
+
+                    this.removeChildrenFromMaster(this.recurringMasterCache[masterUID]);
+
+                    this.removeFromOfflineCache(this.recurringMasterCache[masterUID]);
+                    delete this.recurringMasterCacheById[item.id];
+                    delete this.recurringMasterCache[masterUID];
+                }
+                break;
+            case "Exception":
+                if (this.debug) this.logInfo("@1:" + (item.startDate || item.entryDate) + ":IsException");
+                item.setProperty("X-RecurringType", "RE");
+                var master = this.recurringMasterCache[uid];
+                if (master) {
+                    // We allready have a master in Cache.
+                    if (this.debug) this.logInfo("Found master for exception:" + master.title + ", date:" + (master.startDate || master.entryDate));
+                    master.addException(item);
+                }
+                else {
+                    //if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Exception:"+item.title);
+                    // We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
+                    this.parentLessItems[item.id] = item;
+                    if (!this.newMasters[item.uid]) {
+                        this.newMasters[item.uid] = true;
+                        this.getMasterByItem(item);
+                    }
+                    //this.itemCacheById[item.id] = item;
+                    this.addItemToCache(item);
+
+                    if ((this.useOfflineCache) && (!fromOfflineCache)) {
+                        let cacheItem = {};
+                        cacheItem[item.id] = {
+                            calItem: item,
+                            exchangeItemXML: xml2json.toString(aCalendarItem)
+                        };
+                        this.addToOfflineCache(cacheItem);
+                    }
+
+                    return null;
+                }
+
+                break;
+            case "Occurrence":
+                if (this.debug) this.logInfo("@1:" + (item.startDate || item.entryDate) + ":IsOccurrence");
+                item.setProperty("X-RecurringType", "RO");
+                // This is a occurrence. Try to find the master and link recurrenceinfo.
+                var master = this.recurringMasterCache[uid];
+                if (master) {
+                    // We allready have a master in Cache.
+                    if (this.debug) this.logInfo("Found master for occurrence:" + master.title + ", date:" + (master.startDate || master.entryDate));
+
+                    master.addOccurrence(item);
+                }
+                else {
+                    //if (this.debug) this.logInfo("HAS NO MASTER: STRANGE: Occurrence:"+item.title);
+                    // We do not have a master yet so we are going to request it and put this in itemcache but do not show it.
+                    this.parentLessItems[item.id] = item;
+                    if (!this.newMasters[item.uid]) {
+                        this.newMasters[item.uid] = true;
+                        this.getMasterByItem(item);
+                    }
+                    //this.itemCacheById[item.id] = item;
+                    this.addItemToCache(item);
+
+                    if ((this.useOfflineCache) && (!fromOfflineCache)) {
+                        let cacheItem = {};
+                        cacheItem[item.id] = {
+                            calItem: item,
+                            exchangeItemXML: xml2json.toString(aCalendarItem)
+                        };
+                        this.addToOfflineCache(cacheItem);
+                    }
+
+                    return null;
+                }
+
+                break;
+            case "RecurringMaster":
+
+                //					if (this.debug) this.logInfo(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache);
+                //dump(item.title+":"+(item.startDate || item.entryDate)+":IsMaster, fromOfflineCache:"+fromOfflineCache+"\n");
+
+                // Check if this item existed previously as a Single item and is not converted into a master.
+                if (this.itemCacheById[item.id]) {
+                    if (this.debug) this.logInfo("We allready have this master in the single itemcache. single changed into master. Removing ");
+                    this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
+                    this.removeFromOfflineCache(item);
+                    this.removeItemFromCache(this.itemCacheById[item.id]);
+                }
+
+                //					if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].id == item.id) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
+                if ((this.recurringMasterCache[item.uid]) && (this.recurringMasterCache[item.uid].changeKey != item.changeKey)) {
+                    if (this.debug) this.logInfo("We allready have this master in cache but the changeKey changed.");
+                    if (this.recurringMasterCache[item.uid].id != item.id) {
+                        dump(" @#@# THIS IS WEARD id do not match. @@@!!\n");
+                        dump(" item.title:" + item.title + ", startDate:" + item.startDate + ", calendarItemType:" + item.calendarItemType + "\n");
+                        dump(" this.recurringMasterCache[item.uid].title:" + this.recurringMasterCache[item.uid].title + ", startDate:" + this.recurringMasterCache[item.uid].startDate + ", calendarItemType:" + this.recurringMasterCache[item.uid].calendarItemType + "\n");
+                    }
+                    //dump("We allready have this master in cache but the changeKey changed.\n");
+
+                    let ids = [];
+                    let myExceptions = this.recurringMasterCache[item.uid].getExceptions({});
+                    for each(var tmpException in myExceptions) {
+                        ids.push({
+                            Id: tmpException.id,
+                            type: "Exception",
+                            uid: item.uid,
+                            start: null,
+                            end: null
+                        });
+                    }
+                    let myOccurrences = this.recurringMasterCache[item.uid].getOccurrences({});
+                    for each(var tmpOccurrence in myOccurrences) {
+                        ids.push({
+                            Id: tmpOccurrence.id,
+                            type: "Occurrence",
+                            uid: item.uid,
+                            start: null,
+                            end: null
+                        });
+                    }
+
+                    if (this.debug) this.logInfo("Going to request '" + ids.length + "' children to see if they are updated.");
+                    //dump("Going to request '"+ids.length+"' memorycache children to see if they are updated.\n");
+
+                    // Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
+                    while (ids.length > 0) {
+                        let req = [];
+                        for (var counter = 0;
+                            ((counter < 10) && (ids.length > 0)); counter++) {
+                            req.push(ids.pop());
+                        }
+                        this.findCalendarItemsOK(null, req, [], true);
+                    }
+                }
+
+                if (!fromOfflineCache) {
+                    let changeKey = this.itemIsInOfflineCache(item.id);
+                    if ((changeKey) && (item.changeKey != changeKey)) {
+                        //dump("Master is in offline cache and changeKey is different. Going to see if children have changed.\n");
+                        let inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RO");
+                        let i = 0;
+                        let ids = [];
+                        while (i < inOfflineCache.length) {
+                            ids.push({
+                                Id: inOfflineCache[i],
+                                type: "Occurrence",
+                                uid: item.uid,
+                                start: null,
+                                end: null
+                            });
+                            i++;
+                        }
+
+                        inOfflineCache = this.getOccurrencesFromOfflineCache(item, "RE");
+                        i = 0;
+                        while (i < inOfflineCache.length) {
+                            ids.push({
+                                Id: inOfflineCache[i],
+                                type: "Exception",
+                                uid: item.uid,
+                                start: null,
+                                end: null
+                            });
+                            i++;
+                        }
+
+                        if (this.debug) this.logInfo("Going to request '" + ids.length + "' offline children to see if they are updated.");
+                        //dump("Going to request '"+ids.length+"' offline children to see if they are updated.\n");
+
+                        // Devide the whole in smaller request otherwise on the return answer we will flood the cpu and memory.
+                        while (ids.length > 0) {
+                            let req = [];
+                            for (var counter = 0;
+                                ((counter < 10) && (ids.length > 0)); counter++) {
+                                req.push(ids.pop());
+                            }
+                            this.findCalendarItemsOK(null, req, [], true);
+                        }
+                    }
+                }
+
+                if (this.debug) this.logInfo("Trying to see if there are parentless items for this master:" + item.title + ".");
+                //this.observers.notify("onStartBatch");
+                var parentLessCounter = 0;
+                for (var itemId in this.parentLessItems) {
+                    parentLessCounter++;
+                    if ((this.parentLessItems[itemId])
+                        && (isEvent(this.parentLessItems[itemId]))
+                        && ((this.parentLessItems[itemId].calendarItemType == "Occurrence")
+                            || (this.parentLessItems[itemId].calendarItemType == "Exception"))
+                        && (this.parentLessItems[itemId].uid == item.uid)
+                        && (this.parentLessItems[itemId].parentItem.id != item.id)) {
+                        if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment: Found item without parent:" + this.parentLessItems[itemId] + ", going to set parent.");
+                        //this.itemCacheById[index].parentItem = item;
+                        if (this.parentLessItems[itemId].calendarItemType == "Exception") {
+                            item.addException(this.parentLessItems[itemId]);
+                        }
+                        if (this.parentLessItems[itemId].calendarItemType == "Occurrence") {
+                            item.addOccurrence(this.parentLessItems[itemId]);
+                        }
+
+                        this.notifyTheObservers("onAddItem", [this.parentLessItems[itemId]]);
+                        this.parentLessItems[itemId] = null;
+                        delete this.parentLessItems[itemId];
+                    }
+
+                }
+                //this.observers.notify("onEndBatch");
+
+                if (!fromOfflineCache) {
+                    let cacheItem = {};
+                    cacheItem[item.id] = {
+                        calItem: item,
+                        exchangeItemXML: xml2json.toString(aCalendarItem)
+                    };
+                    this.addToOfflineCache(cacheItem);
+                }
+
+                if (this.recurringMasterCache[uid]) {
+                    if (this.recurringMasterCache[uid].recurrenceInfo.toString() != item.recurrenceInfo.toString()) {
+                        // Recurrence info change. We are going to request all children in a known period.
+                        if (this.debug) this.logInfo(this.name + ": (" + item.title + ") Recurrence info change for master. We are going to request all children in a known period..");
+                        this.masterCount--;
+                        //dump("   xx MasterCount:"+this.masterCount+"\n");
+                        this.recurringMasterCache[uid].deleteItem();
+                        this.recurringMasterCache[uid] = null;
+                        this.recurringMasterCacheById[item.id] = null;
+                        var self = this;
+                        var tmpItem = {
+                            Id: item.id,
+                            ChangeKey: item.changeKey,
+                            type: "RecurringMaster"
+                        };
+                        this.addToQueue(erFindOccurrencesRequest, {
+                                user: this.user,
+                                mailbox: this.mailbox,
+                                folderBase: this.folderBase,
+                                serverUrl: this.serverUrl,
+                                masterItem: tmpItem,
+                                folderID: this.folderID,
+                                changeKey: this.changeKey,
+                                startDate: this.startDate || this.entryDate,
+                                endDate: this.endDate || this.dueDate,
+                                GUID: calExchangeCalendarGUID
+                            },
+                            function (erGetItemsRequest, aIds) {
+                                self.findOccurrencesOK(erGetItemsRequest, aIds);
+                            },
+                            function (erGetItemsRequest, aCode, aMsg) {
+                                self.findCalendarItemsError(erGetItemsRequest, aCode, aMsg);
+                            },
+                            null);
+                    }
+                    /*						this.masterCount--;
+                    						//dump("   xx MasterCount:"+this.masterCount+"\n");
+                    						this.recurringMasterCache[uid].deleteItem();
+                    						this.recurringMasterCache[uid] = null;*/
+                }
+                else {
+                    if ((parentLessCounter == 0) && (!fromOfflineCache) && (this.syncState)) {
+                        if (this.debug) this.logInfo("We have a new master without children. Most of the times this means we nead to request the children separately.");
+                        //dump(this.name+": ("+item.title+") We have a new master without children. Most of the times this means we nead to request the children separately.\n");
+                        //dump("     -- this.startDate:"+this.startDate+", this.endDate:"+this.endDate+"\n");
+
+                        this.requestPeriod(this.startDate || this.entryDate, this.endDate || this.dueDate, Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, false, item.uid);
+                    }
+                }
+
+                this.masterCount++;
+                this.recurringMasterCache[uid] = item;
+                //dump("** Add to this.recurringMasterCache: title:"+item.title+", item.startDate:"+item.startDate+"\n");
+                this.recurringMasterCacheById[item.id] = item;
+                //dump("   :: MasterCount:"+this.masterCount+"\n");
+
+                if (this.debug) this.logInfo("This is a master it will not be put into the normal items cache list.");
+                //dump("convertExchangeAppointmentToCalAppointment. The master will not be visible:"+item.title+"\n");
+                return null; // The master will not be visible
+
+                break;
+            default:
+                //this.setSnoozeTime(item, null);
+            }
+        }
+
+        return item;
+    },
+
+    convertExchangeAppointmentToCalAppointment: function _convertExchangeAppointmentToCalAppointment(aCalendarItem, isMeetingRequest, erGetItemsRequest, doNotify, fromOfflineCache) {
+        if (this.debug) this.logInfo("convertExchangeAppointmentToCalAppointment:" + xml2json.toString(aCalendarItem), 2);
+
+        //var item = createEvent();
+        //		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+        //				.createInstance(Ci.mivExchangeEvent, this);
+
+        var item = new mivExchangeEvent();
+
+        item.addMailboxAlias(this.mailbox);
+        item.calendar = this.superCalendar;
+        item.exchangeData = aCalendarItem;
+
+        //		item.calendar = this;
+
+        //return item;
+
+        if (!doNotify) {
+            doNotify = false;
+        }
+
+        //item.id = this.tryToSetValue(aCalendarItem.getAttributeByTag("t:ItemId", "Id"), item.id);
+        if (!item.id) {
+            if (this.debug) this.logInfo("Item.id is missing. this is a required field.");
+            item.deleteItem();
+            item = null;
+            //dump("convertExchangeAppointmentToCalAppointment. Item.id is missing. this is a required field.\n");
+            return null;
+        }
+        //item.setProperty("X-ChangeKey", aCalendarItem.getAttributeByTag("t:ItemId", "ChangeKey"));
+        if ((erGetItemsRequest) && (erGetItemsRequest.argument.occurrenceIndexes) && (erGetItemsRequest.argument.occurrenceIndexes[item.id])) {
+            if (this.debug) this.logInfo(" Muriel:" + erGetItemsRequest.argument.occurrenceIndexes[item.id] + ", title:" + item.title);
+            item.occurrenceIndex = erGetItemsRequest.argument.occurrenceIndexes[item.id];
+            //setProperty("X-OccurrenceIndex", erGetItemsRequest.argument.occurrenceIndexes[item.id]+"");
+        }
+
+        if (!item.startDate) {
+            if (this.debug) this.logInfo("We have an empty startdate. Skipping this item.");
+            item.deleteItem();
+            item = null;
+            //dump("convertExchangeAppointmentToCalAppointment. We have an empty startdate. Skipping this item.\n");
+            return null;
+        }
+
+        if (!item.endDate) {
+            if (this.debug) this.logInfo("We have an empty enddate. Skipping this item.");
+            item.deleteItem();
+            item = null;
+            //dump("convertExchangeAppointmentToCalAppointment. We have an empty enddate. Skipping this item.\n");
+            return null;
+        }
+
+        if (item.startDate.compare(item.endDate) > 0) {
+            if (this.debug) this.logInfo("Startdate (" + item.startDate + ") is after enddate (" + item.endDate + ")? Skipping this item.");
+            item.deleteItem();
+            item = null;
+            //dump("convertExchangeAppointmentToCalAppointment. Startdate ("+item.startDate+") is after enddate ("+item.endDate+")? Skipping this item.\n");
+            return null;
+        }
+
+        return this.convertExchangeItemtoCalItem(aCalendarItem, item, fromOfflineCache, isMeetingRequest);
+    },
+
+    convertExchangeTaskToCalTask: function _convertExchangeTaskToCalTask(aTask, erGetItemsRequest, fromOfflineCache) {
+        //if (this.debug) this.logInfo("convertExchangeTaskToCalTask:"+xml2json.toString(aTask), 2);
+        //var item = createTodo();
+        //		var item = Cc["@1st-setup.nl/exchange/calendartodo;1"]
+        //				.createInstance(Ci.mivExchangeTodo, this);
+
+        var item = new mivExchangeTodo();
+
+        item.addMailboxAlias(this.mailbox);
+        item.calendar = this.superCalendar;
+        item.exchangeData = aTask;
+
+        return this.convertExchangeItemtoCalItem(aTask, item, fromOfflineCache, false);
+
+        // See if this is a delegated task.
+        /*		var isNotAccepted = 0;
+
+        		for each (var extendedProperty in aTask.getTagValue("t:ExtendedProperty")) {
+
+        			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33032") {
+        				item.setProperty("X-exchWebService-PidLidTaskAccepted",extendedProperty.getTagValue("t:Value"));
+        				// TRUE means accepted or rejected.
+        				if (extendedProperty.getTagValue("t:Value") == "false") isNotAccepted++;
+        			}
+        			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33045") {
+        				item.setProperty("X-exchWebService-PidLidTaskLastUpdate",extendedProperty.getTagValue("t:Value"));
+        				// Date of last update. 
+        			}
+        			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33066") {
+        				item.setProperty("X-exchWebService-PidLidTaskAcceptanceState",extendedProperty.getTagValue("t:Value"));
+        				// Only visible on the Owner task item. Otherwise value == NoMatch
+        				//0x00000000 The task is not assigned.
+        				//0x00000001 The task’s acceptance status is unknown.
+        				//0x00000002 The task assignee accepted the task. This value is set when the client processes a task acceptance.
+        				//0x00000003 The task assignee rejected the task. This value is set when the client processes a task rejection.
+        				if (extendedProperty.getTagValue("t:Value") == "NoMatch") isNotAccepted++;
+        			}
+        			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33050") {
+        				item.setProperty("X-exchWebService-PidLidTaskHistory",extendedProperty.getTagValue("t:Value"));
+        				// Specifies last change to record. PidLidTaskLastUpdate shows date of this change.
+        				//0x00000004 The dispidTaskDueDate (PidLidTaskDueDate) property changed.
+        				//0x00000003 Another property was changed.
+        				//0x00000001 The task assignee accepted this task.
+        				//0x00000002 The task assignee rejected this task.
+        				//0x00000005 The task was assigned to a task assignee.
+        				//0x00000000 No changes were made.
+        				if (extendedProperty.getTagValue("t:Value") == "5") isNotAccepted++;
+        			}
+        			if (extendedProperty.getAttributeByTag("t:ExtendedFieldURI","PropertyId") == "33065") {
+        				item.setProperty("X-exchWebService-PidLidTaskOwnership",extendedProperty.getTagValue("t:Value"));
+        			}
+        		}
+        		if (aTask.getTagValue("t:Delegator") != "") {
+        			item.setProperty("X-exchWebService-Delegator",aTask.getTagValue("t:Delegator"));
+        			item.setProperty("X-exchWebService-Owner",aTask.getTagValue("t:Owner"));
+        			item.setProperty("X-exchWebService-IsTeamTask",aTask.getTagValue("t:IsTeamTask"));
+        		}
+        */
+    },
+
+    convertExchangeUserAvailabilityToCalAppointment: function _convertExchangeUserAvailabilityToCalAppointment(aCalendarEvent) {
+        //		if (aCalendarEvent.getTagValue("t:BusyType") == "Free") {
+        /*			var startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
+        			var endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
+
+        			// Cleanup items that were busy but are now free.
+        dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
+        			for (var index in this.itemCacheById) {
+        				if ((startDate.compare(this.itemCacheById[index].endDate) < 0) && (endDate.compare(this.itemCacheById[index].startDate) > 0)) {
+        					this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
+        					delete this.itemCacheById[index];
+        				}
+        			}*/
+
+        //			return null;
+        //		}
+
+        var item = createEvent();
+        //		var item = Cc["@1st-setup.nl/exchange/calendarevent;1"]
+        //				.createInstance(Ci.mivExchangeEvent);
+        item.calendar = this.superCalendar;
+
+        if (xml2json.getTagValue(aCalendarEvent, "t:BusyType") == "Free") {
+            item.setProperty("TRANSP", "TRANSPARENT");
+        }
+        else {
+            item.setProperty("TRANSP", "OPAQUE");
+        }
+
+        item.title = this.tryToSetValue(xml2json.getTagValue(aCalendarEvent, "t:BusyType"), "");
+        if (!item.title) {
+            item.title = "";
+        }
+
+        if (xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails")) {
+            item.title = this.tryToSetValue(xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Subject"), "") + " (" + item.title + ")";
+
+            item.setProperty("LOCATION", xml2json.getTagValue(xml2json.getTag(aCalendarEvent, "t:CalendarEventDetails"), "t:Location"));
+        }
+        else {
+            item.title = " (" + item.title + ")";
+        }
+
+        //		item.setProperty("DESCRIPTION", aCalendarItem.getTagValue("t:Body"));
+
+        item.startDate = null;
+        if (xml2json.getTagValue(aCalendarEvent, "t:StartTime", null)) {
+            if (this.isVersion2007) {
+                item.startDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:StartTime", null), this.globalFunctions.ecUTC());
+            }
+            else {
+                item.startDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:StartTime", null), this.globalFunctions.ecDefaultTimeZone());
+            }
+        }
+
+        //		item.startDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:StartTime"), null);
+        if (!item.startDate) {
+            if (this.debug) this.logInfo("We have an empty startdate. Skipping this item.");
+            item = null;
+            return null;
+        }
+
+        item.endDate = null;
+        if (xml2json.getTagValue(aCalendarEvent, "t:EndTime", null)) {
+            if (this.isVersion2007) {
+                item.endDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:EndTime", null), this.globalFunctions.ecUTC());
+            }
+            else {
+                item.endDate = cal.fromRFC3339(xml2json.getTagValue(aCalendarEvent, "t:EndTime", null), this.globalFunctions.ecDefaultTimeZone());
+            }
+        }
+
+        //item.endDate = this.tryToSetDateValue(aCalendarEvent.getTagValue("t:EndTime"), null);
+        if (!item.endDate) {
+            if (this.debug) this.logInfo("We have an empty enddate. Skipping this item.");
+            return null;
+        }
+
+
+        var startDateStr = xml2json.getTagValue(aCalendarEvent, "t:StartTime", "");
+        var endDateStr = xml2json.getTagValue(aCalendarEvent, "t:EndTime", "");
+        item.id = this.md5(startDateStr + endDateStr);
+        if (this.itemCacheById[item.id]) {
+            //dump("\n-- we already know this one --:"+xml2json.toString(aCalendarEvent)+"\n");
+            //item = null;
+            return this.itemCacheById[item.id];
+        }
+
+        // Try to see if it is an all day event. Only to see if all hours, minutes and seconds are 0 (zero)
+        if ((item.startDate.hour == 0) && (item.startDate.minute == 0) && (item.startDate.second == 0)
+            && (item.endDate.hour == 0) && (item.endDate.second == 0) && (item.endDate.second == 0)) {
+            item.startDate.isDate = true;
+            item.endDate.isDate = true;
+        }
+
+        //dump("\n-- added --:"+xml2json.toString(aCalendarEvent)+"\n");
+        return item;
+    },
+
+    convertExchangeToCal: function _convertExchangeToCal(aExchangeItem, erGetItemsRequest, doNotify, fromOfflineCache) {
+        //		if (this.debug) this.logInfo("convertExchangeToCal:"+aExchangeItem, 2);
+        if (!aExchangeItem) {
+            if (this.debug) this.logInfo("convertExchangeToCal: !aExchangeItem", 2);
+            //dump("convertExchangeToCal. !aExchangeItem\n");
+            return;
+        }
+
+        var switchValue = xml2json.getTagValue(aExchangeItem, "t:ItemClass", "");
+        if (switchValue.indexOf(".{") > -1) {
+            switchValue = switchValue.substr(0, switchValue.indexOf(".{"));
+        }
+
+        if (switchValue.indexOf("IPM.Appointment") == 0) {
+
+            if (this.debug) this.logInfo("INFO: convertExchangeToCal: ItemClass = '" + switchValue + "'", 2);
+            switchValue = "IPM.Appointment";
+        }
+
+        switch (switchValue) {
+        case "IPM.Appointment":
+        case "IPM.Appointment.Occurrence":
+        case "IPM.Appointment.MP":
+        case "IPM.Appointment.Live Meeting Request":
+        case "IPM.OLE.CLASS":
+        case "IPM.Schedule.Meeting.Request":
+        case "IPM.Schedule.Meeting.Canceled":
+            return this.convertExchangeAppointmentToCalAppointment(aExchangeItem, false, erGetItemsRequest, doNotify, fromOfflineCache);
+            break;
+        case "IPM.Task":
+            return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
+            break;
+        case "IPM.Note":
+            return this.convertExchangeTaskToCalTask(aExchangeItem, erGetItemsRequest, fromOfflineCache);
+            break;
+        default:
+            if (aExchangeItem.tagName == "CalendarEvent") {
+                return this.convertExchangeUserAvailabilityToCalAppointment(aExchangeItem);
+            }
+            if (this.debug) this.logInfo("WARNING: convertExchangeToCal: unknown ItemClass = '" + switchValue + "'");
+        }
+    },
+
+    updateCalendar: function _updateCalendar(erGetItemsRequest, aItems, doNotify, fromOfflineCache, processInParts) {
+        if (!processInParts) {
+            this.updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache);
+            return;
+        }
+
+        if (this.debug) this.logInfo("updateCalendar: We have '" + aItems.length + "' items to update in calendar in parts. fromOfflineCache:" + fromOfflineCache);
+
+        for (var index in aItems) {
+            this.updateCalendarItems.push({
+                request: erGetItemsRequest,
+                item: aItems[index],
+                doNotify: doNotify,
+                fromOfflineCache: fromOfflineCache
+            });
+            aItems[index] = null;
+        }
+
+        this.doUpdateCalendarItem();
+
+        if ((this.updateCalendarItems.length > 0) && (!this.updateCalendarTimerRunning)) {
+            this.updateCalendarTimerRunning = true;
+            let self = this;
+            //this.observerService.notifyObservers(this, "onExchangeProgressChange", "2");
+            this.updateCalendarTimer.initWithCallback({
+                notify: function setTimeout_notify() {
+                    self.doUpdateCalendarItem();
+                }
+            }, 20, this.updateCalendarTimer.TYPE_REPEATING_SLACK);
+        }
+    },
+
+    doUpdateCalendarItem: function _doUpdateCalendarItem() {
+        if (this.updateCalendarItems.length > 0) {
+            var tmpItems = [];
+
+            let counter = 5;
+            while ((counter > 0) && (this.updateCalendarItems.length > 0)) {
+                var updateRecord = this.updateCalendarItems.shift();
+                tmpItems.push(updateRecord.item);
+                counter--;
+            }
+
+            this.updateCalendar2(updateRecord.request, tmpItems, false, true);
+            tmpItems = null;
+            updateRecord.item = null;
+            updateRecord.request = null;
+            updateRecord = null;
+        }
+
+        if (this.updateCalendarItems.length == 0) {
+            //this.observerService.notifyObservers(this, "onExchangeProgressChange", "-2");
+            this.updateCalendarTimer.cancel();
+            this.updateCalendarTimerRunning = false;
+        }
+    },
+
+    updateCalendar2: function _updateCalendar2(erGetItemsRequest, aItems, doNotify, fromOfflineCache) {
+        if (this.debug) this.logInfo("updateCalendar2: We have '" + aItems.length + "' items to update in calendar. fromOfflineCache:" + fromOfflineCache);
+
+        let cacheItem = {};
+
+        for (var index = 0; index < aItems.length; index++) {
+
+            this.itemsFromExchange++;
+
+            var item = this.convertExchangeToCal(aItems[index], erGetItemsRequest, doNotify, fromOfflineCache);
+
+            if (item) {
+                if (item.isCancelled && item.reminderIsSet && isEvent(item)) {
+                    var aNewItem = item.QueryInterface(Ci.mivExchangeEvent);
+                    if (this.debug) this.logInfo("updateCalendar2: This item is Cancelled resetting reminder to false :  " + aNewItem.title);
+                    this.itemCount++;
+                    aNewItem._reminderIsSet = false;
+                    aNewItem._newAlarm = null;
+                    this.modifyItem(aNewItem, item);
+                    if (this.debug) this.logInfo("updateCalendar2: hope! reminder is set  for item " + aNewItem.title + " going to modify next item");
+                }
+                //convertedItems.push(item);
+                else if (!this.itemCacheById[item.id]) {
+                    // This is a new unknown item
+                    //this.itemCacheById[item.id] = item;  
+                    if ((this.isEmailTodo(item, aItems[index]) === false) && (this.isEmail(item) === true)) {
+                        //We are not adding this item because its no longer email followup
+                    }
+                    else {
+                        this.addItemToCache(item);
+                        this.itemCount++;
+
+                        if (isEvent(item) && this.markEventasTentative) {
+                            var isOldCacheItem = false;
+                            var aItem = item.QueryInterface(Ci.mivExchangeEvent);
+
+                            if (this.debug) this.logInfo("updateCalendar2: proceed setTentative:" + item.title);
+                            this.setTentative(aItem, aItems[index], isOldCacheItem);
+                        }
+
+                        if (this.debug) this.logInfo("updateCalendar2: onAddItem:" + item.title);
+                        if (doNotify) {
+                            this.notifyTheObservers("onAddItem", [item]);
+                        }
+
+                        if ((this.useOfflineCache) && (!fromOfflineCache)) {
+                            cacheItem[item.id] = {
+                                calItem: item,
+                                exchangeItemXML: xml2json.toString(aItems[index])
+                            };
+                            //this.addToOfflineCache(item, xml2json.toString(aItems[index]));
+                        }
+                    }
+                }
+                else {
+                    // I Allready known this one.
+                    if (this.debug) this.logInfo("updateCalendar2: onModifyItem:" + item.title);
+                    //dump("updateCalendar: onModifyItem:"+ item.title);
+
+                    if ((this.isEmail(item) === true) && (this.isEmailTodo(item, aItems[index]) === false)) {
+                        //We are removing this item from cache because its no longer email followup  
+                        this.notifyTheObservers("onDeleteItem", [this.itemCacheById[item.id]]);
+                        this.removeFromOfflineCache(item);
+                        this.removeItemFromCache(this.itemCacheById[item.id]);
+                    }
+                    else {
+                        this.singleModified(item, doNotify);
+
+                        if ((this.useOfflineCache) && (!fromOfflineCache)) {
+                            cacheItem[item.id] = {
+                                calItem: item,
+                                exchangeItemXML: xml2json.toString(aItems[index])
+                            };
+                            //this.addToOfflineCache(item, xml2json.toString(aItems[index]));
+                        }
+                    }
+                }
+            }
+
+            aItems[index] = null;
+
+        }
+
+        if ((this.useOfflineCache) && (!fromOfflineCache)) {
+            this.addToOfflineCache(cacheItem);
+        }
+    },
+
+    isEmailTodo: function _isEmailTodo(item, exchangeData) {
+        if (this.isEmail(item)) {
+            var tmpObject = xml2json.XPath(exchangeData, "/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyTag = '0x1090']");
+
+            if (tmpObject.length > 0) {
+                let ext_val = xml2json.getTagValue(tmpObject[0], "t:Value", "0");
+                if ((ext_val === "1") || (ext_val === "2")) {
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return false;
+            }
+        }
+        return false;
+    },
+
+    isEmail: function _isEmail(item) {
+        if (item) {
+            if (item.itemClass == "IPM.Note") return true;
+        }
+        return false;
+    },
+
+    setTentative: function _setTentative(aItem, exchangeItem, isOldCacheItem) {
+        //Return when item already in cache
+        if (!aItem || !exchangeItem || !isEvent(aItem)) {
+            if (this.debug) this.logInfo("setTentative");
+            return;
+        }
+
+        if (this.newCalendar) {
+            if (this.debug) this.logInfo("setTentative : calendar is creating so no setTentative will not proceed");
+            return;
+        }
+
+        if (isOldCacheItem) {
+            //NoResponseReceived
+            //t:MyResponseType 
+            if (this.debug) this.logInfo("setTentative 2: This item : " + aItem.title + " is Old and responded with - " + xml2json.getTagValue(exchangeItem, "t:MyResponseType"));
+            return;
+        }
+        else {
+            var aNewItem = aItem.QueryInterface(Ci.mivExchangeEvent);
+            var aOldItem = aItem.QueryInterface(Ci.mivExchangeEvent);
+
+            var aNewItem = this.cloneItem(aItem);
+            var aOldItem = this.cloneItem(aItem);
+
+            var itemResponse = xml2json.getTagValue(exchangeItem, "t:MyResponseType");
+            if (itemResponse == "NoResponseReceived") {
+                var meNew = this.getInvitedAttendee(aNewItem);
+                var meOld = this.getInvitedAttendee(aOldItem);
+                //Assuming items already marked as tentaive in auto processing settings in ews server
+                if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + " stauts: " + meNew.participationStatus + " :: " + meOld.participationStatus + " - " + aItem.title + " Responded : " + itemResponse);
+                //aNewItem.setProperty("STATUS", "TENTATIVE");
+
+                meNew.participationStatus = "TENTATIVE";
+
+                if (this.debug) this.logInfo("setTentative 2: This item is not in cache " + meNew.participationStatus + " :: " + meOld.participationStatus);
+                this.modifyEventImmediate(aNewItem, aOldItem);
+            }
+            else {
+                if (this.debug) this.logInfo("setTentative 2: This item is found in cache " + aItem.title + " Responded : " + itemResponse);
+                return;
+            }
+        }
+    },
+
+    modifyEventImmediate: function _modifyItemImmediate(aNewItem, aOldItem, aListener) {
+
+        if (this.debug) this.logInfo("modifyEventImmediate");
+        var result = Ci.calIErrors.MODIFICATION_FAILED;
+
+        if (this.OnlyShowAvailability) {
+            this.readOnlyInternal = true;
+            this.notifyOperationComplete(aListener,
+                Ci.calIErrors.OPERATION_CANCELLED,
+                Ci.calIOperationListener.MODIFY,
+                aNewItem.id,
+                aNewItem);
+            return null;
+        }
+
+        if (this.readOnly) {
+            // When we hit this it probably is the change on a alarm. We will process this only in the local cache.
+            if (this.debug) this.logInfo("modifyEventImmediate: modifyItem and this calendar is ReadOnly");
+            this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]);
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.MODIFY,
+                aNewItem.id,
+                aNewItem);
+            return null;
+        }
+
+        if ((aOldItem.className) && (!aOldItem.canModify)) {
+            if (this.debug) this.logInfo("modifyEventImmediate: modifyItem and this item is ReadOnly for this user.");
+            this.notifyOperationComplete(aListener,
+                Cr.NS_OK,
+                Ci.calIOperationListener.MODIFY,
+                aOldItem.id,
+                aOldItem);
+            return null;
+        }
+
+        if (this.debug) this.logInfo("modifyEventImmediate: 1 -- aOldItem.recurrenceInfo:" + aOldItem.recurrenceInfo + ", aNewItem.recurrenceInfo:" + aNewItem.recurrenceInfo);
+        if ((this.debug) && (aOldItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aOldItem.recurrenceInfo.toString():" + aOldItem.recurrenceInfo.toString());
+        if ((this.debug) && (aNewItem.recurrenceInfo)) this.logInfo("modifyItemAsTentative: 1 -- aNewItem.recurrenceInfo.toString():" + aNewItem.recurrenceInfo.toString());
+
+        if (!aNewItem) {
+            throw Cr.NS_ERROR_INVALID_ARG;
+        }
+
+        var this_ = this;
+
+        function reportError(errStr, errId) {
+            this_.notifyOperationComplete(aListener,
+                errId ? errId : Cr.NS_ERROR_FAILURE,
+                Ci.calIOperationListener.MODIFY,
+                aNewItem.id,
+                errStr);
+            return null;
+        }
+
+        if (aNewItem.id == null) {
+            // this is definitely an error
+            return reportError("modifyEventImmediate: ID for modifyItem item is null");
+        }
+
+        // See if attachments changed.
+        var newAttachments = aNewItem.getAttachments({});
+        var attachments = {};
+
+        var attachmentsUpdates = {
+            create: [],
+            delete: []
+        };
+        if (newAttachments.length > 0) {
+            if (this.debug) this.logInfo("modifyEventImmediate:   -- We have newAttachments:" + newAttachments.length);
+            for (var index in newAttachments) {
+                if (newAttachments[index].getParameter("X-AttachmentId")) {
+                    attachments[newAttachments[index].getParameter("X-AttachmentId")] = newAttachments[index];
+                }
+                else {
+                    attachmentsUpdates.create.push(newAttachments[index]);
+                    if (this.debug) this.logInfo("modifyEventImmediate: newAttachment:" + newAttachments[index].uri.spec);
+                }
+            }
+        }
+        // Check which have been removed.
+        var oldAttachments = aOldItem.getAttachments({});
+        for (var index in oldAttachments) {
+            if (!attachments[oldAttachments[index].getParameter("X-AttachmentId")]) {
+                attachmentsUpdates.delete.push(oldAttachments[index]);
+                if (this.debug) this.logInfo("modifyEventImmediate: removedAttachment:" + oldAttachments[index].uri.spec);
+            }
+        }
+
+
+        if (isEvent(aNewItem)) {
+            if (this.debug) this.logInfo("modifyEventImmediate:  it is an event.");
+            var doSendMeetingRespons = false;
+            var meOld = this.getInvitedAttendee(aOldItem);
+            if (!meOld) {
+                if (this.debug) this.logInfo("modifyEventImmediate: Did not find meOld");
+                meOld = cal.createAttendee();
+                meOld.participationStatus = "NEEDS-ACTION";
+            }
+
+            var meNew = this.getInvitedAttendee(aNewItem);
+            if (!meNew) {
+                if (this.debug) this.logInfo("modifyEventImmediate: Did not find meNew");
+                meNew = cal.createAttendee();
+                meNew.participationStatus = "NEEDS-ACTION";
+            }
+
+            if (aOldItem.isInvitation) {
+
+                if (this.debug) this.logInfo("modifyEventImmediate: 1 meOld.participationStatus=" + meOld.participationStatus + ", meNew.participationStatus=" + meNew.participationStatus);
+                if (this.debug) this.logInfo("modifyEventImmediate: 1 aOldItem.status=" + aOldItem.getProperty("STATUS") + ", aNewItem.status=" + aNewItem.getProperty("STATUS"));
+
+                if ((meOld) && (meNew) && (meOld.participationStatus != meNew.participationStatus)) {
+                    doSendMeetingRespons = true;
+                }
+
+                if ((meNew) && (meNew.participationStatus == "NEEDS-ACTION") && (meOld.participationStatus != meNew.participationStatus)) {
+                    // They choose to confirm at a later state. Do not change this item.
+                    this.notifyOperationComplete(aListener,
+                        Cr.NS_OK,
+                        Ci.calIOperationListener.MODIFY,
+                        aNewItem.id,
+                        aNewItem);
+
+                    return null;
+                }
+
+                if ((meOld) && (meNew) && (aOldItem.getProperty("STATUS") != aNewItem.getProperty("STATUS")) && (!doSendMeetingRespons)) {
+                    switch (aNewItem.getProperty("STATUS")) {
+                    case "CONFIRMED":
+                        meNew.participationStatus = "ACCEPTED";
+                        break;
+                    case null:
+                    case "TENTATIVE":
+                        meNew.participationStatus = "TENTATIVE";
+                        break;
+                    case "CANCELLED":
+                        meNew.participationStatus = "DECLINED";
+                        break;
+                    }
+                    doSendMeetingRespons = true;
+                }
+
+            }
+
+            if (this.debug) this.logInfo("modifyEventImmediate:  doSendMeetingRespons " + doSendMeetingRespons);
+
+            if (doSendMeetingRespons) {
+                // The item is an invitation.
+                // My status has changed. Send to this.globalFunctions.
+                if (this.debug) this.logInfo("modifyEventImmediate: 2 aOldItem.participationStatus=" + meOld.participationStatus + ", aNewItem.participationStatus=" + (meNew ? meNew.participationStatus : ".."));
+                if (this.debug) this.logInfo("modifyEventImmediate: 3a aOldItem.id=" + aOldItem.id);
+                if (this.debug) this.logInfo("modifyEventImmediate: 3b aNewItem.id=" + aNewItem.id);
+
+                var requestResponseItem = aNewItem;
+                requestResponseItem.setProperty("X-MEETINGREQUEST", true);
+                var aResponse = null;
+
+                // Loop through meetingRequestsCache to find it.
+                var cachedItem = null;
+                for (var index in this.meetingRequestsCache) {
+                    if (this.meetingRequestsCache[index]) {
+                        if (this.meetingRequestsCache[index].uid == aNewItem.id) {
+                            cachedItem = this.meetingRequestsCache[index];
+                            break;
+                        }
+                    }
+                }
+
+                if (cachedItem) {
+                    if (this.debug) this.logInfo("modifyEventImmediate: ___________ Found in meeting request cache.");
+                    var tmpItem = cachedItem;
+                    var tmpUID = aNewItem.id;
+                    requestResponseItem = this.cloneItem(aNewItem);
+                    requestResponseItem.id = tmpItem.id;
+                    //requestResponseItem.setProperty("X-UID",  tmpItem.uid);
+                    //requestResponseItem.setProperty("X-ChangeKey",  tmpItem.changeKey);
+                }
+                else {
+                    if (this.debug) this.logInfo("modifyEventImmediate: ___________ NOT Found in meeting request cache. X-UID:" + aNewItem.uid);
+
+                    if (aNewItem.id == aNewItem.parentItem.id) {
+                        if (this.debug) this.logInfo("modifyEventImmediate: _________ it is a master.");
+                    }
+
+                    if ((!this.itemCacheById[aNewItem.id]) && (!this.recurringMasterCache[aNewItem.uid])) {
+                        this.getMeetingRequestFromServer(aNewItem, aOldItem.uid, Ci.calIOperationListener.MODIFY, aListener);
+                        return;
+                    }
+
+                }
+
+                if (this.sendMeetingResponsImmediate(requestResponseItem, null, "exisiting", aResponse)) {
+                    //return;
+                    result = Cr.NS_OK;
+                }
+                else {
+                    if (this.debug) this.logInfo("modifyEventImmediate : canceled by user.");
+                    result = Cr.NS_OK;
+                }
+            }
+            else {
+
+                var input = {
+                    item: aNewItem,
+                    response: "sendtonone"
+                };
+
+                if (aNewItem.organizer) {
+                    if (this.debug) this.logInfo("The organizer is:" + aNewItem.organizer.id);
+                }
+                else {
+                    if (this.debug) this.logInfo("We have no organizer!");
+                }
+
+
+                var changesObj = this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation);
+                var changes;
+                if (changesObj) {
+                    changes = changesObj.changes;
+                }
+                var weHaveChanges = (changes || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
+                //				var weHaveChanges = (this.makeUpdateOneItem(aNewItem, aOldItem, null, null, null, aOldItem.isInvitation) || (attachmentsUpdates.create.length > 0) || (attachmentsUpdates.delete.length > 0));
+
+                var iAmOrganizer = ((aNewItem.organizer) && (aNewItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()));
+                //if (iAmOrganizer) {}
+
+                if (this.debug) this.logInfo("modifyEventImmediate:  it is a event. aOldItem.CalendarItemType=:" + aOldItem.calendarItemType);
+
+                // We have a Single or master
+                if (aOldItem.calendarItemType == "RecurringMaster") {
+                    if (this.debug) this.logInfo(" Master changed:" + aNewItem.title);
+                    // See if the aNewItem is also the master record.
+                    var masterChanged = (aNewItem.parentItem.id == aNewItem.id);
+
+                    // We need to find out wat has changed;
+                    if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite=" + aOldItem.isInvitation);
+
+                    if (changes) {
+                        if (this.debug) this.logInfo("modifyEventImmediate: changed:" + String(changes));
+
+                        var self = this;
+                        this.addToQueue(erUpdateItemRequest, {
+                                user: this.user,
+                                mailbox: this.mailbox,
+                                folderBase: this.folderBase,
+                                serverUrl: this.serverUrl,
+                                item: aOldItem,
+                                folderID: this.folderID,
+                                changeKey: this.changeKey,
+                                updateReq: changes,
+                                newItem: aNewItem,
+                                actionStart: Date.now(),
+                                attachmentsUpdates: attachmentsUpdates,
+                                sendto: input.response
+                            },
+                            function (erUpdateItemRequest, aId, aChangeKey) {
+                                self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+                            },
+                            function (erUpdateItemRequest, aCode, aMsg) {
+                                self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+                            },
+                            aListener);
+                        return;
+                    }
+                    else {
+                        if (this.debug) this.logInfo("modifyEventImmediate:  No changes for master.");
+                        // No changes to a master could means that one of the occurrences
+                        // was deleted. 
+                        var removedOccurrence = this.getRemovedOccurrence(aOldItem, aNewItem);
+                        if (removedOccurrence) {
+                            // Delete this occurrence; multi
+                            this.notifyTheObservers("onDeleteItem", [removedOccurrence], true);
+                            this.deleteItem(removedOccurrence);
+                            result = Cr.NS_OK;
+                        }
+                        else {
+                            // Could be an alarm dismiss or snooze
+                            dump("IF YOU SEE THIS PLEASE REPORT..(CODE1)\n");
+                            this.masterModified(aNewItem);
+                        }
+                        result = Cr.NS_OK;
+                    }
+                }
+                else {
+                    if (this.debug) this.logInfo("modifyEventImmediate: '" + aOldItem.calendarItemType + "' event modification");
+                    // We need to find out wat has changed;
+                    if (this.debug) this.logInfo("modifyEventImmediate:  ==1 invite=" + aOldItem.isInvitation);
+
+                    if (changes) {
+                        if (this.debug) this.logInfo("modifyEventImmediate:  changed:" + String(changes));
+
+                        var self = this;
+                        this.addToQueue(erUpdateItemRequest, {
+                                user: this.user,
+                                mailbox: this.mailbox,
+                                folderBase: this.folderBase,
+                                serverUrl: this.serverUrl,
+                                item: aOldItem,
+                                folderID: this.folderID,
+                                changeKey: this.changeKey,
+                                updateReq: changes,
+                                newItem: aNewItem,
+                                actionStart: Date.now(),
+                                attachmentsUpdates: attachmentsUpdates,
+                                sendto: input.response
+                            },
+                            function (erUpdateItemRequest, aId, aChangeKey) {
+                                self.updateItemOk(erUpdateItemRequest, aId, aChangeKey);
+                            },
+                            function (erUpdateItemRequest, aCode, aMsg) {
+                                self.whichOccurrencegetOccurrenceIndexError(erUpdateItemRequest, aCode, aMsg);
+                            },
+                            aListener);
+                        this.singleModified(aNewItem, true, true);
+                        return;
+                    }
+                    else {
+                        if (this.doAttachmentUpdates(attachmentsUpdates, aOldItem, input.response, aListener)) {
+                            // We are done
+                            if (this.debug) this.logInfo("modifyEventImmediate:  No only attachment changes no other fields.");
+                            return;
+                        }
+                        else {
+                            if (this.debug) this.logInfo("modifyEventImmediate:  No changes 1.");
+                            if (!aOldItem.isInvitation) {
+                                //aNewItem.parentItem = aNewItem; move to storagecalendar
+                                this.singleModified(aNewItem, true, true);
+                            }
+                            result = Cr.NS_OK;
+                        }
+                    }
+                }
+            }
+        }
+        //this.notifyTheObservers("onModifyItem", [aNewItem, aOldItem]); 
+        this.notifyOperationComplete(aListener,
+            result,
+            Ci.calIOperationListener.MODIFY,
+            aNewItem.id,
+            aNewItem);
+
+        return null;
+    },
+
+    sendMeetingResponsImmediate: function _sendMeetingResponsImmediate(aItem, aListener, aItemType, aResponse, aBodyText) {
+        if (this.debug) this.logInfo("sendMeetingResponsImmediate");
+
+        // Check if I'm the organiser. Do not send to myself.
+        if (aItem.organizer) {
+            if (aItem.organizer.id.replace(/^mailto:/i, '').toLowerCase() == this.mailbox.toLowerCase()) {
+                return true;
+            }
+        }
+        var me = this.getInvitedAttendee(aItem);
+        if ((!me) && (!aResponse)) {
+            return false;
+        }
+
+        if (aResponse) {
+            var tmpResponse = aResponse;
+        }
+        else {
+            var tmpResponse = me.participationStatus;
+        }
+
+        var messageDisposition = "SendOnly";
+
+        var input = {
+            item: aItem,
+            response: tmpResponse,
+            answer: "",
+            bodyText: ""
+        };
+
+        if (this.debug) this.logInfo("sendMeetingResponsImmediate:  -------------- messageDisposition=" + messageDisposition);
+
+        var self = this;
+        this.addToQueue(erSendMeetingResponsRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                item: aItem,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                response: input.response,
+                bodyText: input.bodyText,
+                senderMailbox: this.mailbox,
+                actionStart: Date.now(),
+                itemType: aItemType,
+                messageDisposition: messageDisposition
+            },
+            function (erSendMeetingResponsRequest) {
+                self.sendMeetingResponsOk(erSendMeetingResponsRequest);
+            },
+            function (erSendMeetingResponsRequest, aCode, aMsg) {
+                self.whichOccurrencegetOccurrenceIndexError(erSendMeetingResponsRequest, aCode, aMsg);
+            },
+            aListener);
+        return true;
+    },
+
+
+    getCalendarItemsOK: function _getCalendarItemsOK(erGetItemsRequest, aItems, aItemErrors) {
+        if (this.debug) this.logInfo("getCalendarItemsOK: aItems.length=" + aItems.length);
+        this.saveCredentials(erGetItemsRequest.argument);
+        this.notConnected = false;
+
+        if ((aItemErrors) && (aItemErrors.length > 0)) {
+            // Remove these items as they have an error
+            var i = 0;
+            while (i < aItemErrors.length) {
+                if (this.itemCacheById[aItemErrors[i]]) {
+                    this.removeFromOfflineCache(this.itemCacheById[aItemErrors[i]]);
+                    this.notifyTheObservers("onDeleteItem", [this.itemCacheById[aItemErrors[i]]]);
+                    this.removeItemFromCache(this.itemCacheById[aItemErrors[i]]);
+                }
+                else {
+                    this.removeFromOfflineCache({
+                        id: aItemErrors[i],
+                        title: "from offline"
+                    });
+                }
+                i++;
+            }
+
+        }
+
+        if (aItems.length == 0) {
+            return;
+        }
+
+        this.updateCalendar(erGetItemsRequest, aItems, true);
+        aItems = null;
+        erGetItemsRequest = null;
+    },
+
+    getCalendarItemsError: function _getCalendarItemsError(erGetItemsRequest, aCode, aMsg) {
+        this.saveCredentials(erGetItemsRequest.argument);
+        this.notConnected = true;
+
+    },
+
+    get isVersion2013() {
+        if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2013") > -1) {
+            return true;
+        }
+
+        return false;
+    },
+
+    get isVersion2010() {
+        if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2010") > -1) {
+            return true;
+        }
+
+        return false;
+    },
+
+    get isVersion2007() {
+        if (this.exchangeStatistics.getServerVersion(this.serverUrl).indexOf("2007") > -1) {
+            return true;
+        }
+
+        return false;
+    },
+
+    set weAreSyncing(aValue) {
+        if (aValue != this._weAreSyncing) {
+            if (this.debug) this.logInfo("this._weAreSyncing changed from '" + this._weAreSyncing + "' to '" + aValue + "'");
+        }
+        this._weAreSyncing = aValue;
+    },
+
+    get weAreSyncing() {
+        return this._weAreSyncing;
+    },
+
+    getSyncState: function _getSyncState() {
+        if (this.isOffline) return;
+
+        if (!this.weAreSyncing) {
+            // We do not yet have a syncState. Get it first.
+            if (this.debug) this.logInfo("getSyncState: Creating erSyncFolderItemsRequest");
+            var self = this;
+            this.weAreSyncing = true;
+            switch (this.folderBase) {
+            case "tasks":
+                if (!this.deactivateTaskFollowup) {
+                    this.logInfo("getSyncState: this.syncStateInbox - " + this.syncStateInbox);
+                    this.addToQueue(erSyncFolderItemsRequest, {
+                            user: this.user,
+                            mailbox: this.mailbox,
+                            serverUrl: this.serverUrl,
+                            folderBase: "inbox",
+                            syncState: this.syncStateInbox,
+                            actionStart: Date.now()
+                        },
+                        function (erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
+                            self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);
+                        },
+                        function (erSyncFolderItemsRequest, aCode, aMsg) {
+                            self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);
+                        },
+                        null);
+                }
+                //Donot  break because we neet to call below section by default..
+            default:
+                this.logInfo("getSyncState: this.syncState - " + this.syncState);
+
+                this.addToQueue(erSyncFolderItemsRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        serverUrl: this.serverUrl,
+                        folderBase: this.folderBase,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        syncState: this.syncState,
+                        actionStart: Date.now()
+                    },
+                    function (erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
+                        self.syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState);
+                    },
+                    function (erSyncFolderItemsRequest, aCode, aMsg) {
+                        self.syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg);
+                    },
+                    null);
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("getSyncState: not creating erSyncFolderItemsRequest because we are allready syncing");
+        }
+    },
+
+    syncFolderItemsOK: function _syncFolderItemsOK(erSyncFolderItemsRequest, creations, updates, deletions, syncState) {
+        this.folderPathStatus = 0;
+        this.saveCredentials(erSyncFolderItemsRequest.argument);
+        this.notConnected = false;
+        if (this.debug) this.logInfo("syncFolderItemsOK: Folderbase: " + erSyncFolderItemsRequest.folderBase + ", Creation:" + creations.length + ", Updates:" + updates.length + ", Deletions:" + deletions.length + ", syncState:" + syncState);
+
+        if ((creations.length > 0) || (updates.length > 0) || (deletions.length > 0)) {
+            this.addActivity(calGetString("calExchangeCalendar", "syncFolderEventMessage", [creations.length, updates.length, deletions.length, this.name], "exchangecalendar"), "", erSyncFolderItemsRequest.argument.actionStart, Date.now());
+        }
+
+        if (syncState) {
+
+            if ((this.syncState) && (syncState == this.syncState || syncState == this.syncStateInbox)) {
+                this.logError("Same syncState received.");
+            }
+
+            // This was the first time. we now save the syncState;
+            if (erSyncFolderItemsRequest.folderBase == "inbox") {
+                this.syncStateInbox = syncState;
+                this.prefs.deleteBranch("syncStateInbox");
+                this.prefs.setCharPref("syncStateInbox", syncState);
+                this.saveToFile("syncStateInbox.txt", syncState);
+            }
+            else {
+                this.syncState = syncState;
+                this.prefs.deleteBranch("syncState");
+                this.prefs.setCharPref("syncState", syncState);
+                this.saveToFile("syncState.txt", syncState);
+            }
+            this.weAreSyncing = false;
+        }
+
+        var self = this;
+
+        var changes = [];
+        for each(var creation in creations) {
+            changes.push(creation);
+        }
+        for each(var update in updates) {
+            changes.push(update);
+        }
+        if (changes.length > 0) {
+            switch (erSyncFolderItemsRequest.folderBase) {
+            case "tasks":
+                this.findTaskItemsOK(erSyncFolderItemsRequest, changes);
+                break;
+            case "calendar":
+                this.findCalendarItemsOK(erSyncFolderItemsRequest, changes, []);
+                break;
+            case "inbox":
+                this.findFollowupTaskItemsOK(erSyncFolderItemsRequest, changes);
+                break;
+            default:
+                this.logError("Changes could not be made." + erSyncFolderItemsRequest.folderBase);
+            }
+
+            /*			this.addToQueue( erGetItemsRequest, 
+            				{user: this.user, 
+            				 mailbox: this.mailbox,
+            				 folderBase: this.folderBase,
+            				 serverUrl: this.serverUrl,
+            				 ids: changes,
+            				 folderID: this.folderID,
+            				 changeKey: this.changeKey,
+            				 folderClass: this.folderClass,
+            				 GUID: calExchangeCalendarGUID,
+            				 syncState: syncState }, 
+            				function(erGetItemsRequest, aIds, aItemErrors) { self.getTaskItemsOK(erGetItemsRequest, aIds, aItemErrors);}, 
+            				function(erGetItemsRequest, aCode, aMsg) { self.getTaskItemsError(erGetItemsRequest, aCode, aMsg);},
+            				null);
+            				*/
+        }
+
+        if (!syncState) return;
+
+        if (deletions.length > 0) {
+            for each(var deleted in deletions) {
+                var item = this.itemCacheById[deleted.Id];
+                if ((!item) && (this.useOfflineCache)) {
+                    // It could be that the item is not yet loaded from offlineCache. We do this now.
+                    item = this.getItemFromOfflineCache(deleted.Id);
+                }
+                if ((item) && (item.calendarItemType != "RecurringMaster")) {
+                    // We have this one. Remove it.
+                    if (this.debug) this.logInfo("Going to remove an item");
+                    // Single item or occurrence.
+                    if (item.parentItem.id == item.id) {
+                        if (this.debug) this.logInfo("This is a Single to delete. Title:" + item.title + ", calendarItemType:" + item.calendarItemType);
+                    }
+                    else {
+                        if (this.debug) this.logInfo("This is a Occurrence or Exception to delete. THIS SHOULD NEVER HAPPEN.");
+                    }
+                    this.notifyTheObservers("onDeleteItem", [item]);
+                    /*this.itemCacheById[item.id].deleteItem();
+                    this.itemCacheById[item.id] = null;
+                    delete this.itemCacheById[item.id];*/
+                    this.removeItemFromCache(item);
+                    this.removeFromOfflineCache(item);
+                }
+                else {
+                    // Find matching master record.
+                    var master;
+                    for (var index in this.recurringMasterCache) {
+                        if ((this.recurringMasterCache[index]) && (this.recurringMasterCache[index].id == deleted.Id)) {
+                            master = this.recurringMasterCache[index]
+                        }
+                    }
+                    if (master) {
+                        // This is a master recurrence. Also remove children.
+                        if (this.debug) this.logInfo("This is Master to delete");
+                        this.removeChildrenFromMaster(master);
+
+                        this.removeFromOfflineCache(master);
+                        //this.notifyTheObservers("onDeleteItem", [master]);
+                        delete this.recurringMasterCache[master.uid];
+                        delete this.recurringMasterCacheById[master.id];
+                    }
+                    else {
+                        if (this.debug) this.logInfo("Do not know what you are trying to delete !!!");
+                    }
+                }
+            }
+        }
+
+        if (!this.firstSyncDone) {
+            this.firstSyncDone = true;
+            if (this.debug) this.logInfo("First sync is done. Normal operation is starting.");
+
+            while (this.getItemsSyncQueue.length > 0) {
+                let getItemsReq = this.getItemsSyncQueue.shift();
+                this.getItems(getItemsReq.itemFilter, getItemsReq.count, getItemsReq.rangeStart, getItemsReq.rangeEnd, getItemsReq.listener);
+            }
+            if (this.debug) this.logInfo("First sync is done. Processed getItemsSyncQueue.");
+        }
+
+        if (this.getItemSyncQueue.length > 0) {
+            if (this.debug) this.logInfo("We have " + this.getItemSyncQueue.length + " items in this.getItemSyncQueue");
+            this.processItemSyncQueue();
+        }
+    },
+
+    syncFolderItemsError: function _syncFolderItemsError(erSyncFolderItemsRequest, aCode, aMsg) {
+        if (this.debug) this.logInfo("syncFolderItemsError");
+        this.folderPathStatus = -1;
+        this.saveCredentials(erSyncFolderItemsRequest.argument);
+        this.notConnected = true;
+        this.weAreSyncing = false;
+        this.processItemSyncQueue();
+    },
+
+    // Check if specified folder still exists. If so get new id and changekey.
+    checkFolderPath: function _checkFolderPath() {
+        // We first restore from prefs.js file from the last time.
+        var tmpFolderClass = this.globalFunctions.safeGetCharPref(this.prefs, "folderClass", null);
+        if (tmpFolderClass) {
+            if (this.debug) this.logInfo("Restore folderClass from prefs.js:" + tmpFolderClass);
+            this.setSupportedItems(tmpFolderClass);
+
+            var tmpFolderProperties = this.globalFunctions.safeGetCharPref(this.prefs, "folderProperties", null);
+            if (tmpFolderProperties) {
+                this.saveToFile("folderProperties.txt", tmpFolderProperties);
+                this.prefs.deleteBranch("folderProperties");
+            }
+
+            if (tmpFolderProperties) {
+                //if (this.debug) this.logInfo("Restore folderProperties from prefs.js:"+tmpFolderProperties);
+                var tmpXML = this.globalFunctions.xmlToJxon(tmpFolderProperties);
+                this.folderProperties = tmpXML;
+
+                this.folderIsNotAvailable = true;
+
+                this.setFolderProperties(tmpXML, tmpFolderClass);
+                tmpXML = null;
+            }
+        }
+
+        this.setServerVersion();
+
+        if (this.isOffline) return;
+
+        if (this.folderPath != "/") {
+            if (this.debug) this.logInfo("checkFolderPath 1");
+            this.folderPathStatus = 1;
+            var self = this;
+
+            this.addToQueue(erFindFolderRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    serverUrl: this.serverUrl,
+                    folderBase: this.folderBase,
+                    folderPath: this.folderPath,
+                    actionStart: Date.now()
+                },
+                function (erFindFolderRequest, aId, aChangeKey, aFolderClass) {
+                    self.checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass);
+                },
+                function (erFindFolderRequest, aCode, aMsg) {
+                    self.checkFolderPathError(erFindFolderRequest, aCode, aMsg);
+                },
+                null);
+        }
+        else {
+            if (this.folderIDOfShare != "") {
+                // Get Folder Properties.
+                var self = this;
+
+                this.addToQueue(erGetFolderRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        serverUrl: this.serverUrl,
+                        folderID: this.folderID,
+                        changeKey: this.changeKey,
+                        actionStart: Date.now()
+                    },
+                    function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+                        self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
+                    },
+                    function (erGetFolderRequest, aCode, aMsg) {
+                        self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
+                    },
+                    null);
+            }
+            else {
+                if (this.debug) this.logInfo("checkFolderPath 2");
+                this.folderPathStatus = 1;
+                var self = this;
+
+                this.addToQueue(erGetFolderRequest, {
+                        user: this.user,
+                        mailbox: this.mailbox,
+                        serverUrl: this.serverUrl,
+                        folderBase: this.folderBase,
+                        folderPath: this.folderPath,
+                        actionStart: Date.now()
+                    },
+                    function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+                        self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
+                    },
+                    function (erGetFolderRequest, aCode, aMsg) {
+                        self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
+                    },
+                    null);
+            }
+        }
+    },
+
+    setSupportedItems: function _setSupportedItems(aFolderClass) {
+        this.folderClass = aFolderClass;
+        if (this.debug) this.logInfo("Set folderClass=" + this.folderClass.toString());
+        this.prefs.setCharPref("folderClass", aFolderClass);
+        var itemType = Ci.calICalendar.ITEM_FILTER_TYPE_EVENT;
+
+        switch (aFolderClass.toString()) {
+        case "IPF.Appointment":
+            this.supportsEvents = true;
+            this.supportsTasks = false;
+            if (this.debug) this.logInfo("This folder supports only events.");
+            //this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, this.startCacheDate, this.endCacheDate, null);
+            break;
+        case "IPF.Task":
+            this.supportsEvents = false;
+            this.supportsTasks = true;
+            if (this.debug) this.logInfo("This folder supports only tasks.");
+            itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
+            // Get the tasks for the current know time frame
+            //this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO, 0, this.startCacheDate, this.endCacheDate, null);
+            break;
+        case "IPF.Note":
+            this.supportsEvents = false;
+            this.supportsTasks = true;
+            if (this.debug) this.logInfo("This folder supports only tasks.");
+            itemType = Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
+            break;
+        default:
+            this.supportsEvents = false;
+            this.supportsTasks = false;
+            if (this.debug) this.logInfo("Unknown folderclass. We do not know if it supports events or tasks so turning it off.");
+            break;
+        }
+
+    },
+
+    checkFolderPathOk: function _checkFolderPathOk(erFindFolderRequest, aId, aChangeKey, aFolderClass) {
+        this.saveCredentials(erFindFolderRequest.argument);
+        if (this.debug) this.logInfo("checkFolderPathOk: aId" + aId + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
+        this.notConnected = false;
+
+        this.folderID = aId;
+        this.changeKey = aChangeKey;
+
+        this.setSupportedItems(aFolderClass);
+
+        // Get Folder Properties.
+        var self = this;
+
+        this.addToQueue(erGetFolderRequest, {
+                user: this.user,
+                mailbox: this.mailbox,
+                serverUrl: this.serverUrl,
+                folderID: aId,
+                changeKey: aChangeKey,
+                actionStart: Date.now()
+            },
+            function (erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+                self.getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass);
+            },
+            function (erGetFolderRequest, aCode, aMsg) {
+                self.checkFolderPathError(erGetFolderRequest, aCode, aMsg);
+            },
+            null);
+
+    },
+
+    get canCreateContent() {
+        if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
+            return false;
+        }
+        return this._canCreateContent;
+    },
+
+    get canDelete() {
+        if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
+            return false;
+        }
+        return this._canDelete;
+    },
+
+    get canRead() {
+        if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
+            return true;
+        }
+        return this._canRead;
+    },
+
+    get canModify() {
+        if ((this.OnlyShowAvailability) || (this.folderIsNotAvailable)) {
+            return false;
+        }
+        return this._canModify;
+    },
+
+    setFolderProperties: function _setFolderProperties(aFolderProperties, aFolderClass) {
+        //BUG 111
+        // When the user only has permissions to see free/busy info and also permissions to read the folder
+        // properties we should activate OnlyShowAvailability variable.
+        // Problem is when is this condition true
+        // For now we will set OnlyShowAvailability = true when EffectiveRights.Read == false
+        if (this.debug) this.logInfo(" >>>>>>>>>>>>>>MIV>:" + aFolderClass.toString());
+        var rm = aFolderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/*/t:EffectiveRights");
+        if (rm.length > 0) {
+            this._effectiveRights = rm[0];
+            if (this._effectiveRights) {
+                this._canDelete = (this._effectiveRights.getTagValue("t:Delete", "false") == "true");
+                this._canModify = (this._effectiveRights.getTagValue("t:Modify", "false") == "true");
+                this._canRead = (this._effectiveRights.getTagValue("t:Read", "false") == "true");
+                this._canCreateContent = (this._effectiveRights.getTagValue("t:CreateContents", "false") == "true");
+            }
+        }
+        else {
+            this._effectiveRights = null;
+            this._canDelete = false;
+            this._canModify = false;
+            this._canRead = false;
+            this._canCreateContent = false;
+        }
+        rm = null;
+
+        var rm = aFolderProperties.XPath("/s:Envelope/s:Body/m:GetFolderResponse/m:ResponseMessages/m:GetFolderResponseMessage/m:Folders/*/t:EffectiveRights[t:Read='true']");
+        this.folderIsNotAvailable = false;
+
+        if (rm.length == 0) {
+            if (this.debug) this.logInfo("getFolderOk: but EffectiveRights.Read == false. Only getting Free/Busy information.");
+            if (!this.OnlyShowAvailability) {
+                this.OnlyShowAvailability = true;
+                this.useOfflineCache = false;
+                this.firstSyncDone = true;
+                this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
+                this.startCalendarPoller();
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("getFolderOk: but EffectiveRights.Read != false. Trying to get all event information.");
+            this.readOnlyInternal = false;
+
+            this.setSupportedItems(aFolderClass);
+        }
+        rm = null;
+
+        this.getTimeZones();
+
+    },
+
+    getFolderOk: function _getFolderOk(erGetFolderRequest, aId, aChangeKey, aFolderClass) {
+        this.saveCredentials(erGetFolderRequest.argument);
+        if (this.debug) this.logInfo("getFolderOk: aId" + aId + ", aChangeKey:" + aChangeKey + ", aFolderClass:" + aFolderClass);
+        this.notConnected = false;
+
+        this.folderProperties = erGetFolderRequest.properties;
+        this.saveToFile("folderProperties.txt", this.folderProperties.toString());
+        //this.prefs.setCharPref("folderProperties", this.folderProperties.toString());
+
+        this.prefs.setCharPref("lastServerVersion", this.exchangeStatistics.getServerVersion(this.serverUrl));
+        this.prefs.setCharPref("lastMajorVersion", this.exchangeStatistics.getMajorVersion(this.serverUrl));
+        this.prefs.setCharPref("lastMinorVersion", this.exchangeStatistics.getMinorVersion(this.serverUrl));
+
+        this.folderIsNotAvailable = true;
+
+        this.setFolderProperties(this.folderProperties, aFolderClass);
+
+        if (this.newCalendar) {
+            this.newCalendar = false;
+            if (this.supportsEvents) {
+                this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, this.newCalRangeStartEvents, this.newCalRangeEndEvents, null);
+            }
+            if (this.supportsTasks) {
+                this.getItems(Ci.calICalendar.ITEM_FILTER_TYPE_TODO, 0, this.newCalRangeStartTodos, this.newCalRangeEndTodos, null);
+            }
+        }
+    },
+
+    checkFolderPathError: function _checkFolderPathError(erFindFolderRequest, aCode, aMsg) {
+        this.folderPathStatus = -1;
+        if (this.debug) this.logInfo("checkFolderPathError: Code:" + aCode + ", Msg:" + aMsg);
+        // We could not get the specified folder anymore. Stop working.
+        // 21-03-2012 Try to get Free/Busy/Tentative information and show that.
+
+        if (aCode == -10) {
+            this.notConnected = true;
+        }
+        else {
+
+            if (this.debug) this.logInfo("Going to check if we should show free/busy data.");
+            if (!this.OnlyShowAvailability) {
+                if (this.debug) this.logInfo("Turning on the showing of only free/busy data.");
+                this.OnlyShowAvailability = true;
+                this.useOfflineCache = false;
+                this.firstSyncDone = true;
+                this.folderIsNotAvailable = true;
+                this.folderProperties = null;
+                //this.prefs.deleteBranch("folderProperties");
+                this.removeFile("folderProperties.txt");
+                this.readOnlyInternal = true;
+                this.getOnlyFreeBusyInformation(this.lastValidRangeStart, this.lastValidRangeEnd);
+                this.startCalendarPoller();
+            }
+        }
+    },
+
+    getOnlyFreeBusyInformation: function _getOnlyFreeBusyInformation(aRangeStart, aRangeEnd) {
+        if ((!aRangeStart) && (!aRangeEnd)) {
+            if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart and aRangeEnd missing. Going to set start to 20 days before and end to 20 days after now.");
+            var offset = cal.createDuration();
+            offset.days = -20;
+            //offset.normalize();
+            aRangeStart = cal.now();
+            aRangeStart.addDuration(offset);
+            var offset = cal.createDuration();
+            offset.days = 20;
+            //offset.normalize();
+            aRangeEnd = cal.now();
+            aRangeEnd.addDuration(offset);
+        }
+
+        if ((aRangeStart) && (!aRangeEnd)) {
+            if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeEnd missing. Going to set end to 40 days after start.");
+            var offset = cal.createDuration();
+            offset.days = 40;
+            //offset.normalize();
+            aRangeEnd = aRangeStart.clone();
+            aRangeEnd.addDuration(offset);
+        }
+
+        if ((!aRangeStart) && (aRangeEnd)) {
+            if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart missing. Going to set start to 40 days before end.");
+            var offset = cal.createDuration();
+            offset.days = -40;
+            //offset.normalize();
+            aRangeStart = aRangeEnd.clone();
+            aRangeStart.addDuration(offset);
+        }
+
+        if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart:" + aRangeStart + ", aRangeEnd:" + aRangeEnd);
+
+        var tmpStartDate = aRangeStart.clone();
+        tmpStartDate.isDate = false;
+        var tmpEndDate = aRangeEnd.clone();
+        tmpEndDate.isDate = false;
+
+        if (tmpStartDate.year == 1970) {
+            if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart is 1970. To big a range. Setting startrange to 40 days before endrange.");
+            var offset = cal.createDuration();
+            offset.days = -40;
+            offset.normalize();
+            tmpStartDate = tmpEndDate.clone();
+            tmpStartDate.addDuration(offset);
+        }
+        else {
+            var offset = tmpEndDate.subtractDate(tmpStartDate);
+            if (offset.days > 40) {
+                if (this.debug) this.logInfo("getOnlyFreeBusyInformation: aRangeStart is more than 40 days before endrange. Setting startrange to 40 days before endrange.");
+                var offset = cal.createDuration();
+                offset.days = -40;
+                offset.normalize();
+                tmpStartDate = tmpEndDate.clone();
+                tmpStartDate.addDuration(offset);
+            }
+        }
+
+        var self = this;
+        this.addToQueue(erGetUserAvailabilityRequest, {
+                user: this.user,
+                folderBase: "calendar",
+                serverUrl: this.serverUrl,
+                email: this.mailbox.replace(/^mailto:/i, ""),
+                attendeeType: 'Required',
+                start: cal.toRFC3339(tmpStartDate.getInTimezone(this.globalFunctions.ecUTC())),
+                end: cal.toRFC3339(tmpEndDate.getInTimezone(this.globalFunctions.ecUTC())),
+                folderID: this.folderID,
+                changeKey: this.changeKey
+            },
+            function (erGetUserAvailabilityRequest, aEvents) {
+                self.getUserAvailabilityRequestOK(erGetUserAvailabilityRequest, aEvents);
+            },
+            function (erGetUserAvailabilityRequest, aCode, aMsg) {
+                self.getUserAvailabilityRequestError(erGetUserAvailabilityRequest, aCode, aMsg);
+            },
+            null);
+    },
+
+    setServerVersion: function _setServerVersion() {
+        this.prefServerVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastServerVersion", null);
+        this.prefMajorVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastMajorVersion", null);
+        this.prefMinorVersion = this.globalFunctions.safeGetCharPref(this.prefs, "lastMinorVersion", null);
+        if (this.prefServerVersion) {
+            if (this.debug) this.logInfo("Restored prefServerVersion from prefs.js:" + this.prefServerVersion + " (" + this.prefMajorVersion + "." + this.prefMinorVersion + ")");
+            this.exchangeStatistics.setServerVersion(this.serverUrl, this.prefServerVersion, this.prefMajorVersion, this.prefMinorVersion);
+        }
+    },
+
+    getTimeZones: function _getTimeZones() {
+        this.setServerVersion();
+
+        this.timeZones.addURL(this.serverUrl, this.user, this);
+    },
+
+    getEWSTimeZoneId: function _getEWSTimeZoneId(aCalTimeZone, aDate) {
+        if (this.debug) this.logInfo("getEWSTimeZoneId:" + aCalTimeZone.tzid);
+
+        return this.timeZones.getExchangeTimeZoneIdByCalTimeZone(aCalTimeZone, this.serverUrl, aDate);
+    },
+
+    doDeleteCalendar: function _doDeleteCalendar() {
+        this.doShutdown();
+
+        // Remove the offline cache database when we delete the calendar.
+        if (this.dbFile) {
+            this.dbFile.remove(true);
+            this.offlineCacheDB = null;
+        }
+    },
+
+    addItemToCache: function _addItemToCache(item) {
+        if (!item) {
+            //dump("addItemToCache: item is null.\n");
+            return;
+        }
+
+        var itemStartDate = item.startDate || item.entryDate;
+        var itemEndDate = item.endDate || item.dueDate;
+
+        /*if (this.itemCacheById[item.id]) { 
+        	dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+". IS AL READY IN CACHE.\n");
+        }
+        else {
+        	dump("addItemToCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
+        }*/
+        if (this.debug) this.logInfo("addItemToCache ById: item.title:" + item.title + ", startDate:" + itemStartDate + ", endDate:" + itemEndDate + " | " + item.id + ".");
+        //dump("addItemToCache ById: item.title:"+item.title+", startDate:"+itemStartDate+", endDate:"+itemEndDate+" | "+item.id+".\n");
+
+        // Add to Id index.
+        this.itemCacheById[item.id] = item;
+
+        // Add to startDate index.
+        if ((itemStartDate) && (itemEndDate)) {
+            itemStartDate = itemStartDate.getInTimezone(this.globalFunctions.ecUTC());
+            itemEndDate = itemEndDate.getInTimezone(this.globalFunctions.ecUTC());
+            var startYear = itemStartDate.year;
+            var startYearDay = itemStartDate.yearday;
+            var endYear = itemEndDate.year;
+            var endYearDay = itemEndDate.yearday;
+            var doStop = false;
+
+            while (!doStop) {
+
+                if ((startYear == endYear) && (startYearDay == endYearDay)) {
+                    doStop = true;
+                }
+                if (!this.itemCacheByStartDate) this.itemCacheByStartDate = {};
+                if (!this.itemCacheByStartDate[startYear]) this.itemCacheByStartDate[startYear] = {};
+                if (!this.itemCacheByStartDate[startYear][startYearDay]) this.itemCacheByStartDate[startYear][startYearDay] = [];
+                if (this.debug) this.logInfo(" -- addItemToCache ByStartDate: item.title:" + item.title + ", startYear:" + startYear + ", startYearDay:" + startYearDay + " | " + item.id + ".", 2);
+                //dump(" -- addItemToCache ByStartDate: item.title:"+item.title+", startYear:"+startYear+", startYearDay:"+startYearDay+" | "+item.id+".\n");
+                this.itemCacheByStartDate[startYear][startYearDay][item.id] = true;
+
+                startYearDay++;
+                if (startYearDay > 366) {
+                    startYearDay = 1;
+                    startYear++;
+                }
+            }
+        }
+
+    },
+
+    removeItemFromCache: function _removeItemFromCache(item) {
+        if (!item) {
+            //dump("removeItemFromCache: item is null.\n");
+            return;
+        }
+
+        var itemStartDate = item.startDate || item.entryDate;
+        var itemEndDate = item.endDate || item.dueDate;
+        // Remove from startDate index.
+        if ((itemStartDate) && (itemEndDate) && (this.itemCacheByStartDate)) {
+            var startYear = itemStartDate.year;
+            var startYearDay = itemStartDate.yearday;
+            var endYear = itemEndDate.year;
+            var endYearDay = itemEndDate.yearday;
+            var doStop = false;
+
+            while (!doStop) {
+
+                if ((startYear >= endYear) && (startYearDay >= endYearDay)) {
+                    doStop = true;
+                }
+
+                if ((this.itemCacheByStartDate[startYear]) && (this.itemCacheByStartDate[startYear][startYearDay])) {
+                    if (this.itemCacheByStartDate[startYear][startYearDay][item.id]) {
+                        this.itemCacheByStartDate[startYear][startYearDay][item.id] = null;
+                        delete this.itemCacheByStartDate[startYear][startYearDay][item.id];
+                    }
+                }
+
+                startYearDay++;
+                if (startYearDay > 366) {
+                    startYearDay = 1;
+                    startYear++;
+                }
+            }
+        }
+
+        if (this.itemCacheById[item.id]) {
+            if (this.itemCacheById[item.id].className) {
+                this.itemCacheById[item.id].deleteItem();
+            }
+            this.itemCacheById[item.id] = null;
+            delete this.itemCacheById[item.id];
+            //			var itemDate = item.startDate || item.entryDate;
+            //dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+" | "+item.id+".\n");
+        }
+        else {
+            //			var itemDate = item.startDate || item.entryDate;
+            //dump("removeItemFromCache: item.title:"+item.title+", startDate:"+itemDate+". is not in itemCache. | "+item.id+"\n");
+        }
+    },
+
+    doShutdown: function _doShutdown() {
+        if (this.shutdown) {
+            return;
+        }
+
+        this.shutdown = true;
+        this.inboxPoller.cancel();
+
+        if (this.offlineTimer) {
+            this.offlineTimer.cancel();
+        }
+
+        if (this.calendarPoller) {
+            this.calendarPoller.cancel();
+        }
+
+        this.loadBalancer.stopRunningJobsForCalendar(this.serverUrl, this);
+
+        this.loadBalancer.clearQueueForCalendar(this.serverUrl, this);
+        this.offlineQueue = [];
+
+        // Now we can initialize.
+        this.syncState = null;
+        this.syncStateInbox = null;
+        this.weAreSyncing = false;
+
+        // Remove all items in cache from calendar.
+        for (var index in this.itemCacheById) {
+            if (this.itemCacheById[index]) {
+                //this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
+                /*if (this.itemCacheById[index].className) {
+                	this.itemCacheById[index].deleteItem();
+                }
+                this.itemCacheById[index] = null;
+                delete this.itemCacheById[index];*/
+                this.removeItemFromCache(this.itemCacheById[index]);
+            }
+        }
+
+        // Reset caches.
+        this.itemCacheById = {};
+        this.itemCacheByStartDate = {};
+        this.itemCacheByEndDate = {};
+
+        for (var index in this.recurringMasterCache) {
+            if (this.recurringMasterCache[index]) {
+                //this.notifyTheObservers("onDeleteItem", [this.itemCacheById[index]]);
+                this.recurringMasterCache[index].deleteItem();
+                this.recurringMasterCache[index] = null;
+                delete this.recurringMasterCache[index];
+            }
+        }
+        this.recurringMasterCache = {};
+        this.recurringMasterCacheById = {};
+
+        this.meetingRequestsCache = [];
+        this.meetingCancelationsCache = [];
+        this.meetingrequestAnswered = [];
+        this.meetingResponsesCache = [];
+
+        if (this.offlineCacheDB) {
+            try {
+                if (this.offlineCacheDB) this.offlineCacheDB.close();
+                this.offlineCacheDB = null;
+            }
+            catch (exc) {}
+        }
+    },
+
+    removeFromMeetingRequestCache: function _removeFromMeetingRequestCache(aID) {
+        //if (this.debug) this.logInfo("removeFromMeetingRequestCache:"+aUID);
+        //		this.meetingRequestsCache[aUID] == null;
+        delete this.meetingRequestsCache[aID];
+    },
+
+    findItemInListByDatesAndID: function _findItemInListByDates(aList, aItem) {
+        var result = null;
+        for each(var listItem in aList) {
+            if ((aItem.getProperty("UID") == listItem.uid)
+                && (listItem.startDate.compare(aItem.startDate) == 0)
+                && (listItem.endDate.compare(aItem.endDate) == 0)) {
+                if (this.debug) this.logInfo("Found matching item in list.");
+                result = listItem;
+            }
+        }
+
+        return result;
+    },
+
+    updateVersionInfoCache: function _updateVersionInfoCache(self, Addon) {
+        this.logInfo("updateVersionInfoCache  : ");
+
+        if (this.noDB) return;
+        if (!Addon) return;
+        var version = Addon.version;
+
+        var sqlStr2 = "DELETE FROM version";
+        try {
+            if (!this.executeQuery(sqlStr2)) {
+                if (this.debug) this.logInfo("removeExchCalDbCache : Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("removeExchCalDbCache: Removed version from offlineCacheDB. ");
+            }
+
+            var sqlStr = "INSERT INTO version VALUES ('" + version + "')";
+            if (!this.executeQuery(sqlStr)) {
+                if (this.debug) this.logInfo("removeExchCalDbCache : Error inserting attachments_per_item into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("removeExchCalDbCache: Inserted attachments_per_item into offlineCacheDB. Name:" + version);
+            }
+        }
+        catch (ex) {
+            this.logInfo("updateVersionInfoCache: excepetion occured ");
+
+        }
+        this.logInfo("updateVersionInfoCache 21 : Done");
+
+        return true;
+
+    },
+
+    checkExchCalAddonVerion: function _checkExchCalAddonVersion() {
+
+        try {
+            this.logInfo("checkExchCalAddonVerion: ");
+            Cu.import("resource://gre/modules/AddonManager.jsm");
+            var self = this;
+            AddonManager.getAddonByID("exchangecalendar@extensions.1st-setup.nl", function (Addon) {
+                self.removeExchCalDbCache(self, Addon);
+            });
+        }
+        catch (ex) {
+            this.logInfo("checkExchCalAddonVerion:  Exception occured ");
+        }
+    },
+
+    removeExchCalDbCache: function _removeExchCalDbCache(self, Addon) {
+        var currentAddonVersion = Addon.version;
+        var OldAddonversion = null;
+        var result = null;
+
+        this.logInfo("removeExchCalDbCache");
+
+        var sqlStr = "SELECT name FROM version limit 1";
+
+        if (this.debug) this.logInfo("removeExchCalDbCache sql-query:" + sqlStr, 2);
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("removeExchCalDbCache Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+            return null;
+        }
+
+        var doContinue = true;
+        try {
+            while (doContinue) {
+                doContinue = sqlStatement.executeStep();
+
+                if (doContinue) {
+                    if (this.debug) this.logInfo("removeExchCalDbCache Found item in offline Cache.");
+                    OldAddonversion = sqlStatement.row.name;
+                }
+            }
+        }
+        finally {
+            sqlStatement.reset();
+        }
+
+        if (OldAddonversion) {
+            if (OldAddonversion != currentAddonVersion) {
+                if (this.offlineCacheDB.connectionReady && this.offlineCacheDB.tableExists("items")) {
+                    this.logInfo("removeExchCalDbCache clearCachedData - " + " NewVersion: " + currentAddonVersion + " OldVersion: " + OldAddonversion);
+                    let statement = this.offlineCacheDB.createStatement("DELETE FROM items");
+                    let statement1 = this.offlineCacheDB.createStatement("DELETE FROM attachments");
+                    let statement2 = this.offlineCacheDB.createStatement("DELETE FROM attachments_per_item");
+
+                    try {
+                        statement.executeStep();
+                        statement1.executeStep();
+                        statement2.executeStep();
+
+                        statement.finalize();
+                        statement1.finalize();
+                        statement2.finalize();
+                    }
+                    catch (e) {
+                        this.logInfo("removeExchCalDbCache 41: unable to clear tables" + e);
+                    }
+                    this.logInfo("removeExchCalDbCache cache cleared! current version : " + currentAddonVersion + " resetting calendar: " + this.id);
+                    var observerService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+                    observerService.notifyObservers(this, "onCalReset", this.id);
+                }
+
+                if (this.updateVersionInfoCache(self, Addon)) {
+                    if (this.debug) this.logInfo("removeExchCalDbCache 21: new version updated in cache: " + currentAddonVersion);
+                }
+                else {
+                    if (this.debug) this.logInfo("removeExchCalDbCache 22: failed! New version not updated in cache");
+                }
+
+                if (this.debug) this.logInfo("removeExchCalDbCache 31: removing offlineCacheDB new/old wVersion found");
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("removeExchCalDbCache 26: not removing offlineCacheDB new/old Version not found: " + currentAddonVersion);
+
+            if (this.updateVersionInfoCache(self, Addon)) {
+                if (this.debug) this.logInfo("removeExchCalDbCache 32: new version updated in cache: " + currentAddonVersion);
+            }
+            else {
+                if (this.debug) this.logInfo("removeExchCalDbCache 35: failed! New version not updated in cache");
+            }
+        }
+
+    },
+
+    createOfflineCacheDB: function _createOfflineCacheDB() {
+
+        if ((this.mUseOfflineCache) && (!this.offlineCacheDB)) {
+            this.noDB = true;
+            this.dbInit = true;
+            this.dbFile = Cc["@mozilla.org/file/directory_service;1"]
+                .getService(Components.interfaces.nsIProperties)
+                .get("ProfD", Components.interfaces.nsIFile);
+            this.dbFile.append("exchange-data");
+            if (!this.dbFile.exists() || !this.dbFile.isDirectory()) {
+                this.dbFile.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
+            }
+
+            this.dbFile.append(this.id + ".offlineCache.sqlite");
+
+            var dbExists = false;
+            if (this.dbFile.exists()) {
+                dbExists = true;
+            }
+
+            try {
+                this.offlineCacheDB = Services.storage.openUnsharedDatabase(this.dbFile); // Will also create the file if it does not exist
+            }
+            catch (exc) {
+                this.offlineCacheDB = null;
+                if (this.debug) this.logInfo("Could not open offlineCache database.");
+                return;
+            }
+
+            if (!this.offlineCacheDB.connectionReady) {
+                this.offlineCacheDB = null;
+                if (this.debug) this.logInfo("connectionReady for offlineCache database.");
+                return;
+            }
+
+            var latestDBVersion = 1;
+            var dbVersion = 0;
+            if (dbExists) {
+                dbVersion = this.globalFunctions.safeGetIntPref(this.prefs, "dbVersion", 0);
+            }
+
+            //Check exchange calendar version clear cache
+            if (!this.mIsOffline) this.checkExchCalAddonVerion();
+
+            //			if (dbVersion < latestDBVersion) {
+            if (!this.offlineCacheDB.tableExists("version")) {
+                if (this.debug) this.logInfo("Table 'version' does not yet exist. We are going to create it.");
+                try {
+                    this.offlineCacheDB.createTable("version", "name STRING");
+                }
+                catch (exc) {
+                    if (this.debug) this.logInfo("Could not create table 'version'. Error:" + exc);
+                    return;
+                }
+
+                var sqlStr = "CREATE UNIQUE INDEX idx_ver_id ON version (name)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_ver_id'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+            }
+
+            if (!this.offlineCacheDB.tableExists("items")) {
+                if (this.debug) this.logInfo("Table 'items' does not yet exist. We are going to create it.");
+                try {
+                    this.offlineCacheDB.createTable("items", "event STRING, id STRING, changeKey STRING, startDate STRING, endDate STRING, uid STRING, type STRING, parentItem STRING, item STRING");
+                }
+                catch (exc) {
+                    if (this.debug) this.logInfo("Could not create table 'items'. Error:" + exc);
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_id ON items (id)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_id'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_type ON items (type)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_type'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE UNIQUE INDEX idx_items_id_changekey ON items (id, changeKey)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_id_changekey'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_type_uid ON items (type ASC, uid)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_type_uid'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_uid ON items (uid)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_uid'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_uid_startdate_enddate ON items (uid, startDate ASC, endDate)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_uid_startdate_enddate'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_startdate_enddate ON items (startDate ASC, endDate)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_parentitem_startdate_enddate ON items (parentitem, startDate ASC, endDate)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_startdate_enddate'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_items_type_startdate_enddate ON items (type, startDate ASC, endDate)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_items_type_startdate_enddate'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+            }
+
+            if (!this.offlineCacheDB.tableExists("attachments")) {
+                if (this.debug) this.logInfo("Table 'attachments' does not yet exist. We are going to create it.");
+                try {
+                    this.offlineCacheDB.createTable("attachments", "id STRING, name STRING, size INTEGER, cachePath STRING");
+                }
+                catch (exc) {
+                    if (this.debug) this.logInfo("Could not create table 'attachments'. Error:" + exc);
+                    return;
+                }
+
+                var sqlStr = "CREATE UNIQUE INDEX idx_att_id ON attachments (id)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_att_id'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+
+            }
+
+            if (!this.offlineCacheDB.tableExists("attachments_per_item")) {
+                if (this.debug) this.logInfo("Table 'attachments_per_item' does not yet exist. We are going to create it.");
+                try {
+                    this.offlineCacheDB.createTable("attachments_per_item", "itemId STRING, attId STRING");
+                }
+                catch (exc) {
+                    if (this.debug) this.logInfo("Could not create table 'attachments_per_item'. Error:" + exc);
+                    return;
+                }
+
+                var sqlStr = "CREATE INDEX idx_attitem_itemid ON attachments_per_item (itemId)";
+                if (!this.executeQuery(sqlStr)) {
+                    if (this.debug) this.logInfo("Could not create index 'idx_attitem_itemid'");
+                    this.offlineCacheDB = null;
+                    return;
+                }
+            }
+
+            if (this.debug) this.logInfo("Created/opened offlineCache database.");
+            // Fix the database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4) 26-05-2012
+            if (dbVersion < latestDBVersion) {
+                if (this.debug) this.logInfo("Running fix for database corruption bug from version 2.0.0-2.0.3 (fixed in version 2.0.4)");
+                var masters = this.executeQueryWithResults("SELECT uid FROM items WHERE type='M'", ["uid"]);
+                if ((masters) && (masters.length > 0)) {
+                    for (var index in masters) {
+                        var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='" + masters[index].uid + "'", ["newEndDate"]);
+                        if ((newMasterEndDate) && (newMasterEndDate.length > 0)) {
+                            if (this.debug) this.logInfo("newMasterEndDate:" + newMasterEndDate[0].newEndDate);
+                            var endDateStr = newMasterEndDate[0].newEndDate;
+                            if (endDateStr) {
+                                if (endDateStr.length == 10) {
+                                    endDateStr += "T23:59:59Z";
+                                }
+                                if (this.debug) this.logInfo("newEndDate for master setting it to:" + endDateStr);
+                                this.executeQuery("UPDATE items set endDate='" + endDateStr + "' where type='M' AND uid='" + masters[index].uid + "'");
+                            }
+                            else {
+                                if (this.debug) this.logInfo("newEndDate for master is null not going to use this. Strange!!");
+                            }
+                        }
+                        else {
+                            if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!");
+                        }
+                    }
+                }
+                this.prefs.setIntPref("dbVersion", latestDBVersion);
+            }
+            //this.executeQuery("UPDATE items set event='y' where event='y_'"); // Turned of 2013-11-19. Items will always be read from offline cache even if they have already been read
+            //this.executeQuery("UPDATE items set event='n' where event='n_'");
+
+            this.dbInit = false;
+            this.noDB = false;
+        }
+        else {
+            this.noDB = true;
+            var tryCount = 0;
+            while ((this.offlineCacheDB) && (tryCount < 3)) {
+                try {
+                    if (this.offlineCacheDB) this.offlineCacheDB.close();
+                    this.offlineCacheDB = null;
+                }
+                catch (exc) {
+                    dump("\nUnable to close offlineCache database connection:" + exc + "\n");
+                    //					if (this.debug) this.logInfo("Unable to close offlineCache database connection:"+exc);
+                    tryCount++;
+                }
+            }
+            this.offlineCacheDB = null;
+        }
+    },
+
+    get useOfflineCache() {
+        if (this.mUseOfflineCache) {
+            return this.mUseOfflineCache;
+        }
+        else {
+            this.mUseOfflineCache = this.globalFunctions.safeGetBoolPref(this.prefs, "useOfflineCache", true);
+            this.createOfflineCacheDB();
+            return this.mUseOfflineCache;
+        }
+    },
+
+    set useOfflineCache(aValue) {
+        var oldValue = this.mUseOfflineCache;
+        this.mUseOfflineCache = aValue;
+        this.prefs.setBoolPref("useOfflineCache", aValue);
+        this.createOfflineCacheDB();
+
+        if ((oldValue != aValue) && (aValue)) {
+            //this.syncExchangeToOfflineCache();
+        }
+    },
+
+    getItemType: function _getItemType(aCalItem) {
+        if (aCalItem.id == aCalItem.parentItem.id) {
+            // Master or Single
+            if (aCalItem.recurrenceInfo) {
+                return "M";
+            }
+            else {
+                return "S";
+            }
+        }
+        else {
+            return aCalItem.getProperty("X-RecurringType");
+        }
+    },
+
+    executeQuery: function _executeQuery(aQuery) {
+        if (this.debug) this.logInfo("sql-query:" + aQuery, 2);
+        if ((this.noDB) && (!this.dbInit)) return false;
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(aQuery);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + aQuery + ")");
+            return false;
+        }
+
+        if ((this.noDB) && (!this.dbInit)) return false;
+        try {
+            sqlStatement.executeStep();
+        }
+        catch (err) {
+            this.logInfo("executeQuery: Error:" + err);
+        }
+        finally {
+            if ((this.noDB) && (!this.dbInit)) return false;
+            sqlStatement.finalize();
+        }
+
+        if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+            return true;
+        }
+        else {
+            if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return false;
+        }
+    },
+
+    executeQueryWithResults: function _executeQueryWithResults(aQuery, aFieldArray) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return null;
+        }
+
+        if (this.debug) this.logInfo("sql-query:" + aQuery, 2);
+        if ((this.noDB) && (!this.dbInit)) return [];
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(aQuery);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + aQuery + ")");
+            return null;
+        }
+
+        var results = [];
+        if ((this.noDB) && (!this.dbInit)) return [];
+        try {
+            while (sqlStatement.executeStep()) {
+                var tmpResult = {};
+                for (var index in aFieldArray) {
+                    try {
+                        tmpResult[aFieldArray[index]] = sqlStatement.row[aFieldArray[index]];
+                    }
+                    catch (exc) {
+                        if (this.debug) this.logInfo("Error on getting field '" + aFieldArray[index] + "' from query '" + aQuery + "' result.(" + exc + ")");
+                    }
+                }
+                results.push(tmpResult);
+                if ((this.noDB) && (!this.dbInit)) return [];
+            }
+        }
+        finally {
+            if ((this.noDB) && (!this.dbInit)) return [];
+            sqlStatement.finalize();
+        }
+
+        if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+            return results;
+        }
+        else {
+            if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return null;
+        }
+    },
+
+    addAttachmentsToOfflineCache: function _addAttachmentsToOfflineCache(aList) {
+        for each(var item in aList) {
+            var attachments = item.calItem.getAttachments({});
+            this.removeAttachmentsFromOfflineCache(item.calItem);
+            for (var index in attachments) {
+                this.addAttachmentToOfflineCache(item.calItem, attachments[index]);
+            }
+        }
+    },
+
+    addAttachmentToOfflineCache: function _addAttachmentToOfflineCache(aCalItem, aCalAttachment) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        var attParams = this.globalFunctions.splitUriGetParams(aCalAttachment.uri);
+
+        if (attParams) {
+
+            var sqlStr = "SELECT COUNT() as attcount from attachments WHERE id='" + attParams.id + "'";
+            if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+            if (this.noDB) return;
+            sqlStatement.executeStep();
+            if (sqlStatement.row.attcount > 0) {
+                if (this.debug) this.logInfo("Going to update the attachment because it all ready exist.");
+                this.updateAttachmentInOfflineCache(aCalItem, aCalAttachment);
+                sqlStatement.finalize();
+                return;
+            }
+            sqlStatement.finalize();
+
+            var sqlStr = "INSERT INTO attachments VALUES ('" + attParams.id + "', '" + attParams.name.replace(/\x27/g, "''") + "', '" + attParams.size + "', '')";
+            if (this.noDB) return;
+            if (!this.executeQuery(sqlStr)) {
+                if (this.debug) this.logInfo("Error inserting attachment into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("Inserted attachment into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
+            }
+
+            var sqlStr = "INSERT INTO attachments_per_item VALUES ('" + aCalItem.id + "','" + attParams.id + "')";
+            if (this.noDB) return;
+            if (!this.executeQuery(sqlStr)) {
+                if (this.debug) this.logInfo("Error inserting attachments_per_item into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("Inserted attachments_per_item into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
+            }
+
+        }
+    },
+
+    updateAttachmentInOfflineCache: function _updateAttachmentInOfflineCache(aCalItem, aCalAttachment) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        var attParams = this.globalFunctions.splitUriGetParams(aCalAttachment.uri);
+
+        if (attParams) {
+
+            var sqlStr = "UPDATE attachments SET id='" + attParams.id + "', name='" + attParams.name.replace(/\x27/g, "''") + "', size='" + attParams.size + "', cachePath='' WHERE id='" + attParams.id + "'";
+            if (this.noDB) return;
+            if (!this.executeQuery(sqlStr)) {
+                if (this.debug) this.logInfo("Error updating attachment into offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("Updated attachment into offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
+            }
+        }
+    },
+
+    removeAttachmentsFromOfflineCache: function _removeAttachmentsFromOfflineCache(aCalItem) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        var sqlStr = "SELECT attId FROM attachments_per_item WHERE itemId='" + aCalItem.id + "'";
+
+        if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+            return false;
+        }
+
+        var doContinue = true;
+        try {
+            while (doContinue) {
+                if (this.noDB) return;
+                doContinue = sqlStatement.executeStep();
+
+                if (doContinue) {
+                    var sqlStr2 = "DELETE FROM attachments WHERE id='" + sqlStatement.row.attId + "'";
+                    if (this.noDB) return;
+                    if (!this.executeQuery(sqlStr2)) {
+                        if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+                    }
+                    else {
+                        if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Title:" + aCalItem.title);
+                    }
+                }
+            }
+        }
+        finally {
+            sqlStatement.finalize();
+        }
+
+        if ((this.offlineCacheDB.lastError != 0) && (this.offlineCacheDB.lastError != 100) && (this.offlineCacheDB.lastError != 101)) {
+            if (this.debug) this.logInfo("Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return false;
+        }
+
+        var sqlStr2 = "DELETE FROM attachments_per_item WHERE itemId='" + aCalItem.id + "'";
+        if (this.noDB) return;
+        if (!this.executeQuery(sqlStr2)) {
+            if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+        }
+        else {
+            if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Title:" + aCalItem.title);
+        }
+
+        return true;
+    },
+
+    removeAttachmentFromOfflineCache: function _removeAttachmentFromOfflineCache(aCalItem, aCalAttachment) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        var attParams = this.globalFunctions.splitUriGetParams(aCalAttachment.uri);
+
+        if (attParams) {
+
+            var sqlStr = "DELETE FROM attachments WHERE id='" + attParams.id + "'";
+            if (this.noDB) return;
+            if (!this.executeQuery(sqlStr)) {
+                if (this.debug) this.logInfo("Error removing attachment from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("Removed attachment from offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
+            }
+
+            var sqlStr = "DELETE FROM attachments_per_item WHERE itemId='" + aCalItem.id + "' AND attId='" + attParams.id + "'";
+            if (this.noDB) return;
+            if (!this.executeQuery(sqlStr)) {
+                if (this.debug) this.logInfo("Error removing attachments_per_item from offlineCacheDB. Error:(" + this.offlineCacheDB.lastError + ")" + this.offlineCacheDB.lastErrorString);
+            }
+            else {
+                if (this.debug) this.logInfo("Removed attachments_per_item from offlineCacheDB. Name:" + attParams.name + ", Title:" + aCalItem.title);
+            }
+        }
+    },
+
+    addToOfflineCache: function _addToOfflineCache(aList) {
+
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        //dump(this.name+":addToOfflineCache 1\n");
+        var sqlQueries = [];
+
+        for each(var item in aList) {
+
+            if (isEvent(item.calItem)) {
+                var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
+                var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
+                var eventField = "y";
+            }
+            else {
+                if (item.calItem.entryDate) {
+                    var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
+                }
+                else {
+                    var startDate = "";
+                };
+
+                if (((item.calItem.completedDate) && (item.calItem.dueDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) || ((item.calItem.completedDate) && (!item.calItem.dueDate))) {
+                    var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
+                }
+                else {
+                    if (item.calItem.dueDate) {
+                        var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    }
+                    else {
+                        var endDate = "";
+                    }
+                }
+                var eventField = "n";
+            }
+
+            var sqlStr = "SELECT '" + item.calItem.id + "' as realid, id, changeKey, COUNT() as itemcount from items WHERE id='" + item.calItem.id + "'";
+            //dump(this.name+":addToOfflineCache: sqlStr:"+sqlStr+"\n");
+            if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+
+            sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
+        }
+
+        if (sqlQueries.length == 0) {
+            //dump(this.name+":addToOfflineCache: No items in aList to be added to offlinecache.\n");
+            return;
+        }
+
+        //dump(this.name+":addToOfflineCache: Going to execute '"+sqlQueries.length+"' queries\n");
+
+        var self = this;
+        var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
+            toBeInserted: [],
+            toBeUpdated: [],
+            list: aList,
+            handleCompletion: function _handleCompletion(aReason) {
+                if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
+                    // Finished looking up items in offline cache. Now insert or update the items.
+                    //dump(self.name+":Finished looking up items in offline cache. Now insert or update the items.\n");
+                    if (this.toBeInserted.length > 0) {
+                        self.insertToOfflineCache(this.toBeInserted);
+                    }
+                    if (this.toBeUpdated.length > 0) {
+                        self.updateInOfflineCache(this.toBeUpdated);
+                    }
+                }
+                else {
+                    //dump(self.name+":addToOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
+                    /*if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_CANCELED) {
+                    	dump("  -- It was canceled.\n");
+                    }
+                    if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_ERROR) {
+                    	dump("  -- It was an error.\n");
+                    }*/
+                }
+            },
+
+            handleError: function _handleError(aError) {
+                dump(self.name + ":addToOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
+            },
+
+            handleResult: function _handleResult(aResultSet) {
+                if (self.debug) self.logInfo("Found item in offline Cache.");
+                var row = aResultSet.getNextRow();
+                while (row) {
+
+                    if (row) {
+                        if (row.getResultByName('itemcount') > 0) {
+                            if (row.getResultByName('changeKey') != this.list[row.getResultByName('id')].calItem.changeKey) {
+                                //dump(self.name+":Item will be updated id:"+row.getResultByName('id')+"\n");
+                                this.toBeUpdated.push(this.list[row.getResultByName('id')]);
+                            }
+                            else {
+                                if (this.debug)
+                                    this.logInfo("This item '" + this.list[row.getResultByName('id')] + "' is allready in offlineCache database. id and changeKey are the same. Not going to update it.");
+                                //dump(self.name+":This item '"+this.list[row.getResultByName('id')]+"' is allready in offlineCache database. id and changeKey are the same. Not going to update it.\n");
+                            }
+                        }
+                        else {
+                            //dump(self.name+":Item will be inserted id 1:"+row.getResultByName('realid')+"\n");
+                            //dump("Item will be inserted id 2:"+row.getResultByName('id')+"\n");
+                            //dump("Item will be inserted id 3:"+row.getResultByIndex(0)+"\n");
+                            this.toBeInserted.push(this.list[row.getResultByName('realid')]);
+                        }
+                    }
+                    row = aResultSet.getNextRow();
+                }
+            }
+        });
+
+    },
+
+    insertToOfflineCache: function _insertToOfflineCache(aList) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            //dump(this.name+":NO Offline Cache DB: insertToOfflineCache 1\n");
+            return;
+        }
+
+        try {
+            //dump(this.name+":insertToOfflineCache 1\n");
+            var sqlQueries = [];
+            var mastersToBeUpdated = [];
+
+            for each(var item in aList) {
+
+                if (isEvent(item.calItem)) {
+                    var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    var eventField = "y";
+                }
+                else {
+                    if (item.calItem.entryDate) {
+                        var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    }
+                    else {
+                        var startDate = "";
+                    };
+
+                    if (((item.calItem.completedDate) && (item.calItem.dueDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) || ((item.calItem.completedDate) && (!item.calItem.dueDate))) {
+                        var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    }
+                    else {
+                        if (item.calItem.dueDate) {
+                            var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
+                        }
+                        else {
+                            var endDate = "";
+                        }
+                    }
+                    var eventField = "n";
+                }
+
+                if (isEvent(item.calItem)) {
+                    if (this.getItemType(item.calItem) == "M") {
+                        // Lets find the real end date.
+                        for (var childIndex in this.itemCacheById) {
+                            if ((this.itemCacheById[childIndex]) && (item.calItem.uid == this.itemCacheById[childIndex].uid)) {
+                                var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
+                                if (childEnd > endDate) {
+                                    endDate = childEnd;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
+                            mastersToBeUpdated.push(item.calItem.parentItem);
+                        }
+                    }
+                }
+
+                var sqlStr = "INSERT INTO items VALUES ('" + eventField + "','" + item.calItem.id + "', '" + item.calItem.changeKey + "', '" + startDate + "', '" + endDate + "', '" + item.calItem.uid + "', '" + this.getItemType(item.calItem) + "', '" + item.calItem.parentItem.id + "', '" + item.exchangeItemXML.replace(/\x27/g, "''") + "')";
+
+                sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
+            }
+
+            //dump(this.name+":insertToOfflineCache 2\n");
+            if (mastersToBeUpdated.length > 0) {
+                this.updateMasterInOfflineCache(mastersToBeUpdated);
+            }
+
+            //dump(this.name+":insertToOfflineCache 3\n");
+            if (sqlQueries.length == 0) {
+                //dump(this.name+":insertToOfflineCache: No items in aList to be inserted to offlinecache.\n");
+                return;
+            }
+
+            //dump(this.name+":insertToOfflineCache: Going to insert '"+sqlQueries.length+"' items to offlinecache.\n");
+
+            var self = this;
+            var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
+                handleCompletion: function _handleCompletion(aReason) {
+                    if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
+                        // Finished looking up items in offline cache. Now insert or update the items.
+                        //dump(self.name+":updateInOfflineCache: handleCompletion: items were inserted ok.\n");
+                        self.addAttachmentsToOfflineCache(aList);
+                    }
+                    else {
+                        //dump(self.name+":updateInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
+                    }
+                },
+
+                handleError: function _handleError(aError) {
+                    dump(self.name + ":updateInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
+                },
+
+                handleResult: function _handleResult(aResultSet) {
+                    //dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
+                }
+            });
+        }
+        catch (err) {
+            dump(this.name + ":insertToOfflineCache: err:" + err + "\n");
+        }
+    },
+
+    updateInOfflineCache: function _updateInOfflineCache(aList) //aCalItem, aExchangeItemXML)
+        {
+            if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+                return;
+            }
+
+            //dump(this.name+":updateInOfflineCache:\n");
+
+            var sqlQueries = [];
+            var mastersToBeUpdated = [];
+
+            for each(var item in aList) {
+
+                if (isEvent(item.calItem)) {
+                    var startDate = cal.toRFC3339(item.calItem.startDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    var endDate = cal.toRFC3339(item.calItem.endDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    var eventField = "y";
+                }
+                else {
+                    if (item.calItem.entryDate) {
+                        var startDate = cal.toRFC3339(item.calItem.entryDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    }
+                    else {
+                        var startDate = "";
+                    };
+
+                    if ((item.calItem.completedDate) && (item.calItem.completedDate.compare(item.calItem.dueDate) == 1)) {
+                        var endDate = cal.toRFC3339(item.calItem.completedDate.getInTimezone(this.globalFunctions.ecUTC()));
+                    }
+                    else {
+                        if (item.calItem.dueDate) {
+                            var endDate = cal.toRFC3339(item.calItem.dueDate.getInTimezone(this.globalFunctions.ecUTC()));
+                        }
+                        else {
+                            var endDate = "";
+                        }
+                    }
+                    var eventField = "n";
+                }
+
+                if (isEvent(item.calItem)) {
+                    if (this.getItemType(item.calItem) == "M") {
+                        // Lets find the real end date.
+                        if (this.noDB) return;
+                        var newMasterEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items WHERE uid='" + item.calItem.uid + "'", ["newEndDate"]);
+                        if ((newMasterEndDate) && (newMasterEndDate.length > 0)) {
+                            if (this.debug) this.logInfo("newMasterEndDate:" + newMasterEndDate[0].newEndDate);
+                            var endDateStr = newMasterEndDate[0].newEndDate;
+                            if (endDateStr) {
+                                if (endDateStr.length == 10) {
+                                    endDateStr += "T23:59:59Z";
+                                }
+                                if (this.debug) this.logInfo("newEndDate for master setting it to:" + endDateStr);
+                                endDate = endDateStr;
+                            }
+                            else {
+                                if (this.debug) this.logInfo("newEndDate for master is null not going to use this. Strange!!");
+                            }
+                        }
+                        else {
+                            if (this.debug) this.logInfo("Could not get newEndDate for Master. What is wrong!!");
+                        }
+
+                    }
+                    else {
+                        if ((this.getItemType(item.calItem) == "RO") || (this.getItemType(item.calItem) == "RE")) {
+                            mastersToBeUpdated.push(item.calItem.parentItem);
+                        }
+                    }
+                }
+
+                let sqlStr = "UPDATE items SET event='" + eventField + "', id='" + item.calItem.id + "', changeKey='" + item.calItem.changeKey + "', startDate='" + startDate + "', endDate='" + endDate + "', uid='" + item.calItem.uid + "', type='" + this.getItemType(item.calItem) + "', parentItem='" + item.calItem.parentItem.id + "', item='" + item.exchangeItemXML.replace(/\x27/g, "''") + "' WHERE id='" + item.calItem.id + "'";
+
+                sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
+            }
+
+            if (mastersToBeUpdated.length > 0) {
+                this.updateMasterInOfflineCache(mastersToBeUpdated);
+            }
+
+            if (sqlQueries.length == 0) {
+                //dump(this.name+":updateInOfflineCache: No items in aList to be updated in offlinecache.\n");
+                return;
+            }
+
+            //dump(this.name+":updateInOfflineCache: Going to update '"+sqlQueries.length+"' items to offlinecache.\n");
+
+            var self = this;
+            var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
+                handleCompletion: function _handleCompletion(aReason) {
+                    if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
+                        // Finished looking up items in offline cache. Now insert or update the items.
+                        //dump(self.name+":updateInOfflineCache: handleCompletion: items were updated ok.\n");
+                        self.addAttachmentsToOfflineCache(aList);
+                    }
+                    else {
+                        //dump(self.name+":updateInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
+                    }
+                },
+
+                handleError: function _handleError(aError) {
+                    dump(self.name + ":updateInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
+                },
+
+                handleResult: function _handleResult(aResultSet) {
+                    //dump(self.name+":updateInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
+                }
+            });
+
+        },
+
+    updateMasterInOfflineCache: function _updateMasterInOfflineCache(aList) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        try {
+            //dump(this.name+":updateMasterInOfflineCache:\n");
+
+            var sqlQueries = [];
+            var mastersToBeUpdated = [];
+
+            for each(var item in aList) {
+
+
+                var endDate = cal.toRFC3339(item.endDate.getInTimezone(this.globalFunctions.ecUTC()));
+
+                if (this.getItemType(item) == "M") {
+                    // Lets find the real end date.
+                    for (var childIndex in this.itemCacheById) {
+                        if ((this.itemCacheById[childIndex]) && (item.uid == this.itemCacheById[childIndex].uid)) {
+                            var childEnd = cal.toRFC3339(this.itemCacheById[childIndex].endDate.getInTimezone(this.globalFunctions.ecUTC()));
+                            if (childEnd > endDate) {
+                                endDate = childEnd;
+                            }
+                        }
+                    }
+                }
+                else {
+                    if ((this.getItemType(item) == "RO") || (this.getItemType(item) == "RE")) {
+                        mastersToBeUpdated.push(item.parentItem);
+                    }
+                }
+
+                let sqlStr = "UPDATE items SET endDate='" + endDate + "' WHERE id='" + item.id + "'";
+                sqlQueries.push(this.offlineCacheDB.createAsyncStatement(sqlStr));
+            }
+
+            if (mastersToBeUpdated.length > 0) {
+                this.updateMasterInOfflineCache(mastersToBeUpdated);
+            }
+
+            if (sqlQueries.length == 0) {
+                //dump(this.name+":updateMasterInOfflineCache: No masters in aList to be updated in offlinecache.\n");
+                return;
+            }
+
+            //dump(this.name+":updateMasterInOfflineCache: '"+sqlQueries.length+"' masters will be updated in offlinecache.\n");
+
+            var self = this;
+            var pendingStatement = this.offlineCacheDB.executeAsync(sqlQueries, sqlQueries.length, {
+                handleCompletion: function _handleCompletion(aReason) {
+                    if (aReason == Components.interfaces.mozIStorageStatementCallback.REASON_FINISHED) {
+                        // Finished looking up items in offline cache. Now insert or update the items.
+                        //dump(self.name+":updateMasterInOfflineCache: handleCompletion: masters were updated ok.\n");
+                    }
+                    else {
+                        //dump(self.name+":updateMasterInOfflineCache: handleCompletion: DB update did not end normally aReason:"+aReason+".\n");
+                    }
+                },
+
+                handleError: function _handleError(aError) {
+                    dump(self.name + ":updateMasterInOfflineCache: handleError: aError:" + aError.message + " (" + aError.result + ")\n");
+                },
+
+                handleResult: function _handleResult(aResultSet) {
+                    //dump(self.name+":updateMasterInOfflineCache: handleResult.  DOES THIS EVER GET CALLED \n");
+                }
+            });
+
+        }
+        catch (err) {
+            dump(this.name + ":updateMasterInOfflineCache: err:" + err + "\n");
+        }
+    },
+
+    removeFromOfflineCache: function _removeFromOfflineCache(aCalItem) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        var sqlStr = "DELETE FROM items WHERE id='" + aCalItem.id + "'";
+        if (this.noDB) return;
+        if (!this.executeQuery(sqlStr)) {
+            if (this.debug) this.logInfo("Error deleting item from offlineCacheDB. Error:" + this.offlineCacheDB.lastErrorString);
+        }
+        else {
+            if (this.debug) this.logInfo("Removed item from offlineCacheDB. Title:" + aCalItem.title);
+        }
+        this.removeAttachmentsFromOfflineCache(aCalItem);
+    },
+
+    removeChildrenFromMasterInOfflineCache: function _removeChildrenFromMasterInOfflineCache(aMaster) {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        var sqlStr = "DELETE FROM items WHERE uid='" + aMaster.uid + "' and type <> 'M'";
+        if (this.noDB) return;
+        if (!this.executeQuery(sqlStr)) {
+            if (this.debug) this.logInfo("Error deleting children from offlineCacheDB. Error:" + this.offlineCacheDB.lastErrorString);
+        }
+        else {
+            if (this.debug) this.logInfo("Removed children from offlineCacheDB. Title:" + aMaster.title);
+        }
+
+        // We have to remove the attachments from offline cache for each child.
+        this.removeAttachmentsFromOfflineCache(aMaster);
+
+    },
+
+    syncExchangeToOfflineCache: function _syncExchangeToOfflineCache() {
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB) || (this.mIsOffline) || (this.weAreSyncing)) {
+            if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are offline or already syncing or no cache enabled! ");
+            return;
+        }
+        if (this.debug) this.logInfo("syncExchangeToOfflineCache: You are online syncing  ");
+        // This will sync the specified period from Exchange to offlineCache.
+        var monthsAfter = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsAfterToday", 1, true) * 31;
+        var monthsBefore = this.globalFunctions.safeGetIntPref(this.prefs, "ecOfflineCacheMonthsBeforeToday", 1, true) * 31;
+
+        var monthAfterDurarion = cal.createDuration("P" + monthsAfter + "D");
+        var monthsBeforeDurarion = cal.createDuration("-P" + monthsBefore + "D");
+
+        var startDate = cal.now();
+        var endDate = cal.now();
+        startDate.addDuration(monthsBeforeDurarion);
+        endDate.addDuration(monthAfterDurarion);
+
+        // Check what is missing for minimal time period.
+        var filter = 0;
+        if (this.supportsEvents) filter |= Ci.calICalendar.ITEM_FILTER_TYPE_EVENT;
+        if (this.supportsTasks) filter |= Ci.calICalendar.ITEM_FILTER_TYPE_TODO;
+
+        // Reset memory caches.
+        this.itemCacheById = {};
+        this.itemCacheByStartDate = {};
+        this.itemCacheByEndDate = {};
+        this.recurringMasterCache = {};
+        this.recurringMasterCacheById = {};
+
+        if (this.supportsEvents) {
+            if ((!this.startDate) && (!this.endDate)) {
+                if (this.debug) this.logInfo("Going to request events in the period of '" + startDate.toString() + "' until '" + endDate.toString() + "' from the exchange server to fill offlinecache.");
+                //this.getItems(filter, 0, startDate, endDate, null);
+                this.requestPeriod(startDate, endDate, filter, {}, false);
+
+            }
+            else {
+                if (this.debug) this.logInfo("Going to request events in the period of '" + this.startDate + "' until '" + this.endDate + "' from the exchange server to fill offlinecache.");
+                this.requestPeriod(this.startDate, this.endDate, filter, {}, false);
+
+                if ((this.startDate) && (startDate.compare(this.startDate)) < 0) {
+                    if (this.debug) this.logInfo("Going to request events in the period of '" + startDate.toString() + "' until '" + this.startDate.toString() + "' from the exchange server to fill offlinecache.");
+                    //this.getItems(filter, 0, startDate, this.startDate, null);
+                    this.requestPeriod(startDate, this.startDate, filter, {}, false);
+                }
+                if ((this.endDate) && (endDate.compare(this.endDate) > 0)) {
+                    if (this.debug) this.logInfo("Going to request events in the period of '" + this.endDate.toString() + "' until '" + endDate.toString() + "' from the exchange server to fill offlinecache.");
+                    //this.getItems(filter, 0, this.endDate, endDate, null);
+                    this.requestPeriod(this.endDate, endDate, filter, {}, false);
+                }
+            }
+        }
+
+        var self = this;
+        if (this.supportsTasks) {
+            if (this.debug) this.logInfo("Requesting tasks from exchange server.");
+            this.addToQueue(erFindTaskItemsRequest, {
+                    user: this.user,
+                    mailbox: this.mailbox,
+                    serverUrl: this.serverUrl,
+                    folderBase: this.folderBase,
+                    itemFilter: filter,
+                    folderID: this.folderID,
+                    changeKey: this.changeKey,
+                    actionStart: Date.now()
+                },
+                function (erFindTaskItemsRequest, aIds) {
+                    self.findTaskItemsOK(erFindTaskItemsRequest, aIds);
+                },
+                function (erFindTaskItemsRequest, aCode, aMsg) {
+                    self.findTaskItemsError(erFindTaskItemsRequest, aCode, aMsg);
+                },
+                null);
+        }
+
+    },
+
+    masterIsInOfflineCache: function _masterIsInOfflineCache(aId) {
+        if (this.debug) this.logInfo("masterIsInOfflineCache: aId:" + aId);
+        if (!aId) return null;
+
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return null;
+        }
+
+        var result = null;
+
+        var sqlStr = "SELECT id, uid, changeKey FROM items WHERE id = '" + aId + "' AND type='M'";
+
+        if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+            return null;
+        }
+
+        var doContinue = true;
+        try {
+            while (doContinue) {
+                doContinue = sqlStatement.executeStep();
+
+                if (doContinue) {
+                    if (this.debug) this.logInfo("Found item in offline Cache.");
+
+                    // Check if this item is not in the itemCache already.
+                    result = {
+                        changeKey: sqlStatement.row.changeKey,
+                        uid: sqlStatement.row.uid
+                    };
+                }
+            }
+        }
+        finally {
+            sqlStatement.reset();
+        }
+
+        if ((this.debug) && (result)) this.logInfo("masterIsInOfflineCache: Retreived uid:'" + result.uid + "', changeKey:'" + result.changeKey + "' from offline cache.");
+        if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+
+            if (result) {
+                if (this.debug) this.logInfo("masterIsInOfflineCache: found in offline cache aId:" + aId + ", changeKey:" + result.changeKey);
+                return result;
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("masterIsInOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return null;
+        }
+        return null;
+    },
+
+
+    itemIsInOfflineCache: function _itemIsInOfflineCache(aId) {
+        if (this.debug) this.logInfo("itemIsInOfflineCache: aId:" + aId);
+        if (!aId) return null;
+
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return null;
+        }
+
+        var result = null;
+
+        var sqlStr = "SELECT id, changeKey FROM items WHERE id = '" + aId + "'";
+
+        if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+            return null;
+        }
+
+        var doContinue = true;
+        try {
+            while (doContinue) {
+                doContinue = sqlStatement.executeStep();
+
+                if (doContinue) {
+                    if (this.debug) this.logInfo("Found item in offline Cache.");
+
+                    // Check if this item is not in the itemCache already.
+                    result = sqlStatement.row.changeKey;
+                }
+            }
+        }
+        finally {
+            sqlStatement.reset();
+        }
+
+        if (this.debug) this.logInfo("itemIsInOfflineCache: Retreived changeKey:'" + result + "' from offline cache.");
+        if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+
+            if (result) {
+                dump("itemIsInOfflineCache: found:" + result + "\n");
+                return result;
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("itemIsInOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return null;
+        }
+        return null;
+    },
+
+    getOccurrencesFromOfflineCache: function _getOccurrencesFromOfflineCache(aMaster, aType) {
+        if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: aMaster.title:" + aMaster.title);
+        if (!aMaster) return [];
+
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return [];
+        }
+
+        var result = [];
+
+        var sqlStr = "SELECT id FROM items";
+        var whereStr = "";
+        if ((this.supportsEvents) && (!this.supportsTasks)) {
+            whereStr = " WHERE event = 'y' AND type = '" + aType + "' AND uid = '" + aMaster.uid + "'";
+            sqlStr += whereStr;
+        }
+        else {
+            if ((!this.supportsEvents) && (this.supportsTasks)) {
+                whereStr = " WHERE event = 'n' AND type = '" + aType + "' AND uid = '" + aMaster.uid + "'";
+                sqlStr += whereStr;
+            }
+        }
+
+        if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+            return [];
+        }
+
+        var doContinue = true;
+        try {
+            while (doContinue) {
+                doContinue = sqlStatement.executeStep();
+
+                if (doContinue) {
+                    if (this.debug) this.logInfo("Found item in offline Cache.");
+
+                    // Check if this item is not in the itemCache already.
+                    if (!this.itemCacheById[sqlStatement.row.id]) {
+                        result.push(sqlStatement.row.id);
+                        cachedItem = null;
+                    }
+                }
+            }
+        }
+        finally {
+            sqlStatement.reset();
+        }
+
+        if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Retreived '" + result.length + "' records from offline cache.");
+        if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+
+            if (result.length > 0) {
+                dump("getOccurrencesFromOfflineCache: found:" + result.length + "\n");
+                return result;
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("getOccurrencesFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return [];
+        }
+        return [];
+    },
+
+    getItemsFromOfflineCache: function _getItemsFromOfflineCache(aStartDate, aEndDate) {
+        this.logInfo("getItemsFromOfflineCache: startDate:" + aStartDate + ", endDate:" + aEndDate);
+
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return;
+        }
+
+        let result = [];
+
+        let utcStartDate = cal.createDateTime("1900-01-01");
+        let utcEndDate = cal.createDateTime("3500-01-01");
+
+        if (aStartDate) {
+            utcStartDate = aStartDate.clone();
+            utcStartDate.isDate = false;
+            utcStartDate = utcStartDate.getInTimezone(cal.UTC());
+            utcStartDate.isDate = true;
+        }
+
+        if (aEndDate) {
+            utcEndDate = aEndDate.clone();
+            utcEndDate.isDate = false;
+            utcEndDate = utcEndDate.getInTimezone(cal.UTC());
+            utcEndDate.isDate = true;
+        }
+
+        let startDate = cal.toRFC3339(utcStartDate);
+        let endDate = cal.toRFC3339(utcEndDate);
+
+        let sqlStr = "SELECT item FROM items";
+        let whereStr = "";
+
+        if (this.supportsEvents
+            && !this.supportsTasks) {
+            whereStr = " WHERE event = 'y' AND "
+                + "startDate <= '" + endDate + "' AND endDate >= '" + startDate + "'";
+        }
+        else if (!this.supportsEvents
+            && this.supportsTasks) {
+            whereStr = " WHERE event = 'n' AND ("
+                + "(startDate = '' AND endDate >= '" + startDate + "' AND endDate <= '" + endDate + "')"
+                + "OR (endDate = '' AND startDate >= '" + startDate + "' AND startDate <= '" + endDate + "')"
+                + "OR (startDate <= '" + endDate + "' AND endDate >= '" + startDate + "')"
+                + "OR (startDate = '' AND endDate = '')"
+                + ")";
+        }
+
+        sqlStr += whereStr + " ORDER BY type ASC";
+
+        this.logInfo("getItemsFromOfflineCache: sql-query:" + sqlStr, 2);
+
+        let sqlStatement;
+
+        try {
+            sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            this.logInfo("getItemsFromOfflineCache: Error on SQL statement creation: " + this.offlineCacheDB.lastError
+                + ", Msg:" + this.offlineCacheDB.lastErrorString
+                + ", Exception:" + exc + ". (SQL source: " + sqlStr + ")");
+
+            return false;
+        }
+
+        try {
+            while (sqlStatement.executeStep()) {
+                this.logInfo("getItemsFromOfflineCache: Found item in offline Cache.");
+
+                let root = xml2json.newJSON();
+                xml2json.parseXML(root, sqlStatement.row.item);
+
+                let cachedItem = root[telements][0];
+
+                result.push(cachedItem);
+            }
+        }
+        finally {
+            sqlStatement.reset();
+        }
+
+        this.logInfo("getItemsFromOfflineCache: retrieved '" + result.length
+            + "' records from offline cache. "
+            + "startDate:" + startDate + ", endDate:" + endDate);
+
+        let sqliteSuccessCode = [0, 100, 101];
+
+        if (sqliteSuccessCode.indexOf(this.offlineCacheDB.lastError) > -1) {
+            if (result.length > 0) {
+                // Turned off so items are always requested from offline cache. Even if they have been requested already.
+                //this.executeQuery("UPDATE items set event=(event || '_')"+whereStr);
+
+                let updateResult = this.updateCalendar(null, result, false, true, false);
+
+                this.logInfo("getItemsFromOfflineCache: Updated calendar with '" + result.length
+                    + "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
+
+                return updateResult;
+            }
+        }
+        else {
+            this.logInfo("getItemsFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+
+            return null;
+        }
+        return null;
+    },
+
+    getItemFromOfflineCache: function _getItemFromOfflineCache(aId) {
+        if (this.debug) this.logInfo("getItemFromOfflineCache: aId:" + aId);
+        if (!aId) return null;
+
+        if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
+            return null;
+        }
+
+        var result = null;
+
+        var sqlStr = "SELECT item FROM items WHERE id = '" + aId + "'";
+
+        if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
+        try {
+            var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
+        }
+        catch (exc) {
+            if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
+            return null;
+        }
+
+        var doContinue = true;
+        try {
+            while (doContinue) {
+                doContinue = sqlStatement.executeStep();
+
+                if (doContinue) {
+                    if (this.debug) this.logInfo("Found item in offline Cache.");
+
+                    // Check if this item is not in the itemCache already.
+                    var root = xml2json.newJSON();
+                    xml2json.parseXML(root, sqlStatement.row.item);
+                    result = this.convertExchangeToCal(root[telements][0], null, false, true);
+                    if (!result) {
+                        if (this.debug) this.logInfo("getItemFromOfflineCache: Could not convert exchange XML into Cal item.!! item:" + sqlStatement.row.item);
+                    }
+                }
+            }
+        }
+        finally {
+            sqlStatement.reset();
+        }
+
+        if (this.debug) this.logInfo("getItemFromOfflineCache: Retreived item from offline cache.");
+        if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+
+            if (result) {
+                return result;
+            }
+        }
+        else {
+            if (this.debug) this.logInfo("getItemFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
+            return null;
+        }
+        return null;
+    },
+
+
+    set isOffline(aValue) {
+        if (this.debug) this.logInfo("setting mIsOffline=" + aValue);
+
+        if (aValue != this.mIsOffline) {
+            this.notConnected = aValue;
+            this.mIsOffline = aValue;
+
+            if (!aValue) {
+                if (this.debug) this.logInfo("Initialized:" + this.isInitialized);
+                this.readOnlyInternal = false;
+                this.refresh();
+            }
+            else {
+                if (this.calendarPoller) {
+                    this.calendarPoller.cancel();
+                }
+                this.inboxPoller.cancel();
+                this.firstrun = true;
+            }
+        }
+    },
+
+    get isOffline() {
+        return this.mIsOffline;
+    },
+
+    offlineStateChanged: function _offlineStateChanged(aStatus) {
+        if (this.debug) this.logInfo("The offline state of TB changed to:" + aStatus);
+        this.isOffline = (aStatus == "offline");
+    },
+
+    get offlineStartDate() {
+        if (this.noDB) return null;
+        var tmpStartDate = this.executeQueryWithResults("SELECT min(endDate) as newStartDate FROM items where type <> 'M'", ["newStartDate"]);
+        if ((tmpStartDate) && (tmpStartDate.length > 0)) {
+            var newStartDate = tmpStartDate[0].newStartDate;
+            if (newStartDate) {
+                if (newStartDate.length == 10) {
+                    newStartDate += "T00:00:00Z";
+                }
+                if (this.debug) this.logInfo("get offlineStartDate = '" + newStartDate + "'");
+                return cal.createDateTime(newStartDate);
+            }
+        }
+
+        return null;
+    },
+
+    get offlineEndDate() {
+        if (this.noDB) return null;
+        var tmpEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items where type <> 'M'", ["newEndDate"]);
+        if ((tmpEndDate) && (tmpEndDate.length > 0)) {
+            var newEndDate = tmpEndDate[0].newEndDate;
+            if (newEndDate) {
+                if (newEndDate.length == 10) {
+                    newEndDate += "T00:00:00Z";
+                }
+                if (this.debug) this.logInfo("get offlineEndDate = '" + newEndDate + "'");
+                return cal.createDateTime(newEndDate);
+            }
+        }
+
+        return null;
+    },
+
+    get offlineEventItemCount() {
+        if (this.noDB) return "-";
+        var tmpEventCount = this.executeQueryWithResults("SELECT COUNT() as eventCount FROM items where event = 'y' or event = 'y_'", ["eventCount"]);
+        if ((tmpEventCount) && (tmpEventCount.length > 0)) {
+            return tmpEventCount[0].eventCount;
+        }
+
+        return "--";
+    },
+
+    get offlineToDoItemCount() {
+        if (this.noDB) return "-";
+        var tmpToDoCount = this.executeQueryWithResults("SELECT COUNT() as toDoCount FROM items where event = 'n' or event = 'n_'", ["toDoCount"]);
+        if ((tmpToDoCount) && (tmpToDoCount.length > 0)) {
+            return tmpToDoCount[0].toDoCount;
+        }
+
+        return "--";
+    },
+
+    get memoryCacheItemCount() {
+        var result = 0;
+        for (var index in this.itemCacheById) {
+            result++;
+        }
+        return result;
+    },
+
+    /**
+     * Internal logging function that should be called on any database error,
+     * it will log as much info as possible about the database context and
+     * last statement so the problem can be investigated more easilly.
+     *
+     * @param message           Error message to log.
+     * @param exception         Exception that caused the error.
+     */
+    logError: function _logError(message, exception) {
+        let logMessage = "(" + this.name + ") " + message;
+
+        if (exception) {
+            logMessage += "\nException: " + exception;
+        }
+
+        this.globalFunctions.ERROR(logMessage + "\n" + this.globalFunctions.STACK(10));
+    },
+
+    logInfo: function _logInfo(message, aDebugLevel) {
+
+        if (!this.debug) return;
+
+        if (!aDebugLevel) {
+            var debugLevel = 1;
+        }
+        else {
+            var debugLevel = aDebugLevel;
+        }
+
+        if (this.globalFunctions.shouldLog()) {
+            exchWebService.check4addon.logAddOnVersion();
+        }
+
+        if (debugLevel <= this.storedDebugLevel) {
+            this.globalFunctions.LOG("[" + this.name + "] " + message + " (" + this.globalFunctions.STACKshort() + ")");
+        }
+    },
+
+    setDoDebug: function _setDoDebug() {
+
+        var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+        this.storedDebugLevel = this.globalFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true);
+
+        this.debug = (this.storedDebugLevel > 0);
+
+        if ((this.storedDebugLevel == 0) || (!this.globalFunctions.shouldLog())) {
+            this.debug = false;
+        }
+    },
+
+    connectionIsNotOk: function _connectionIsNotOk(aUrl, aStatus) {
+        switch (aStatus) {
+        case "2152398851":
+            this._connectionStateDescription = "Error resolving hostname '" + aUrl + "'. Did you type the right hostname. (STATUS_RESOLVING)";
+            break;
+        case "2152398852":
+            this._connectionStateDescription = "Error during connection to hostname '" + aUrl + "'. (STATUS_CONNECTED_TO)";
+            break;
+        case "2152398853":
+            this._connectionStateDescription = "Error during sending data to hostname '" + aUrl + "'. (STATUS_SENDING_TO)";
+            break;
+        case "2152398854":
+            this._connectionStateDescription = "Error during receiving of data from hostname '" + aUrl + "'. (STATUS_RECEIVING_FROM)";
+            break;
+        case "2152398855":
+            this._connectionStateDescription = "Error during connecting to hostname '" + aUrl + "'. Is the host down?. (STATUS_CONNECTING_TO)";
+            break;
+        case "2152398858":
+            this._connectionStateDescription = "Error during waiting for data of hostname '" + aUrl + "'. (STATUS_WAITING_FOR)";
+            break;
+        case "2152398859":
+            this._connectionStateDescription = "Error resolving hostname '" + aUrl + "'. Did you type the right hostname. (STATUS_RESOLVED)";
+            break;
+        default:
+            this._connectionStateDescription = "Unknown error during communication with hostname '" + aUrl + "'. (" + aStatus + ")";
+        }
+        this.setProperty("exchangeCurrentStatus", Cr.NS_ERROR_FAILURE);
+    },
+
+    connectionIsOk: function _connectionIsOk() {
+        this._connectionStateDescription = "";
+        this.setProperty("exchangeCurrentStatus", Cr.NS_OK);
+    },
+
+    get connectionStateDescription() {
+        if (this._disabled) {
+            this._connectionStateDescription = "Disabled";
+        }
+        else {
+            if (this.isOffline) {
+                this._connectionStateDescription = "Thunderbird is in Offline mode";
+            }
+        }
+        return this._connectionStateDescription;
+    },
+
+    // Loads a file which is located below the Thunderbird <profile folder>/exchange-data
+    // Real filename will be <calendar.id>.<aFilename>
+    // e.g: aFilename == 'syncState'  -> <ProfD>/exchange-data/<calendar.id>.syncState
+    // When the file exists the content will be read and returned as a string.
+    // When the file does not exists it will return null.
+    loadFromFile: function _loadFromFile(aFilename)
+
+    {
+        var file = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Components.interfaces.nsIProperties)
+            .get("ProfD", Components.interfaces.nsIFile);
+        file.append("exchange-data");
+        if (!file.exists() || !file.isDirectory()) {
+            return null;
+        }
+
+        file.append(this.id + "." + aFilename);
+
+        if (!file.exists()) {
+            return null;
+        }
+
+        var istream = Components.classes["@mozilla.org/network/file-input-stream;1"].
+        createInstance(Components.interfaces.nsIFileInputStream);
+        istream.init(file, -1, -1, 0);
+        istream.QueryInterface(Components.interfaces.nsILineInputStream);
+
+        // read lines into array  
+        var line = {},
+            lines = "",
+            hasmore;
+        do {
+            hasmore = istream.readLine(line);
+            if (lines != "") lines += "\n";
+            lines += line.value;
+        } while (hasmore);
+
+        istream.close();
+
+        return lines;
+    },
+
+    // Loads a file which is located below the Thunderbird <profile folder>/exchange-data
+    // Real filename will be <calendar.id>.<aFilename>
+    // e.g: aFilename == 'syncState'  -> <ProfD>/exchange-data/<calendar.id>.syncState
+    // When the file exists the file will be overwritten.
+    saveToFile: function _saveToFile(aFilename, aContent) {
+        var file = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Components.interfaces.nsIProperties)
+            .get("ProfD", Components.interfaces.nsIFile);
+        file.append("exchange-data");
+        if (!file.exists() || !file.isDirectory()) {
+            file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
+        }
+
+        file.append(this.id + "." + aFilename);
+
+        if (file.exists()) {
+            file.remove(false);
+        }
+
+        //		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0777);  
+
+        var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
+        createInstance(Components.interfaces.nsIFileOutputStream);
+        foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);
+
+        var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
+        createInstance(Components.interfaces.nsIConverterOutputStream);
+        converter.init(foStream, "UTF-8", 0, 0);
+        converter.writeString(aContent);
+        converter.close(); // this closes foStream
+
+        return 0;
+    },
+
+    removeFile: function _removeFile(aFilename) {
+        var file = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Components.interfaces.nsIProperties)
+            .get("ProfD", Components.interfaces.nsIFile);
+        file.append("exchange-data");
+        if (!file.exists() || !file.isDirectory()) {
+            return;
+        }
+
+        file.append(this.id + "." + aFilename);
+
+        if (file.exists()) {
+            file.remove(false);
+        }
+    },
+};
 
-				let updateResult = this.updateCalendar(null, result, false, true, false);
+function ecObserver(inCalendar) {
+    this.calendar = inCalendar;
 
-				this.logInfo("getItemsFromOfflineCache: Updated calendar with '" + result.length
-					+ "' records from offline cache. startDate:" + startDate + ", endDate:" + endDate);
+    var self = this;
+    this.ecInvitationsCalendarManagerObserver = {
+        onCalendarRegistered: function cMO_onCalendarRegistered(aCalendar) {
+            //			self.calendar.logInfo("onCalendarRegistered name="+aCalendar.name+", id="+aCalendar.id);
+        },
 
-				return updateResult;
-			}
-		}
-		else {
-			this.logInfo("getItemsFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-
-			return null;
-		}
-		return null;
-	},
-
-	getItemFromOfflineCache: function _getItemFromOfflineCache(aId) {
-		if (this.debug) this.logInfo("getItemFromOfflineCache: aId:" + aId);
-		if (!aId) return null;
-
-		if ((!this.useOfflineCache) || (!this.offlineCacheDB)) {
-			return null;
-		}
-
-		var result = null;
-
-		var sqlStr = "SELECT item FROM items WHERE id = '" + aId + "'";
-
-		if (this.debug) this.logInfo("sql-query:" + sqlStr, 2);
-		try {
-			var sqlStatement = this.offlineCacheDB.createStatement(sqlStr);
-		}
-		catch (exc) {
-			if (this.debug) this.logInfo("Error on createStatement. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString + ", Exception:" + exc + ". (" + sqlStr + ")");
-			return null;
-		}
-
-		var doContinue = true;
-		try {
-			while (doContinue) {
-				doContinue = sqlStatement.executeStep();
-
-				if (doContinue) {
-					if (this.debug) this.logInfo("Found item in offline Cache.");
-
-					// Check if this item is not in the itemCache already.
-					var root = xml2json.newJSON();
-					xml2json.parseXML(root, sqlStatement.row.item);
-					result = this.convertExchangeToCal(root[telements][0], null, false, true);
-					if (!result) {
-						if (this.debug) this.logInfo("getItemFromOfflineCache: Could not convert exchange XML into Cal item.!! item:" + sqlStatement.row.item);
-					}
-				}
-			}
-		}
-		finally {
-			sqlStatement.reset();
-		}
+        onCalendarUnregistering: function cMO_onCalendarUnregistering(aCalendar) {
+            self.calendar.logInfo("onCalendarUnregistering name=" + aCalendar.name + ", id=" + aCalendar.id);
+            if (aCalendar.id == self.calendar.id) {
 
-		if (this.debug) this.logInfo("getItemFromOfflineCache: Retreived item from offline cache.");
-		if ((this.offlineCacheDB.lastError == 0) || (this.offlineCacheDB.lastError == 100) || (this.offlineCacheDB.lastError == 101)) {
+                self.calendar.doDeleteCalendar();
+                self.calendar.logInfo("Removing calendar preference settings.");
 
-			if (result) {
-				return result;
-			}
-		}
-		else {
-			if (this.debug) this.logInfo("getItemFromOfflineCache: Error executing Query. Error:" + this.offlineCacheDB.lastError + ", Msg:" + this.offlineCacheDB.lastErrorString);
-			return null;
-		}
-		return null;
-	},
-
-
-	set isOffline(aValue) {
-		if (this.debug) this.logInfo("setting mIsOffline=" + aValue);
-
-		if (aValue != this.mIsOffline) {
-			this.notConnected = aValue;
-			this.mIsOffline = aValue;
-
-			if (!aValue) {
-				if (this.debug) this.logInfo("Initialized:" + this.isInitialized);
-				this.readOnlyInternal = false;
-				this.refresh();
-			}
-			else {
-				if (this.calendarPoller) {
-					this.calendarPoller.cancel();
-				}
-				this.inboxPoller.cancel();
-				this.firstrun = true;
-			}
-		}
-	},
-
-	get isOffline() {
-		return this.mIsOffline;
-	},
-
-	offlineStateChanged: function _offlineStateChanged(aStatus) {
-		if (this.debug) this.logInfo("The offline state of TB changed to:" + aStatus);
-		this.isOffline = (aStatus == "offline");
-	},
-
-	get offlineStartDate() {
-		if (this.noDB) return null;
-		var tmpStartDate = this.executeQueryWithResults("SELECT min(endDate) as newStartDate FROM items where type <> 'M'", ["newStartDate"]);
-		if ((tmpStartDate) && (tmpStartDate.length > 0)) {
-			var newStartDate = tmpStartDate[0].newStartDate;
-			if (newStartDate) {
-				if (newStartDate.length == 10) {
-					newStartDate += "T00:00:00Z";
-				}
-				if (this.debug) this.logInfo("get offlineStartDate = '" + newStartDate + "'");
-				return cal.createDateTime(newStartDate);
-			}
-		}
-
-		return null;
-	},
-
-	get offlineEndDate() {
-		if (this.noDB) return null;
-		var tmpEndDate = this.executeQueryWithResults("SELECT max(endDate) as newEndDate FROM items where type <> 'M'", ["newEndDate"]);
-		if ((tmpEndDate) && (tmpEndDate.length > 0)) {
-			var newEndDate = tmpEndDate[0].newEndDate;
-			if (newEndDate) {
-				if (newEndDate.length == 10) {
-					newEndDate += "T00:00:00Z";
-				}
-				if (this.debug) this.logInfo("get offlineEndDate = '" + newEndDate + "'");
-				return cal.createDateTime(newEndDate);
-			}
-		}
-
-		return null;
-	},
-
-	get offlineEventItemCount() {
-		if (this.noDB) return "-";
-		var tmpEventCount = this.executeQueryWithResults("SELECT COUNT() as eventCount FROM items where event = 'y' or event = 'y_'", ["eventCount"]);
-		if ((tmpEventCount) && (tmpEventCount.length > 0)) {
-			return tmpEventCount[0].eventCount;
-		}
-
-		return "--";
-	},
-
-	get offlineToDoItemCount() {
-		if (this.noDB) return "-";
-		var tmpToDoCount = this.executeQueryWithResults("SELECT COUNT() as toDoCount FROM items where event = 'n' or event = 'n_'", ["toDoCount"]);
-		if ((tmpToDoCount) && (tmpToDoCount.length > 0)) {
-			return tmpToDoCount[0].toDoCount;
-		}
-
-		return "--";
-	},
-
-	get memoryCacheItemCount() {
-		var result = 0;
-		for (var index in this.itemCacheById) {
-			result++;
-		}
-		return result;
-	},
-
-	/**
-	 * Internal logging function that should be called on any database error,
-	 * it will log as much info as possible about the database context and
-	 * last statement so the problem can be investigated more easilly.
-	 *
-	 * @param message           Error message to log.
-	 * @param exception         Exception that caused the error.
-	 */
-	logError: function _logError(message, exception) {
-		let logMessage = "(" + this.name + ") " + message;
-
-		if (exception) {
-			logMessage += "\nException: " + exception;
-		}
-
-		this.globalFunctions.ERROR(logMessage + "\n" + this.globalFunctions.STACK(10));
-	},
-
-	logInfo: function _logInfo(message, aDebugLevel) {
-
-		if (!this.debug) return;
-
-		if (!aDebugLevel) {
-			var debugLevel = 1;
-		}
-		else {
-			var debugLevel = aDebugLevel;
-		}
-
-		if (this.globalFunctions.shouldLog()) {
-			exchWebService.check4addon.logAddOnVersion();
-		}
-
-		if (debugLevel <= this.storedDebugLevel) {
-			this.globalFunctions.LOG("[" + this.name + "] " + message + " (" + this.globalFunctions.STACKshort() + ")");
-		}
-	},
-
-	setDoDebug: function _setDoDebug() {
-
-		var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-		this.storedDebugLevel = this.globalFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true);
-
-		this.debug = (this.storedDebugLevel > 0);
-
-		if ((this.storedDebugLevel == 0) || (!this.globalFunctions.shouldLog())) {
-			this.debug = false;
-		}
-	},
-
-	connectionIsNotOk: function _connectionIsNotOk(aUrl, aStatus) {
-		switch (aStatus) {
-		case "2152398851":
-			this._connectionStateDescription = "Error resolving hostname '" + aUrl + "'. Did you type the right hostname. (STATUS_RESOLVING)";
-			break;
-		case "2152398852":
-			this._connectionStateDescription = "Error during connection to hostname '" + aUrl + "'. (STATUS_CONNECTED_TO)";
-			break;
-		case "2152398853":
-			this._connectionStateDescription = "Error during sending data to hostname '" + aUrl + "'. (STATUS_SENDING_TO)";
-			break;
-		case "2152398854":
-			this._connectionStateDescription = "Error during receiving of data from hostname '" + aUrl + "'. (STATUS_RECEIVING_FROM)";
-			break;
-		case "2152398855":
-			this._connectionStateDescription = "Error during connecting to hostname '" + aUrl + "'. Is the host down?. (STATUS_CONNECTING_TO)";
-			break;
-		case "2152398858":
-			this._connectionStateDescription = "Error during waiting for data of hostname '" + aUrl + "'. (STATUS_WAITING_FOR)";
-			break;
-		case "2152398859":
-			this._connectionStateDescription = "Error resolving hostname '" + aUrl + "'. Did you type the right hostname. (STATUS_RESOLVED)";
-			break;
-		default:
-			this._connectionStateDescription = "Unknown error during communication with hostname '" + aUrl + "'. (" + aStatus + ")";
-		}
-		this.setProperty("exchangeCurrentStatus", Cr.NS_ERROR_FAILURE);
-	},
-
-	connectionIsOk: function _connectionIsOk() {
-		this._connectionStateDescription = "";
-		this.setProperty("exchangeCurrentStatus", Cr.NS_OK);
-	},
-
-	get connectionStateDescription() {
-		if (this._disabled) {
-			this._connectionStateDescription = "Disabled";
-		}
-		else {
-			if (this.isOffline) {
-				this._connectionStateDescription = "Thunderbird is in Offline mode";
-			}
-		}
-		return this._connectionStateDescription;
-	},
-
-	// Loads a file which is located below the Thunderbird <profile folder>/exchange-data
-	// Real filename will be <calendar.id>.<aFilename>
-	// e.g: aFilename == 'syncState'  -> <ProfD>/exchange-data/<calendar.id>.syncState
-	// When the file exists the content will be read and returned as a string.
-	// When the file does not exists it will return null.
-	loadFromFile: function _loadFromFile(aFilename)
-
-	{
-		var file = Cc["@mozilla.org/file/directory_service;1"]
-			.getService(Components.interfaces.nsIProperties)
-			.get("ProfD", Components.interfaces.nsIFile);
-		file.append("exchange-data");
-		if (!file.exists() || !file.isDirectory()) {
-			return null;
-		}
-
-		file.append(this.id + "." + aFilename);
-
-		if (!file.exists()) {
-			return null;
-		}
-
-		var istream = Components.classes["@mozilla.org/network/file-input-stream;1"].
-		createInstance(Components.interfaces.nsIFileInputStream);
-		istream.init(file, -1, -1, 0);
-		istream.QueryInterface(Components.interfaces.nsILineInputStream);
-
-		// read lines into array  
-		var line = {},
-			lines = "",
-			hasmore;
-		do {
-			hasmore = istream.readLine(line);
-			if (lines != "") lines += "\n";
-			lines += line.value;
-		} while (hasmore);
-
-		istream.close();
-
-		return lines;
-	},
-
-	// Loads a file which is located below the Thunderbird <profile folder>/exchange-data
-	// Real filename will be <calendar.id>.<aFilename>
-	// e.g: aFilename == 'syncState'  -> <ProfD>/exchange-data/<calendar.id>.syncState
-	// When the file exists the file will be overwritten.
-	saveToFile: function _saveToFile(aFilename, aContent) {
-		var file = Cc["@mozilla.org/file/directory_service;1"]
-			.getService(Components.interfaces.nsIProperties)
-			.get("ProfD", Components.interfaces.nsIFile);
-		file.append("exchange-data");
-		if (!file.exists() || !file.isDirectory()) {
-			file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, parseInt("0777", 8));
-		}
-
-		file.append(this.id + "." + aFilename);
-
-		if (file.exists()) {
-			file.remove(false);
-		}
-
-		//		file.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0777);  
-
-		var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
-		createInstance(Components.interfaces.nsIFileOutputStream);
-		foStream.init(file, 0x02 | 0x08 | 0x20, parseInt("0777", 8), 0);
-
-		var converter = Components.classes["@mozilla.org/intl/converter-output-stream;1"].
-		createInstance(Components.interfaces.nsIConverterOutputStream);
-		converter.init(foStream, "UTF-8", 0, 0);
-		converter.writeString(aContent);
-		converter.close(); // this closes foStream
-
-		return 0;
-	},
-
-	removeFile: function _removeFile(aFilename) {
-		var file = Cc["@mozilla.org/file/directory_service;1"]
-			.getService(Components.interfaces.nsIProperties)
-			.get("ProfD", Components.interfaces.nsIFile);
-		file.append("exchange-data");
-		if (!file.exists() || !file.isDirectory()) {
-			return;
-		}
-
-		file.append(this.id + "." + aFilename);
-
-		if (file.exists()) {
-			file.remove(false);
-		}
-	},
-};
+                var rmPrefs = Cc["@mozilla.org/preferences-service;1"]
+                    .getService(Ci.nsIPrefService)
+                    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.");
+                try {
+                    rmPrefs.deleteBranch(aCalendar.id);
+                }
+                catch (err) {}
 
-function ecObserver(inCalendar) {
-	this.calendar = inCalendar;
-
-	var self = this;
-	this.ecInvitationsCalendarManagerObserver = {
-		onCalendarRegistered: function cMO_onCalendarRegistered(aCalendar) {
-			//			self.calendar.logInfo("onCalendarRegistered name="+aCalendar.name+", id="+aCalendar.id);
-		},
-
-		onCalendarUnregistering: function cMO_onCalendarUnregistering(aCalendar) {
-			self.calendar.logInfo("onCalendarUnregistering name=" + aCalendar.name + ", id=" + aCalendar.id);
-			if (aCalendar.id == self.calendar.id) {
-
-				self.calendar.doDeleteCalendar();
-				self.calendar.logInfo("Removing calendar preference settings.");
-
-				var rmPrefs = Cc["@mozilla.org/preferences-service;1"]
-					.getService(Ci.nsIPrefService)
-					.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.");
-				try {
-					rmPrefs.deleteBranch(aCalendar.id);
-				}
-				catch (err) {}
-
-				aCalendar.removeFile("syncState.txt");
-				aCalendar.removeFile("syncInboxState.txt");
-				aCalendar.removeFile("folderProperties.txt");
-				aCalendar.removeFile("syncStateInbox.txt");
-				self.unregister();
-			}
-		},
+                aCalendar.removeFile("syncState.txt");
+                aCalendar.removeFile("syncInboxState.txt");
+                aCalendar.removeFile("folderProperties.txt");
+                aCalendar.removeFile("syncStateInbox.txt");
+                self.unregister();
+            }
+        },
 
-		onCalendarDeleting: function cMO_onCalendarDeleting(aCalendar) {
-			self.calendar.logInfo("onCalendarDeleting name=" + aCalendar.name + ", id=" + aCalendar.id);
+        onCalendarDeleting: function cMO_onCalendarDeleting(aCalendar) {
+            self.calendar.logInfo("onCalendarDeleting name=" + aCalendar.name + ", id=" + aCalendar.id);
 
-		}
-	};
+        }
+    };
 
 
-	this.register();
+    this.register();
 }
 
 ecObserver.prototype = {
 
-	observe: function (subject, topic, data) {
-		// Do your stuff here.
-		//LOG("ecObserver.observe. topic="+topic+",data="+data+"\n"); 
-		switch (topic) {
-		case "onCalReset":
-			if (data == this.calendar.id) {
-				this.calendar.resetCalendar();
-			}
-			break;
-		case "onExchangeConnectionError":
-			var parts = data.split("|");
-			if (this.calendar.serverUrl == parts[0]) {
-				this.calendar.connectionIsNotOk(parts[2], parts[1]);
-			}
-			break;
-		case "onExchangeConnectionOk":
-			// See if it is for us
-			if (data == this.calendar.serverUrl) {
-				this.calendar.connectionIsOk();
-			}
-			break;
-		case "quit-application":
-			this.unregister();
-			break;
-		case "nsPref:changed":
-			if ((data == "extensions.1st-setup.debug.log") || (data == "extensions.1st-setup.core.debuglevel")) {
-				this.calendar.setDoDebug();
-			}
-			break;
-		case "network:offline-status-changed":
-			this.calendar.offlineStateChanged(data);
-			break;
-		}
-	},
-
-	register: function () {
-		var observerService = Cc["@mozilla.org/observer-service;1"]
-			.getService(Ci.nsIObserverService);
-		observerService.addObserver(this, "onCalReset", false);
-		observerService.addObserver(this, "onExchangeConnectionError", false);
-		observerService.addObserver(this, "onExchangeConnectionOk", false);
-		observerService.addObserver(this, "quit-application", false);
-		observerService.addObserver(this, "network:offline-status-changed", false);
-
-		Services.prefs.addObserver("extensions.1st-setup.debug.log", this, false);
-		Services.prefs.addObserver("extensions.1st-setup.core.debuglevel", this, false);
-
-
-		getCalendarManager().addObserver(this.ecInvitationsCalendarManagerObserver);
-	},
-
-	unregister: function () {
-		this.calendar.doShutdown();
-
-		var observerService = Cc["@mozilla.org/observer-service;1"]
-			.getService(Ci.nsIObserverService);
-		observerService.removeObserver(this, "onCalReset");
-		observerService.removeObserver(this, "onExchangeConnectionError");
-		observerService.removeObserver(this, "onExchangeConnectionOk");
-		observerService.removeObserver(this, "quit-application");
-		observerService.removeObserver(this, "network:offline-status-changed");
-
-		getCalendarManager().removeObserver(this.ecInvitationsCalendarManagerObserver);
-	}
+    observe: function (subject, topic, data) {
+        // Do your stuff here.
+        //LOG("ecObserver.observe. topic="+topic+",data="+data+"\n"); 
+        switch (topic) {
+        case "onCalReset":
+            if (data == this.calendar.id) {
+                this.calendar.resetCalendar();
+            }
+            break;
+        case "onExchangeConnectionError":
+            var parts = data.split("|");
+            if (this.calendar.serverUrl == parts[0]) {
+                this.calendar.connectionIsNotOk(parts[2], parts[1]);
+            }
+            break;
+        case "onExchangeConnectionOk":
+            // See if it is for us
+            if (data == this.calendar.serverUrl) {
+                this.calendar.connectionIsOk();
+            }
+            break;
+        case "quit-application":
+            this.unregister();
+            break;
+        case "nsPref:changed":
+            if ((data == "extensions.1st-setup.debug.log") || (data == "extensions.1st-setup.core.debuglevel")) {
+                this.calendar.setDoDebug();
+            }
+            break;
+        case "network:offline-status-changed":
+            this.calendar.offlineStateChanged(data);
+            break;
+        }
+    },
+
+    register: function () {
+        var observerService = Cc["@mozilla.org/observer-service;1"]
+            .getService(Ci.nsIObserverService);
+        observerService.addObserver(this, "onCalReset", false);
+        observerService.addObserver(this, "onExchangeConnectionError", false);
+        observerService.addObserver(this, "onExchangeConnectionOk", false);
+        observerService.addObserver(this, "quit-application", false);
+        observerService.addObserver(this, "network:offline-status-changed", false);
+
+        Services.prefs.addObserver("extensions.1st-setup.debug.log", this, false);
+        Services.prefs.addObserver("extensions.1st-setup.core.debuglevel", this, false);
+
+
+        getCalendarManager().addObserver(this.ecInvitationsCalendarManagerObserver);
+    },
+
+    unregister: function () {
+        this.calendar.doShutdown();
+
+        var observerService = Cc["@mozilla.org/observer-service;1"]
+            .getService(Ci.nsIObserverService);
+        observerService.removeObserver(this, "onCalReset");
+        observerService.removeObserver(this, "onExchangeConnectionError");
+        observerService.removeObserver(this, "onExchangeConnectionOk");
+        observerService.removeObserver(this, "quit-application");
+        observerService.removeObserver(this, "network:offline-status-changed");
+
+        getCalendarManager().removeObserver(this.ecInvitationsCalendarManagerObserver);
+    }
 }
 
 function convertToVersion1() {
-	var tmpPrefService = Cc["@mozilla.org/preferences-service;1"]
-		.getService(Ci.nsIPrefService);
-	var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
-		.getService(Ci.nsIPrefService)
-		.getBranch("calendar.registry.");
-
-	var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
-
-	var children = tmpPrefs.getChildList("");
-	if (children.length > 0) {
-		// Move prefs from old location to new location.
-		var oldUUID = "";
-		var newUUID = false;
-		var exchangeType = false;
-		var updateToUUID = null;
-		for (var index in children) {
-
-			var pos = children[index].indexOf(".");
-			var tmpUUID = children[index].substr(0, pos);
-			var tmpField = children[index].substr(pos + 1);
-
-			if (tmpField == "uri") {
-				mivFunctions.LOG("Going to check calendar registry '" + tmpUUID + "' if it needs to be updated.");
-
-				var tmpType = mivFunctions.safeGetCharPref(null, "calendar.registry." + tmpUUID + ".type", null, false);
-
-				var tmpURI = mivFunctions.safeGetCharPref(null, "calendar.registry." + children[index], null, false);
-				if ((tmpURI != "https://auto/" + tmpUUID) && (tmpType == "exchangecalendar")) {
-					// update uri preference
-					mivFunctions.LOG("Going to upgrade calendar registry '" + tmpUUID + "'");
-
-					var updatePrefs = Cc["@mozilla.org/preferences-service;1"]
-						.getService(Ci.nsIPrefService)
-						.getBranch("calendar.registry." + tmpUUID + ".");
-					updatePrefs.setCharPref("uri", "https://auto/" + tmpUUID);
-
-					var updatePrefs = Cc["@mozilla.org/preferences-service;1"]
-						.getService(Ci.nsIPrefService)
-						.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + tmpUUID + ".");
-					updatePrefs.setIntPref("exchangePrefVersion", 1);
-					tmpPrefService.savePrefFile(null);
-				}
-			}
-		}
-
-	}
+    var tmpPrefService = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService);
+    var tmpPrefs = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefService)
+        .getBranch("calendar.registry.");
+
+    var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
+
+    var children = tmpPrefs.getChildList("");
+    if (children.length > 0) {
+        // Move prefs from old location to new location.
+        var oldUUID = "";
+        var newUUID = false;
+        var exchangeType = false;
+        var updateToUUID = null;
+        for (var index in children) {
+
+            var pos = children[index].indexOf(".");
+            var tmpUUID = children[index].substr(0, pos);
+            var tmpField = children[index].substr(pos + 1);
+
+            if (tmpField == "uri") {
+                mivFunctions.LOG("Going to check calendar registry '" + tmpUUID + "' if it needs to be updated.");
+
+                var tmpType = mivFunctions.safeGetCharPref(null, "calendar.registry." + tmpUUID + ".type", null, false);
+
+                var tmpURI = mivFunctions.safeGetCharPref(null, "calendar.registry." + children[index], null, false);
+                if ((tmpURI != "https://auto/" + tmpUUID) && (tmpType == "exchangecalendar")) {
+                    // update uri preference
+                    mivFunctions.LOG("Going to upgrade calendar registry '" + tmpUUID + "'");
+
+                    var updatePrefs = Cc["@mozilla.org/preferences-service;1"]
+                        .getService(Ci.nsIPrefService)
+                        .getBranch("calendar.registry." + tmpUUID + ".");
+                    updatePrefs.setCharPref("uri", "https://auto/" + tmpUUID);
+
+                    var updatePrefs = Cc["@mozilla.org/preferences-service;1"]
+                        .getService(Ci.nsIPrefService)
+                        .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + tmpUUID + ".");
+                    updatePrefs.setIntPref("exchangePrefVersion", 1);
+                    tmpPrefService.savePrefFile(null);
+                }
+            }
+        }
+
+    }
 
 }
 
 /** Module Registration */
 const scriptLoadOrder = [
-	"calUtils.js"
+    "calUtils.js"
 ];
 
 if (!exchWebService) var exchWebService = {};
 
 exchWebService.check4addon = {
 
-	allReadyLogged: false,
-
-	checkAddOnIsInstalledCallback: function _checkAddOnIsInstalledCallback(aAddOn) {
-		var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
-		if (!aAddOn) {
-			mivFunctions.LOG("Exchange Calendar and Tasks add-on is NOT installed.");
-		}
-		else {
-			mivFunctions.LOG(aAddOn.name + " is installed.");
-			try {
-				mivFunctions.LOG(aAddOn.name + " is installed from:" + aAddOn.sourceURI.prePath + aAddOn.sourceURI.path);
-			}
-			catch (err) {
-				mivFunctions.LOG(aAddOn.name + " unable to determine where installed from.");
-			}
-			mivFunctions.LOG(aAddOn.name + " is version:" + aAddOn.version);
-			if (aAddOn.isActive) {
-				mivFunctions.LOG(aAddOn.name + " is active.");
-			}
-			else {
-				mivFunctions.LOG(aAddOn.name + " is NOT active.");
-			}
-		}
-
-	},
-
-	logAddOnVersion: function _logAddOnVersion() {
-		if (this.allReadyLogged) return;
-
-		this.allReadyLogged = true;
-
-		Cu.import("resource://gre/modules/AddonManager.jsm");
-		AddonManager.getAddonByID("exchangecalendar@extensions.1st-setup.nl", exchWebService.check4addon.checkAddOnIsInstalledCallback);
-	}
+    allReadyLogged: false,
+
+    checkAddOnIsInstalledCallback: function _checkAddOnIsInstalledCallback(aAddOn) {
+        var mivFunctions = Cc["@1st-setup.nl/global/functions;1"].getService(Ci.mivFunctions);
+        if (!aAddOn) {
+            mivFunctions.LOG("Exchange Calendar and Tasks add-on is NOT installed.");
+        }
+        else {
+            mivFunctions.LOG(aAddOn.name + " is installed.");
+            try {
+                mivFunctions.LOG(aAddOn.name + " is installed from:" + aAddOn.sourceURI.prePath + aAddOn.sourceURI.path);
+            }
+            catch (err) {
+                mivFunctions.LOG(aAddOn.name + " unable to determine where installed from.");
+            }
+            mivFunctions.LOG(aAddOn.name + " is version:" + aAddOn.version);
+            if (aAddOn.isActive) {
+                mivFunctions.LOG(aAddOn.name + " is active.");
+            }
+            else {
+                mivFunctions.LOG(aAddOn.name + " is NOT active.");
+            }
+        }
+
+    },
+
+    logAddOnVersion: function _logAddOnVersion() {
+        if (this.allReadyLogged) return;
+
+        this.allReadyLogged = true;
+
+        Cu.import("resource://gre/modules/AddonManager.jsm");
+        AddonManager.getAddonByID("exchangecalendar@extensions.1st-setup.nl", exchWebService.check4addon.checkAddOnIsInstalledCallback);
+    }
 }
 
 function NSGetFactory(cid) {
-	try {
-		if (!NSGetFactory.mainEC) {
-			// Load main script from lightning that we need.
-			convertToVersion1();
+    try {
+        if (!NSGetFactory.mainEC) {
+            // Load main script from lightning that we need.
+            convertToVersion1();
 
-			cal.loadScripts(scriptLoadOrder, Cu.getGlobalForObject(this));
-			NSGetFactory.mainEC = XPCOMUtils.generateNSGetFactory([calExchangeCalendar]);
+            cal.loadScripts(scriptLoadOrder, Cu.getGlobalForObject(this));
+            NSGetFactory.mainEC = XPCOMUtils.generateNSGetFactory([calExchangeCalendar]);
 
-		}
+        }
 
-	}
-	catch (e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
-	return NSGetFactory.mainEC(cid);
+    return NSGetFactory.mainEC(cid);
 }
 
 /* Following is code for testing and debugging. 
diff --git a/interfaces/exchangeEvent/mivExchangeEvent.js b/interfaces/exchangeEvent/mivExchangeEvent.js
index 6a7fd85b..964be7db 100644
--- a/interfaces/exchangeEvent/mivExchangeEvent.js
+++ b/interfaces/exchangeEvent/mivExchangeEvent.js
@@ -38,17 +38,17 @@ Cu.import("resource://interfaces/xml2json/xml2json.js");
 var EXPORTED_SYMBOLS = ["mivExchangeEvent"];
 
 var exchGlobalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-					.getService(Ci.mivFunctions);
+    .getService(Ci.mivFunctions);
 
 var exchTimeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-			.getService(Ci.mivExchangeTimeZones);
+    .getService(Ci.mivExchangeTimeZones);
 
 
 function mivExchangeEvent() {
 
-	this.initialize();
+    this.initialize();
 
-	this.initExchangeBaseItem();
+    this.initExchangeBaseItem();
 
 }
 
@@ -56,614 +56,612 @@ var mivExchangeEventGUID = "4cd0469e-093f-4f7c-8ace-68f6ec76b36e";
 
 mivExchangeEvent.prototype = {
 
-	__proto__ : mivExchangeBaseItem.prototype,
-
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeEvent,
-				Ci.mivExchangeBaseItem,
-				Ci.calIInternalShallowCopy,
-				Ci.calIEvent,
-				Ci.calIItemBase,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
-
-	_className : "mivExchangeEvent",
-	_mainTag : "CalendarItem",
-
-	classDescription : "Exchange calendar event.",
-
-	classID : components.ID("{"+mivExchangeEventGUID+"}"),
-	contractID : "@1st-setup.nl/exchange/calendarevent;1",
-	flags : 0,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeEvent,
-			Ci.mivExchangeBaseItem,
-			Ci.calIInternalShallowCopy,
-			Ci.calIEvent,
-			Ci.calIItemBase,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	initialize : function _initialize()
-	{
-		this._calEvent = null;
-		this._calEvent = Cc["@mozilla.org/calendar/event;1"]
-					.createInstance(Ci.calIEvent);
-	},
-
-	cloneFrom: function _cloneFrom(aItem)
-	{
-try{
-		this.baseCloneFrom(aItem);
-		if (aItem._startDate) this._startDate = aItem._startDate;
-		if (aItem._endDate) this._endDate = aItem._endDate;
-		if (aItem._duration) this._duration = aItem._duration.clone();
-		if (aItem._status) this._status = aItem._status;
-}
-catch(err){
-	dump(" @@@@@@@@@@@@@ mivExchangeEvent: cloneFrom Error:"+err+"\n");
-}
-	},
-
-	clone: function _clone()
-	{
-try {
-		//dump("mivExchangeEvent: clone 1: title:"+this.title+", this.calendarItemType:"+this.calendarItemType+", startDate:"+this.startDate+"\n");
-
-		var result = new mivExchangeEvent();
-
-		result.baseClone(this);
-
-		if (this._newStartDate !== undefined) result.startDate = this.startDate.clone();
-		if (this._newEndDate !== undefined) result.endDate = this.endDate.clone();
-
-		if (this._newStatus) {
-			result.status = this._newStatus;
-		}
-}
-catch(err){
-  dump("mivExchangeEvent: Clone: error:"+err+"\n");
-}
-		//dump("mivExchangeEvent: clone 2: title:"+this.title+", this.calendarItemType:"+this.calendarItemType+", startDate:"+this.startDate+"\n");
-		return result;
-	},
-
-	get startDate()
-	{
-		//dump("get startdate 1: title:"+this.title);
-		//dump("get startdate 2: title:"+this.title+", startdate=="+this._calEvent.startDate);
-
-		if (this._newStartDate) {
-			return this._newStartDate;
-		}
-
-		if (this._startDate) {
-			return this._startDate;
-		}
-
-		return this._calEvent.startDate;
-	},
-
-	set startDate(aValue)
-	{
-		if (aValue.toString() != this.startDate.toString()) {
-			this._newStartDate = aValue;
-			this._calEvent.startDate = aValue;
-		}
-	},
-
-	get endDate()
-	{
-		//dump("get endDate: title:"+this.title+", endDate=="+this._calEvent.endDate, -1);
-		if (this._newEndDate) {
-			return this._newEndDate;
-		}
-
-		if (this._endDate) {
-			return this._endDate;
-		}
-
-		return this._calEvent.endDate;
-	},
-
-	set endDate(aValue)
-	{
-		//dump("set enddate: title:"+this.title+", aValue:"+aValue);
-		if (aValue.toString() != this.endDate.toString()) {
-			this._newEndDate = aValue;
-			this._calEvent.endDate = aValue;
-		}
-	},
-
-	get duration()
-	{
-		//dump("get duration: title:"+this.title+", value:"+this._calEvent.duration);
-		return this._calEvent.duration;
-	},
-
-	// status of the event
-	//attribute AUTF8String status;
-	get status()
-	{
-		//dump("get status: title:"+this.title+", value:"+this._calEvent.status+", this._status:"+this._status);
-		const statusMap = {
-			"Unknown"	: "NONE",
-			"NoResponseReceived" : "NONE",
-			"Tentative"	: "TENTATIVE",
-			"Accept"	: "CONFIRMED",
-			"Decline"	: "CANCELLED",
-			"Organizer"	: "CONFIRMED",
-			null: null
-		};
-
-		if (this._newStatus !== undefined) {
-
-			return statusMap[this._newStatus];
-		}
-
-		if (this._status !== undefined) {
-
-			return statusMap[this._status];
-		}
-
-		return this._calEvent.status;
-	},
-
-	set status(aValue)
-	{
-		//dump("set status: title:"+this.title+", aValue:"+aValue);
-		if (aValue != this.status) {
-			const statuses = { "NONE": "NoResponseReceived",
-					"TENTATIVE": "Tentative", 
-					"CONFIRMED" : "Accept",
-					"CANCELLED" : "Decline",
-					null: null };
-
-			this._newStatus = statuses[aValue];
-			this._calEvent.status = aValue;
-		}
-	},
-
-	get updateXML()
-	{
-		this._nonPersonalDataChanged = false;
-
-		var updates = exchGlobalFunctions.xmlToJxon('<t:Updates xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-
-		if (this.isInvitation) {
-			// Only can accept/decline/tentative
-			if ((this._newMyResponseType) && (this._newMyResponseType != this._myResponseType)) {
-				this._nonPersonalDataChanged = true;
-				this.addSetItemField(updates, "MyResponseType", this._newMyResponseType);
-			}
-
-			// Or change alarm.
-			this.checkAlarmChange(updates);
-			
-		}
-		else {
-
-			if (this._newTitle !== undefined) {
-				this._nonPersonalDataChanged = true;
-				this.addSetItemField(updates, "Subject", this._newTitle);
-			}
-			if (this._newPrivacy) {
-				this.addSetItemField(updates, "Sensitivity", this._newPrivacy);
-			}
-
-//dump("updatexml1: this.bodyType:"+this.bodyType+"\n");
-//dump("updatexml2: this._newBody:"+this._newBody+"\n");
-//dump("updatexml3: this._newBody2:"+this._newBody2+"\n");
-
-			if (this.bodyType == "HTML") {
-				if (this._newBody2 !== undefined) {
-					this._nonPersonalDataChanged = true;
-					if (this._newBody2 === null) {
-						this.addDeleteItemField(updates, "Body");
-					}
-					else {
-						this.addSetItemField(updates, "Body", this._newBody2, { BodyType: "HTML" });
-					}
-				}
-			}
-			else {
-				if (this._newBody !== undefined) {
-					this._nonPersonalDataChanged = true;
-					if (this._newBody === null) {
-						this.addDeleteItemField(updates, "Body");
-					}
-					else {
-						this.addSetItemField(updates, "Body", this._newBody, { BodyType: "Text" });
-					}
-				}
-			}
-//dump("updatexml4: body\n");
-			// Categories
-			if (this._changesCategories) {
-				var categoriesXML = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
-							.createInstance(Ci.mivIxml2jxon);
-				var categories = this.getCategories({});
-				var first = true;
-				for each(var category in categories) {
-					if (first) {
-						first = false;
-						categoriesXML.processXMLString("<t:String>"+category+"</t:String>", 0, null);
-					}
-					else {
-						categoriesXML.addSibblingTag("String", "t", category);
-					}
-				}
-				if (categories.length > 0) {
-					this.addSetItemField(updates, "Categories", categoriesXML);
-				}
-				else {
-					if (this._categories.length > 0) {
-						this.addDeleteItemField(updates, "Categories");
-					}
-				}
-			}
-
-			if (this._newPriority) {
-				this.addSetItemField(updates, "Importance", this._newPriority);
-			}
-
-			// Recurrence rule. Michel
-			var recurrenceInfoChanged;
-			if (this._recurrenceInfo) {
-				// We had recurrenceInfo. Lets see if it changed.
-				//dump("We had recurrenceInfo. Lets see if it changed.\n");
-				if (this._newRecurrenceInfo !== undefined) {
-					// It was changed or removed
-					if (this._newRecurrenceInfo === null) {
-						// It was removed
-						//dump("We had recurrenceInfo. And it is removed.\n");
-						recurrenceInfoChanged = false;
-						this._nonPersonalDataChanged = true;
-						this.addDeleteItemField(updates, "Recurrence");
-					}
-					else {
-						// See if something changed
-						//dump("We had recurrenceInfo. And it was changed. 1.\n");
-						recurrenceInfoChanged = true;
-					}
-				}
-				else {
-					// It could be that the content of the recurrenceInfo was changed
-					if (this._recurrenceInfo.toString() != this.recurrenceInfo.toString()) {
-						//dump("We had recurrenceInfo. And it was changed. 2.\n");
-						recurrenceInfoChanged = true;
-					}
-				}
-			}
-			else {
-				// We did not have recurrence info. Check if we have now
-				//dump("We did not have recurrenceInfo. See if it was added.\n");
-				if (this._newRecurrenceInfo) {
-					//dump("We did not have recurrenceInfo. But we do have now.\n");
-					recurrenceInfoChanged = true;
-				}
-			}
-
-			if (recurrenceInfoChanged) {
-				var recurrenceXML = this.makeRecurrenceRule();
-				this._nonPersonalDataChanged = true;
-				this.addSetItemField(updates, "Recurrence", recurrenceXML, null, true);
-
-				// Next is to trigger sending the start and end dates when we have a changed reccurrence.
-				if (!this._newStartDate) this._newStartDate = this.startDate.clone();
-				if (!this._newEndDate) this._newEndDate = this.endDate.clone();
-
-			}
-
-
-			if (this._newStartDate) {
-				var tmpStart = this._newStartDate.clone();
-				if (this._newStartDate.isDate) {
-					tmpStart.isDate = false;
-					//var tmpDuration = cal.createDuration();
-					//tmpDuration.minutes = -60;
-					//tmpStart.addDuration(tmpDuration);
-
-					// We make a non-UTC datetime value for exchGlobalFunctions.
-					// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-//					var exchStart = cal.toRFC3339(tmpStart).substr(0, 19)+"Z"; //cal.toRFC3339(tmpStart).length-6);
-					var exchStart = cal.toRFC3339(tmpStart).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
-				}
-				else {
-					// We set in bias advanced to UCT datetime values for exchGlobalFunctions.
-//					var exchStart = cal.toRFC3339(tmpStart.getInTimezone(cal.UTC()));
-					var exchStart = cal.toRFC3339(tmpStart).substr(0, 19);
-				}
-				this._nonPersonalDataChanged = true;
-				this.addSetItemField(updates, "Start", exchStart);
-
-				if (!this.calendar.isVersion2007) {
-					var exchTimeZone = exchTimeZones.getExchangeTimeZoneByCalTimeZone(this._newStartDate.timezone, this.calendar.serverUrl, this._newStartDate);
-//					var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:StartTimeZone Name="'+exchTimeZone.name+'" Id="'+exchTimeZone.id+'" xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-					var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:StartTimeZone xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-					tmpTimeZone.setAttribute("Name",exchTimeZone.name); 
-					tmpTimeZone.setAttribute("Id",exchTimeZone.id); 
-					var periods = xml2json.getTag(exchTimeZone.timeZone, "t:Periods");
-					var transitionsGroups = xml2json.getTag(exchTimeZone.timeZone, "t:TransitionsGroups");
-					var transitions = xml2json.getTag(exchTimeZone.timeZone, "t:Transitions");
-
-					var tmpPeriods = exchGlobalFunctions.xmlToJxon(xml2json.toString(periods));
-					tmpTimeZone.addChildTagObject(tmpPeriods);
-					var tmpTransitionsGroups = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitionsGroups));
-					tmpTimeZone.addChildTagObject(tmpTransitionsGroups);
-					var tmpTransitions = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitions));
-					tmpTimeZone.addChildTagObject(tmpTransitions);
-
-					this.addSetItemField(updates, "StartTimeZone", tmpTimeZone, null, true);
-				}
-			}
-
-			if (this._newEndDate) {
-				var tmpEnd = this._newEndDate.clone();
-
-				if (this._newEndDate.isDate) {
-					tmpEnd.isDate = false;
-					var tmpDuration = cal.createDuration();
-					tmpDuration.minutes = -61;
-					tmpEnd.addDuration(tmpDuration);
-
-					// We make a non-UTC datetime value for exchGlobalFunctions.
-					// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-//					var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
-					var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19); //cal.toRFC3339(tmpEnd).length-6);
-				}
-				else {
-					// We set in bias advanced to UCT datetime values for exchGlobalFunctions.
-//					var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(cal.UTC()));
-					var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
-				}
-				this._nonPersonalDataChanged = true;
-				this.addSetItemField(updates, "End", exchEnd);
-
-				if (!this.calendar.isVersion2007) {
-					var exchTimeZone = exchTimeZones.getExchangeTimeZoneByCalTimeZone(this._newEndDate.timezone, this.calendar.serverUrl, this._newEndDate);
-//					var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:EndTimeZone Name="'+exchTimeZone.name+'" Id="'+exchTimeZone.id+'" xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-					var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:EndTimeZone xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-					tmpTimeZone.setAttribute("Name",exchTimeZone.name); 
-					tmpTimeZone.setAttribute("Id",exchTimeZone.id); 
-					var periods = xml2json.getTag(exchTimeZone.timeZone, "t:Periods");
-					var transitionsGroups = xml2json.getTag(exchTimeZone.timeZone, "t:TransitionsGroups");
-					var transitions = xml2json.getTag(exchTimeZone.timeZone, "t:Transitions");
-
-					var tmpPeriods = exchGlobalFunctions.xmlToJxon(xml2json.toString(periods));
-					tmpTimeZone.addChildTagObject(tmpPeriods);
-					var tmpTransitionsGroups = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitionsGroups));
-					tmpTimeZone.addChildTagObject(tmpTransitionsGroups);
-					var tmpTransitions = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitions));
-					tmpTimeZone.addChildTagObject(tmpTransitions);
-
-					this.addSetItemField(updates, "EndTimeZone", tmpTimeZone, null, true);
-				}
-			}
-
-			if (this._newStartDate) {
-				this._nonPersonalDataChanged = true;
-				if (this._newStartDate.isDate) {
-					this.addSetItemField(updates, "IsAllDayEvent", "true");
-				}
-				else {
-					this.addSetItemField(updates, "IsAllDayEvent", "false");
-				}
-	
-			}
-			else {
-				if (this._newEndDate) {
-					this._nonPersonalDataChanged = true;
-					if (this._newEndDate.isDate) {
-						this.addSetItemField(updates, "IsAllDayEvent", "true");
-					}
-					else {
-						this.addSetItemField(updates, "IsAllDayEvent", "false");
-					}
-	
-				}
-			}
-
-			if (((this._newStartDate) || (this._newEndDate)) && (this.calendar.isVersion2007)) {
-				if (this._newStartDate) {
-					this.addSetItemField(updates, "MeetingTimeZone", null, { TimeZoneName: exchTimeZones.getExchangeTimeZoneIdByCalTimeZone(this._newStartDate.timezone, this.calendar.serverUrl, this._newStartDate)});
-				}
-				else {
-					this.addSetItemField(updates, "MeetingTimeZone", null, { TimeZoneName: exchTimeZones.getExchangeTimeZoneIdByCalTimeZone(this._newEndDate.timezone, this.calendar.serverUrl, this._newEndDate)});
-				}
-			}
-
-			if (this._newLegacyFreeBusyStatus) {
-				this.addSetItemField(updates, "LegacyFreeBusyStatus", this._newLegacyFreeBusyStatus);
-			}
-
-			if (this._newLocation !== undefined) {
-				this._nonPersonalDataChanged = true;
-				this.addSetItemField(updates, "Location", this._newLocation);
-			}
-
-			// Attendees
-			if (this._changesAttendees.length > 0) {
-				var reqAttendeeCount = 0;
-				var optAttendeeCount = 0;
-				var attendees = this.getAttendees({});
-				if (attendees.length > 0) {
-
-					const attendeeStatus = {
-						"NEEDS-ACTION"	: "Unknown",
-						"TENTATIVE"	: "Tentative",
-						"ACCEPTED"	: "Accept",
-						"DECLINED"	: "Decline",
-						null		: "Unknown"
-					};
-
-					for each(var attendee in attendees) {
-						switch (attendee.role) {
-						case "REQ-PARTICIPANT":
-							if (reqAttendeeCount == 0) {
-								var reqAttendees = exchGlobalFunctions.xmlToJxon('<t:Attendee xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-								var ae = reqAttendees;
-							}
-							else {
-								var ae = reqAttendees.addSibblingTag("Attendee", "t", null);
-							}
-							reqAttendeeCount++;
-							break;
-						case "OPT-PARTICIPANT":
-							if (optAttendeeCount == 0) {
-								var optAttendees = exchGlobalFunctions.xmlToJxon('<t:Attendee xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-								var ae = optAttendees;
-							}
-							else {
-								var ae = optAttendees.addSibblingTag("Attendee", "t", null);
-							}
-							optAttendeeCount++;
-							break;
-						}
-						var mailbox = ae.addChildTag("Mailbox", "t", null);
-						mailbox.addChildTag("Name", "t", attendee.commonName);
-
-						var tmpEmailAddress = attendee.id.replace(/^mailto:/i, '');
-						if (tmpEmailAddress.indexOf("@") > 0) {
-							mailbox.addChildTag("EmailAddress", "t", tmpEmailAddress);
-						}
-						else {
-							mailbox.addChildTag("EmailAddress", "t", "unknown@somewhere.com");
-						}
-						ae.addChildTag("ResponseType", "t", attendeeStatus[attendee.participationStatus]);
-
-					}
-					if (reqAttendeeCount > 0) {
-						this._nonPersonalDataChanged = true;
-						this.addSetItemField(updates, "RequiredAttendees", reqAttendees);
-					}
-					else {
-						if (this._reqParticipants) {
-							this._nonPersonalDataChanged = true;
-							this.addDeleteItemField(updates, "RequiredAttendees");
-						}
-					}
-					if (optAttendeeCount > 0) {
-						this._nonPersonalDataChanged = true;
-						this.addSetItemField(updates, "OptionalAttendees", optAttendees);
-					}
-					else {
-						if (this._optParticipants) {
-							this._nonPersonalDataChanged = true;
-							this.addDeleteItemField(updates, "OptionalAttendees");
-						}
-					}
-				}
-			}
-
-
-			// Alarms and snoozes
-			this.checkAlarmChange(updates);
-		}
-
-		//dump("updates:"+updates.toString()+"\n");
-		return updates;
-	},
-
-	preLoad: function _preLoad()
-	{
-		this._startDate = this.tryToSetDateValue(this.getTagValue("t:Start", null), this._calEvent.startDate);
-		if (this._startDate) {
-			if (this.isAllDayEvent) this._startDate.isDate = true;
-
-			if (this.startTimeZoneId) {
-				var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._startDate);
-			}
-			else {
-				if (this.meetingTimeZone) {
-					var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.meetingTimeZone, this._startDate);
-				}
-				else {
-					if (this.timeZone) {
-						var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.timeZone, this._startDate);
-					}
-				}
-			}
-			if (timezone) {
-				this._startDate = this._startDate.getInTimezone(timezone);
-			}
-			this._calEvent.startDate = this._startDate.clone();
-		}
-
-		this._endDate = this.tryToSetDateValue(this.getTagValue("t:End", null), this._calEvent.endDate);
-		if (this._endDate) {
-			if (this.isAllDayEvent) this._endDate.isDate = true;
-			if (this.endTimeZoneId) {
-				var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:EndTimeZone"), "", this._endDate);
-			}
-			else {
-				if (this.meetingTimeZone) {
-					var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.meetingTimeZone, this._endDate);
-				}
-				else {
-					if (this.timeZone) {
-						var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.timeZone, this._endDate);
-					}
-				}
-			}
-			if (timezone) {
-				this._endDate = this._endDate.getInTimezone(timezone);
-			}
-			this._calEvent.endDate = this._endDate.clone();
-		}
-
-	},
-
-	postLoad: function _postLoad()
-	{
-		if ((!this._duration) && (!this._newEndDate) && (!this._newStartDate)) {
-			this._duration = this.getTagValue("t:Duration", null);
-			if (this._duration) {
-				//dump("get duration: title:"+this.title+", value:"+cal.createDuration(this._duration));
-				this._duration = cal.createDuration(this._duration);
-			}
-		}
-
-		if (!this._status) {
-			this._status = this.myResponseType;
-
-			const statusMap = {
-				"Unknown"	: "NONE",
-				"NoResponseReceived" : "NONE",
-				"Tentative"	: "TENTATIVE",
-				"Accept"	: "CONFIRMED",
-				"Decline"	: "CANCELLED",
-				"Organizer"	: "CONFIRMED",
-				null: null
-			};
-
-			this._calEvent.status = statusMap[this._status];
-		}
-
-	},
+    __proto__: mivExchangeBaseItem.prototype,
+
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeEvent,
+        Ci.mivExchangeBaseItem,
+        Ci.calIInternalShallowCopy,
+        Ci.calIEvent,
+        Ci.calIItemBase,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    _className: "mivExchangeEvent",
+    _mainTag: "CalendarItem",
+
+    classDescription: "Exchange calendar event.",
+
+    classID: components.ID("{" + mivExchangeEventGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/calendarevent;1",
+    flags: 0,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeEvent,
+            Ci.mivExchangeBaseItem,
+            Ci.calIInternalShallowCopy,
+            Ci.calIEvent,
+            Ci.calIItemBase,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    initialize: function _initialize() {
+        this._calEvent = null;
+        this._calEvent = Cc["@mozilla.org/calendar/event;1"]
+            .createInstance(Ci.calIEvent);
+    },
+
+    cloneFrom: function _cloneFrom(aItem) {
+        try {
+            this.baseCloneFrom(aItem);
+            if (aItem._startDate) this._startDate = aItem._startDate;
+            if (aItem._endDate) this._endDate = aItem._endDate;
+            if (aItem._duration) this._duration = aItem._duration.clone();
+            if (aItem._status) this._status = aItem._status;
+        }
+        catch (err) {
+            dump(" @@@@@@@@@@@@@ mivExchangeEvent: cloneFrom Error:" + err + "\n");
+        }
+    },
+
+    clone: function _clone() {
+        try {
+            //dump("mivExchangeEvent: clone 1: title:"+this.title+", this.calendarItemType:"+this.calendarItemType+", startDate:"+this.startDate+"\n");
+
+            var result = new mivExchangeEvent();
+
+            result.baseClone(this);
+
+            if (this._newStartDate !== undefined) result.startDate = this.startDate.clone();
+            if (this._newEndDate !== undefined) result.endDate = this.endDate.clone();
+
+            if (this._newStatus) {
+                result.status = this._newStatus;
+            }
+        }
+        catch (err) {
+            dump("mivExchangeEvent: Clone: error:" + err + "\n");
+        }
+        //dump("mivExchangeEvent: clone 2: title:"+this.title+", this.calendarItemType:"+this.calendarItemType+", startDate:"+this.startDate+"\n");
+        return result;
+    },
+
+    get startDate() {
+        //dump("get startdate 1: title:"+this.title);
+        //dump("get startdate 2: title:"+this.title+", startdate=="+this._calEvent.startDate);
+
+        if (this._newStartDate) {
+            return this._newStartDate;
+        }
+
+        if (this._startDate) {
+            return this._startDate;
+        }
+
+        return this._calEvent.startDate;
+    },
+
+    set startDate(aValue) {
+        if (aValue.toString() != this.startDate.toString()) {
+            this._newStartDate = aValue;
+            this._calEvent.startDate = aValue;
+        }
+    },
+
+    get endDate() {
+        //dump("get endDate: title:"+this.title+", endDate=="+this._calEvent.endDate, -1);
+        if (this._newEndDate) {
+            return this._newEndDate;
+        }
+
+        if (this._endDate) {
+            return this._endDate;
+        }
+
+        return this._calEvent.endDate;
+    },
+
+    set endDate(aValue) {
+        //dump("set enddate: title:"+this.title+", aValue:"+aValue);
+        if (aValue.toString() != this.endDate.toString()) {
+            this._newEndDate = aValue;
+            this._calEvent.endDate = aValue;
+        }
+    },
+
+    get duration() {
+        //dump("get duration: title:"+this.title+", value:"+this._calEvent.duration);
+        return this._calEvent.duration;
+    },
+
+    // status of the event
+    //attribute AUTF8String status;
+    get status() {
+        //dump("get status: title:"+this.title+", value:"+this._calEvent.status+", this._status:"+this._status);
+        const statusMap = {
+            "Unknown": "NONE",
+            "NoResponseReceived": "NONE",
+            "Tentative": "TENTATIVE",
+            "Accept": "CONFIRMED",
+            "Decline": "CANCELLED",
+            "Organizer": "CONFIRMED",
+            null: null
+        };
+
+        if (this._newStatus !== undefined) {
+
+            return statusMap[this._newStatus];
+        }
+
+        if (this._status !== undefined) {
+
+            return statusMap[this._status];
+        }
+
+        return this._calEvent.status;
+    },
+
+    set status(aValue) {
+        //dump("set status: title:"+this.title+", aValue:"+aValue);
+        if (aValue != this.status) {
+            const statuses = {
+                "NONE": "NoResponseReceived",
+                "TENTATIVE": "Tentative",
+                "CONFIRMED": "Accept",
+                "CANCELLED": "Decline",
+                null: null
+            };
+
+            this._newStatus = statuses[aValue];
+            this._calEvent.status = aValue;
+        }
+    },
+
+    get updateXML() {
+        this._nonPersonalDataChanged = false;
+
+        var updates = exchGlobalFunctions.xmlToJxon('<t:Updates xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+
+        if (this.isInvitation) {
+            // Only can accept/decline/tentative
+            if ((this._newMyResponseType) && (this._newMyResponseType != this._myResponseType)) {
+                this._nonPersonalDataChanged = true;
+                this.addSetItemField(updates, "MyResponseType", this._newMyResponseType);
+            }
+
+            // Or change alarm.
+            this.checkAlarmChange(updates);
+
+        }
+        else {
+
+            if (this._newTitle !== undefined) {
+                this._nonPersonalDataChanged = true;
+                this.addSetItemField(updates, "Subject", this._newTitle);
+            }
+            if (this._newPrivacy) {
+                this.addSetItemField(updates, "Sensitivity", this._newPrivacy);
+            }
+
+            //dump("updatexml1: this.bodyType:"+this.bodyType+"\n");
+            //dump("updatexml2: this._newBody:"+this._newBody+"\n");
+            //dump("updatexml3: this._newBody2:"+this._newBody2+"\n");
+
+            if (this.bodyType == "HTML") {
+                if (this._newBody2 !== undefined) {
+                    this._nonPersonalDataChanged = true;
+                    if (this._newBody2 === null) {
+                        this.addDeleteItemField(updates, "Body");
+                    }
+                    else {
+                        this.addSetItemField(updates, "Body", this._newBody2, {
+                            BodyType: "HTML"
+                        });
+                    }
+                }
+            }
+            else {
+                if (this._newBody !== undefined) {
+                    this._nonPersonalDataChanged = true;
+                    if (this._newBody === null) {
+                        this.addDeleteItemField(updates, "Body");
+                    }
+                    else {
+                        this.addSetItemField(updates, "Body", this._newBody, {
+                            BodyType: "Text"
+                        });
+                    }
+                }
+            }
+            //dump("updatexml4: body\n");
+            // Categories
+            if (this._changesCategories) {
+                var categoriesXML = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
+                    .createInstance(Ci.mivIxml2jxon);
+                var categories = this.getCategories({});
+                var first = true;
+                for each(var category in categories) {
+                    if (first) {
+                        first = false;
+                        categoriesXML.processXMLString("<t:String>" + category + "</t:String>", 0, null);
+                    }
+                    else {
+                        categoriesXML.addSibblingTag("String", "t", category);
+                    }
+                }
+                if (categories.length > 0) {
+                    this.addSetItemField(updates, "Categories", categoriesXML);
+                }
+                else {
+                    if (this._categories.length > 0) {
+                        this.addDeleteItemField(updates, "Categories");
+                    }
+                }
+            }
+
+            if (this._newPriority) {
+                this.addSetItemField(updates, "Importance", this._newPriority);
+            }
+
+            // Recurrence rule. Michel
+            var recurrenceInfoChanged;
+            if (this._recurrenceInfo) {
+                // We had recurrenceInfo. Lets see if it changed.
+                //dump("We had recurrenceInfo. Lets see if it changed.\n");
+                if (this._newRecurrenceInfo !== undefined) {
+                    // It was changed or removed
+                    if (this._newRecurrenceInfo === null) {
+                        // It was removed
+                        //dump("We had recurrenceInfo. And it is removed.\n");
+                        recurrenceInfoChanged = false;
+                        this._nonPersonalDataChanged = true;
+                        this.addDeleteItemField(updates, "Recurrence");
+                    }
+                    else {
+                        // See if something changed
+                        //dump("We had recurrenceInfo. And it was changed. 1.\n");
+                        recurrenceInfoChanged = true;
+                    }
+                }
+                else {
+                    // It could be that the content of the recurrenceInfo was changed
+                    if (this._recurrenceInfo.toString() != this.recurrenceInfo.toString()) {
+                        //dump("We had recurrenceInfo. And it was changed. 2.\n");
+                        recurrenceInfoChanged = true;
+                    }
+                }
+            }
+            else {
+                // We did not have recurrence info. Check if we have now
+                //dump("We did not have recurrenceInfo. See if it was added.\n");
+                if (this._newRecurrenceInfo) {
+                    //dump("We did not have recurrenceInfo. But we do have now.\n");
+                    recurrenceInfoChanged = true;
+                }
+            }
+
+            if (recurrenceInfoChanged) {
+                var recurrenceXML = this.makeRecurrenceRule();
+                this._nonPersonalDataChanged = true;
+                this.addSetItemField(updates, "Recurrence", recurrenceXML, null, true);
+
+                // Next is to trigger sending the start and end dates when we have a changed reccurrence.
+                if (!this._newStartDate) this._newStartDate = this.startDate.clone();
+                if (!this._newEndDate) this._newEndDate = this.endDate.clone();
+
+            }
+
+
+            if (this._newStartDate) {
+                var tmpStart = this._newStartDate.clone();
+                if (this._newStartDate.isDate) {
+                    tmpStart.isDate = false;
+                    //var tmpDuration = cal.createDuration();
+                    //tmpDuration.minutes = -60;
+                    //tmpStart.addDuration(tmpDuration);
+
+                    // We make a non-UTC datetime value for exchGlobalFunctions.
+                    // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+                    //					var exchStart = cal.toRFC3339(tmpStart).substr(0, 19)+"Z"; //cal.toRFC3339(tmpStart).length-6);
+                    var exchStart = cal.toRFC3339(tmpStart).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
+                }
+                else {
+                    // We set in bias advanced to UCT datetime values for exchGlobalFunctions.
+                    //					var exchStart = cal.toRFC3339(tmpStart.getInTimezone(cal.UTC()));
+                    var exchStart = cal.toRFC3339(tmpStart).substr(0, 19);
+                }
+                this._nonPersonalDataChanged = true;
+                this.addSetItemField(updates, "Start", exchStart);
+
+                if (!this.calendar.isVersion2007) {
+                    var exchTimeZone = exchTimeZones.getExchangeTimeZoneByCalTimeZone(this._newStartDate.timezone, this.calendar.serverUrl, this._newStartDate);
+                    //					var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:StartTimeZone Name="'+exchTimeZone.name+'" Id="'+exchTimeZone.id+'" xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
+                    var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:StartTimeZone xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+                    tmpTimeZone.setAttribute("Name", exchTimeZone.name);
+                    tmpTimeZone.setAttribute("Id", exchTimeZone.id);
+                    var periods = xml2json.getTag(exchTimeZone.timeZone, "t:Periods");
+                    var transitionsGroups = xml2json.getTag(exchTimeZone.timeZone, "t:TransitionsGroups");
+                    var transitions = xml2json.getTag(exchTimeZone.timeZone, "t:Transitions");
+
+                    var tmpPeriods = exchGlobalFunctions.xmlToJxon(xml2json.toString(periods));
+                    tmpTimeZone.addChildTagObject(tmpPeriods);
+                    var tmpTransitionsGroups = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitionsGroups));
+                    tmpTimeZone.addChildTagObject(tmpTransitionsGroups);
+                    var tmpTransitions = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitions));
+                    tmpTimeZone.addChildTagObject(tmpTransitions);
+
+                    this.addSetItemField(updates, "StartTimeZone", tmpTimeZone, null, true);
+                }
+            }
+
+            if (this._newEndDate) {
+                var tmpEnd = this._newEndDate.clone();
+
+                if (this._newEndDate.isDate) {
+                    tmpEnd.isDate = false;
+                    var tmpDuration = cal.createDuration();
+                    tmpDuration.minutes = -61;
+                    tmpEnd.addDuration(tmpDuration);
+
+                    // We make a non-UTC datetime value for exchGlobalFunctions.
+                    // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+                    //					var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
+                    var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19); //cal.toRFC3339(tmpEnd).length-6);
+                }
+                else {
+                    // We set in bias advanced to UCT datetime values for exchGlobalFunctions.
+                    //					var exchEnd = cal.toRFC3339(tmpEnd.getInTimezone(cal.UTC()));
+                    var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
+                }
+                this._nonPersonalDataChanged = true;
+                this.addSetItemField(updates, "End", exchEnd);
+
+                if (!this.calendar.isVersion2007) {
+                    var exchTimeZone = exchTimeZones.getExchangeTimeZoneByCalTimeZone(this._newEndDate.timezone, this.calendar.serverUrl, this._newEndDate);
+                    //					var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:EndTimeZone Name="'+exchTimeZone.name+'" Id="'+exchTimeZone.id+'" xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
+                    var tmpTimeZone = exchGlobalFunctions.xmlToJxon('<t:EndTimeZone xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+                    tmpTimeZone.setAttribute("Name", exchTimeZone.name);
+                    tmpTimeZone.setAttribute("Id", exchTimeZone.id);
+                    var periods = xml2json.getTag(exchTimeZone.timeZone, "t:Periods");
+                    var transitionsGroups = xml2json.getTag(exchTimeZone.timeZone, "t:TransitionsGroups");
+                    var transitions = xml2json.getTag(exchTimeZone.timeZone, "t:Transitions");
+
+                    var tmpPeriods = exchGlobalFunctions.xmlToJxon(xml2json.toString(periods));
+                    tmpTimeZone.addChildTagObject(tmpPeriods);
+                    var tmpTransitionsGroups = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitionsGroups));
+                    tmpTimeZone.addChildTagObject(tmpTransitionsGroups);
+                    var tmpTransitions = exchGlobalFunctions.xmlToJxon(xml2json.toString(transitions));
+                    tmpTimeZone.addChildTagObject(tmpTransitions);
+
+                    this.addSetItemField(updates, "EndTimeZone", tmpTimeZone, null, true);
+                }
+            }
+
+            if (this._newStartDate) {
+                this._nonPersonalDataChanged = true;
+                if (this._newStartDate.isDate) {
+                    this.addSetItemField(updates, "IsAllDayEvent", "true");
+                }
+                else {
+                    this.addSetItemField(updates, "IsAllDayEvent", "false");
+                }
+
+            }
+            else {
+                if (this._newEndDate) {
+                    this._nonPersonalDataChanged = true;
+                    if (this._newEndDate.isDate) {
+                        this.addSetItemField(updates, "IsAllDayEvent", "true");
+                    }
+                    else {
+                        this.addSetItemField(updates, "IsAllDayEvent", "false");
+                    }
+
+                }
+            }
+
+            if (((this._newStartDate) || (this._newEndDate)) && (this.calendar.isVersion2007)) {
+                if (this._newStartDate) {
+                    this.addSetItemField(updates, "MeetingTimeZone", null, {
+                        TimeZoneName: exchTimeZones.getExchangeTimeZoneIdByCalTimeZone(this._newStartDate.timezone, this.calendar.serverUrl, this._newStartDate)
+                    });
+                }
+                else {
+                    this.addSetItemField(updates, "MeetingTimeZone", null, {
+                        TimeZoneName: exchTimeZones.getExchangeTimeZoneIdByCalTimeZone(this._newEndDate.timezone, this.calendar.serverUrl, this._newEndDate)
+                    });
+                }
+            }
+
+            if (this._newLegacyFreeBusyStatus) {
+                this.addSetItemField(updates, "LegacyFreeBusyStatus", this._newLegacyFreeBusyStatus);
+            }
+
+            if (this._newLocation !== undefined) {
+                this._nonPersonalDataChanged = true;
+                this.addSetItemField(updates, "Location", this._newLocation);
+            }
+
+            // Attendees
+            if (this._changesAttendees.length > 0) {
+                var reqAttendeeCount = 0;
+                var optAttendeeCount = 0;
+                var attendees = this.getAttendees({});
+                if (attendees.length > 0) {
+
+                    const attendeeStatus = {
+                        "NEEDS-ACTION": "Unknown",
+                        "TENTATIVE": "Tentative",
+                        "ACCEPTED": "Accept",
+                        "DECLINED": "Decline",
+                        null: "Unknown"
+                    };
+
+                    for each(var attendee in attendees) {
+                        switch (attendee.role) {
+                        case "REQ-PARTICIPANT":
+                            if (reqAttendeeCount == 0) {
+                                var reqAttendees = exchGlobalFunctions.xmlToJxon('<t:Attendee xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+                                var ae = reqAttendees;
+                            }
+                            else {
+                                var ae = reqAttendees.addSibblingTag("Attendee", "t", null);
+                            }
+                            reqAttendeeCount++;
+                            break;
+                        case "OPT-PARTICIPANT":
+                            if (optAttendeeCount == 0) {
+                                var optAttendees = exchGlobalFunctions.xmlToJxon('<t:Attendee xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+                                var ae = optAttendees;
+                            }
+                            else {
+                                var ae = optAttendees.addSibblingTag("Attendee", "t", null);
+                            }
+                            optAttendeeCount++;
+                            break;
+                        }
+                        var mailbox = ae.addChildTag("Mailbox", "t", null);
+                        mailbox.addChildTag("Name", "t", attendee.commonName);
+
+                        var tmpEmailAddress = attendee.id.replace(/^mailto:/i, '');
+                        if (tmpEmailAddress.indexOf("@") > 0) {
+                            mailbox.addChildTag("EmailAddress", "t", tmpEmailAddress);
+                        }
+                        else {
+                            mailbox.addChildTag("EmailAddress", "t", "unknown@somewhere.com");
+                        }
+                        ae.addChildTag("ResponseType", "t", attendeeStatus[attendee.participationStatus]);
+
+                    }
+                    if (reqAttendeeCount > 0) {
+                        this._nonPersonalDataChanged = true;
+                        this.addSetItemField(updates, "RequiredAttendees", reqAttendees);
+                    }
+                    else {
+                        if (this._reqParticipants) {
+                            this._nonPersonalDataChanged = true;
+                            this.addDeleteItemField(updates, "RequiredAttendees");
+                        }
+                    }
+                    if (optAttendeeCount > 0) {
+                        this._nonPersonalDataChanged = true;
+                        this.addSetItemField(updates, "OptionalAttendees", optAttendees);
+                    }
+                    else {
+                        if (this._optParticipants) {
+                            this._nonPersonalDataChanged = true;
+                            this.addDeleteItemField(updates, "OptionalAttendees");
+                        }
+                    }
+                }
+            }
+
+
+            // Alarms and snoozes
+            this.checkAlarmChange(updates);
+        }
+
+        //dump("updates:"+updates.toString()+"\n");
+        return updates;
+    },
+
+    preLoad: function _preLoad() {
+        this._startDate = this.tryToSetDateValue(this.getTagValue("t:Start", null), this._calEvent.startDate);
+        if (this._startDate) {
+            if (this.isAllDayEvent) this._startDate.isDate = true;
+
+            if (this.startTimeZoneId) {
+                var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._startDate);
+            }
+            else {
+                if (this.meetingTimeZone) {
+                    var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.meetingTimeZone, this._startDate);
+                }
+                else {
+                    if (this.timeZone) {
+                        var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.timeZone, this._startDate);
+                    }
+                }
+            }
+            if (timezone) {
+                this._startDate = this._startDate.getInTimezone(timezone);
+            }
+            this._calEvent.startDate = this._startDate.clone();
+        }
+
+        this._endDate = this.tryToSetDateValue(this.getTagValue("t:End", null), this._calEvent.endDate);
+        if (this._endDate) {
+            if (this.isAllDayEvent) this._endDate.isDate = true;
+            if (this.endTimeZoneId) {
+                var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:EndTimeZone"), "", this._endDate);
+            }
+            else {
+                if (this.meetingTimeZone) {
+                    var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.meetingTimeZone, this._endDate);
+                }
+                else {
+                    if (this.timeZone) {
+                        var timezone = exchTimeZones.getCalTimeZoneByExchangeMeetingTimeZone(this.timeZone, this._endDate);
+                    }
+                }
+            }
+            if (timezone) {
+                this._endDate = this._endDate.getInTimezone(timezone);
+            }
+            this._calEvent.endDate = this._endDate.clone();
+        }
+
+    },
+
+    postLoad: function _postLoad() {
+        if ((!this._duration) && (!this._newEndDate) && (!this._newStartDate)) {
+            this._duration = this.getTagValue("t:Duration", null);
+            if (this._duration) {
+                //dump("get duration: title:"+this.title+", value:"+cal.createDuration(this._duration));
+                this._duration = cal.createDuration(this._duration);
+            }
+        }
+
+        if (!this._status) {
+            this._status = this.myResponseType;
+
+            const statusMap = {
+                "Unknown": "NONE",
+                "NoResponseReceived": "NONE",
+                "Tentative": "TENTATIVE",
+                "Accept": "CONFIRMED",
+                "Decline": "CANCELLED",
+                "Organizer": "CONFIRMED",
+                null: null
+            };
+
+            this._calEvent.status = statusMap[this._status];
+        }
+
+    },
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeEvent) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeEvent = XPCOMUtils.generateNSGetFactory([mivExchangeEvent]);
+    try {
+        if (!NSGetFactory.mivExchangeEvent) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeEvent = XPCOMUtils.generateNSGetFactory([mivExchangeEvent]);
 
-	}
+        }
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeEvent(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeEvent(cid);
+}
diff --git a/interfaces/exchangeItemsManager/mivExchangeItemsManager.js b/interfaces/exchangeItemsManager/mivExchangeItemsManager.js
index b2dfc450..a5a283f2 100644
--- a/interfaces/exchangeItemsManager/mivExchangeItemsManager.js
+++ b/interfaces/exchangeItemsManager/mivExchangeItemsManager.js
@@ -29,34 +29,34 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeItemsManager() {
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this._exchangeAccountId = null;
-	this._exchangeAccount = null;
+    this._exchangeAccountId = null;
+    this._exchangeAccount = null;
 
-	this._folderBase = null;
-	this._folderId = null;
-	this._folderChangeKey = null;
-	this._name = "noname";
-	this._displayName = null;
-	this._status = this.STATUS_UNINITIALIZED;
+    this._folderBase = null;
+    this._folderId = null;
+    this._folderChangeKey = null;
+    this._name = "noname";
+    this._displayName = null;
+    this._status = this.STATUS_UNINITIALIZED;
 
-	this._pollInterval = 0; // 0 (zero) is off. Value is in seconds.
+    this._pollInterval = 0; // 0 (zero) is off. Value is in seconds.
 
-	this.prefsBase = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch)
-			.getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.");
+    this.prefsBase = Cc["@mozilla.org/preferences-service;1"]
+        .getService(Ci.nsIPrefBranch)
+        .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl.");
 
-	this._accountManager = Cc["@1st-setup.nl/exchange/accountmanager;1"]
-				.getService(Ci.mivExchangeAccountManager)
+    this._accountManager = Cc["@1st-setup.nl/exchange/accountmanager;1"]
+        .getService(Ci.mivExchangeAccountManager)
 
-	this._loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
-				.getService(Ci.mivExchangeLoadBalancer)
+    this._loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer)
 
-	this.uuid = this.globalFunctions.getUUID();
+    this.uuid = this.globalFunctions.getUUID();
 
-	this.logInfo("mivExchangeItemsManager: init");
+    this.logInfo("mivExchangeItemsManager: init");
 
 }
 
@@ -64,195 +64,187 @@ var mivExchangeItemsManagerGUID = "b722909d-f83d-4f01-9b98-369201f8ae38";
 
 mivExchangeItemsManager.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeItemsManager,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Exchange Items Manager.",
-	classID: components.ID("{"+mivExchangeItemsManagerGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/itemmanager;1",
-	flags: Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// methods from nsIClassInfo
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeItemsManager,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	// External methods 
-	get exchangeAccountId()
-	{
-		return this._exchangeAccountId;
-	},
-
-	set exchangeAccountId(aValue)
-	{
-		var tmpAccount = this._accountManager.getAccountById(aValue);
-		if (tmpAccount.result) {
-			// We found an account;
-			this._exchangeAccountId = aValue;
-			this._exchangeAccount = tmpAccount.account;
-
-			// We need to reload everything.
-		}
-	},
-
-	get folderBase()
-	{
-		return this._folderBase;
-	},
-
-	set folderBase(aValue)
-	{
-		if (aValue != this._folderBase) {
-			this._folderBase = aValue;
-
-			// We need to reload everything.
-		}
-	},
-
-	get folderId()
-	{
-		return this._folderId;
-	},
-
-	set folderId(aValue)
-	{
-		if (aValue != this._folderId) {
-			this._folderId = aValue;
-
-			// We need to reload everything.
-		}
-	},
-
-	get pollInterval()
-	{
-		return this._pollInterval;
-	},
-
-	set pollInterval(aValue)
-	{
-		if (aValue != this._pollInterval) {
-			this._pollInterval = aValue;
-
-			// We need to reload everything.
-		}
-	},
-
-	get name()
-	{
-		var tmpStr = this._name;
-		if (this._displayName) {
-			tmpStr = tmpStr + " ("+this._displayName+")";
-		}
-		return tmpStr;
-	},
-
-	set name(aValue)
-	{
-		if (aValue != this._name) {
-			this._name = aValue;
-		}
-	},
-
-	get status()
-	{
-		return this._status;
-	},
-
-	// Internal Methods
-	reset: function reset
-	{
-		if ((!this._exchangeAccount) || ((!this._folderBase) && (!this._folderId))) {
-			return;
-		}
-
-		// Kill all running jobs.
-		this._loadBalancer.clearQueueForCalendar(this._exchangeAccount.server.value, this);
-		this._loadBalancer.stopRunningJobsForCalendar(this._exchangeAccount.server.value, this);
-		
-		// Get Folder details.
-		this._status = this.STATUS_GET_FOLDER;
-
-		this.loadBalancer.addToQueue({ calendar: this,
-				 ecRequest:erGetFolderRequest,
-				 arguments: 			
-					{user: this.user, 
-					 mailbox: this.mailbox,
-					 folderBase: this.folderBase,
-					 serverUrl: this.serverUrl,
-					 occurrences: aOccurrences,
-					 folderID: this.folderID,
-					 changeKey: this.changeKey,
-					 folderClass: this.folderClass,
-					 GUID: calExchangeCalendarGUID}, 
-				 cbOk: function(aFolderRequest, aFolderId, aChangeKey, aFolderClass){ this.getFolderRequestOk(aFolderRequest, aFolderId, aChangeKey, aFolderClass); },
-				 cbError: function(aRequest, aCode, aMsg) { this.ecRequestError(aRequest, aCode, aMsg); },
-				 listener: null});
-		
-	},
-
-	getFolderRequestOk: function getFolderRequestOk(aFolderRequest, aFolderId, aChangeKey, aFolderClass)
-	{
-		this._folderId = afolderId;
-	},
-
-	ecRequestError: function(aRequest, aCode, aMsg)
-	{
-	},
-
-	logInfo: function _logInfo(aMsg, aDebugLevel) 
-	{
-			this.globalFunctions.LOG("mivExchangeItemsManager: "+aMsg);
-		return;
-
-		if (!aDebugLevel) aDebugLevel = 1;
-
-		var prefB = Cc["@mozilla.org/preferences-service;1"]
-			.getService(Ci.nsIPrefBranch);
-
-		this.debugLevel = this.globalFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true);
-		if (aDebugLevel <= this.debugLevel) {
-			this.globalFunctions.LOG("mivExchangeItemsManager: "+aMsg);
-		}
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeItemsManager,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Exchange Items Manager.",
+    classID: components.ID("{" + mivExchangeItemsManagerGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/itemmanager;1",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // methods from nsIClassInfo
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeItemsManager,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    // External methods 
+    get exchangeAccountId() {
+        return this._exchangeAccountId;
+    },
+
+    set exchangeAccountId(aValue) {
+        var tmpAccount = this._accountManager.getAccountById(aValue);
+        if (tmpAccount.result) {
+            // We found an account;
+            this._exchangeAccountId = aValue;
+            this._exchangeAccount = tmpAccount.account;
+
+            // We need to reload everything.
+        }
+    },
+
+    get folderBase() {
+        return this._folderBase;
+    },
+
+    set folderBase(aValue) {
+        if (aValue != this._folderBase) {
+            this._folderBase = aValue;
+
+            // We need to reload everything.
+        }
+    },
+
+    get folderId() {
+        return this._folderId;
+    },
+
+    set folderId(aValue) {
+        if (aValue != this._folderId) {
+            this._folderId = aValue;
+
+            // We need to reload everything.
+        }
+    },
+
+    get pollInterval() {
+        return this._pollInterval;
+    },
+
+    set pollInterval(aValue) {
+        if (aValue != this._pollInterval) {
+            this._pollInterval = aValue;
+
+            // We need to reload everything.
+        }
+    },
+
+    get name() {
+        var tmpStr = this._name;
+        if (this._displayName) {
+            tmpStr = tmpStr + " (" + this._displayName + ")";
+        }
+        return tmpStr;
+    },
+
+    set name(aValue) {
+        if (aValue != this._name) {
+            this._name = aValue;
+        }
+    },
+
+    get status() {
+        return this._status;
+    },
+
+    // Internal Methods
+    reset: function reset {
+        if ((!this._exchangeAccount) || ((!this._folderBase) && (!this._folderId))) {
+            return;
+        }
+
+        // Kill all running jobs.
+        this._loadBalancer.clearQueueForCalendar(this._exchangeAccount.server.value, this);
+        this._loadBalancer.stopRunningJobsForCalendar(this._exchangeAccount.server.value, this);
+
+        // Get Folder details.
+        this._status = this.STATUS_GET_FOLDER;
+
+        this.loadBalancer.addToQueue({
+            calendar: this,
+            ecRequest: erGetFolderRequest,
+            arguments: {
+                user: this.user,
+                mailbox: this.mailbox,
+                folderBase: this.folderBase,
+                serverUrl: this.serverUrl,
+                occurrences: aOccurrences,
+                folderID: this.folderID,
+                changeKey: this.changeKey,
+                folderClass: this.folderClass,
+                GUID: calExchangeCalendarGUID
+            },
+            cbOk: function (aFolderRequest, aFolderId, aChangeKey, aFolderClass) {
+                this.getFolderRequestOk(aFolderRequest, aFolderId, aChangeKey, aFolderClass);
+            },
+            cbError: function (aRequest, aCode, aMsg) {
+                this.ecRequestError(aRequest, aCode, aMsg);
+            },
+            listener: null
+        });
+
+    },
+
+    getFolderRequestOk: function getFolderRequestOk(aFolderRequest, aFolderId, aChangeKey, aFolderClass) {
+        this._folderId = afolderId;
+    },
+
+    ecRequestError: function (aRequest, aCode, aMsg) {},
+
+    logInfo: function _logInfo(aMsg, aDebugLevel) {
+        this.globalFunctions.LOG("mivExchangeItemsManager: " + aMsg);
+        return;
+
+        if (!aDebugLevel) aDebugLevel = 1;
+
+        var prefB = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefBranch);
+
+        this.debugLevel = this.globalFunctions.safeGetIntPref(prefB, "extensions.1st-setup.core.debuglevel", 0, true);
+        if (aDebugLevel <= this.debugLevel) {
+            this.globalFunctions.LOG("mivExchangeItemsManager: " + aMsg);
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeItemsManager) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeItemsManager = XPCOMUtils.generateNSGetFactory([mivExchangeItemsManager]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeItemsManager) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeItemsManager = XPCOMUtils.generateNSGetFactory([mivExchangeItemsManager]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeItemsManager(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeItemsManager(cid);
+}
diff --git a/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.js b/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.js
index a1c61f83..f566f814 100644
--- a/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.js
+++ b/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.js
@@ -31,18 +31,18 @@ Cu.import("resource://calendar/modules/calUtils.jsm");
 //Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
 function mivExchangeLightningNotifier() {
-	this.mObservers = new cal.ObserverBag(Ci.calIObserver);
+    this.mObservers = new cal.ObserverBag(Ci.calIObserver);
 
-	this.queue = [];
+    this.queue = [];
 
-	this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-	this.timerRunning = false;
+    this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this.timerRunning = false;
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService); 
+    this.observerService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
 }
 
@@ -52,71 +52,75 @@ var mivExchangeLightningNotifierGUID = "3b2d58f7-9528-44cf-8cd7-865dc209590c";
 
 mivExchangeLightningNotifier.prototype = {
 
-	// methods from nsISupport
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeLightningNotifier,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-	classDescription: "Load balancer in sending observer notify request to Lightning.",
-	classID: components.ID("{"+mivExchangeLightningNotifierGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/lightningnotifier;1",
-	flags: Ci.nsIClassInfo.SINGLETON,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-
-	// Internal methods.
-	notify: function _notify() {
-		this.processQueue();
-	},
-
-	addToNotifyQueue: function _addToNotifyQueue(aCalendar, aCmd, aArg)
-	{
-		this.queue.push({calendar: aCalendar, cmd: aCmd, arg: aArg});
-
-		if (!this.timerRunning) {
-			this.timerRunning = true;
-			//dump("mivExchangeLightningNotifier: Start timer\n");
-			this.timer.initWithCallback(this, 500, this.timer.TYPE_REPEATING_SLACK);
-		}
-	},
-
-	processQueue: function _processQueue()
-	{
-		//dump("mivExchangeLightningNotifier: processQueue\n");
-		this.mObservers.notify("onStartBatch");
-
-		for (var counter = 0; ((counter < 100) && (this.queue.length > 0)); counter++) {
-			var notification = this.queue.shift();
-			notification.calendar.notifyObservers.notify(notification.cmd, notification.arg);
-			//this.mObservers.notify(notification.cmd, notification.arg);
-		}
-		this.mObservers.notify("onEndBatch");
-
-		if (this.queue.length == 0) {
-			//dump("mivExchangeLightningNotifier: stop timer\n");
-			this.timer.cancel();
-			this.timerRunning = false;
-		}
-	},
+    // methods from nsISupport
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeLightningNotifier,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+    classDescription: "Load balancer in sending observer notify request to Lightning.",
+    classID: components.ID("{" + mivExchangeLightningNotifierGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/lightningnotifier;1",
+    flags: Ci.nsIClassInfo.SINGLETON,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+
+    // Internal methods.
+    notify: function _notify() {
+        this.processQueue();
+    },
+
+    addToNotifyQueue: function _addToNotifyQueue(aCalendar, aCmd, aArg) {
+        this.queue.push({
+            calendar: aCalendar,
+            cmd: aCmd,
+            arg: aArg
+        });
+
+        if (!this.timerRunning) {
+            this.timerRunning = true;
+            //dump("mivExchangeLightningNotifier: Start timer\n");
+            this.timer.initWithCallback(this, 500, this.timer.TYPE_REPEATING_SLACK);
+        }
+    },
+
+    processQueue: function _processQueue() {
+        //dump("mivExchangeLightningNotifier: processQueue\n");
+        this.mObservers.notify("onStartBatch");
+
+        for (var counter = 0;
+            ((counter < 100) && (this.queue.length > 0)); counter++) {
+            var notification = this.queue.shift();
+            notification.calendar.notifyObservers.notify(notification.cmd, notification.arg);
+            //this.mObservers.notify(notification.cmd, notification.arg);
+        }
+        this.mObservers.notify("onEndBatch");
+
+        if (this.queue.length == 0) {
+            //dump("mivExchangeLightningNotifier: stop timer\n");
+            this.timer.cancel();
+            this.timerRunning = false;
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeLightningNotifier) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeLightningNotifier = XPCOMUtils.generateNSGetFactory([mivExchangeLightningNotifier]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeLightningNotifier) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeLightningNotifier = XPCOMUtils.generateNSGetFactory([mivExchangeLightningNotifier]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeLightningNotifier(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeLightningNotifier(cid);
+}
diff --git a/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.js b/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.js
index f817ad84..9445ae18 100644
--- a/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.js
+++ b/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.js
@@ -27,262 +27,254 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-function jobObject(aJob, aServer, aLoadBalancer)
-{
-	this.job = aJob;
-	this.server = aServer;
-	this.startTime = new Date().getTime();
-	this.exchangeRequest = null;
-	this.loadBalancer = aLoadBalancer;
-	this.state = this.QUEUED;
-	this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-	this.uuid = this.loadBalancer.globalFunctions.getUUID();
+function jobObject(aJob, aServer, aLoadBalancer) {
+    this.job = aJob;
+    this.server = aServer;
+    this.startTime = new Date().getTime();
+    this.exchangeRequest = null;
+    this.loadBalancer = aLoadBalancer;
+    this.state = this.QUEUED;
+    this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this.uuid = this.loadBalancer.globalFunctions.getUUID();
 
 }
 
 jobObject.prototype = {
-	QUEUED : 0,
-	RUNNING : 1,
-	DONE : 2,
-	ERROR : 3,
-	notify: function setTimeout_notify(aTimer) {
-//dump(this.server+":loadBalancer: starting Job\n");
-
-		var self = this;
-		try {
-			this.loadBalancer.logInfo(this.uuid+":"+this.server+":jobObject:notify: starting exchangeRequest.");
-
-			this.exchangeRequest = new this.job.ecRequest(this.job.arguments, 
-			function myOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) { self.onRequestOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.job);}, 
-			function myError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {self.onRequestError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.job);}
-			, this.job.listener);
-			this.state = this.RUNNING;
-		}
-		catch(err) {
-			dump(this.uuid+":"+this.server+":jobObject.notify Error:"+err+"\n");
-			this.state = this.ERROR;
-			this.exchangeRequest = null;
-		}
-	},
-
-	onRequestOk: function _onRequestOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, job)
-	{
-//dump(this.server+":jobObject.onRequestOk\n");
-		this.loadBalancer.logInfo(this.uuid+":"+this.server+":jobObject:onRequestOk.");
-		try{
-			arg1.argument.cbOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-		}
-		catch(err) { 
-			dump(this.uuid+":"+this.server+":jobObject.onRequestOk Error:"+err+"\n");
-		}
-		if (!this.exchangeRequest.isRunning) {
-			this.loadBalancer.logInfo(this.uuid+":"+this.server+":jobObject:onRequestOk: isRunning="+this.exchangeRequest.isRunning);
-		}
-	},
-
-	onRequestError: function _onRequestError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, job)
-	{
-//dump(this.server+":jobObject.onRequestError\n");
-		this.loadBalancer.logInfo(this.uuid+":"+this.server+":jobObject:onRequestError. arg2:"+arg2+", arg3:"+arg3);
-		try{
-			arg1.argument.cbError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-		}
-		catch(err) { 
-			dump(this.uuid+":"+this.server+":onRequestError Error:"+err +"\n");
-		}
-	},
-
-	clear: function _clear()
-	{
-		this.loadBalancer.logInfo(this.uuid+":"+this.server+":jobObject:clear.");
-		this.exchangeRequest = null;
-		this.timer.cancel();
-		this.timer = null;
-		this.state = this.DONE;
-		this.loadBalancer = null;
-		this.job = null;
-		this.server = null
-	},
+    QUEUED: 0,
+    RUNNING: 1,
+    DONE: 2,
+    ERROR: 3,
+    notify: function setTimeout_notify(aTimer) {
+        //dump(this.server+":loadBalancer: starting Job\n");
+
+        var self = this;
+        try {
+            this.loadBalancer.logInfo(this.uuid + ":" + this.server + ":jobObject:notify: starting exchangeRequest.");
+
+            this.exchangeRequest = new this.job.ecRequest(this.job.arguments,
+                function myOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+                    self.onRequestOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.job);
+                },
+                function myError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+                    self.onRequestError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.job);
+                }, this.job.listener);
+            this.state = this.RUNNING;
+        }
+        catch (err) {
+            dump(this.uuid + ":" + this.server + ":jobObject.notify Error:" + err + "\n");
+            this.state = this.ERROR;
+            this.exchangeRequest = null;
+        }
+    },
+
+    onRequestOk: function _onRequestOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, job) {
+        //dump(this.server+":jobObject.onRequestOk\n");
+        this.loadBalancer.logInfo(this.uuid + ":" + this.server + ":jobObject:onRequestOk.");
+        try {
+            arg1.argument.cbOk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+        }
+        catch (err) {
+            dump(this.uuid + ":" + this.server + ":jobObject.onRequestOk Error:" + err + "\n");
+        }
+        if (!this.exchangeRequest.isRunning) {
+            this.loadBalancer.logInfo(this.uuid + ":" + this.server + ":jobObject:onRequestOk: isRunning=" + this.exchangeRequest.isRunning);
+        }
+    },
+
+    onRequestError: function _onRequestError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, job) {
+        //dump(this.server+":jobObject.onRequestError\n");
+        this.loadBalancer.logInfo(this.uuid + ":" + this.server + ":jobObject:onRequestError. arg2:" + arg2 + ", arg3:" + arg3);
+        try {
+            arg1.argument.cbError(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+        }
+        catch (err) {
+            dump(this.uuid + ":" + this.server + ":onRequestError Error:" + err + "\n");
+        }
+    },
+
+    clear: function _clear() {
+        this.loadBalancer.logInfo(this.uuid + ":" + this.server + ":jobObject:clear.");
+        this.exchangeRequest = null;
+        this.timer.cancel();
+        this.timer = null;
+        this.state = this.DONE;
+        this.loadBalancer = null;
+        this.job = null;
+        this.server = null
+    },
 
 }
 
-function serverQueue(aServer, aLoadBalancer)
-{
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService); 
-
-	this.server = aServer;
-	this.loadBalancer = aLoadBalancer;
-	this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-	this.timerStopped = true;
-	this.uuid = this.loadBalancer.globalFunctions.getUUID();
-	this.calendars = [];
-	this.calendarIndex = 0;
-	this.jobs = {};
-	this.calendarNames = {};
-	this.jobCount = 0;
-	this.runningJobs = [];
-	this.jobsRunning = 0;
+function serverQueue(aServer, aLoadBalancer) {
+    this.observerService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
+
+    this.server = aServer;
+    this.loadBalancer = aLoadBalancer;
+    this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this.timerStopped = true;
+    this.uuid = this.loadBalancer.globalFunctions.getUUID();
+    this.calendars = [];
+    this.calendarIndex = 0;
+    this.jobs = {};
+    this.calendarNames = {};
+    this.jobCount = 0;
+    this.runningJobs = [];
+    this.jobsRunning = 0;
 }
 
 serverQueue.prototype = {
-	matchesServer: function _matchesServer(aServer)
-	{
-		return (aServer.toLowerCase() == this.server.toLowerCase());
-	},
-
-	clearQueueForCalendar: function _clearQueueForCalendar(aCalendar)
-	{
-		if (this.jobs[aCalendar.id]) {
-			this.jobCount = this.jobCount - this.jobs[aCalendar.id].length;
-			delete this.jobs[aCalendar.id];
-			this.observerService.notifyObservers(aCalendar, "onExchangeProgressChange", null); 
-		}
-	},
-
-	stopRunningJobsForCalendar: function _stopRunningJobsForCalendar(aCalendar)
-	{
-		if (this.jobs[aCalendar.id]) {
-			for (var index in this.runningJobs) {
-				// only stop for current calendar
-				try {
-					if ((this.runningJobs[index].exchangeRequest) && (this.runningJobs[index].exchangeRequest.isRunning) && (this.runningJobs[index].calendar) && (this.runningJobs[index].calendar.id == aCalendar.id)) {
-						this.runningJobs[index].exchangeRequest.stopRequest();
-					}
-				}
-				catch(err) {
-					this.loadBalancer.globalFunctions.LOG("serverQueue:"+this.server+":stopRunningJobsForCalendar Error:"+err + " ("+this.globalFunctions.STACKshort()+")", -1);
-				}
-			}
-		}
-	},
-
-	addJob: function _addJob(aJob)
-	{
-		// Check if we already have this calendar id;
-		if (!this.jobs[aJob.calendar.id]) {
-			this.calendars.push(aJob.calendar.id);
-			this.jobs[aJob.calendar.id] = [];
-			this.calendarNames[aJob.calendar.id] = aJob.calendar.name;
-		}
-
-		this.jobs[aJob.calendar.id].push(aJob);
-		this.jobCount++;
-
-		if (this.timerStopped) {
-			this.loadBalancer.logInfo("serverQueue:"+this.server+": Timer started.",1);
-			this.timerStopped = false;
-			this.timer.initWithCallback(this, 10, this.timer.TYPE_REPEATING_SLACK);
-		}
-
-		this.loadBalancer.logInfo("serverQueue:"+this.server+": Added job to queue for server '"+this.server+"' for calendar '"+aJob.calendar.name+"'. We now have:"+this.jobs[aJob.calendar.id].length+" jobs.",2);
-		this.observerService.notifyObservers(aJob.calendar, "onExchangeProgressChange", null); 
-	},
-
-	get maxJobs()
-	{
-		return 1;  // Currently going for default one at a time to the same server because the xmlhttprequest cannot handle more simultaniously.
-		//return this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"maxJobs", 3, true);
-	},
-
-	get sleepBetweenJobs()
-	{
-		return 50;  // Currently going for default zero because it works.
-		//return this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"sleepBetweenJobs", 2, true);
-	},
-
-	notify: function _notify(aTimer) {
-//dump(this.server+":loadBalancer: starting Job\n");
-try{
-		// Cleanup jobs wich have finished
-		var newJobList = [];
-		for (var index in this.runningJobs) {
-			if ((this.runningJobs[index].exchangeRequest) && (!this.runningJobs[index].exchangeRequest.isRunning)) {
-				// Job stopped.
-				this.loadBalancer.logInfo("serverQueue:"+this.server+": Removing stopped job.",1);
-				this.jobsRunning--;
-				this.runningJobs[index].clear();
-			}
-			else {
-				newJobList.push(this.runningJobs[index]);
-				if (this.runningJobs[index].state == jobObject.RUNNING) {
-					var timeNow = new Date().getTime();
-					var timeDiff = timeNow - this.runningJobs[index].startTime;
-					if (timeDiff > 300000)  {
-						dump("We have a job which is running longer than 5 minutes:"+this.runningJobs[index].job.ecRequest+"\n"); 
-						if (this.runningJobs[index].exchangeRequest["runs"]) {
-							dump("  ## runs="+this.runningJobs[index].exchangeRequest["runs"]+"  ##\n");
-						}
-						//dump("We have a job which is running longer than 5 minutes\n"); 
-						this.runningJobs[index].startTime = new Date().getTime();
-					}
-				}
-			}
-		}
-		this.runningJobs = newJobList;
-
-		//this.loadBalancer.logInfo("serverQueue:"+this.server+": Notify: this.runningJobs:"+this.runningJobs.length+".",2);
-
-		if ((this.runningJobs.length < this.maxJobs) && (this.jobCount > 0)) {
-
-			// Try to find next calendar with a job.
-			var oldCalendarIndex = this.calendarIndex;
-			do {
-				this.calendarIndex++;
-				if (this.calendarIndex >= this.calendars.length) {
-					this.calendarIndex = 0;
-				}
-			} while ((this.jobs[this.calendars[this.calendarIndex]].length == 0) && (this.calendarIndex != oldCalendarIndex));
-
-			if (this.jobs[this.calendars[this.calendarIndex]].length > 0) {
-				var job = this.jobs[this.calendars[this.calendarIndex]].shift();
-				if (job === undefined) {
-					dump("%%%%%%%%%%%%%%%%% job === undefined &&&&&&&&&&&&&&&&&&&&\n");
-				}
-				this.jobCount--;
-
-				this.observerService.notifyObservers(job.calendar, "onExchangeProgressChange", null); 
-
-				job.arguments["cbOk"] = job.cbOk;
-				job.arguments["cbError"] = job.cbError;
-				job.arguments["job"] = job;
-				job.arguments["calendar"] = job.calendar;
-				var newJob = new jobObject(job, this.server, this.loadBalancer);
-				this.runningJobs.push(newJob);
-
-				this.jobsRunning++;
-				this.loadBalancer.logInfo("serverQueue:"+this.server+":Starting job for calendar '"+job.calendar.name+"'. We now have:"+this.jobs[job.calendar.id].length+" jobs in queue and "+this.runningJobs.length+" jobs running.",2);
-
-	//dump(server+":loadBalancer: starting timeout for Job\n");
-				newJob.timer.initWithCallback(newJob, this.sleepBetweenJobs, Ci.nsITimer.TYPE_ONE_SHOT);
-				this.loadBalancer.logInfo("serverQueue:"+this.server+": Started timer for new job.",1);
-			}
-			else {
-				dump("serverQueue:"+this.server+": Strange. this.jobCount == "+this.jobCount+" but could not find calendar with jobs.\n");
-			}
-		}
-
-		if ((this.jobCount == 0) && (this.runningJobs.length == 0)) {
-			this.loadBalancer.logInfo("serverQueue:"+this.server+": Stopping server queue timer.",1);
-			this.timer.cancel();
-			this.timerStopped = true;
-			this.loadBalancer.logInfo("serverQueue:"+this.server+": Timer stopped.",1);
-		}
-}
-catch(err) {
-	dump("serverQueue: notify: err:"+err+"\n");
-}
-	},
+    matchesServer: function _matchesServer(aServer) {
+        return (aServer.toLowerCase() == this.server.toLowerCase());
+    },
+
+    clearQueueForCalendar: function _clearQueueForCalendar(aCalendar) {
+        if (this.jobs[aCalendar.id]) {
+            this.jobCount = this.jobCount - this.jobs[aCalendar.id].length;
+            delete this.jobs[aCalendar.id];
+            this.observerService.notifyObservers(aCalendar, "onExchangeProgressChange", null);
+        }
+    },
+
+    stopRunningJobsForCalendar: function _stopRunningJobsForCalendar(aCalendar) {
+        if (this.jobs[aCalendar.id]) {
+            for (var index in this.runningJobs) {
+                // only stop for current calendar
+                try {
+                    if ((this.runningJobs[index].exchangeRequest) && (this.runningJobs[index].exchangeRequest.isRunning) && (this.runningJobs[index].calendar) && (this.runningJobs[index].calendar.id == aCalendar.id)) {
+                        this.runningJobs[index].exchangeRequest.stopRequest();
+                    }
+                }
+                catch (err) {
+                    this.loadBalancer.globalFunctions.LOG("serverQueue:" + this.server + ":stopRunningJobsForCalendar Error:" + err + " (" + this.globalFunctions.STACKshort() + ")", -1);
+                }
+            }
+        }
+    },
+
+    addJob: function _addJob(aJob) {
+        // Check if we already have this calendar id;
+        if (!this.jobs[aJob.calendar.id]) {
+            this.calendars.push(aJob.calendar.id);
+            this.jobs[aJob.calendar.id] = [];
+            this.calendarNames[aJob.calendar.id] = aJob.calendar.name;
+        }
+
+        this.jobs[aJob.calendar.id].push(aJob);
+        this.jobCount++;
+
+        if (this.timerStopped) {
+            this.loadBalancer.logInfo("serverQueue:" + this.server + ": Timer started.", 1);
+            this.timerStopped = false;
+            this.timer.initWithCallback(this, 10, this.timer.TYPE_REPEATING_SLACK);
+        }
+
+        this.loadBalancer.logInfo("serverQueue:" + this.server + ": Added job to queue for server '" + this.server + "' for calendar '" + aJob.calendar.name + "'. We now have:" + this.jobs[aJob.calendar.id].length + " jobs.", 2);
+        this.observerService.notifyObservers(aJob.calendar, "onExchangeProgressChange", null);
+    },
+
+    get maxJobs() {
+        return 1; // Currently going for default one at a time to the same server because the xmlhttprequest cannot handle more simultaniously.
+        //return this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"maxJobs", 3, true);
+    },
+
+    get sleepBetweenJobs() {
+        return 50; // Currently going for default zero because it works.
+        //return this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"sleepBetweenJobs", 2, true);
+    },
+
+    notify: function _notify(aTimer) {
+        //dump(this.server+":loadBalancer: starting Job\n");
+        try {
+            // Cleanup jobs wich have finished
+            var newJobList = [];
+            for (var index in this.runningJobs) {
+                if ((this.runningJobs[index].exchangeRequest) && (!this.runningJobs[index].exchangeRequest.isRunning)) {
+                    // Job stopped.
+                    this.loadBalancer.logInfo("serverQueue:" + this.server + ": Removing stopped job.", 1);
+                    this.jobsRunning--;
+                    this.runningJobs[index].clear();
+                }
+                else {
+                    newJobList.push(this.runningJobs[index]);
+                    if (this.runningJobs[index].state == jobObject.RUNNING) {
+                        var timeNow = new Date().getTime();
+                        var timeDiff = timeNow - this.runningJobs[index].startTime;
+                        if (timeDiff > 300000) {
+                            dump("We have a job which is running longer than 5 minutes:" + this.runningJobs[index].job.ecRequest + "\n");
+                            if (this.runningJobs[index].exchangeRequest["runs"]) {
+                                dump("  ## runs=" + this.runningJobs[index].exchangeRequest["runs"] + "  ##\n");
+                            }
+                            //dump("We have a job which is running longer than 5 minutes\n"); 
+                            this.runningJobs[index].startTime = new Date().getTime();
+                        }
+                    }
+                }
+            }
+            this.runningJobs = newJobList;
+
+            //this.loadBalancer.logInfo("serverQueue:"+this.server+": Notify: this.runningJobs:"+this.runningJobs.length+".",2);
+
+            if ((this.runningJobs.length < this.maxJobs) && (this.jobCount > 0)) {
+
+                // Try to find next calendar with a job.
+                var oldCalendarIndex = this.calendarIndex;
+                do {
+                    this.calendarIndex++;
+                    if (this.calendarIndex >= this.calendars.length) {
+                        this.calendarIndex = 0;
+                    }
+                } while ((this.jobs[this.calendars[this.calendarIndex]].length == 0) && (this.calendarIndex != oldCalendarIndex));
+
+                if (this.jobs[this.calendars[this.calendarIndex]].length > 0) {
+                    var job = this.jobs[this.calendars[this.calendarIndex]].shift();
+                    if (job === undefined) {
+                        dump("%%%%%%%%%%%%%%%%% job === undefined &&&&&&&&&&&&&&&&&&&&\n");
+                    }
+                    this.jobCount--;
+
+                    this.observerService.notifyObservers(job.calendar, "onExchangeProgressChange", null);
+
+                    job.arguments["cbOk"] = job.cbOk;
+                    job.arguments["cbError"] = job.cbError;
+                    job.arguments["job"] = job;
+                    job.arguments["calendar"] = job.calendar;
+                    var newJob = new jobObject(job, this.server, this.loadBalancer);
+                    this.runningJobs.push(newJob);
+
+                    this.jobsRunning++;
+                    this.loadBalancer.logInfo("serverQueue:" + this.server + ":Starting job for calendar '" + job.calendar.name + "'. We now have:" + this.jobs[job.calendar.id].length + " jobs in queue and " + this.runningJobs.length + " jobs running.", 2);
+
+                    //dump(server+":loadBalancer: starting timeout for Job\n");
+                    newJob.timer.initWithCallback(newJob, this.sleepBetweenJobs, Ci.nsITimer.TYPE_ONE_SHOT);
+                    this.loadBalancer.logInfo("serverQueue:" + this.server + ": Started timer for new job.", 1);
+                }
+                else {
+                    dump("serverQueue:" + this.server + ": Strange. this.jobCount == " + this.jobCount + " but could not find calendar with jobs.\n");
+                }
+            }
+
+            if ((this.jobCount == 0) && (this.runningJobs.length == 0)) {
+                this.loadBalancer.logInfo("serverQueue:" + this.server + ": Stopping server queue timer.", 1);
+                this.timer.cancel();
+                this.timerStopped = true;
+                this.loadBalancer.logInfo("serverQueue:" + this.server + ": Timer stopped.", 1);
+            }
+        }
+        catch (err) {
+            dump("serverQueue: notify: err:" + err + "\n");
+        }
+    },
 }
 
 function mivExchangeLoadBalancer() {
-	this.serverQueues = [];
+    this.serverQueues = [];
 
-	this.observerService = Cc["@mozilla.org/observer-service;1"]  
-	                          .getService(Ci.nsIObserverService); 
+    this.observerService = Cc["@mozilla.org/observer-service;1"]
+        .getService(Ci.nsIObserverService);
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
 }
 
@@ -292,102 +284,99 @@ var mivExchangeLoadBalancerGUID = "2db8c940-1927-11e2-892e-0800200c9a55";
 
 mivExchangeLoadBalancer.prototype = {
 
-	// methods from nsISupport
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeLoadBalancer,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-	classDescription: "Load balancer for requests to Exchange server.",
-	classID: components.ID("{"+mivExchangeLoadBalancerGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/loadbalancer;1",
-	flags: Ci.nsIClassInfo.SINGLETON,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-
-	addToQueue: function _addToQueue(aJob)
-	{
-		if (!aJob.arguments) {
-			this.logInfo("addToQueue: arguments is not defined!!!????:"+this.globalFunctions.STACK());
-			return;
-		}
-
-		var queueToUse = undefined;
-		for each(var serverq in this.serverQueues) {
-			if (serverq.matchesServer(aJob.arguments.serverUrl)) {
-				queueToUse = serverq;
-				break;
-			}
-		}
-
-		if (queueToUse === undefined) {
-			queueToUse = new serverQueue(aJob.arguments.serverUrl, this);
-			this.serverQueues.push(queueToUse);
-		}
-
-		queueToUse.addJob(aJob);
-	},
-
-	get jobList()
-	{
-		return this.serverQueues;
-	},
-
-	clearQueueForCalendar: function _clearQueueForCalendar(aServer, aCalendar)
-	{
-		var queueToUse = undefined;
-		for each(var serverq in this.serverQueues) {
-			if (serverq.matchesServer(aServer)) {
-				serverq.clearQueueForCalendar(aCalendar);
-				break;
-			}
-		}
-	},
-
-	stopRunningJobsForCalendar: function _stopRunningJobsForCalendar(aServer, aCalendar)
-	{
-		var queueToUse = undefined;
-		for each(var serverq in this.serverQueues) {
-			if (serverq.matchesServer(aServer)) {
-				serverq.stopRunningJobsForCalendar(aCalendar);
-				break;
-			}
-		}
-
-	},
-
-	logInfo: function _logInfo(message, aDebugLevel) {
-
-		if (!aDebugLevel) {
-			var debugLevel = 1;
-		}
-		else {
-			var debugLevel = aDebugLevel;
-		}
-
-		this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"debuglevel", 0, true);
-		if (debugLevel <= this.storedDebugLevel) {
-			this.globalFunctions.LOG("[exchangeLoadBalancer] "+message + " ("+this.globalFunctions.STACKshort()+")");
-		}
-	},
+    // methods from nsISupport
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeLoadBalancer,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+    classDescription: "Load balancer for requests to Exchange server.",
+    classID: components.ID("{" + mivExchangeLoadBalancerGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/loadbalancer;1",
+    flags: Ci.nsIClassInfo.SINGLETON,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+
+    addToQueue: function _addToQueue(aJob) {
+        if (!aJob.arguments) {
+            this.logInfo("addToQueue: arguments is not defined!!!????:" + this.globalFunctions.STACK());
+            return;
+        }
+
+        var queueToUse = undefined;
+        for each(var serverq in this.serverQueues) {
+            if (serverq.matchesServer(aJob.arguments.serverUrl)) {
+                queueToUse = serverq;
+                break;
+            }
+        }
+
+        if (queueToUse === undefined) {
+            queueToUse = new serverQueue(aJob.arguments.serverUrl, this);
+            this.serverQueues.push(queueToUse);
+        }
+
+        queueToUse.addJob(aJob);
+    },
+
+    get jobList() {
+        return this.serverQueues;
+    },
+
+    clearQueueForCalendar: function _clearQueueForCalendar(aServer, aCalendar) {
+        var queueToUse = undefined;
+        for each(var serverq in this.serverQueues) {
+            if (serverq.matchesServer(aServer)) {
+                serverq.clearQueueForCalendar(aCalendar);
+                break;
+            }
+        }
+    },
+
+    stopRunningJobsForCalendar: function _stopRunningJobsForCalendar(aServer, aCalendar) {
+        var queueToUse = undefined;
+        for each(var serverq in this.serverQueues) {
+            if (serverq.matchesServer(aServer)) {
+                serverq.stopRunningJobsForCalendar(aCalendar);
+                break;
+            }
+        }
+
+    },
+
+    logInfo: function _logInfo(message, aDebugLevel) {
+
+        if (!aDebugLevel) {
+            var debugLevel = 1;
+        }
+        else {
+            var debugLevel = aDebugLevel;
+        }
+
+        this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART + "debuglevel", 0, true);
+        if (debugLevel <= this.storedDebugLevel) {
+            this.globalFunctions.LOG("[exchangeLoadBalancer] " + message + " (" + this.globalFunctions.STACKshort() + ")");
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeLoadBalancer) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeLoadBalancer = XPCOMUtils.generateNSGetFactory([mivExchangeLoadBalancer]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeLoadBalancer) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeLoadBalancer = XPCOMUtils.generateNSGetFactory([mivExchangeLoadBalancer]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeLoadBalancer(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeLoadBalancer(cid);
+}
diff --git a/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js b/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
index f239c22a..0fc1fc10 100644
--- a/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
+++ b/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
@@ -29,11 +29,11 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeRecurrenceInfo() {
 
-	this._recurrenceInfo = Cc["@mozilla.org/calendar/recurrence-info;1"]
-				.createInstance(Ci.calIRecurrenceInfo);
+    this._recurrenceInfo = Cc["@mozilla.org/calendar/recurrence-info;1"]
+        .createInstance(Ci.calIRecurrenceInfo);
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
 }
 
@@ -43,450 +43,419 @@ var mivExchangeRecurrenceInfoGUID = "d69c5580-8ff7-11e2-9e96-0800200c9a66";
 
 mivExchangeRecurrenceInfo.prototype = {
 
-	// methods from nsISupport
-
-	_refCount: 0,
-
-	//nsrefcnt AddRef();
-	AddRef: function _AddRef()
-	{
-		this._refCount++;
-		return this._refCount;
-	},
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeRecurrenceInfo,
-						Ci.nsISupports,
-						Ci.calIRecurrenceInfo,
-						Ci.nsIClassInfo]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "RecurrenceInfo object for Exchange recurring master.",
-	classID: components.ID("{"+mivExchangeRecurrenceInfoGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/recurrenceinfo;1",
-	flags: Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeRecurrenceInfo,
-				Ci.nsISupports,
-				Ci.calIRecurrenceInfo,
-				Ci.nsIClassInfo];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) 
-	{
-		return null;
-	},
-
-	// External methods
-
-	// Internal methods.
-  // returns true if this thing is able to be modified;
-  // if the item is not mutable, attempts to modify
-  // any data will throw CAL_ERROR_ITEM_IS_IMMUTABLE
-  //readonly attribute boolean isMutable;
-
-	get isMutable()
-	{
-		return this._recurrenceInfo.isMutable;
-	},
-
-  // makes this item immutable
-  //void makeImmutable();
-	makeImmutable: function _makeImmutable()
-	{
-		return this._recurrenceInfo.makeImmutable();
-	},
-
-  // clone always returns a mutable event
-  //calIRecurrenceInfo clone();
-	clone: function _clone()
-	{
-		//this.logInfo("clone 1.", 1, 2);
-		var result = Cc["@1st-setup.nl/exchange/recurrenceinfo;1"]
-				.createInstance(Ci.mivExchangeRecurrenceInfo);
-
-		result.item = this.item;
-		var count = {};
-		var myItems = this.getRecurrenceItems(count);
-		//this.logInfo("clone 1: title:"+this.item.title+", myItems.length:"+myItems.length+", count.value:"+count.value, 1, 3);
-		result.setRecurrenceItems(count.value, myItems);
-		//this.logInfo("clone 2.");
-		return result;
-	},
-
-  // initialize this with the item for which this recurrence
-  // applies, so that the start date can be tracked
-  //attribute calIItemBase item;
-	get item()
-	{
-		return this._recurrenceInfo.item;
-	},
-
-	set item(aValue)
-	{
-		this._recurrenceInfo.item = aValue;
-	},
-
-  /**
-   * The start date of an item is directly referenced by parts of calIRecurrenceInfo,
-   * thus changing the former without adjusting the latter would break the internal structure.
-   * This method provides the necessary functionality. There's no need to call it manually
-   * after writing to the start date of an item, since it's called automatically in the
-   * appropriate setter of an item.
-   */
-  //void onStartDateChange(in calIDateTime aNewStartTime, in calIDateTime aOldStartTime);
-	onStartDateChange: function _onStartDateChange(aNewStartTime, aOldStartTime)
-	{
-		this._recurrenceInfo.onStartDateChange(aNewStartTime, aOldStartTime);
-	},
-
-  /**
-   * If the base item's UID changes, this implicitly has to change all overridden items' UID, too.
-   *
-   * @param id new UID 
-   */
-  //void onIdChange(in AUTF8String aNewId);
-	onIdChange: function _onIdChange(aNewId)
-	{
-		this._recurrenceInfo.onIdChange(aNewId);
-	},
-
-  /*
-   * Set of recurrence items; the order of these matters.
-   */
-
-  //void getRecurrenceItems(out unsigned long aCount, [array,size_is(aCount),retval] out calIRecurrenceItem aItems);
-	getRecurrenceItems: function _getRecurrenceItems(aReturn)
-	{
-		var result = this._recurrenceInfo.getRecurrenceItems(aReturn);
-/*		for each(var reitem in result) {
-			//this.logInfo("getRecurrenceItems 1: title:"+this.item.title+", result.length:"+result.length+", reitem.interval:"+reitem.interval, 1, 3);
-			if (reitem.isByCount) {
-				//this.logInfo("getRecurrenceItems 1: title:"+this.item.title+", result.length:"+result.length+", reitem.count:"+reitem.count, 1, 3);
-			}
-			else {
-				//this.logInfo("getRecurrenceItems 1: title:"+this.item.title+", result.length:"+result.length+", reitem.untilDate:"+reitem.untilDate, 1, 3);
-			}
-		}*/
-		return result;
-	},
-  //void setRecurrenceItems(in unsigned long aCount, [array,size_is(aCount)] in calIRecurrenceItem aItems);
-	setRecurrenceItems: function _setRecurrenceItems(aCount, aItems)
-	{
-/*		for each(var reitem in aItems) {
-			this.logInfo("setRecurrenceItems 1: title:"+this.item.title+", aItems.length:"+aItems.length+", reitem.interval:"+reitem.interval, 1, 3);
-			if (reitem.isByCount) {
-				this.logInfo("setRecurrenceItems 1: title:"+this.item.title+", aItems.length:"+aItems.length+", reitem.count:"+reitem.count, 1, 3);
-			}
-			else {
-				this.logInfo("setRecurrenceItems 1: title:"+this.item.title+", aItems.length:"+aItems.length+", reitem.untilDate:"+reitem.untilDate, 1, 3);
-			}
-		}*/
-		this._recurrenceInfo.setRecurrenceItems(aCount, aItems);
-
-		var recItems = this.getRecurrenceItems({});
-		//this.logInfo("setRecurrenceItems 2: title:"+this.item.title+", recItems.length:"+recItems.length);
-	},
-
-  //unsigned long countRecurrenceItems();
-	countRecurrenceItems: function _countRecurrenceItems()
-	{
-		return this._recurrenceInfo.countRecurrenceItems();
-	},
-
-  //void clearRecurrenceItems();
-	clearRecurrenceItems: function _clearRecurrenceItems()
-	{
-		this._recurrenceInfo.clearRecurrenceItems();
-	},
-
-  //void appendRecurrenceItem(in calIRecurrenceItem aItem);
-	appendRecurrenceItem: function _appendRecurrenceItem(aItem)
-	{
-		//this.logInfo("appendRecurrenceItem.");
-		this._recurrenceInfo.appendRecurrenceItem(aItem);
-	},
-
-  //calIRecurrenceItem getRecurrenceItemAt(in unsigned long aIndex);
-	getRecurrenceItemAt: function _getRecurrenceItemAt(aIndex)
-	{
-		//this.logInfo("getRecurrenceItemAt: aIndex:"+aIndex);
-		return this._recurrenceInfo.getRecurrenceItemAt(aIndex);
-	},
-
-  //void deleteRecurrenceItemAt(in unsigned long aIndex);
-	deleteRecurrenceItemAt: function _deleteRecurrenceItemAt(aIndex)
-	{
-		//dump("deleteRecurrenceItemAt: aIndex:"+aIndex+"\n");
-		this._recurrenceInfo.deleteRecurrenceItemAt(aIndex);
-	},
-
-  //void deleteRecurrenceItem(in calIRecurrenceItem aItem);
-	deleteRecurrenceItem: function _deleteRecurrenceItem(aItem)
-	{
-		//dump(" -- deleteRecurrenceItem.\n");
-		this._recurrenceInfo.deleteRecurrenceItem(aItem);
-	},
-
-  // inserts the item at the given index, pushing the item that was previously there forward
-  //void insertRecurrenceItemAt(in calIRecurrenceItem aItem, in unsigned long aIndex);
-	insertRecurrenceItemAt: function _insertRecurrenceItemAt(aItem, aIndex)
-	{
-		//this.logInfo("insertRecurrenceItemAt: aIndex:"+aIndex);
-		this._recurrenceInfo.insertRecurrenceItemAt(aItem, aIndex);
-	},
-
-
-  /**
-   * isFinite is true if the recurrence items specify a finite number
-   * of occurrences.  This is useful for UI and for possibly other users.
-   */
-  //readonly attribute boolean isFinite;
-	get isFinite()
-	{
-		return this._recurrenceInfo.isFinite;
-	},
-
-  /**
-   * This is a shortcut to appending or removing a single negative date
-   * assertion. aRecurrenceId needs to be a normal recurrence id, it may not be
-   * RDATE.
-   */
-  //void removeOccurrenceAt(in calIDateTime aRecurrenceId);
-	removeOccurrenceAt: function _removeOccurrenceAt(aRecurrenceId)
-	{
-		//dump("removeOccurrenceAt: aRecurrenceId:"+aRecurrenceId+"\n");
-		this.item.removeOccurrenceAt(aRecurrenceId);
-		this._recurrenceInfo.removeOccurrenceAt(aRecurrenceId);
-	},
-
-  //void restoreOccurrenceAt(in calIDateTime aRecurrenceId);
-	restoreOccurrenceAt: function _restoreOccurrenceAt(aRecurrenceId)
-	{
-		//this.logInfo("restoreOccurrenceAt: aRecurrenceId:"+aRecurrenceId);
-		this._recurrenceInfo.restoreOccurrenceAt(aRecurrenceId);
-	},
-
-
-  /*
-   * exceptions
-   */
-
-  /**
-   * Modify an a particular occurrence with the given exception proxy
-   * item.  If the recurrenceId isn't an already existing exception item,
-   * a new exception is added.  Otherwise, the existing exception
-   * is modified.
-   *
-   * The item's parentItem must be equal to this RecurrenceInfo's
-   * item. <-- XXX check this, compare by calendar/id only
-   *
-   * @param anItem exceptional/overridden item
-   * @param aTakeOverOwnership whether the recurrence info object can take over
-   *        the item or needs to clone it
-   */
-  //void modifyException(in calIItemBase anItem, in boolean aTakeOverOwnership);
-	modifyException: function _modifyException(anItem, aTakeOverOwnership)
-	{
-		//dump("modifyException: anItem:"+anItem.title+"\n");
-		this._recurrenceInfo.modifyException(anItem, aTakeOverOwnership);
-		this.item.modifyException(anItem);
-	},
-
-  /**
-   * Return an existing exception item for the given recurrence ID.
-   * If an exception does not exist, null is returned.
-   */
-  //calIItemBase getExceptionFor(in calIDateTime aRecurrenceId);
-	getExceptionFor: function _getExceptionFor(aRecurrenceId)
-	{
-		//this.logInfo("getExceptionFor: aRecurrenceId:"+aRecurrenceId);
-		return this._recurrenceInfo.getExceptionFor(aRecurrenceId);
-	},
-
-  /**
-   * Removes an exception item for the given recurrence ID, if
-   * any exist.
-   */
-  //void removeExceptionFor(in calIDateTime aRecurrenceId);
-	removeExceptionFor: function _removeExceptionFor(aRecurrenceId)
-	{
-		//this.logInfo("removeExceptionFor: aRecurrenceId:"+aRecurrenceId);
-		this._recurrenceInfo.removeExceptionFor(aRecurrenceId);
-	},
-
-  /**
-   * Returns a list of all recurrence ids that have exceptions.
-   */
-  //void getExceptionIds(out unsigned long aCount, [array,size_is(aCount),retval] out calIDateTime aIds);
-	getExceptionIds: function _getExceptionIds(aValue)
-	{
-		return this._recurrenceInfo.getExceptionIds(aValue);
-	},
-
-  /*
-   * Recurrence calculation
-   */
-
-  /*
-   * Get the occurrence at the given recurrence ID; if there is no
-   * exception, then create a new proxy object with the normal occurrence.
-   * Otherwise, return the exception.
-   *
-   * @param aRecurrenceId   The recurrence ID to get the occurrence for.
-   * @return                The occurrence or exception corresponding to the id
-   */
-  //calIItemBase getOccurrenceFor(in calIDateTime aRecurrenceId);
-	getOccurrenceFor: function _getOccurrenceFor(aRecurrenceId)
-	{
-		return this._recurrenceInfo.getOccurrenceFor(aRecurrenceId);
-	},
-
-  /**
-   * Return the chronologically next occurrence after aTime. This takes
-   * exceptions and EXDATE/RDATEs into account.
-   *
-   * @param aTime           The (exclusive) date to start searching.
-   * @return                The next occurrence, or null if there is none.
-   */
-  //calIItemBase getNextOccurrence(in calIDateTime aTime);
-	getNextOccurrence: function _getNextOccurrence(aTime)
-	{
-		return this._recurrenceInfo.getNextOccurrence(aTime);
-	},
-
-  /**
-   * Return the chronologically previous occurrence after aTime. This takes
-   * exceptions and EXDATE/RDATEs into account.
-   *
-   * @param aTime           The (exclusive) date to start searching.
-   * @return                The previous occurrence, or null if there is none.
-   */
-  //calIItemBase getPreviousOccurrence(in calIDateTime aTime);
-	getPreviousOccurrence: function _getPreviousOccurrence(aTime)
-	{
-		return this._recurrenceInfo.getPreviousOccurrence(aTime);
-	},
-
-  /**
-   * Return an array of calIDateTime representing all start times of this event
-   * between start (inclusive) and end (non-inclusive). Exceptions are taken
-   * into account.
-   *
-   * @param aRangeStart     The (inclusive) date to start searching.
-   * @param aRangeEnd       The (exclusive) date to end searching.
-   * @param aMaxCount       The maximum number of dates to return
-   *
-   * @param aCount          The number of dates returned.
-   * @return                The array of dates.
-   */
-  //void getOccurrenceDates(in calIDateTime aRangeStart,
-  //                        in calIDateTime aRangeEnd,
-  //                        in unsigned long aMaxCount,
-  //                        out unsigned long aCount, [array,size_is(aCount),retval] out calIDateTime aDates);
-	getOccurrenceDates: function _getOccurrenceDates(aRangeStart, aRangeEnd, aMaxCount, aCount)
-	{
-		return this._recurrenceInfo.getOccurrenceDates(aRangeStart, aRangeEnd, aMaxCount, aCount);
-	},
-
-  /**
-   * Return an array of calIItemBase representing all occurrences of this event
-   * between start (inclusive) and end (non-inclusive). Exceptions are taken
-   * into account.
-   *
-   * @param aRangeStart     The (inclusive) date to start searching.
-   * @param aRangeEnd       The (exclusive) date to end searching.
-   * @param aMaxCount       The maximum number of occurrences to return
-   *
-   * @param aCount          The number of occurrences returned.
-   * @return                The array of occurrences.
-   */
-  //void getOccurrences(in calIDateTime aRangeStart,
-  //                     in calIDateTime aRangeEnd,
-  //                     in unsigned long aMaxCount,
-  //                     out unsigned long aCount, [array,size_is(aCount),retval] out calIItemBase aItems);
-	getOccurrences: function _getOccurrences(aRangeStart, aRangeEnd, aMaxCount, aCount)
-	{
-		if ((this.item) && (this.item.className == "mivExchangeTodo")) {
-			var occurrences = new Array();
-			occurrences.push(this.item);
-			aCount.value = occurrences.length;
-			return occurrences;
-		}
-
-		return this._recurrenceInfo.getOccurrences(aRangeStart, aRangeEnd, aMaxCount, aCount);
-	},
-
-
-	toString: function _toString()
-	{
-		var recurrenceItems = this.getRecurrenceItems({});
-		//this.logInfo("Going to see if we have recurrenceItems:"+recurrenceItems.length);
-		var result = "";
-		for each (var ritem in recurrenceItems) {
-				//this.logInfo(" ||||| ritem:"+ritem);
-			if (ritem instanceof Ci.calIRecurrenceRule) {
-				if (ritem) {
-					//dump(" ;;;; ritem:"+ritem.icalProperty.icalString+"\n");
-
-					// RRULE:FREQ=DAILY;UNTIL=20131203T121500Z  ---> RRULE:FREQ=DAILY;UNTIL=20131203T000000Z
-					//dump(" ---- ritem:"+ritem.icalProperty.icalString.replace(/RRULE:(.*);UNTIL=(\d*)T(\d*)Z/, "RRULE:$1;UNTIL=$2T000000Z")+"\n");
-					result += ritem.icalProperty.icalString.replace(/RRULE:(.*);UNTIL=(\d*)T(\d*)Z/, "RRULE:$1;UNTIL=$2T000000Z");
-				}
-				else {
-					//this.logInfo(" ;;;; ritem: null !!!!!!!!!!!!!!");
-				}
-				break;
-			}
-		}
-		return result;
-	},
-
-	logInfo: function _logInfo(message, aDebugLevel, aDepth) {
-
-		var depth = aDepth || 1;
-
-		if (!aDebugLevel) {
-			var debugLevel = 1;
-		}
-		else {
-			var debugLevel = aDebugLevel;
-		}
-
-		this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"debuglevel", 0, true);
-		//this.storedDebugLevel = 2;
-		if (debugLevel <= this.storedDebugLevel) {
-			this.globalFunctions.LOG("[exchangeRecurrenceInfo] "+message  + " ("+this.globalFunctions.STACK(depth, 1)+")");
-		}
-	},
+    // methods from nsISupport
+
+    _refCount: 0,
+
+    //nsrefcnt AddRef();
+    AddRef: function _AddRef() {
+        this._refCount++;
+        return this._refCount;
+    },
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeRecurrenceInfo,
+        Ci.nsISupports,
+        Ci.calIRecurrenceInfo,
+        Ci.nsIClassInfo
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "RecurrenceInfo object for Exchange recurring master.",
+    classID: components.ID("{" + mivExchangeRecurrenceInfoGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/recurrenceinfo;1",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeRecurrenceInfo,
+            Ci.nsISupports,
+            Ci.calIRecurrenceInfo,
+            Ci.nsIClassInfo
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    // External methods
+
+    // Internal methods.
+    // returns true if this thing is able to be modified;
+    // if the item is not mutable, attempts to modify
+    // any data will throw CAL_ERROR_ITEM_IS_IMMUTABLE
+    //readonly attribute boolean isMutable;
+
+    get isMutable() {
+        return this._recurrenceInfo.isMutable;
+    },
+
+    // makes this item immutable
+    //void makeImmutable();
+    makeImmutable: function _makeImmutable() {
+        return this._recurrenceInfo.makeImmutable();
+    },
+
+    // clone always returns a mutable event
+    //calIRecurrenceInfo clone();
+    clone: function _clone() {
+        //this.logInfo("clone 1.", 1, 2);
+        var result = Cc["@1st-setup.nl/exchange/recurrenceinfo;1"]
+            .createInstance(Ci.mivExchangeRecurrenceInfo);
+
+        result.item = this.item;
+        var count = {};
+        var myItems = this.getRecurrenceItems(count);
+        //this.logInfo("clone 1: title:"+this.item.title+", myItems.length:"+myItems.length+", count.value:"+count.value, 1, 3);
+        result.setRecurrenceItems(count.value, myItems);
+        //this.logInfo("clone 2.");
+        return result;
+    },
+
+    // initialize this with the item for which this recurrence
+    // applies, so that the start date can be tracked
+    //attribute calIItemBase item;
+    get item() {
+        return this._recurrenceInfo.item;
+    },
+
+    set item(aValue) {
+        this._recurrenceInfo.item = aValue;
+    },
+
+    /**
+     * The start date of an item is directly referenced by parts of calIRecurrenceInfo,
+     * thus changing the former without adjusting the latter would break the internal structure.
+     * This method provides the necessary functionality. There's no need to call it manually
+     * after writing to the start date of an item, since it's called automatically in the
+     * appropriate setter of an item.
+     */
+    //void onStartDateChange(in calIDateTime aNewStartTime, in calIDateTime aOldStartTime);
+    onStartDateChange: function _onStartDateChange(aNewStartTime, aOldStartTime) {
+        this._recurrenceInfo.onStartDateChange(aNewStartTime, aOldStartTime);
+    },
+
+    /**
+     * If the base item's UID changes, this implicitly has to change all overridden items' UID, too.
+     *
+     * @param id new UID 
+     */
+    //void onIdChange(in AUTF8String aNewId);
+    onIdChange: function _onIdChange(aNewId) {
+        this._recurrenceInfo.onIdChange(aNewId);
+    },
+
+    /*
+     * Set of recurrence items; the order of these matters.
+     */
+
+    //void getRecurrenceItems(out unsigned long aCount, [array,size_is(aCount),retval] out calIRecurrenceItem aItems);
+    getRecurrenceItems: function _getRecurrenceItems(aReturn) {
+        var result = this._recurrenceInfo.getRecurrenceItems(aReturn);
+        /*		for each(var reitem in result) {
+        			//this.logInfo("getRecurrenceItems 1: title:"+this.item.title+", result.length:"+result.length+", reitem.interval:"+reitem.interval, 1, 3);
+        			if (reitem.isByCount) {
+        				//this.logInfo("getRecurrenceItems 1: title:"+this.item.title+", result.length:"+result.length+", reitem.count:"+reitem.count, 1, 3);
+        			}
+        			else {
+        				//this.logInfo("getRecurrenceItems 1: title:"+this.item.title+", result.length:"+result.length+", reitem.untilDate:"+reitem.untilDate, 1, 3);
+        			}
+        		}*/
+        return result;
+    },
+    //void setRecurrenceItems(in unsigned long aCount, [array,size_is(aCount)] in calIRecurrenceItem aItems);
+    setRecurrenceItems: function _setRecurrenceItems(aCount, aItems) {
+        /*		for each(var reitem in aItems) {
+        			this.logInfo("setRecurrenceItems 1: title:"+this.item.title+", aItems.length:"+aItems.length+", reitem.interval:"+reitem.interval, 1, 3);
+        			if (reitem.isByCount) {
+        				this.logInfo("setRecurrenceItems 1: title:"+this.item.title+", aItems.length:"+aItems.length+", reitem.count:"+reitem.count, 1, 3);
+        			}
+        			else {
+        				this.logInfo("setRecurrenceItems 1: title:"+this.item.title+", aItems.length:"+aItems.length+", reitem.untilDate:"+reitem.untilDate, 1, 3);
+        			}
+        		}*/
+        this._recurrenceInfo.setRecurrenceItems(aCount, aItems);
+
+        var recItems = this.getRecurrenceItems({});
+        //this.logInfo("setRecurrenceItems 2: title:"+this.item.title+", recItems.length:"+recItems.length);
+    },
+
+    //unsigned long countRecurrenceItems();
+    countRecurrenceItems: function _countRecurrenceItems() {
+        return this._recurrenceInfo.countRecurrenceItems();
+    },
+
+    //void clearRecurrenceItems();
+    clearRecurrenceItems: function _clearRecurrenceItems() {
+        this._recurrenceInfo.clearRecurrenceItems();
+    },
+
+    //void appendRecurrenceItem(in calIRecurrenceItem aItem);
+    appendRecurrenceItem: function _appendRecurrenceItem(aItem) {
+        //this.logInfo("appendRecurrenceItem.");
+        this._recurrenceInfo.appendRecurrenceItem(aItem);
+    },
+
+    //calIRecurrenceItem getRecurrenceItemAt(in unsigned long aIndex);
+    getRecurrenceItemAt: function _getRecurrenceItemAt(aIndex) {
+        //this.logInfo("getRecurrenceItemAt: aIndex:"+aIndex);
+        return this._recurrenceInfo.getRecurrenceItemAt(aIndex);
+    },
+
+    //void deleteRecurrenceItemAt(in unsigned long aIndex);
+    deleteRecurrenceItemAt: function _deleteRecurrenceItemAt(aIndex) {
+        //dump("deleteRecurrenceItemAt: aIndex:"+aIndex+"\n");
+        this._recurrenceInfo.deleteRecurrenceItemAt(aIndex);
+    },
+
+    //void deleteRecurrenceItem(in calIRecurrenceItem aItem);
+    deleteRecurrenceItem: function _deleteRecurrenceItem(aItem) {
+        //dump(" -- deleteRecurrenceItem.\n");
+        this._recurrenceInfo.deleteRecurrenceItem(aItem);
+    },
+
+    // inserts the item at the given index, pushing the item that was previously there forward
+    //void insertRecurrenceItemAt(in calIRecurrenceItem aItem, in unsigned long aIndex);
+    insertRecurrenceItemAt: function _insertRecurrenceItemAt(aItem, aIndex) {
+        //this.logInfo("insertRecurrenceItemAt: aIndex:"+aIndex);
+        this._recurrenceInfo.insertRecurrenceItemAt(aItem, aIndex);
+    },
+
+
+    /**
+     * isFinite is true if the recurrence items specify a finite number
+     * of occurrences.  This is useful for UI and for possibly other users.
+     */
+    //readonly attribute boolean isFinite;
+    get isFinite() {
+        return this._recurrenceInfo.isFinite;
+    },
+
+    /**
+     * This is a shortcut to appending or removing a single negative date
+     * assertion. aRecurrenceId needs to be a normal recurrence id, it may not be
+     * RDATE.
+     */
+    //void removeOccurrenceAt(in calIDateTime aRecurrenceId);
+    removeOccurrenceAt: function _removeOccurrenceAt(aRecurrenceId) {
+        //dump("removeOccurrenceAt: aRecurrenceId:"+aRecurrenceId+"\n");
+        this.item.removeOccurrenceAt(aRecurrenceId);
+        this._recurrenceInfo.removeOccurrenceAt(aRecurrenceId);
+    },
+
+    //void restoreOccurrenceAt(in calIDateTime aRecurrenceId);
+    restoreOccurrenceAt: function _restoreOccurrenceAt(aRecurrenceId) {
+        //this.logInfo("restoreOccurrenceAt: aRecurrenceId:"+aRecurrenceId);
+        this._recurrenceInfo.restoreOccurrenceAt(aRecurrenceId);
+    },
+
+
+    /*
+     * exceptions
+     */
+
+    /**
+     * Modify an a particular occurrence with the given exception proxy
+     * item.  If the recurrenceId isn't an already existing exception item,
+     * a new exception is added.  Otherwise, the existing exception
+     * is modified.
+     *
+     * The item's parentItem must be equal to this RecurrenceInfo's
+     * item. <-- XXX check this, compare by calendar/id only
+     *
+     * @param anItem exceptional/overridden item
+     * @param aTakeOverOwnership whether the recurrence info object can take over
+     *        the item or needs to clone it
+     */
+    //void modifyException(in calIItemBase anItem, in boolean aTakeOverOwnership);
+    modifyException: function _modifyException(anItem, aTakeOverOwnership) {
+        //dump("modifyException: anItem:"+anItem.title+"\n");
+        this._recurrenceInfo.modifyException(anItem, aTakeOverOwnership);
+        this.item.modifyException(anItem);
+    },
+
+    /**
+     * Return an existing exception item for the given recurrence ID.
+     * If an exception does not exist, null is returned.
+     */
+    //calIItemBase getExceptionFor(in calIDateTime aRecurrenceId);
+    getExceptionFor: function _getExceptionFor(aRecurrenceId) {
+        //this.logInfo("getExceptionFor: aRecurrenceId:"+aRecurrenceId);
+        return this._recurrenceInfo.getExceptionFor(aRecurrenceId);
+    },
+
+    /**
+     * Removes an exception item for the given recurrence ID, if
+     * any exist.
+     */
+    //void removeExceptionFor(in calIDateTime aRecurrenceId);
+    removeExceptionFor: function _removeExceptionFor(aRecurrenceId) {
+        //this.logInfo("removeExceptionFor: aRecurrenceId:"+aRecurrenceId);
+        this._recurrenceInfo.removeExceptionFor(aRecurrenceId);
+    },
+
+    /**
+     * Returns a list of all recurrence ids that have exceptions.
+     */
+    //void getExceptionIds(out unsigned long aCount, [array,size_is(aCount),retval] out calIDateTime aIds);
+    getExceptionIds: function _getExceptionIds(aValue) {
+        return this._recurrenceInfo.getExceptionIds(aValue);
+    },
+
+    /*
+     * Recurrence calculation
+     */
+
+    /*
+     * Get the occurrence at the given recurrence ID; if there is no
+     * exception, then create a new proxy object with the normal occurrence.
+     * Otherwise, return the exception.
+     *
+     * @param aRecurrenceId   The recurrence ID to get the occurrence for.
+     * @return                The occurrence or exception corresponding to the id
+     */
+    //calIItemBase getOccurrenceFor(in calIDateTime aRecurrenceId);
+    getOccurrenceFor: function _getOccurrenceFor(aRecurrenceId) {
+        return this._recurrenceInfo.getOccurrenceFor(aRecurrenceId);
+    },
+
+    /**
+     * Return the chronologically next occurrence after aTime. This takes
+     * exceptions and EXDATE/RDATEs into account.
+     *
+     * @param aTime           The (exclusive) date to start searching.
+     * @return                The next occurrence, or null if there is none.
+     */
+    //calIItemBase getNextOccurrence(in calIDateTime aTime);
+    getNextOccurrence: function _getNextOccurrence(aTime) {
+        return this._recurrenceInfo.getNextOccurrence(aTime);
+    },
+
+    /**
+     * Return the chronologically previous occurrence after aTime. This takes
+     * exceptions and EXDATE/RDATEs into account.
+     *
+     * @param aTime           The (exclusive) date to start searching.
+     * @return                The previous occurrence, or null if there is none.
+     */
+    //calIItemBase getPreviousOccurrence(in calIDateTime aTime);
+    getPreviousOccurrence: function _getPreviousOccurrence(aTime) {
+        return this._recurrenceInfo.getPreviousOccurrence(aTime);
+    },
+
+    /**
+     * Return an array of calIDateTime representing all start times of this event
+     * between start (inclusive) and end (non-inclusive). Exceptions are taken
+     * into account.
+     *
+     * @param aRangeStart     The (inclusive) date to start searching.
+     * @param aRangeEnd       The (exclusive) date to end searching.
+     * @param aMaxCount       The maximum number of dates to return
+     *
+     * @param aCount          The number of dates returned.
+     * @return                The array of dates.
+     */
+    //void getOccurrenceDates(in calIDateTime aRangeStart,
+    //                        in calIDateTime aRangeEnd,
+    //                        in unsigned long aMaxCount,
+    //                        out unsigned long aCount, [array,size_is(aCount),retval] out calIDateTime aDates);
+    getOccurrenceDates: function _getOccurrenceDates(aRangeStart, aRangeEnd, aMaxCount, aCount) {
+        return this._recurrenceInfo.getOccurrenceDates(aRangeStart, aRangeEnd, aMaxCount, aCount);
+    },
+
+    /**
+     * Return an array of calIItemBase representing all occurrences of this event
+     * between start (inclusive) and end (non-inclusive). Exceptions are taken
+     * into account.
+     *
+     * @param aRangeStart     The (inclusive) date to start searching.
+     * @param aRangeEnd       The (exclusive) date to end searching.
+     * @param aMaxCount       The maximum number of occurrences to return
+     *
+     * @param aCount          The number of occurrences returned.
+     * @return                The array of occurrences.
+     */
+    //void getOccurrences(in calIDateTime aRangeStart,
+    //                     in calIDateTime aRangeEnd,
+    //                     in unsigned long aMaxCount,
+    //                     out unsigned long aCount, [array,size_is(aCount),retval] out calIItemBase aItems);
+    getOccurrences: function _getOccurrences(aRangeStart, aRangeEnd, aMaxCount, aCount) {
+        if ((this.item) && (this.item.className == "mivExchangeTodo")) {
+            var occurrences = new Array();
+            occurrences.push(this.item);
+            aCount.value = occurrences.length;
+            return occurrences;
+        }
+
+        return this._recurrenceInfo.getOccurrences(aRangeStart, aRangeEnd, aMaxCount, aCount);
+    },
+
+
+    toString: function _toString() {
+        var recurrenceItems = this.getRecurrenceItems({});
+        //this.logInfo("Going to see if we have recurrenceItems:"+recurrenceItems.length);
+        var result = "";
+        for each(var ritem in recurrenceItems) {
+            //this.logInfo(" ||||| ritem:"+ritem);
+            if (ritem instanceof Ci.calIRecurrenceRule) {
+                if (ritem) {
+                    //dump(" ;;;; ritem:"+ritem.icalProperty.icalString+"\n");
+
+                    // RRULE:FREQ=DAILY;UNTIL=20131203T121500Z  ---> RRULE:FREQ=DAILY;UNTIL=20131203T000000Z
+                    //dump(" ---- ritem:"+ritem.icalProperty.icalString.replace(/RRULE:(.*);UNTIL=(\d*)T(\d*)Z/, "RRULE:$1;UNTIL=$2T000000Z")+"\n");
+                    result += ritem.icalProperty.icalString.replace(/RRULE:(.*);UNTIL=(\d*)T(\d*)Z/, "RRULE:$1;UNTIL=$2T000000Z");
+                }
+                else {
+                    //this.logInfo(" ;;;; ritem: null !!!!!!!!!!!!!!");
+                }
+                break;
+            }
+        }
+        return result;
+    },
+
+    logInfo: function _logInfo(message, aDebugLevel, aDepth) {
+
+        var depth = aDepth || 1;
+
+        if (!aDebugLevel) {
+            var debugLevel = 1;
+        }
+        else {
+            var debugLevel = aDebugLevel;
+        }
+
+        this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART + "debuglevel", 0, true);
+        //this.storedDebugLevel = 2;
+        if (debugLevel <= this.storedDebugLevel) {
+            this.globalFunctions.LOG("[exchangeRecurrenceInfo] " + message + " (" + this.globalFunctions.STACK(depth, 1) + ")");
+        }
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeRecurrenceInfo) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeRecurrenceInfo = XPCOMUtils.generateNSGetFactory([mivExchangeRecurrenceInfo]);
-	}
-
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.mivExchangeRecurrenceInfo(cid);
-} 
+    try {
+        if (!NSGetFactory.mivExchangeRecurrenceInfo) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeRecurrenceInfo = XPCOMUtils.generateNSGetFactory([mivExchangeRecurrenceInfo]);
+        }
 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeRecurrenceInfo(cid);
+}
diff --git a/interfaces/exchangeStatistics/mivExchangeStatistics.js b/interfaces/exchangeStatistics/mivExchangeStatistics.js
index 53be9080..62c27285 100644
--- a/interfaces/exchangeStatistics/mivExchangeStatistics.js
+++ b/interfaces/exchangeStatistics/mivExchangeStatistics.js
@@ -28,17 +28,17 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 function mivExchangeStatistics() {
-	this.serverVersions = {};
-	this.majorVersions = {};
-	this.minorVersions = {};
+    this.serverVersions = {};
+    this.majorVersions = {};
+    this.minorVersions = {};
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this.dataRead = {};
-	this.dataSend = {};
+    this.dataRead = {};
+    this.dataSend = {};
 
-	this._xml2jxonCount = 0;
+    this._xml2jxonCount = 0;
 }
 
 var PREF_MAINPART = 'extensions.1st-setup.exchangecalendar.statistics.';
@@ -47,168 +47,160 @@ var mivExchangeStatisticsGUID = "e491a5d9-678a-4b2c-8d7f-c1a8f8ff40e8";
 
 mivExchangeStatistics.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeStatistics,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Statistics maintainer for requests to Exchange server.",
-	classID: components.ID("{"+mivExchangeStatisticsGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/statistics;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeStatistics,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-	// External methods
-
-	setServerVersion: function _setServerVersion(aURL, aVersion, aMajorVersion, aMinorVersion)
-	{
-		if (aMajorVersion == 15) {
-			this.serverVersions[aURL] = "Exchange2013";
-			//if (aMinorVersion > 0) this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP" + aMinorVersion;
-		}
-		else {
-			if (aMajorVersion == 14) {
-				this.serverVersions[aURL] = "Exchange2010";
-				if (aMinorVersion > 1) {
-					this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP2";
-				}
-				else {
-					if (aMinorVersion > 0) this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP" + aMinorVersion;
-				}
-			}
-			else {
-				if (aMajorVersion == 8) {
-					this.serverVersions[aURL] = "Exchange2007";
-					if (aMinorVersion > 0) this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP1";
-				}
-				else {
-					this.serverVersions[aURL] = aVersion;
-				}
-			}
-		}
-		this.majorVersions[aURL] = aMajorVersion;
-		this.minorVersions[aURL] = aMinorVersion;
-	},
-
-	getServerVersion: function _getServerVersion(aURL)
-	{
-		if ((aURL) && (this.serverVersions[aURL])) {
-			return this.serverVersions[aURL];
-		}
-	
-		return "Exchange2007_SP1";
-	},
-
-	getMajorVersion: function _getMajorVersion(aURL)
-	{
-		if ((aURL) && (this.majorVersions[aURL])) {
-			return this.majorVersions[aURL];
-		}
-	
-		return 8;
-	},
-
-	getMinorVersion: function _getMinorVersion(aURL)
-	{
-		if ((aURL) && (this.minorVersions[aURL])) {
-			return this.minorVersions[aURL];
-		}
-	
-		return 1;
-	},
-
-	getURLList: function _getURLList(aCount)
-	{
-		var result = new Array();
-		for (var index in this.serverVersions) {
-			result.push(index);
-		}
-		aCount.value = result.length;
-		return result;
-	},
-
-	addDataRead: function _addDataRead(aURL, aSize)
-	{
-		if (!this.dataRead[aURL]) {
-			this.dataRead[aURL] = 0;
-		}
-		this.dataRead[aURL] += aSize;
-//		dump("addDataRead: server:"+aURL+", dataRead:"+this.dataRead[aURL]+"\n");
-	},
-
-	addDataSend: function _addDataSend(aURL, aSize)
-	{
-		if (!this.dataSend[aURL]) {
-			this.dataSend[aURL] = 0;
-		}
-		this.dataSend[aURL] += aSize;
-//		dump("addDataSend: server:"+aURL+", dataSend:"+this.dataSend[aURL]+"\n");
-	},
-
-	// Internal methods.
-
-	logInfo: function _logInfo(message, aDebugLevel) {
-
-		if (!aDebugLevel) {
-			var debugLevel = 1;
-		}
-		else {
-			var debugLevel = aDebugLevel;
-		}
-
-		this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART+"debuglevel", 0, true);
-		if (debugLevel <= this.storedDebugLevel) {
-			this.globalFunctions.LOG("[exchangeStatistics] "+message + " ("+this.globalFunctions.STACKshort()+")");
-		}
-	},
-
-	addXML2JXONObject: function _addXML2JXONObject()
-	{
-		this._xml2jxonCount++;
-		dump(" xml2xjonCount:"+this._xml2jxonCount+"\n");
-	},
-
-	get xml2jxonCount()
-	{
-		return this._xml2jxonCount;
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeStatistics,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Statistics maintainer for requests to Exchange server.",
+    classID: components.ID("{" + mivExchangeStatisticsGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/statistics;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeStatistics,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+    // External methods
+
+    setServerVersion: function _setServerVersion(aURL, aVersion, aMajorVersion, aMinorVersion) {
+        if (aMajorVersion == 15) {
+            this.serverVersions[aURL] = "Exchange2013";
+            //if (aMinorVersion > 0) this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP" + aMinorVersion;
+        }
+        else {
+            if (aMajorVersion == 14) {
+                this.serverVersions[aURL] = "Exchange2010";
+                if (aMinorVersion > 1) {
+                    this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP2";
+                }
+                else {
+                    if (aMinorVersion > 0) this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP" + aMinorVersion;
+                }
+            }
+            else {
+                if (aMajorVersion == 8) {
+                    this.serverVersions[aURL] = "Exchange2007";
+                    if (aMinorVersion > 0) this.serverVersions[aURL] = this.serverVersions[aURL] + "_SP1";
+                }
+                else {
+                    this.serverVersions[aURL] = aVersion;
+                }
+            }
+        }
+        this.majorVersions[aURL] = aMajorVersion;
+        this.minorVersions[aURL] = aMinorVersion;
+    },
+
+    getServerVersion: function _getServerVersion(aURL) {
+        if ((aURL) && (this.serverVersions[aURL])) {
+            return this.serverVersions[aURL];
+        }
+
+        return "Exchange2007_SP1";
+    },
+
+    getMajorVersion: function _getMajorVersion(aURL) {
+        if ((aURL) && (this.majorVersions[aURL])) {
+            return this.majorVersions[aURL];
+        }
+
+        return 8;
+    },
+
+    getMinorVersion: function _getMinorVersion(aURL) {
+        if ((aURL) && (this.minorVersions[aURL])) {
+            return this.minorVersions[aURL];
+        }
+
+        return 1;
+    },
+
+    getURLList: function _getURLList(aCount) {
+        var result = new Array();
+        for (var index in this.serverVersions) {
+            result.push(index);
+        }
+        aCount.value = result.length;
+        return result;
+    },
+
+    addDataRead: function _addDataRead(aURL, aSize) {
+        if (!this.dataRead[aURL]) {
+            this.dataRead[aURL] = 0;
+        }
+        this.dataRead[aURL] += aSize;
+        //		dump("addDataRead: server:"+aURL+", dataRead:"+this.dataRead[aURL]+"\n");
+    },
+
+    addDataSend: function _addDataSend(aURL, aSize) {
+        if (!this.dataSend[aURL]) {
+            this.dataSend[aURL] = 0;
+        }
+        this.dataSend[aURL] += aSize;
+        //		dump("addDataSend: server:"+aURL+", dataSend:"+this.dataSend[aURL]+"\n");
+    },
+
+    // Internal methods.
+
+    logInfo: function _logInfo(message, aDebugLevel) {
+
+        if (!aDebugLevel) {
+            var debugLevel = 1;
+        }
+        else {
+            var debugLevel = aDebugLevel;
+        }
+
+        this.storedDebugLevel = this.globalFunctions.safeGetIntPref(null, PREF_MAINPART + "debuglevel", 0, true);
+        if (debugLevel <= this.storedDebugLevel) {
+            this.globalFunctions.LOG("[exchangeStatistics] " + message + " (" + this.globalFunctions.STACKshort() + ")");
+        }
+    },
+
+    addXML2JXONObject: function _addXML2JXONObject() {
+        this._xml2jxonCount++;
+        dump(" xml2xjonCount:" + this._xml2jxonCount + "\n");
+    },
+
+    get xml2jxonCount() {
+        return this._xml2jxonCount;
+    },
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeStatistics) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeStatistics = XPCOMUtils.generateNSGetFactory([mivExchangeStatistics]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivExchangeStatistics) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeStatistics = XPCOMUtils.generateNSGetFactory([mivExchangeStatistics]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeStatistics(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeStatistics(cid);
+}
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZone.js b/interfaces/exchangeTimeZones/mivExchangeTimeZone.js
index 563a776b..aeed2e6e 100644
--- a/interfaces/exchangeTimeZones/mivExchangeTimeZone.js
+++ b/interfaces/exchangeTimeZones/mivExchangeTimeZone.js
@@ -32,17 +32,17 @@ Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 function mivExchangeTimeZone() {
-	this._timeZone = null;
-	this._indexDate = null;
+    this._timeZone = null;
+    this._indexDate = null;
 
-	this._standardBias = 0;
-	this._daylightBias = 0;
+    this._standardBias = 0;
+    this._daylightBias = 0;
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this._names = new Array();
-	this._hasDaylight = false;
+    this._names = new Array();
+    this._hasDaylight = false;
 }
 
 var PREF_MAINPART = 'extensions.1st-setup.exchangecalendar.timezones.';
@@ -51,385 +51,371 @@ var mivExchangeTimeZoneGUID = "7621c4ee-d6fb-445a-80f3-4786d2ad5903";
 
 mivExchangeTimeZone.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeTimeZone,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Interface for Cal and Exchange TimeZones comparing.",
-	classID: components.ID("{"+mivExchangeTimeZoneGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/timezone;1",
-	flags: Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeTimeZone,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	// Internal private.
-	dateTimeToStrExchange: function _dateTimeToStrExchange(aDate)
-	{
-		if (!aDate) return "1900-01-01T00:00:00";
-
-		var result = aDate.year+"-";
-		if (aDate.month < 10) result += "0";
-		result += aDate.month+"-";
-		if (aDate.day < 10) result += "0";
-		result += aDate.day+"T";
-		if (aDate.hour < 10) result += "0";
-		result += aDate.hour+":";
-		if (aDate.minute < 10) result += "0";
-		result += aDate.minute+":";
-		if (aDate.second < 10) result += "0";
-		result += aDate.second;
-
-		return result;
-	},
-
-	dateTimeToStrCal: function _dateTimeToStrCal(aDate)
-	{
-		if (!aDate) return "19000101T000000";
-
-		var result = aDate.year;
-		if (aDate.month < 10) result += "0";
-		result += aDate.month;
-		if (aDate.day < 10) result += "0";
-		result += aDate.day+"T";
-		if (aDate.hour < 10) result += "0";
-		result += aDate.hour;
-		if (aDate.minute < 10) result += "0";
-		result += aDate.minute;
-		if (aDate.second < 10) result += "0";
-		result += aDate.second;
-
-		return result;
-	},
-
-	// External methods
-
-	setExchangeTimezone: function _setExchangeTimezone(aValue, aDate)
-	{
-		if (aValue == null) {
-			this._hasDaylight = false;
-			return null;
-		}
-		if (!aDate) {
-			aDate = cal.now();
-		}
-		var indexDateStr = this.dateTimeToStrExchange(aDate);
-
-		var result = null;
-
-		this._id = xml2json.getAttribute(aValue, "Id", "??");
-
-		this._name = xml2json.getAttribute(aValue, "Name", "??");
-		//dump("Exchange timezone:"+this._id+"/"+this._name+"\n");
-
-		//dump("exchangezone:"+aValue+"\n");
-		// Se if we have <t:Transitions><t:AbsoluteDateTransition>
-		var absoluteDateTransitions = xml2json.XPath(aValue, "/t:Transitions/t:AbsoluteDateTransition");
-		var lastDate = "1900-01-01T00:00:00";
-		var transitionIndex = 0;
-		for each(var absoluteDateTransition in absoluteDateTransitions) {
-			var newDate = xml2json.getTagValue(absoluteDateTransition, "t:DateTime", lastDate);
-			if ((newDate >= lastDate) && (newDate <= indexDateStr)) {
-				lastDate = xml2json.getTagValue(absoluteDateTransition, "t:DateTime", lastDate);
-				transitionIndex = xml2json.getTagValue(absoluteDateTransition, "t:To", 0);
-			}
-		}
-		absoluteDateTransitions = null;
-
-		//dump("\nindexDateStr:"+indexDateStr+", lastDate:"+lastDate+", transitionIndex:"+transitionIndex+"\n\n");
-
-		// Now we are going to find the right transition.
-		var transitions = xml2json.XPath(aValue, "/t:TransitionsGroups/t:TransitionsGroup[@Id = '"+transitionIndex+"']/*");
-
-		// Get Standard and Daylight transitionId's
-		var standardTransition = null;
-		var daylightTransition = null;
-		for each(var transition in transitions) {
-			var tmpId = xml2json.getTagValue(transition, "t:To","");
-			if (tmpId.indexOf("-Standard") >= 0) {
-				standardTransition = transition;
-			}
-			else {
-				if (tmpId.indexOf("-Daylight") >= 0) {
-					daylightTransition = transition;
-				}
-			}
-		}
-		transitions = null;
-
-		const dayMap = { Sunday : "SU",
-				Saturday : "SA",
-				Monday : "MO",
-				Tuesday : "TU",
-				Wednesday : "WE",
-				Thursday: "TH",
-				Friday: "FR" };
-
-		this._standardBias = null;
-		if (standardTransition) {
-			var standardPeriods = xml2json.XPath(aValue, "/t:Periods/t:Period[@Name = 'Standard' and @Id='"+xml2json.getTagValue(standardTransition, "t:To","")+"']");
-			if (standardPeriods.length > 0) {
-				this._standardBias = this.globalFunctions.convertDurationToSeconds(xml2json.getAttribute(standardPeriods[0], "Bias"));
-			}
-			standardPeriods = null;
-
-			if (standardTransition.tagName == "RecurringDayTransition") {
-				this._standardRRule = "FREQ=YEARLY;BYDAY="+xml2json.getTagValue(standardTransition, "t:Occurrence", 1)+dayMap[xml2json.getTagValue(standardTransition, "t:DayOfWeek", "Sunday")]+";BYMONTH="+xml2json.getTagValue(standardTransition, "t:Month", 3);
-			}
-			else {
-				this._standardRRule = null;
-			}
-			//dump("this._standardBias:"+this._standardBias+"\n");
-			//dump("this._standardRRule:"+this._standardRRule+"\n");
-		}
-
-		this._daylightBias = null;
-		if (daylightTransition) {
-			var daylightPeriods = xml2json.XPath(aValue, "/t:Periods/t:Period[@Name = 'Daylight' and @Id='"+xml2json.getTagValue(daylightTransition, "t:To","")+"']");
-			if (daylightPeriods.length > 0) {
-				this._daylightBias = this.globalFunctions.convertDurationToSeconds(xml2json.getAttribute(daylightPeriods[0], "Bias"));
-			}
-			daylightPeriods = null;
-
-			this._daylightRRule = "FREQ=YEARLY;BYDAY="+xml2json.getTagValue(daylightTransition, "t:Occurrence", 1)+dayMap[xml2json.getTagValue(daylightTransition, "t:DayOfWeek", "Sunday")]+";BYMONTH="+xml2json.getTagValue(daylightTransition, "t:Month", 3);
-			//dump("this._daylightBias:"+this._daylightBias+"\n");
-			//dump("this._daylightRRule:"+this._daylightRRule+"\n");
-
-			this._hasDaylight = true;
-		}
-		else {
-			this._hasDaylight = false;
-		}
-	},
-
-	setCalTimezone: function _setCalTimezone(aValue, aDate)
-	{
-		if (aValue == null) {
-			this._hasDaylight = false;
-			return null;
-		}
-
-		if (!aDate) {
-			aDate = cal.now();
-		}
-		var indexDateStr = this.dateTimeToStrCal(aDate);
-
-		this._id = aValue.tzid;
-
-		var tmpNames = aValue.tzid.split("/");
-
-		this._names = new Array();
-		for each(var name in tmpNames) {
-			this._names.push(name);
-		}
-//dump(" setCalTimezone: this._names:"+this._names+"\n");
-
-		//calculateBiasOffsets
-		var tzcomp = aValue.icalComponent;
-		if (!tzcomp) {
-			this._hasDaylight = false;
-			return;
-		}
-	
-		var standardTimezone = null;
-		comp = tzcomp.getFirstSubcomponent("STANDARD");
-		while (comp) {
-			var daylightStart = comp.getFirstProperty("DTSTART").value;
-			if ((daylightStart) && (daylightStart <= indexDateStr)) {
-				standardTimezone = comp;
-			}
-			comp = tzcomp.getNextSubcomponent("STANDARD");
-		}
-
-		var daylightTimezone = null;
-		var comp = tzcomp.getFirstSubcomponent("DAYLIGHT");
-		while (comp) {
-			var daylightStart = comp.getFirstProperty("DTSTART").value;
-			if ((daylightStart) && (daylightStart <= indexDateStr)) {
-				daylightTimezone = comp;
-			}
-			comp = tzcomp.getNextSubcomponent("DAYLIGHT");
-		}
-
-		// Get TZOFFSETTO from standard time.
-		if (standardTimezone) {
-			var m = standardTimezone.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
-
-			this._standardBias = (m[2] * 3600) + (m[3]*60);
-
-			if (m[1] == '+') {
-				this._standardBias = -1 * this._standardBias;
-			}
-
-			if (standardTimezone.getFirstProperty("RRULE")) {
-				this._standardRRule = standardTimezone.getFirstProperty("RRULE").value;
-			}
-			else {
-				this._standardRRule = null;
-			}
-			//dump("this._standardRRule:"+this._standardRRule+"\n");
-		}
-
-		if (daylightTimezone) {
-			var m = daylightTimezone.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
-
-			this._daylightBias = (m[2] * 3600) + (m[3]*60);
-
-			if (m[1] == '+') {
-				this._daylightBias = -1 * this._daylightBias;
-			}
-
-			if (daylightTimezone.getFirstProperty("RRULE")) {
-				this._daylightRRule = daylightTimezone.getFirstProperty("RRULE").value;
-			}
-			else {
-				this._daylightRRule = null;
-			}
-			//dump("this._daylightRRule:"+this._daylightRRule+"\n");
-
-			this._hasDaylight = true;
-		}
-		else {
-			this._hasDaylight = false;
-		}
-	
-	},
-
-	equal: function _equal(aTimeZone)
-	{
-		if (this.standardBias != aTimeZone.standardBias) { // Standard bias does not match
-			//dump("  -- Standard Bias values do not match. "+this.standardBias+" != "+aTimeZone.standardBias+"\n");
-			return false;
-		}
-
-		if (this.hasDaylight != aTimeZone.hasDaylight) { // daylight does not match.
-			//dump("  -- One has daylight other not.\n");
-			return false;
-		}
-
-		if ((this.hasDaylight) && (this.daylightBias != aTimeZone.daylightBias)) { // daylight bias does not match.
-			//dump("  -- Daylight Bias values do not match. "+this.daylightBias+" != "+aTimeZone.daylightBias+"\n");
-			return false;
-		}
-	
-		if (this.standardRRule != aTimeZone.standardRRule) {
-			//dump("  -- standard RRUle values do not match. "+this.standardRRule+" != "+aTimeZone.standardRRule+"\n");
-			return false;
-		}
-
-		if ((this.hasDaylight) && (this.daylightRRule != aTimeZone.daylightRRule)) {
-			//dump("  -- Daylight RRUle values do not match. "+this.daylightRRule+" != "+aTimeZone.daylightRRule+"\n");
-			if	(aTimeZone.id == "Asia/Jerusalem"  &&  this.id == "Israel Standard Time") return true; //temporary fix for israel timezone wil be removed 
-			return false;
-		}
-
-		return true;
-	},
-
-	get hasDaylight()
-	{
-		return this._hasDaylight;
-	},
-
-	get standardRRule()
-	{
-		return this._standardRRule;
-	},
-
-	get daylightRRule()
-	{
-		return this._daylightRRule;
-	},
-
-	get id()
-	{
-		return this._id;
-	},
-
-	get name()
-	{
-		return this._name;
-	},
-
-	getNames: function _getNames(aCount)
-	{
-		aCount.value = this._names.length;
-		return this._names;
-	},
-
-	get standardBias()
-	{
-		return this._standardBias;
-	},
-
-	get daylightBias()
-	{
-		return this._daylightBias;
-	},
-
-	get timeZone()
-	{
-		return this._timeZone;
-	},
-
-	set timeZone(aValue)
-	{
-		this._timeZone = aValue;
-		if (aValue[telements]) {
-		//if (aValue instanceof Ci.mivIxml2jxon) {
-			this.setExchangeTimezone(aValue, this._indexDate);
-		}
-		if (aValue instanceof Ci.calITimezone) {
-			this.setCalTimezone(aValue, this._indexDate);
-		}
-	},
-
-	get indexDate()
-	{
-		return this._indexDate;
-	},
-
-	set indexDate(aValue)
-	{
-		this._indexDate = aValue;
-		if (this._timeZone) this.timeZone = this._timeZone;
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeTimeZone,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Interface for Cal and Exchange TimeZones comparing.",
+    classID: components.ID("{" + mivExchangeTimeZoneGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/timezone;1",
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeTimeZone,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    // Internal private.
+    dateTimeToStrExchange: function _dateTimeToStrExchange(aDate) {
+        if (!aDate) return "1900-01-01T00:00:00";
+
+        var result = aDate.year + "-";
+        if (aDate.month < 10) result += "0";
+        result += aDate.month + "-";
+        if (aDate.day < 10) result += "0";
+        result += aDate.day + "T";
+        if (aDate.hour < 10) result += "0";
+        result += aDate.hour + ":";
+        if (aDate.minute < 10) result += "0";
+        result += aDate.minute + ":";
+        if (aDate.second < 10) result += "0";
+        result += aDate.second;
+
+        return result;
+    },
+
+    dateTimeToStrCal: function _dateTimeToStrCal(aDate) {
+        if (!aDate) return "19000101T000000";
+
+        var result = aDate.year;
+        if (aDate.month < 10) result += "0";
+        result += aDate.month;
+        if (aDate.day < 10) result += "0";
+        result += aDate.day + "T";
+        if (aDate.hour < 10) result += "0";
+        result += aDate.hour;
+        if (aDate.minute < 10) result += "0";
+        result += aDate.minute;
+        if (aDate.second < 10) result += "0";
+        result += aDate.second;
+
+        return result;
+    },
+
+    // External methods
+
+    setExchangeTimezone: function _setExchangeTimezone(aValue, aDate) {
+        if (aValue == null) {
+            this._hasDaylight = false;
+            return null;
+        }
+        if (!aDate) {
+            aDate = cal.now();
+        }
+        var indexDateStr = this.dateTimeToStrExchange(aDate);
+
+        var result = null;
+
+        this._id = xml2json.getAttribute(aValue, "Id", "??");
+
+        this._name = xml2json.getAttribute(aValue, "Name", "??");
+        //dump("Exchange timezone:"+this._id+"/"+this._name+"\n");
+
+        //dump("exchangezone:"+aValue+"\n");
+        // Se if we have <t:Transitions><t:AbsoluteDateTransition>
+        var absoluteDateTransitions = xml2json.XPath(aValue, "/t:Transitions/t:AbsoluteDateTransition");
+        var lastDate = "1900-01-01T00:00:00";
+        var transitionIndex = 0;
+        for each(var absoluteDateTransition in absoluteDateTransitions) {
+            var newDate = xml2json.getTagValue(absoluteDateTransition, "t:DateTime", lastDate);
+            if ((newDate >= lastDate) && (newDate <= indexDateStr)) {
+                lastDate = xml2json.getTagValue(absoluteDateTransition, "t:DateTime", lastDate);
+                transitionIndex = xml2json.getTagValue(absoluteDateTransition, "t:To", 0);
+            }
+        }
+        absoluteDateTransitions = null;
+
+        //dump("\nindexDateStr:"+indexDateStr+", lastDate:"+lastDate+", transitionIndex:"+transitionIndex+"\n\n");
+
+        // Now we are going to find the right transition.
+        var transitions = xml2json.XPath(aValue, "/t:TransitionsGroups/t:TransitionsGroup[@Id = '" + transitionIndex + "']/*");
+
+        // Get Standard and Daylight transitionId's
+        var standardTransition = null;
+        var daylightTransition = null;
+        for each(var transition in transitions) {
+            var tmpId = xml2json.getTagValue(transition, "t:To", "");
+            if (tmpId.indexOf("-Standard") >= 0) {
+                standardTransition = transition;
+            }
+            else {
+                if (tmpId.indexOf("-Daylight") >= 0) {
+                    daylightTransition = transition;
+                }
+            }
+        }
+        transitions = null;
+
+        const dayMap = {
+            Sunday: "SU",
+            Saturday: "SA",
+            Monday: "MO",
+            Tuesday: "TU",
+            Wednesday: "WE",
+            Thursday: "TH",
+            Friday: "FR"
+        };
+
+        this._standardBias = null;
+        if (standardTransition) {
+            var standardPeriods = xml2json.XPath(aValue, "/t:Periods/t:Period[@Name = 'Standard' and @Id='" + xml2json.getTagValue(standardTransition, "t:To", "") + "']");
+            if (standardPeriods.length > 0) {
+                this._standardBias = this.globalFunctions.convertDurationToSeconds(xml2json.getAttribute(standardPeriods[0], "Bias"));
+            }
+            standardPeriods = null;
+
+            if (standardTransition.tagName == "RecurringDayTransition") {
+                this._standardRRule = "FREQ=YEARLY;BYDAY=" + xml2json.getTagValue(standardTransition, "t:Occurrence", 1) + dayMap[xml2json.getTagValue(standardTransition, "t:DayOfWeek", "Sunday")] + ";BYMONTH=" + xml2json.getTagValue(standardTransition, "t:Month", 3);
+            }
+            else {
+                this._standardRRule = null;
+            }
+            //dump("this._standardBias:"+this._standardBias+"\n");
+            //dump("this._standardRRule:"+this._standardRRule+"\n");
+        }
+
+        this._daylightBias = null;
+        if (daylightTransition) {
+            var daylightPeriods = xml2json.XPath(aValue, "/t:Periods/t:Period[@Name = 'Daylight' and @Id='" + xml2json.getTagValue(daylightTransition, "t:To", "") + "']");
+            if (daylightPeriods.length > 0) {
+                this._daylightBias = this.globalFunctions.convertDurationToSeconds(xml2json.getAttribute(daylightPeriods[0], "Bias"));
+            }
+            daylightPeriods = null;
+
+            this._daylightRRule = "FREQ=YEARLY;BYDAY=" + xml2json.getTagValue(daylightTransition, "t:Occurrence", 1) + dayMap[xml2json.getTagValue(daylightTransition, "t:DayOfWeek", "Sunday")] + ";BYMONTH=" + xml2json.getTagValue(daylightTransition, "t:Month", 3);
+            //dump("this._daylightBias:"+this._daylightBias+"\n");
+            //dump("this._daylightRRule:"+this._daylightRRule+"\n");
+
+            this._hasDaylight = true;
+        }
+        else {
+            this._hasDaylight = false;
+        }
+    },
+
+    setCalTimezone: function _setCalTimezone(aValue, aDate) {
+        if (aValue == null) {
+            this._hasDaylight = false;
+            return null;
+        }
+
+        if (!aDate) {
+            aDate = cal.now();
+        }
+        var indexDateStr = this.dateTimeToStrCal(aDate);
+
+        this._id = aValue.tzid;
+
+        var tmpNames = aValue.tzid.split("/");
+
+        this._names = new Array();
+        for each(var name in tmpNames) {
+                this._names.push(name);
+            }
+            //dump(" setCalTimezone: this._names:"+this._names+"\n");
+
+        //calculateBiasOffsets
+        var tzcomp = aValue.icalComponent;
+        if (!tzcomp) {
+            this._hasDaylight = false;
+            return;
+        }
+
+        var standardTimezone = null;
+        comp = tzcomp.getFirstSubcomponent("STANDARD");
+        while (comp) {
+            var daylightStart = comp.getFirstProperty("DTSTART").value;
+            if ((daylightStart) && (daylightStart <= indexDateStr)) {
+                standardTimezone = comp;
+            }
+            comp = tzcomp.getNextSubcomponent("STANDARD");
+        }
+
+        var daylightTimezone = null;
+        var comp = tzcomp.getFirstSubcomponent("DAYLIGHT");
+        while (comp) {
+            var daylightStart = comp.getFirstProperty("DTSTART").value;
+            if ((daylightStart) && (daylightStart <= indexDateStr)) {
+                daylightTimezone = comp;
+            }
+            comp = tzcomp.getNextSubcomponent("DAYLIGHT");
+        }
+
+        // Get TZOFFSETTO from standard time.
+        if (standardTimezone) {
+            var m = standardTimezone.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
+
+            this._standardBias = (m[2] * 3600) + (m[3] * 60);
+
+            if (m[1] == '+') {
+                this._standardBias = -1 * this._standardBias;
+            }
+
+            if (standardTimezone.getFirstProperty("RRULE")) {
+                this._standardRRule = standardTimezone.getFirstProperty("RRULE").value;
+            }
+            else {
+                this._standardRRule = null;
+            }
+            //dump("this._standardRRule:"+this._standardRRule+"\n");
+        }
+
+        if (daylightTimezone) {
+            var m = daylightTimezone.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
+
+            this._daylightBias = (m[2] * 3600) + (m[3] * 60);
+
+            if (m[1] == '+') {
+                this._daylightBias = -1 * this._daylightBias;
+            }
+
+            if (daylightTimezone.getFirstProperty("RRULE")) {
+                this._daylightRRule = daylightTimezone.getFirstProperty("RRULE").value;
+            }
+            else {
+                this._daylightRRule = null;
+            }
+            //dump("this._daylightRRule:"+this._daylightRRule+"\n");
+
+            this._hasDaylight = true;
+        }
+        else {
+            this._hasDaylight = false;
+        }
+
+    },
+
+    equal: function _equal(aTimeZone) {
+        if (this.standardBias != aTimeZone.standardBias) { // Standard bias does not match
+            //dump("  -- Standard Bias values do not match. "+this.standardBias+" != "+aTimeZone.standardBias+"\n");
+            return false;
+        }
+
+        if (this.hasDaylight != aTimeZone.hasDaylight) { // daylight does not match.
+            //dump("  -- One has daylight other not.\n");
+            return false;
+        }
+
+        if ((this.hasDaylight) && (this.daylightBias != aTimeZone.daylightBias)) { // daylight bias does not match.
+            //dump("  -- Daylight Bias values do not match. "+this.daylightBias+" != "+aTimeZone.daylightBias+"\n");
+            return false;
+        }
+
+        if (this.standardRRule != aTimeZone.standardRRule) {
+            //dump("  -- standard RRUle values do not match. "+this.standardRRule+" != "+aTimeZone.standardRRule+"\n");
+            return false;
+        }
+
+        if ((this.hasDaylight) && (this.daylightRRule != aTimeZone.daylightRRule)) {
+            //dump("  -- Daylight RRUle values do not match. "+this.daylightRRule+" != "+aTimeZone.daylightRRule+"\n");
+            if (aTimeZone.id == "Asia/Jerusalem" && this.id == "Israel Standard Time") return true; //temporary fix for israel timezone wil be removed 
+            return false;
+        }
+
+        return true;
+    },
+
+    get hasDaylight() {
+        return this._hasDaylight;
+    },
+
+    get standardRRule() {
+        return this._standardRRule;
+    },
+
+    get daylightRRule() {
+        return this._daylightRRule;
+    },
+
+    get id() {
+        return this._id;
+    },
+
+    get name() {
+        return this._name;
+    },
+
+    getNames: function _getNames(aCount) {
+        aCount.value = this._names.length;
+        return this._names;
+    },
+
+    get standardBias() {
+        return this._standardBias;
+    },
+
+    get daylightBias() {
+        return this._daylightBias;
+    },
+
+    get timeZone() {
+        return this._timeZone;
+    },
+
+    set timeZone(aValue) {
+        this._timeZone = aValue;
+        if (aValue[telements]) {
+            //if (aValue instanceof Ci.mivIxml2jxon) {
+            this.setExchangeTimezone(aValue, this._indexDate);
+        }
+        if (aValue instanceof Ci.calITimezone) {
+            this.setCalTimezone(aValue, this._indexDate);
+        }
+    },
+
+    get indexDate() {
+        return this._indexDate;
+    },
+
+    set indexDate(aValue) {
+        this._indexDate = aValue;
+        if (this._timeZone) this.timeZone = this._timeZone;
+    },
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeTimeZone) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeTimeZone = XPCOMUtils.generateNSGetFactory([mivExchangeTimeZone]);
-			
-	}
-
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-	return NSGetFactory.mivExchangeTimeZone(cid);
-} 
+    try {
+        if (!NSGetFactory.mivExchangeTimeZone) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeTimeZone = XPCOMUtils.generateNSGetFactory([mivExchangeTimeZone]);
 
+        }
+
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
+    return NSGetFactory.mivExchangeTimeZone(cid);
+}
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZones.js b/interfaces/exchangeTimeZones/mivExchangeTimeZones.js
index 4dca6ad6..1c052653 100644
--- a/interfaces/exchangeTimeZones/mivExchangeTimeZones.js
+++ b/interfaces/exchangeTimeZones/mivExchangeTimeZones.js
@@ -36,24 +36,24 @@ Cu.import("resource://exchangecalendar/erGetTimeZones.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 function mivExchangeTimeZones() {
-	this._timeZones = {};
+    this._timeZones = {};
 
-	this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-				.getService(Ci.mivFunctions);
+    this.globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
+        .getService(Ci.mivFunctions);
 
-	this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]  
-	                          .getService(Ci.mivExchangeLoadBalancer); 
+    this.loadBalancer = Cc["@1st-setup.nl/exchange/loadbalancer;1"]
+        .getService(Ci.mivExchangeLoadBalancer);
 
-	this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
-				.getService(Ci.mivExchangeStatistics);
+    this.exchangeStatistics = Cc["@1st-setup.nl/exchange/statistics;1"]
+        .getService(Ci.mivExchangeStatistics);
 
-	this.timezoneService = Cc["@mozilla.org/calendar/timezone-service;1"]
-				.getService(Ci.calITimezoneProvider);
+    this.timezoneService = Cc["@mozilla.org/calendar/timezone-service;1"]
+        .getService(Ci.calITimezoneProvider);
 
-	this.exchangeToLightningMemory = {};
+    this.exchangeToLightningMemory = {};
 
-	// load timezone file from resource. This is for Exchange server version before 2010.
-	this.load_timezonedefinitions_file();
+    // load timezone file from resource. This is for Exchange server version before 2010.
+    this.load_timezonedefinitions_file();
 }
 
 var PREF_MAINPART = 'extensions.1st-setup.exchangecalendar.timezones.';
@@ -62,414 +62,412 @@ var mivExchangeTimeZonesGUID = "16093d9f-a9ac-41ab-9995-0a3a7423b45c";
 
 mivExchangeTimeZones.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeTimeZones,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Keeps the Exchange TimeZones retreived from server in memory.",
-	classID: components.ID("{"+mivExchangeTimeZonesGUID+"}"),
-	contractID: "@1st-setup.nl/exchange/timezones;1",
-	flags: Ci.nsIClassInfo.SINGLETON,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeTimeZones,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-	// External methods
-
-	// void addURL(in AUTF8String aURL);
-	addURL: function _addURL(aURL, aUser, aCalendar)
-	{
-		var version = this.exchangeStatistics.getServerVersion(aURL);
-
-		if (this._timeZones[version] === undefined) {
-			this._timeZones[version] = null;
-			var self = this;
-			this.loadBalancer.addToQueue({ calendar: aCalendar,
-					 ecRequest:erGetTimeZonesRequest,
-					 arguments: {user: aUser, 
-					 serverUrl: aURL,
-					 serverVersion: version,
-					 actionStart: Date.now() },
-					 cbOk: function(erGetTimeZonesRequest, aTimeZoneDefinitions) { self.getTimeZonesOK(erGetTimeZonesRequest, aTimeZoneDefinitions);}, 
-					 cbError: function(erGetTimeZonesRequest, aCode, aMsg) { self.getTimeZonesError(erGetTimeZonesRequest, aCode, aMsg);},
-					 listener: null});
-
-		}
-
-	},
-
-	getExchangeTimeZoneByCalTimeZone: function _getExchangeTimeZoneByCalTimeZone(aCalTimeZone, aURL, aIndexDate)
-	{
-		var version = this.exchangeStatistics.getServerVersion(aURL);
-		if (!this._timeZones[version]) {
-			version = "Exchange2007_SP1";
-		}
-
-		if (this._timeZones[version]) {
-			if (aCalTimeZone.isFloating) {
-				var tmpZone = this.globalFunctions.ecDefaultTimeZone();
-			}
-			else {
-				var tmpZone = aCalTimeZone;
-			}
-
-			var calTimeZone = this.getTimeZone(tmpZone, aIndexDate);
-
-			var tmpArray = calTimeZone.id.split("/");
-
-			var weHaveAMatch = null;
-
-			var finalScore = -1;
-			for each(var timeZoneDefinition in this._timeZones[version]) {
-
-				// First we match on values.
-				var exchangeTimeZone = this.getTimeZone(timeZoneDefinition, aIndexDate);
-				if (exchangeTimeZone.equal(calTimeZone)) {
-					// Now we see if we have also a match on name.
-					var tmpScore = 0;
-					for each(var zonePart in tmpArray) {
-						if ((exchangeTimeZone.id) && (exchangeTimeZone.id.indexOf(zonePart) > -1)) {
-							tmpScore = tmpScore + 1;
-						}
-						if ((exchangeTimeZone.name) && (exchangeTimeZone.name.indexOf(zonePart) > -1)) {
-							tmpScore = tmpScore + 1;
-						}
-					}
-					
-					if (tmpScore > finalScore) {
-						finalScore = tmpScore;
-						weHaveAMatch = exchangeTimeZone;
-					}
-				}
-			}
-
-			return weHaveAMatch;
-		}
-
-		return null;
-	},
-	
-	getExchangeTimeZoneIdByCalTimeZone: function _getExchangeTimeZoneIdByCalTimeZone(aCalTimeZone, aURL, aIndexDate)
-	{
-
-		var exchangeTimeZone = this.getExchangeTimeZoneByCalTimeZone(aCalTimeZone, aURL, aIndexDate);
-		if (exchangeTimeZone) {
-			return exchangeTimeZone.id;
-		}
-		return "UTC";
-	},
-
-	getExchangeTimeZoneNameByCalTimeZone: function _getExchangeTimeZoneNameByCalTimeZone(aCalTimeZone, aURL, aIndexDate)
-	{
-
-		var exchangeTimeZone = this.getExchangeTimeZoneByCalTimeZone(aCalTimeZone, aURL, aIndexDate);
-		if (exchangeTimeZone) {
-			return exchangeTimeZone.name;
-		}
-		return "UTC";
-	},
-
-	getTimeZone: function _getTimeZone(aTimeZone, aIndexDate)
-	{
-		if (!aTimeZone) return null;
-
-		var timeZoneId = null;
-		if (aTimeZone[telements]) {
-			timeZoneId = xml2json.getAttribute(aTimeZone, "Id", null);
-		}
-		if (aTimeZone instanceof Ci.calITimezone) {
-			timeZoneId = aTimeZone.tzid;
-		}
-
-		if (!timeZoneId) return null;
-
-		if (!this._tzCache) {
-			this._tzCache = {};
-		}
-
-		if (this._tzCache[timeZoneId]) {
-			return this._tzCache[timeZoneId];
-		}
-
-		this._tzCache[timeZoneId] = Cc["@1st-setup.nl/exchange/timezone;1"]
-				.createInstance(Ci.mivExchangeTimeZone);
-
-		this._tzCache[timeZoneId].indexDate = aIndexDate;
-		this._tzCache[timeZoneId].timeZone = aTimeZone;
-
-		return this._tzCache[timeZoneId];
-	},
-
-	getCalTimeZoneByExchangeMeetingTimeZone: function _getCalTimeZoneByExchangeMeetingTimeZone(aMeetingTimeZone, aIndexDate)
-	{
-		var name;
-		if (!aMeetingTimeZone) {
-			return null;
-		}
-		if (aMeetingTimeZone.indexOf(") ") > -1) {
-			name = aMeetingTimeZone.substr(aMeetingTimeZone.indexOf(") ")+2).toLowerCase();
-		}
-		else {
-			// We need to get the timezone name for this id.
-			if (this._timeZones["Exchange2007_SP1"][aMeetingTimeZone]) {
-				return this.getCalTimeZoneByExchangeTimeZone(this._timeZones["Exchange2007_SP1"][aMeetingTimeZone], "", aIndexDate);
-			}
-			else {
-				return null;
-			}
-		}
-
-		// The name could contain multiple names comma separated.
-		name = name.replace(/, /g,",");
-		var names = name.split(",");
-
-		var timezones = this.timezoneService.timezoneIds;
-		var tmpResult = null;
-		while (timezones.hasMore()) {
-			var tmpZoneId = timezones.getNext();
-			for each(var cname in names) {
-				if (tmpZoneId.toLowerCase().indexOf(cname) > -1) {
-					return this.timezoneService.getTimezone(tmpZoneId);
-				}
-			}
-		}
-
-		return null;
-	},
-
-	getCalTimeZoneByExchangeTimeZone: function _getCalTimeZoneByExchangeTimeZone(aExchangeTimeZone, aURL, aIndexDate)
-	{
-//dump("getCalTimeZoneByExchangeTimeZone: aExchangeTimeZone:"+xml2json.toString(aExchangeTimeZone)+"\n");
-		var exchangeTimeZone = this.getTimeZone(aExchangeTimeZone, aIndexDate);
-
-		if (exchangeTimeZone == null) return null;
-
-		var result = null;
-
-		if (this.exchangeToLightningMemory[exchangeTimeZone.id]) {
-			return this.exchangeToLightningMemory[exchangeTimeZone.id];
-		}
-
-		// See if the Lightning default timezone matches.
-		var defaultTimeZone = this.getTimeZone(this.globalFunctions.ecDefaultTimeZone());
-		if (defaultTimeZone.equal(exchangeTimeZone)) {
-			return this.globalFunctions.ecDefaultTimeZone();
-		}
-
-		// Loop through the lightning timezones.
-		// First we try to do a fast detection by name
-		var zoneScore = 0;
-		if ((exchangeTimeZone.id != "??") || (exchangeTimeZone.name != "??")) {
-			var timezones = this.timezoneService.timezoneIds;
-			var tmpResult = null;
-			while (timezones.hasMore()) {
-				var tmpZoneId = timezones.getNext();
-				var tmpZone = this.timezoneService.getTimezone(tmpZoneId);
-
-				var calTimeZone = this.getTimeZone(tmpZone, aIndexDate);
-
-				var tmpArray = calTimeZone.id.split("/");
-
-				var tmpScore = 0;
-				for each(var zonePart in tmpArray) {
-
-					if ((exchangeTimeZone.id) && (exchangeTimeZone.id.indexOf(zonePart) > -1)) {
-						tmpScore = tmpScore + 1;
-					}
-					if ((exchangeTimeZone.name) && (exchangeTimeZone.name.indexOf(zonePart) > -1)) {
-						tmpScore = tmpScore + 1;
-					}
-				}
-				if ((tmpScore > zoneScore) && (tmpScore > 0)) {
-					if (calTimeZone.equal(exchangeTimeZone)) {
-						result = tmpZone;
-						zoneScore = tmpScore;
-					}
-				}
-			}
-		}
-
-		var weHaveAMatch = false;
-		if (result == null) {
-			// We scan the while list to find a match.
-			var timezones = this.timezoneService.timezoneIds;
-			var tmpResult = null;
-			while (timezones.hasMore() && (!weHaveAMatch)) {
-				var tmpZoneId = timezones.getNext();
-				var tmpZone = this.timezoneService.getTimezone(tmpZoneId);
-
-				var calTimeZone = this.getTimeZone(tmpZone);
-				if (calTimeZone.equal(exchangeTimeZone)) {
-					result = tmpZone;
-					weHaveAMatch = true;
-				}
-
-			}
-		}
-
-		if (result == null) {
-			dump("  --> c. Could not find a matching lightning timezone.\n");
-		}
-		else {
-			this.exchangeToLightningMemory[exchangeTimeZone.id] = result;
-		}
-
-		return result;
-	},
-
-	// Internal methods.
-
-	calculateBiasOffsets: function _calculateBiasOffsets(aCalTimeZone)
-	{
-		var tzcomp = aCalTimeZone.icalComponent;
-		if (!tzcomp) {
-			return {};
-		}
-	
-		var dsttz = null;
-		for (var comp = tzcomp.getFirstSubcomponent("DAYLIGHT");
-		     comp;
-		     comp = tzcomp.getNextSubcomponent("DAYLIGHT")) {
-			if (!dsttz || dsttz.getFirstProperty("DTSTART").valueAsDatetime.compare(
-					comp.getFirstProperty("DTSTART").valueAsDatetime) < 0) {
-				dsttz = comp;
-			}
-		}
-		var stdtz = null;
-		for (var comp = tzcomp.getFirstSubcomponent("STANDARD");
-		     comp;
-		     comp = tzcomp.getNextSubcomponent("STANDARD")) {
-			if (!stdtz || stdtz.getFirstProperty("DTSTART").valueAsDatetime.compare(
-					comp.getFirstProperty("DTSTART").valueAsDatetime) < 0) {
-				stdtz = comp;
-			}
-		}
-	
-		if (!stdtz) {
-			return {};
-		}
-	
-		// Get TZOFFSETTO from standard time.
-		var m = stdtz.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
-		var biasOffset = cal.createDuration();
-		biasOffset.hours = m[2];
-		biasOffset.minutes = m[3];
-		if (m[1] == '+') {
-			biasOffset.isNegative = true;
-		}
-
-		var tmpBaseOffset = biasOffset.icalString;
-
-		var daylightOffset = null;
-		if (dsttz) {
-			var m = dsttz.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
-			daylightOffset = cal.createDuration();
-			daylightOffset.hours = m[2];
-			daylightOffset.minutes = m[3];
-			if (m[1] == '+') {
-				daylightOffset.isNegative = true;
-			}
-		}
-	
-		if (daylightOffset) {
-			return { standard: biasOffset.icalString,
-				 daylight: daylightOffset.icalString } ;
-		}
-		else {
-			return { standard: biasOffset.icalString,
-				 daylight: null } ;
-		}
-	},
-
-	getTimeZonesOK: function _getTimeZonesOK(erGetTimeZonesRequest, aTimeZoneDefinitions)
-	{
-		this.addExchangeTimeZones(aTimeZoneDefinitions, erGetTimeZonesRequest.argument.serverVersion);
-	},
-
-	getTimeZonesError: function _getTimeZonesError(erGetTimeZonesRequest, aCode, aMsg)
-	{
-	},
-
-	addExchangeTimeZones: function _addExchangeTimeZones(aTimeZoneDefinitions, aVersion)
-	{
-		var rm = xml2json.XPath(aTimeZoneDefinitions, "/s:Envelope/s:Body/m:GetServerTimeZonesResponse/m:ResponseMessages/m:GetServerTimeZonesResponseMessage");
-		if (rm.length == 0) return null;
-		this._timeZones[aVersion] = {};
-
-		var timeZoneDefinitionArray = xml2json.XPath(rm[0], "/m:TimeZoneDefinitions/t:TimeZoneDefinition");
-		for (var index in timeZoneDefinitionArray) {
-			this._timeZones[aVersion][xml2json.getAttribute(timeZoneDefinitionArray[index], "Id")] = timeZoneDefinitionArray[index];
-		}
-		timeZoneDefinitionArray = null;
-		rm = null;
-	},
-
-	load_timezonedefinitions_file: function _load_timezonedefinitions_file()
-	{
-		var somefile = this.globalFunctions.chromeToPath("chrome://exchangeTimeZones/content/ewsTimesZoneDefinitions_2007.xml");
-		var file = Components.classes["@mozilla.org/file/local;1"]
-				.createInstance(Components.interfaces.nsILocalFile);
-
-		file.initWithPath(somefile);
-
-		var istream = Components.classes["@mozilla.org/network/file-input-stream;1"].  
-				 createInstance(Components.interfaces.nsIFileInputStream);  
-		istream.init(file, -1, -1, 0);  
-		istream.QueryInterface(Components.interfaces.nsILineInputStream);  
-		  
-		// read lines into array  
-		var line = {}, lines = "", hasmore;  
-		do {  
-			hasmore = istream.readLine(line);  
-			lines += line.value;   
-		} while(hasmore);  
-		  
-		istream.close();
-		var root = xml2json.newJSON();
-		xml2json.parseXML(root, lines);
-		var timezonedefinitions = root[telements][0];
-		this.addExchangeTimeZones(root, "Exchange2007_SP1");
-
-		timezonedefinitions = null;
-		lines = null;
-		line = null;
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeTimeZones,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Keeps the Exchange TimeZones retreived from server in memory.",
+    classID: components.ID("{" + mivExchangeTimeZonesGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/timezones;1",
+    flags: Ci.nsIClassInfo.SINGLETON,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeTimeZones,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+    // External methods
+
+    // void addURL(in AUTF8String aURL);
+    addURL: function _addURL(aURL, aUser, aCalendar) {
+        var version = this.exchangeStatistics.getServerVersion(aURL);
+
+        if (this._timeZones[version] === undefined) {
+            this._timeZones[version] = null;
+            var self = this;
+            this.loadBalancer.addToQueue({
+                calendar: aCalendar,
+                ecRequest: erGetTimeZonesRequest,
+                arguments: {
+                    user: aUser,
+                    serverUrl: aURL,
+                    serverVersion: version,
+                    actionStart: Date.now()
+                },
+                cbOk: function (erGetTimeZonesRequest, aTimeZoneDefinitions) {
+                    self.getTimeZonesOK(erGetTimeZonesRequest, aTimeZoneDefinitions);
+                },
+                cbError: function (erGetTimeZonesRequest, aCode, aMsg) {
+                    self.getTimeZonesError(erGetTimeZonesRequest, aCode, aMsg);
+                },
+                listener: null
+            });
+
+        }
+
+    },
+
+    getExchangeTimeZoneByCalTimeZone: function _getExchangeTimeZoneByCalTimeZone(aCalTimeZone, aURL, aIndexDate) {
+        var version = this.exchangeStatistics.getServerVersion(aURL);
+        if (!this._timeZones[version]) {
+            version = "Exchange2007_SP1";
+        }
+
+        if (this._timeZones[version]) {
+            if (aCalTimeZone.isFloating) {
+                var tmpZone = this.globalFunctions.ecDefaultTimeZone();
+            }
+            else {
+                var tmpZone = aCalTimeZone;
+            }
+
+            var calTimeZone = this.getTimeZone(tmpZone, aIndexDate);
+
+            var tmpArray = calTimeZone.id.split("/");
+
+            var weHaveAMatch = null;
+
+            var finalScore = -1;
+            for each(var timeZoneDefinition in this._timeZones[version]) {
+
+                // First we match on values.
+                var exchangeTimeZone = this.getTimeZone(timeZoneDefinition, aIndexDate);
+                if (exchangeTimeZone.equal(calTimeZone)) {
+                    // Now we see if we have also a match on name.
+                    var tmpScore = 0;
+                    for each(var zonePart in tmpArray) {
+                        if ((exchangeTimeZone.id) && (exchangeTimeZone.id.indexOf(zonePart) > -1)) {
+                            tmpScore = tmpScore + 1;
+                        }
+                        if ((exchangeTimeZone.name) && (exchangeTimeZone.name.indexOf(zonePart) > -1)) {
+                            tmpScore = tmpScore + 1;
+                        }
+                    }
+
+                    if (tmpScore > finalScore) {
+                        finalScore = tmpScore;
+                        weHaveAMatch = exchangeTimeZone;
+                    }
+                }
+            }
+
+            return weHaveAMatch;
+        }
+
+        return null;
+    },
+
+    getExchangeTimeZoneIdByCalTimeZone: function _getExchangeTimeZoneIdByCalTimeZone(aCalTimeZone, aURL, aIndexDate) {
+
+        var exchangeTimeZone = this.getExchangeTimeZoneByCalTimeZone(aCalTimeZone, aURL, aIndexDate);
+        if (exchangeTimeZone) {
+            return exchangeTimeZone.id;
+        }
+        return "UTC";
+    },
+
+    getExchangeTimeZoneNameByCalTimeZone: function _getExchangeTimeZoneNameByCalTimeZone(aCalTimeZone, aURL, aIndexDate) {
+
+        var exchangeTimeZone = this.getExchangeTimeZoneByCalTimeZone(aCalTimeZone, aURL, aIndexDate);
+        if (exchangeTimeZone) {
+            return exchangeTimeZone.name;
+        }
+        return "UTC";
+    },
+
+    getTimeZone: function _getTimeZone(aTimeZone, aIndexDate) {
+        if (!aTimeZone) return null;
+
+        var timeZoneId = null;
+        if (aTimeZone[telements]) {
+            timeZoneId = xml2json.getAttribute(aTimeZone, "Id", null);
+        }
+        if (aTimeZone instanceof Ci.calITimezone) {
+            timeZoneId = aTimeZone.tzid;
+        }
+
+        if (!timeZoneId) return null;
+
+        if (!this._tzCache) {
+            this._tzCache = {};
+        }
+
+        if (this._tzCache[timeZoneId]) {
+            return this._tzCache[timeZoneId];
+        }
+
+        this._tzCache[timeZoneId] = Cc["@1st-setup.nl/exchange/timezone;1"]
+            .createInstance(Ci.mivExchangeTimeZone);
+
+        this._tzCache[timeZoneId].indexDate = aIndexDate;
+        this._tzCache[timeZoneId].timeZone = aTimeZone;
+
+        return this._tzCache[timeZoneId];
+    },
+
+    getCalTimeZoneByExchangeMeetingTimeZone: function _getCalTimeZoneByExchangeMeetingTimeZone(aMeetingTimeZone, aIndexDate) {
+        var name;
+        if (!aMeetingTimeZone) {
+            return null;
+        }
+        if (aMeetingTimeZone.indexOf(") ") > -1) {
+            name = aMeetingTimeZone.substr(aMeetingTimeZone.indexOf(") ") + 2).toLowerCase();
+        }
+        else {
+            // We need to get the timezone name for this id.
+            if (this._timeZones["Exchange2007_SP1"][aMeetingTimeZone]) {
+                return this.getCalTimeZoneByExchangeTimeZone(this._timeZones["Exchange2007_SP1"][aMeetingTimeZone], "", aIndexDate);
+            }
+            else {
+                return null;
+            }
+        }
+
+        // The name could contain multiple names comma separated.
+        name = name.replace(/, /g, ",");
+        var names = name.split(",");
+
+        var timezones = this.timezoneService.timezoneIds;
+        var tmpResult = null;
+        while (timezones.hasMore()) {
+            var tmpZoneId = timezones.getNext();
+            for each(var cname in names) {
+                if (tmpZoneId.toLowerCase().indexOf(cname) > -1) {
+                    return this.timezoneService.getTimezone(tmpZoneId);
+                }
+            }
+        }
+
+        return null;
+    },
+
+    getCalTimeZoneByExchangeTimeZone: function _getCalTimeZoneByExchangeTimeZone(aExchangeTimeZone, aURL, aIndexDate) {
+        //dump("getCalTimeZoneByExchangeTimeZone: aExchangeTimeZone:"+xml2json.toString(aExchangeTimeZone)+"\n");
+        var exchangeTimeZone = this.getTimeZone(aExchangeTimeZone, aIndexDate);
+
+        if (exchangeTimeZone == null) return null;
+
+        var result = null;
+
+        if (this.exchangeToLightningMemory[exchangeTimeZone.id]) {
+            return this.exchangeToLightningMemory[exchangeTimeZone.id];
+        }
+
+        // See if the Lightning default timezone matches.
+        var defaultTimeZone = this.getTimeZone(this.globalFunctions.ecDefaultTimeZone());
+        if (defaultTimeZone.equal(exchangeTimeZone)) {
+            return this.globalFunctions.ecDefaultTimeZone();
+        }
+
+        // Loop through the lightning timezones.
+        // First we try to do a fast detection by name
+        var zoneScore = 0;
+        if ((exchangeTimeZone.id != "??") || (exchangeTimeZone.name != "??")) {
+            var timezones = this.timezoneService.timezoneIds;
+            var tmpResult = null;
+            while (timezones.hasMore()) {
+                var tmpZoneId = timezones.getNext();
+                var tmpZone = this.timezoneService.getTimezone(tmpZoneId);
+
+                var calTimeZone = this.getTimeZone(tmpZone, aIndexDate);
+
+                var tmpArray = calTimeZone.id.split("/");
+
+                var tmpScore = 0;
+                for each(var zonePart in tmpArray) {
+
+                    if ((exchangeTimeZone.id) && (exchangeTimeZone.id.indexOf(zonePart) > -1)) {
+                        tmpScore = tmpScore + 1;
+                    }
+                    if ((exchangeTimeZone.name) && (exchangeTimeZone.name.indexOf(zonePart) > -1)) {
+                        tmpScore = tmpScore + 1;
+                    }
+                }
+                if ((tmpScore > zoneScore) && (tmpScore > 0)) {
+                    if (calTimeZone.equal(exchangeTimeZone)) {
+                        result = tmpZone;
+                        zoneScore = tmpScore;
+                    }
+                }
+            }
+        }
+
+        var weHaveAMatch = false;
+        if (result == null) {
+            // We scan the while list to find a match.
+            var timezones = this.timezoneService.timezoneIds;
+            var tmpResult = null;
+            while (timezones.hasMore() && (!weHaveAMatch)) {
+                var tmpZoneId = timezones.getNext();
+                var tmpZone = this.timezoneService.getTimezone(tmpZoneId);
+
+                var calTimeZone = this.getTimeZone(tmpZone);
+                if (calTimeZone.equal(exchangeTimeZone)) {
+                    result = tmpZone;
+                    weHaveAMatch = true;
+                }
+
+            }
+        }
+
+        if (result == null) {
+            dump("  --> c. Could not find a matching lightning timezone.\n");
+        }
+        else {
+            this.exchangeToLightningMemory[exchangeTimeZone.id] = result;
+        }
+
+        return result;
+    },
+
+    // Internal methods.
+
+    calculateBiasOffsets: function _calculateBiasOffsets(aCalTimeZone) {
+        var tzcomp = aCalTimeZone.icalComponent;
+        if (!tzcomp) {
+            return {};
+        }
+
+        var dsttz = null;
+        for (var comp = tzcomp.getFirstSubcomponent("DAYLIGHT"); comp; comp = tzcomp.getNextSubcomponent("DAYLIGHT")) {
+            if (!dsttz || dsttz.getFirstProperty("DTSTART").valueAsDatetime.compare(
+                    comp.getFirstProperty("DTSTART").valueAsDatetime) < 0) {
+                dsttz = comp;
+            }
+        }
+        var stdtz = null;
+        for (var comp = tzcomp.getFirstSubcomponent("STANDARD"); comp; comp = tzcomp.getNextSubcomponent("STANDARD")) {
+            if (!stdtz || stdtz.getFirstProperty("DTSTART").valueAsDatetime.compare(
+                    comp.getFirstProperty("DTSTART").valueAsDatetime) < 0) {
+                stdtz = comp;
+            }
+        }
+
+        if (!stdtz) {
+            return {};
+        }
+
+        // Get TZOFFSETTO from standard time.
+        var m = stdtz.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
+        var biasOffset = cal.createDuration();
+        biasOffset.hours = m[2];
+        biasOffset.minutes = m[3];
+        if (m[1] == '+') {
+            biasOffset.isNegative = true;
+        }
+
+        var tmpBaseOffset = biasOffset.icalString;
+
+        var daylightOffset = null;
+        if (dsttz) {
+            var m = dsttz.getFirstProperty("TZOFFSETTO").value.match(/^([+-]?)(\d\d)(\d\d)$/);
+            daylightOffset = cal.createDuration();
+            daylightOffset.hours = m[2];
+            daylightOffset.minutes = m[3];
+            if (m[1] == '+') {
+                daylightOffset.isNegative = true;
+            }
+        }
+
+        if (daylightOffset) {
+            return {
+                standard: biasOffset.icalString,
+                daylight: daylightOffset.icalString
+            };
+        }
+        else {
+            return {
+                standard: biasOffset.icalString,
+                daylight: null
+            };
+        }
+    },
+
+    getTimeZonesOK: function _getTimeZonesOK(erGetTimeZonesRequest, aTimeZoneDefinitions) {
+        this.addExchangeTimeZones(aTimeZoneDefinitions, erGetTimeZonesRequest.argument.serverVersion);
+    },
+
+    getTimeZonesError: function _getTimeZonesError(erGetTimeZonesRequest, aCode, aMsg) {},
+
+    addExchangeTimeZones: function _addExchangeTimeZones(aTimeZoneDefinitions, aVersion) {
+        var rm = xml2json.XPath(aTimeZoneDefinitions, "/s:Envelope/s:Body/m:GetServerTimeZonesResponse/m:ResponseMessages/m:GetServerTimeZonesResponseMessage");
+        if (rm.length == 0) return null;
+        this._timeZones[aVersion] = {};
+
+        var timeZoneDefinitionArray = xml2json.XPath(rm[0], "/m:TimeZoneDefinitions/t:TimeZoneDefinition");
+        for (var index in timeZoneDefinitionArray) {
+            this._timeZones[aVersion][xml2json.getAttribute(timeZoneDefinitionArray[index], "Id")] = timeZoneDefinitionArray[index];
+        }
+        timeZoneDefinitionArray = null;
+        rm = null;
+    },
+
+    load_timezonedefinitions_file: function _load_timezonedefinitions_file() {
+        var somefile = this.globalFunctions.chromeToPath("chrome://exchangeTimeZones/content/ewsTimesZoneDefinitions_2007.xml");
+        var file = Components.classes["@mozilla.org/file/local;1"]
+            .createInstance(Components.interfaces.nsILocalFile);
+
+        file.initWithPath(somefile);
+
+        var istream = Components.classes["@mozilla.org/network/file-input-stream;1"].
+        createInstance(Components.interfaces.nsIFileInputStream);
+        istream.init(file, -1, -1, 0);
+        istream.QueryInterface(Components.interfaces.nsILineInputStream);
+
+        // read lines into array  
+        var line = {},
+            lines = "",
+            hasmore;
+        do {
+            hasmore = istream.readLine(line);
+            lines += line.value;
+        } while (hasmore);
+
+        istream.close();
+        var root = xml2json.newJSON();
+        xml2json.parseXML(root, lines);
+        var timezonedefinitions = root[telements][0];
+        this.addExchangeTimeZones(root, "Exchange2007_SP1");
+
+        timezonedefinitions = null;
+        lines = null;
+        line = null;
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeTimeZones) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeTimeZones = XPCOMUtils.generateNSGetFactory([mivExchangeTimeZones]);
-			
-	}
-
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-	return NSGetFactory.mivExchangeTimeZones(cid);
-} 
+    try {
+        if (!NSGetFactory.mivExchangeTimeZones) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeTimeZones = XPCOMUtils.generateNSGetFactory([mivExchangeTimeZones]);
 
+        }
+
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
+    return NSGetFactory.mivExchangeTimeZones(cid);
+}
diff --git a/interfaces/exchangeTodo/mivExchangeTodo.js b/interfaces/exchangeTodo/mivExchangeTodo.js
index 0a0fb63a..0f921f90 100644
--- a/interfaces/exchangeTodo/mivExchangeTodo.js
+++ b/interfaces/exchangeTodo/mivExchangeTodo.js
@@ -36,20 +36,20 @@ Cu.import("resource://interfaces/exchangeBaseItem/mivExchangeBaseItem.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var exchGlobalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-					.getService(Ci.mivFunctions);
+    .getService(Ci.mivFunctions);
 
 var exchTimeZones = Cc["@1st-setup.nl/exchange/timezones;1"]
-			.getService(Ci.mivExchangeTimeZones);
+    .getService(Ci.mivExchangeTimeZones);
 
 var EXPORTED_SYMBOLS = ["mivExchangeTodo"];
 
 function mivExchangeTodo() {
 
-	this.initialize();
+    this.initialize();
 
-	this.initExchangeBaseItem();
+    this.initExchangeBaseItem();
 
-	//dump("mivExchangeTodo: init");
+    //dump("mivExchangeTodo: init");
 
 }
 
@@ -57,1107 +57,1135 @@ var mivExchangeTodoGUID = "95dac4fd-58c7-44f9-80ad-1448558fc460";
 
 mivExchangeTodo.prototype = {
 
-	__proto__ : mivExchangeBaseItem.prototype,
-
-	QueryInterface : XPCOMUtils.generateQI([Ci.mivExchangeTodo,
-				Ci.mivExchangeBaseItem,
-				Ci.calIInternalShallowCopy,
-				Ci.calITodo,
-				Ci.calIItemBase,
-				Ci.nsIClassInfo,
-				Ci.nsISupports]),
-
-	_className : "mivExchangeTodo",
-	_mainTag : "Task",
-
-	classDescription : "Exchange calendar todo/task.",
-
-	classID : components.ID("{"+mivExchangeTodoGUID+"}"),
-	contractID : "@1st-setup.nl/exchange/calendartodo;1",
-	flags : 0,
-	implementationLanguage : Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	getInterfaces : function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivExchangeTodo,
-				Ci.mivExchangeBaseItem,
-				Ci.calIInternalShallowCopy,
-				Ci.calITodo,
-				Ci.calIItemBase,
-				Ci.nsIClassInfo,
-				Ci.nsISupports];
-
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	initialize : function _initialize()
-	{
-		this._calEvent = null;
-		this._calEvent = Cc["@mozilla.org/calendar/todo;1"]
-					.createInstance(Ci.calITodo);
-	},
-
-	cloneFrom: function _cloneFrom(aItem)
-	{
-		//dump(" mivExchangeTodo: cloneFrom1\n");
-try{
-		this.baseCloneFrom(aItem);
-		if (aItem._entryDate) this._entryDate = aItem._entryDate;
-		if (aItem._dueDate) this._dueDate = aItem._dueDate;
-		if (aItem._completedDate) this._completedDate = aItem._completedDate;
-
-		this._percentComplete = aItem._percentComplete;
-		this._isCompleted = aItem._isCompleted;
-		if (aItem._duration) this._duration = aItem._duration.clone();
-		this._owner = aItem._owner;
-		this._totalWork = aItem._totalWork;
-		this._actualWork = aItem._actualWork;
-		this._mileage = aItem._mileage;
-		this._billingInformation = aItem._billingInformation;
-		this._companies = [];
-		if (aItem._companies) {
-			for each(var company in aItem._companies) {
-				this._companies.push(company);
-			}
-		}
-		this._status = null;
-		if (aItem._status) this._status = aItem._status;
-}
-catch(err){
-	dump(" @@@@@@@@@@@@@ mivExchangeTodo: cloneFrom Error:"+err+"\n");
-}
-		//dump(" mivExchangeTodo: cloneFrom2\n");
-	},
-
-	clone: function _clone()
-	{
-try {
-		//dump("mivExchangeTodo: clone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
-
-		var result = new mivExchangeTodo();
-
-		result.baseClone(this);
-
-		if (this._newStartDate !== undefined) result.startDate = this.startDate.clone();
-		if (this._newEndDate !== undefined) result.endDate = this.endDate.clone();
-
-		if (this._newStatus) {
-			const statusMap = {
-				"NotStarted"	: "NONE",
-				"InProgress" : "IN-PROCESS",
-				"Completed"	: "COMPLETED",
-				"WaitingOnOthers"	: "NEEDS-ACTION",
-				"Deferred"	: "CANCELLED",
-				null: "NONE"
-			};
-
-			result.status = statusMap[this._newStatus];
-		}
-
-		if (this._newEntryDate !== undefined) {
-			if (this.entryDate) {
-				result.entryDate = this.entryDate.clone();
-			}
-			else {
-				result.entryDate = null;
-			}
-		}
-
-		if (this._newDueDate !== undefined) {
-			if (this.dueDate) {
-				result.dueDate = this.dueDate.clone();
-			}
-			else {
-				result.dueDate = null;
-			}
-		}
-		if (this._newCompletedDate !== undefined) {
-			if (this.completedDate) {
-				result.completedDate = this.completedDate.clone();
-			}
-			else {
-				result.completedDate = null;
-			}
-		}
-		if (this._newPercentComplete) result.percentComplete = this._newPercentComplete;
-		if (this._newDuration) result.duration = this._newDuration;
-		if (this._newTotalWork) result.totalWork = this._newTotalWork;
-		if (this._newActualWork) result.actualWork = this._newActualWork;
-		if (this._newMileage) result.mileage = this._newMileage;
-		if (this._newBillingInformation) result.billingInformation = this._newBillingInformation;
-		if (this._newCompanies) result.companies = this.companies;
-		if (this._newIsCompleted !== null) result.isCompleted = this._newIsCompleted; 
-}
-catch(err){
-  dump("mivExchangeTodo: Clone: error:"+err+"\n");
-}
-		//dump("mivExchangeTodo: clone 2: title:"+this.title+", contractId:"+this.contractID+"\n");
-		return result;
-	},
-
-
-	//attribute calIDateTime entryDate;
-	get entryDate()
-	{
-		//dump("get entryDate 2: title:"+this.title+", this._calEvent.entryDate:"+this._calEvent.entryDate+"\n");
-		if (this._newEntryDate !== undefined) {
-			return this._newEntryDate;
-		}
-
-		if (this._entryDate !== undefined) {
-			return this._entryDate;
-		}
-
-		return this._calEvent.entryDate;
-	},
-
-	set entryDate(aValue)
-	{
-		//dump("set entryDate 1: title:"+this.title+", aValue:"+aValue+"\n");
-		//dump("set entryDate x:"+exchGlobalFunctions.STACK()+"\n");
-		if (aValue) {
-			if ((!this.entryDate) || ((aValue.compare(this.entryDate) != 0) || (!this._newEntryDate) || (aValue.compare(this._newEntryDate) != 0))) {
-			//if ((!this.entryDate) || (aValue.compare(this.entryDate) != 0)) {
-				//dump("set entryDate 2: title:"+this.title+", aValue:"+aValue+"\n");
-				this._newEntryDate = aValue.clone();
-				this._calEvent.entryDate = aValue.clone();
-			}
-		}
-		else {
-			if (this.entryDate !== null) {
-				//dump("this._newEntryDate becomes '"+aValue+"'\n");
-				this._newEntryDate = aValue;
-				this._calEvent.entryDate = aValue;
-			}
-		}
-		//dump("set entryDate 3: title:"+this.title+", this._newEntryDate:"+this._newEntryDate+", this._calEvent.entryDate:"+this._calEvent.entryDate+"\n");
-	},
-
-	//attribute calIDateTime dueDate;
-	get dueDate()
-	{
-		//dump("get dueDate 2: title:"+this.title+", this._calEvent.dueDate:"+this._calEvent.dueDate+"\n");
-		if (this._newDueDate !== undefined) {
-			return this._newDueDate;
-		}
-
-		if (this._dueDate !== undefined) {
-			return this._dueDate;
-		}
-
-		return this._calEvent.dueDate;
-	},
-
-	set dueDate(aValue)
-	{
-		//dump("set dueDate 1: title:"+this.title+", aValue:"+aValue+", this.dueDate="+this.dueDate+", this._newDueDate="+this._newDueDate+"\n");
-		if (aValue) {
-			if ((!this.dueDate) || ((aValue.compare(this.dueDate) != 0) || (!this._newDueDate) || (aValue.compare(this._newDueDate) != 0))) {
-				//dump("set dueDate 2: title:"+this.title+", aValue:"+aValue+"\n");
-				this._newDueDate = aValue.clone();
-				this._calEvent.dueDate = aValue.clone();
-			}
-		}
-		else {
-			if (this.dueDate !== null) {
-				this._newDueDate = aValue;
-				this._calEvent.dueDate = aValue;
-			}
-		}
-		//dump("set dueDate 3: title:"+this.title+", this._newDueDate:"+this._newDueDate+", this._calEvent.dueDate:"+this._calEvent.dueDate+"\n");
-	},
-
-	//attribute calIDateTime completedDate;
-	get completedDate()
-	{
-		//dump("get completedDate 2: title:"+this.title+", completedDate=="+this._calEvent.completedDate+"\n");
-		if (this._newCompletedDate !== undefined) {
-			return this._newCompletedDate;
-		}
-
-		if (this._completedDate !== undefined) {
-			return this._completedDate;
-		}
-
-		return this._calEvent.completedDate;
-	},
-
-	set completedDate(aValue)
-	{
-		//dump("set completedDate: title:"+this.title+", aValue:"+aValue+"\n");
-		if (aValue) {
-//			if ((!this._newCompletedDate) || (aValue.compare(this._newCompletedDate) != 0)) {
-			if ((!this.completedDate) || (aValue.compare(this.completedDate) != 0)) {
-				this._newCompletedDate = aValue.clone();
-				this._calEvent.completedDate = aValue.clone();
-			}
-		}
-		else {
-			if (this.completedDate !== null) {
-				this._newCompletedDate = aValue;
-				this._calEvent.completedDate = aValue;
-			}
-		}
-	},
-
-	//attribute short percentComplete;
-	get percentComplete()
-	{
-		if (this._newPercentComplete !== undefined) {
-			//dump("get percentComplete 1: title:"+this.title+", this._newPercentComplete:"+this._newPercentComplete+"\n");
-			return this._newPercentComplete;
-		}
-
-		if (this._percentComplete !== undefined) {
-			//dump("get percentComplete 1: title:"+this.title+", this._percentComplete:"+this._percentComplete+"\n");
-			return this._percentComplete;
-		}
-
-		//dump("get percentComplete 1: title:"+this.title+", this._calEvent.percentComplete:"+this._calEvent.percentComplete+"\n");
-		return this._calEvent.percentComplete;
-	},
-
-	set percentComplete(aValue)
-	{
-		//dump("set percentComplete: title:"+this.title+", aValue:"+aValue+", this.percentComplete:"+this.percentComplete+"\n");
-		if (aValue != this.percentComplete) {
-			this._newPercentComplete = aValue;
-			this._calEvent.percentComplete = aValue;
-		}
-	},
-
-	get isCompleted()
-	{
-		if (this._newIsCompleted !== undefined) {
-			return this._newIsCompleted;
-		}
-
-		if (this._isCompleted !== undefined) {
-			return this._isCompleted;
-		}
-
-		return this._calEvent.isCompleted;
-	},
-
-	set isCompleted(aValue)
-	{
-		if (aValue != this.isCompleted) {
-			this._newIsCompleted = aValue;
-		}
-		this._calEvent.isCompleted = aValue;
-	},
-
-	//attribute long totalWork;
-	get totalWork()
-	{
-		if (this._newTotalWork !== undefined) {
-			return this._newTotalWork;
-		}
-
-		return this._totalWork;
-	},
-
-	set totalWork(aValue)
-	{
-		if (aValue != this.totalWork) {
-			this._newTotalWork = aValue;
-			this._totalWork = aValue;
-		}
-	},
-
-	//attribute long totalWork;
-	get actualWork()
-	{
-		if (this._newActualWork !== undefined) {
-			return this._newActualWork;
-		}
-
-		return this._actualWork;
-	},
-
-	set actualWork(aValue)
-	{
-		if (aValue != this.actualWork) {
-			this._newActualWork = aValue;
-			this._actualWork = aValue;
-		}
-	},
-
-	//attribute AUTF8String mileage;
-	get mileage()
-	{
-		if (this._newMileage !== undefined) {
-			return this._newMileage;
-		}
-
-		return this._mileage;
-	},
-
-	set mileage(aValue)
-	{
-		if (aValue != this.mileage) {
-			this._newMileage = aValue;
-			this._mileage = aValue;
-		}
-	},
-
-	//attribute AUTF8String billingInformation;
-	get billingInformation()
-	{
-		if (this._newBillingInformation !== undefined) {
-			return this._newBillingInformation;
-		}
-
-		return this._billingInformation;
-	},
-
-	set billingInformation(aValue)
-	{
-		if (aValue != this.billingInformation) {
-			this._newBillingInformation = aValue;
-			this._billingInformation = aValue;
-		}
-	},
-
-	//void getCompanies(out PRUint32 count, [array, size_is(count), retval] out AUTF8String aCompanies);
-	get companies()
-	{
-		var tmpCompanies = this.getCompanies({});
-		var result = "";
-		for (var index in tmpCompanies) {
-			if (result != "") {
-				result += ", ";
-			}
-			result += tmpCompanies[index];
-		}
-
-		return result;
-	},
-
-	set companies(aValue)
-	{
-		// Replace ", " (comma + space) by only comma.
-		var tmpStr = aValue;
-
-		while (tmpStr.indexOf(", ") >= 0) {
-			tmpStr = tmpStr.replace(/, /g, ",");
-		}
-		
-		var newArray = tmpStr.split(",");
-		var newResult = "";
-		for (var index in newArray) {
-			if (newResult != "") {
-				newResult += ", ";
-			}
-			newResult += newArray[index];
-		}
-
-		if (this.companies != newResult) {
-			this.clearCompanies();
-			for (var index in newArray) {
-				this.addCompany(newArray[index]);
-			}
-		}
-		
-	},
-
-	getCompanies: function _getCompanies(aCount)
-	{
-		if (this._newCompanies) {
-			aCount.value = this._newCompanies.length;
-			return this._newCompanies;
-		}
-		
-		if (!this._companies) {
-			aCount.value = 0;
-			return [];
-		}
-
-		aCount.value = this._companies.length;
-		return this._companies;
-	},
-
-	//void addCompany(in AUTF8String aCompany);
-	addCompany: function _addCompany(aCompany)
-	{
-		if (!this._newCompanies) {
-			this._newCompanies = [];
-		}
-
-		this._newCompanies.push(aCompany);
-	},
-
-	//void clearCompanies();
-	clearCompanies: function _clearCompanies()
-	{
-		this._newCompanies = [];
-	},
-
-	get duration()
-	{
-		if (this._newDuration !== undefined) {
-			return this._newDuration;
-		}
-
-		if (this._duration !== undefined) {
-			return this._duration;
-		}
-
-		return this._calEvent.duration;
-	},
-
-	set duration(aValue)
-	{
-		if (aValue.toString() != this.duration.toString()) {
-			this._newDuration = aValue;
-			this._calEvent.duration = aValue;
-		}
-	},
-
-	// status of the event
-	//attribute AUTF8String status;
-	get status()
-	{
-		const statusMap = {
-			"NotStarted"	: "NONE",
-			"InProgress" : "IN-PROCESS",
-			"Completed"	: "COMPLETED",
-			"WaitingOnOthers"	: "NEEDS-ACTION",
-			"Deferred"	: "CANCELLED",
-			null: "NONE"
-		};
-
-		if (this._newStatus !== undefined) {
-			//dump("mivExchangeTodo: get status: title:"+this.title+", this._newStatus:"+this._newStatus+", return:"+statusMap[this._newStatus]+"\n");
-			return statusMap[this._newStatus];
-		}
-
-		if (this._status !== undefined) {
-			//dump("mivExchangeTodo: get status: title:"+this.title+", this._status:"+this._status+", return:"+statusMap[this._status]+"\n");
-			return statusMap[this._status];
-		}
-
-		//dump("mivExchangeTodo: get status: title:"+this.title+", this._calEvent.status:"+this._calEvent.status+", return:"+this._calEvent.status+"\n");
-		return this._calEvent.status;
-	},
-
-	set status(aValue)
-	{
-		//dump("mivExchangeTodo: set status: title:"+this.title+", aValue:"+aValue+", this.status:"+this.status+"\n");
-		if (aValue != this.status) {
-
-			const statuses = { "NONE": "NotStarted",
-					"IN-PROCESS": "InProgress", 
-					"COMPLETED" : "Completed",
-					"NEEDS-ACTION" : "WaitingOnOthers",
-					"CANCELLED" : "Deferred",
-					null: "NotStarted" };
-
-			this._newStatus = statuses[aValue];
-			this._calEvent.status = aValue;
-			this._calEvent.setProperty("STATUS", aValue);
-		}
-	},
-
-	//readonly attribute AUTF8String owner;
-	get owner()
-	{
-		return this._owner;
-	},
-
-	get updateXML()
-	{
-		this._nonPersonalDataChanged = false;
-		
-		const statusMapInt = {
-				"NotStarted"		: "0",
-				"InProgress"    	: "1"  ,
-				"Completed"	    	: "2",
-				"WaitingOnOthers"	: "3",
-				"Deferred"			: "4",
-					null			: "0"
-			};  
-		
-		var updates = exchGlobalFunctions.xmlToJxon('<t:Updates xmlns:m="'+nsMessagesStr+'" xmlns:t="'+nsTypesStr+'"/>');
-
-		if (this._newTitle !== undefined) {
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "Subject", this._newTitle);
-		}
-		if (this._newPrivacy) {
-			this.addSetItemField(updates, "Sensitivity", this._newPrivacy);
-		}
-
-/*		if (this._newBody !== undefined) {
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "Body", this._newBody, { BodyType: "Text" });
-		}*/
-
-		if (this.bodyType == "HTML") {
-			if (this._newBody2 !== undefined) {
-				this._nonPersonalDataChanged = true;
-				if (this._newBody2 === null) {
-					this.addDeleteItemField(updates, "Body");
-				}
-				else {
-					this.addSetItemField(updates, "Body", this._newBody2, { BodyType: "HTML" });
-				}
-			}
-		}
-		else {
-			if (this._newBody !== undefined) {
-				this._nonPersonalDataChanged = true;
-				if (this._newBody === null) {
-					this.addDeleteItemField(updates, "Body");
-				}
-				else {
-					this.addSetItemField(updates, "Body", this._newBody, { BodyType: "Text" });
-				}
-			}
-		}
-
-		if ((this._newPercentComplete) || ((this._newIsCompleted) && (this._newIsCompleted === true))) {
-			this._nonPersonalDataChanged = true;
-			switch(this.itemClass){
-			case "IPM.Note":
-			 //Email Todo
-				    let percentComplete =   this.percentComplete / 100.0   ;  
- 					this.addSetItemField(updates,"ExtendedFieldURI",percentComplete,{"DistinguishedPropertySetId":"Task","PropertyId":"33026","PropertyType":"Double"});
-		 		break;
-			default: 
-				this.addSetItemField(updates, "PercentComplete", this.percentComplete);
-			}
-		}
-
-		if ((this._newStatus) || (this._newIsCompleted !== undefined)) {
-			this._nonPersonalDataChanged = true;
-
-			if (this._newStatus) {
-				switch(this.itemClass){
-				case "IPM.Note":
-				 //Email Todo
-					if (this._newIsCompleted === true ) {
-						let percentComplete = 1  ; 
-						this.addSetItemField(updates,"ExtendedFieldURI",percentComplete,{"DistinguishedPropertySetId":"Task","PropertyId":"33026","PropertyType":"Double"});
-						this.addSetItemField(updates,"ExtendedFieldURI","1",{"DistinguishedPropertySetId":"Task","PropertyId":"33052","PropertyType":"Boolean"});
-					}
-					else{
-						let percentComplete;
-						if( this._newStatus == "InProgress" ){
-							percentComplete = this.percentComplete / 100.0  ;
-							
-						}
-						else{
-							percentComplete = 0  ; 
-						}
-	 					this.addSetItemField(updates,"ExtendedFieldURI",percentComplete,{"DistinguishedPropertySetId":"Task","PropertyId":"33026","PropertyType":"Double"});
-						this.addSetItemField(updates,"ExtendedFieldURI","0",{"DistinguishedPropertySetId":"Task","PropertyId":"33052","PropertyType":"Boolean"});
-					}
-					this.addSetItemField(updates,"ExtendedFieldURI",statusMapInt[this._newStatus],{"DistinguishedPropertySetId":"Task","PropertyId":"33025","PropertyType":"Integer"});
-					break;
-				default: 
-					this.addSetItemField(updates, "Status", this._newStatus);
-				}
-			}
-			else {
-				if (this._newIsCompleted === false) {
-					switch(this.itemClass){
-					case "IPM.Note":
-					 //Email Todo
-						let percentComplete = 0  ;
-	 					this.addSetItemField(updates,"ExtendedFieldURI",percentComplete,{"DistinguishedPropertySetId":"Task","PropertyId":"33026","PropertyType":"Double"});
-						this.addSetItemField(updates,"ExtendedFieldURI",statusMapInt["NotStarted"],{"DistinguishedPropertySetId":"Task","PropertyId":"33025","PropertyType":"Integer"});
-						this.addSetItemField(updates,"ExtendedFieldURI","0",{"DistinguishedPropertySetId":"Task","PropertyId":"33052","PropertyType":"Boolean"});
- 						break;
-					default: 
-						this.addSetItemField(updates, "Status", "NotStarted");
-					}
-				}
-				else {
-					switch(this.itemClass){
-					case "IPM.Note":
-					 //Email Todo
-	 					this.addSetItemField(updates,"ExtendedFieldURI",statusMapInt["Completed"],{"DistinguishedPropertySetId":"Task","PropertyId":"33025","PropertyType":"Integer"});
-						this.addSetItemField(updates,"ExtendedFieldURI","1",{"DistinguishedPropertySetId":"Task","PropertyId":"33052","PropertyType":"Boolean"});
-				 		break;
-					default: 
-						this.addSetItemField(updates, "Status", "Completed");
-					}
-				}
-			}
-		}
-
-		if (this._newTotalWork) {
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "TotalWork", this._newTotalWork);
-		}
-
-		if (this._newActualWork) {
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "ActualWork", this._newActualWork);
-		}
-
-		if (this._newMileage !== undefined) {
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "Mileage", this._newMileage);
-		}
-
-		if (this._newBillingInformation !== undefined) {
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "BillingInformation", this._newBillingInformation);
-		}
-
-		// Categories
-		this.getCategories({});
-		if (this._changesCategories) {
-			var categoriesXML = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
-						.createInstance(Ci.mivIxml2jxon);
-			var categories = this.getCategories({});
-			var first = true;
-			for each(var category in categories) {
-				if (first) {
-					first = false;
-					categoriesXML.processXMLString("<t:String>"+category+"</t:String>", 0, null);
-				}
-				else {
-					categoriesXML.addSibblingTag("String", "t", category);
-				}
-			}
-			if (categories.length > 0) {
-				this.addSetItemField(updates, "Categories", categoriesXML);
-			}
-			else {
-				if (this._categories.length > 0) {
-					this.addDeleteItemField(updates, "Categories");
-				}
-			}
-		}
-
-		// Companies
-		if (this._newCompanies) {
-			var companiesXML = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
-						.createInstance(Ci.mivIxml2jxon);
-			var companies = this.getCompanies({});
-			//var companies = this.companies;
-			var first = true;
-			for each(var company in companies) {
-				if (first) {
-					first = false;
-					companiesXML.processXMLString("<t:String>"+company+"</t:String>", 0, null);
-				}
-				else {
-					companiesXML.addSibblingTag("String", "t", company);
-				}
-			}
-			if (companies.length > 0) {
-				this.addSetItemField(updates, "Companies", companiesXML);
-			}
-			else {
-				if (this._companies.length > 0) {
-					this.addDeleteItemField(updates, "Companies");
-				}
-			}
-		}
-
-		if (this._newPriority) {
-			this.addSetItemField(updates, "Importance", this._newPriority);
-		}
-
-
-		// Recurrence rule. Michel
-		var recurrenceInfoChanged;
-		if (this._recurrenceInfo) {
-			// We had recurrenceInfo. Lets see if it changed.
-			//dump("We had recurrenceInfo. Lets see if it changed.");
-			if (this._newRecurrenceInfo !== undefined) {
-				// It was changed or removed
-				if (this._newRecurrenceInfo === null) {
-					// It was removed
-					//dump("We had recurrenceInfo. And it is removed.");
-					recurrenceInfoChanged = false;
-					this._nonPersonalDataChanged = true;
-					this.addDeleteItemField(updates, "Recurrence");
-				}
-				else {
-					// See if something changed
-					//dump("We had recurrenceInfo. And it was changed.");
-					recurrenceInfoChanged = true;
-				}
-			}
-			else {
-				// It could be that the content of the recurrenceInfo was changed
-				if (this._recurrenceInfo.toString() != this.recurrenceInfo.toString()) {
-					//dump("We had recurrenceInfo. And it was changed. 2.\n");
-					recurrenceInfoChanged = true;
-				}
-			}
-		}
-		else {
-			// We did not have recurrence info. Check if we have now
-			//dump("We did not have recurrenceInfo. See if it was added.");
-			if (this._newRecurrenceInfo) {
-				//dump("We did not have recurrenceInfo. But we do have now.");
-				recurrenceInfoChanged = true;
-			}
-		}
-
-		if (recurrenceInfoChanged) {
-			var recurrenceXML = this.makeRecurrenceRule();
-			this._nonPersonalDataChanged = true;
-			this.addSetItemField(updates, "Recurrence", recurrenceXML, null, true);
-
-			// Next is to trigger sending the start and end dates when we have a changed reccurrence.
-			if ((!this._newEntryDate) && (this.entryDate)) this._newEntryDate = this.entryDate.clone();
-			if ((!this._newDueDate) && (this.dueDate)) this._newDueDate = this.dueDate.clone();
-
-		}
-
-		this.entryDate;
-		if (this._newEntryDate) {
-			var tmpStart = this._newEntryDate.clone();
-			if (this._newEntryDate.isDate) {
-				tmpStart.isDate = false;
-/*				var tmpDuration = cal.createDuration();
-				tmpDuration.minutes = -60;
-				tmpStart.addDuration(tmpDuration);*/
-
-				// We make a non-UTC datetime value for exchGlobalFunctions.
-				// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-//				var exchStart = cal.toRFC3339(tmpStart).substr(0, 19)+"Z"; //cal.toRFC3339(tmpStart).length-6);
-				var exchStart = cal.toRFC3339(tmpStart).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
-			}
-			else {
-				// We set in bias advanced to UCT datetime values for exchGlobalFunctions.
-//				var exchStart = cal.toRFC3339(tmpStart).substr(0, 19)+"Z";
-				var exchStart = cal.toRFC3339(tmpStart).substr(0, 19);
-			}
-			this._nonPersonalDataChanged = true; 
-			switch(this.itemClass){
-			case "IPM.Note":
-			 //Email Todo
-				this.addSetItemField(updates,"ExtendedFieldURI",exchStart,{"DistinguishedPropertySetId":"Common","PropertyId":"34070","PropertyType":"SystemTime"});
-		 		break;
-			default: 
-				this.addSetItemField(updates, "StartDate", exchStart);
-			}
-		}
-		else {
-			if (((this._entryDate )) || (this._entryDate === undefined)) {
-				this._nonPersonalDataChanged = true;
-				switch(this.itemClass){
-				case "IPM.Note":
-				 //Email Todo
-			 		break;
-				default: 
-					this.addDeleteItemField(updates, "StartDate");
-				}
-			}
-		}
-
-		this.dueDate;
-		if (this._newDueDate) {
-			var tmpEnd = this._newDueDate.clone();
-
-			if (this._newDueDate.isDate) {
-				tmpEnd.isDate = false;
-/*				var tmpDuration = cal.createDuration();
-				tmpDuration.minutes = -61;
-				tmpEnd.addDuration(tmpDuration);*/
-
-				// We make a non-UTC datetime value for exchGlobalFunctions.
-				// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-//				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
-				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
-			}
-			else {
-				// We set in bias advanced to UCT datetime values for exchGlobalFunctions.
-//				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z";
-				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
-			}
-			this._nonPersonalDataChanged = true;
-			switch(this.itemClass){
-			case "IPM.Note":
-			 //Email Todo
-				this.addSetItemField(updates,"ExtendedFieldURI",exchEnd,{"DistinguishedPropertySetId":"Common","PropertyId":"34071","PropertyType":"SystemTime"});
-		 		break;
-			default: 
-				this.addSetItemField(updates, "DueDate", exchEnd);
-			}
-		}
-		else {
-			if (((this._dueDate) && (this._newDueDate === null)) || (this._dueDate === undefined)) {
-				this._nonPersonalDataChanged = true;
-				switch(this.itemClass){
-				case "IPM.Note":
-				 //Email Todo
- 			 		break;
-				default: 
-					this.addDeleteItemField(updates, "DueDate");
-				}
-			}
-		}
-
-		this.completedDate;
-		if ((this._newCompletedDate) && ((this._newIsCompleted) && (this._newIsCompleted === true))) {
-//			var tmpEnd = this._newCompletedDate.clone();
-			var tmpEnd = this.completedDate.clone();
-
-			if (this.completedDate.isDate) {
-				tmpEnd.isDate = false;
-/*				var tmpDuration = cal.createDuration();
-				tmpDuration.minutes = -61;
-				tmpEnd.addDuration(tmpDuration);*/
-
-				// We make a non-UTC datetime value for exchGlobalFunctions.
-				// EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
-//				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
-				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
-			}
-			else {
-				// We set in bias advanced to UCT datetime values for exchGlobalFunctions.
-//				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z";
-				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
-			}
-			this._nonPersonalDataChanged = true;
-			switch(this.itemClass){
-			case "IPM.Note":
-			 //Email Todo
-				this.addSetItemField(updates,"ExtendedFieldURI",exchEnd,{"DistinguishedPropertySetId":"Task","PropertyId":"33039","PropertyType":"SystemTime"});
-				break;
-			default: 
-				this.addSetItemField(updates, "CompleteDate", exchEnd);
-			} 
-		}
-		else {
-			if (((this._completedDate) && (this._newCompletedDate === null)) || (this._completedDate === undefined) || ((this._newIsCompleted) && (this._newIsCompleted === false))) {
-				this._nonPersonalDataChanged = true;
-				switch(this.itemClass){
-				case "IPM.Note":
-				 //Email Todo
-					//this.addSetItemField(updates,"ExtendedFieldURI",exchEnd,{"DistinguishedPropertySetId":"Task","PropertyId":"33039","PropertyType":"SystemTime"});
-			 		break;
-				default: 
-					this.addDeleteItemField(updates, "CompleteDate");
-				}
-			}
-		}
-
-		if (this._newLegacyFreeBusyStatus) {
-			this.addSetItemField(updates, "LegacyFreeBusyStatus", this._newLegacyFreeBusyStatus);
-		}
-
-		// Alarms and snoozes
-		this.checkAlarmChange(updates);
-
-	  //  dump("\nupdates:"+updates.toString()+"\n");
-		return updates;
-	},
-
-	preLoad: function _preLoad()
-	{
-		switch(this.itemClass){
-		case "IPM.Note":
-			var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34070']");
-			if (tmpObject.length > 0) {
-				this._entryDate = this.tryToSetDateValue(xml2json.getTagValue(tmpObject[0], "t:Value", null),this._calEvent.entryDate);
- 			} 
- 		break;
-		default: 
-			this._entryDate = this.tryToSetDateValue(this.getTagValue("t:StartDate", null), this._calEvent.entryDate);
-		}
-	  
-		if (this._entryDate) {
-/*				this._entryDate.hour = 0;
-			this._entryDate.minute = 0;
-			this._entryDate.second = 0;
-			this._entryDate.isDate = false;
-*/
-			if ((this._entryDate.hour === 0) && (this._entryDate.minute === 0) && (this.dueDate) && (this.dueDate.hour === 0) && (this.dueDate.minute === 0)) {
-				// When a new task is created in outlook it will have entryDate en dueDate times set to 00:00.
-				// We change this to the start of the working day..
-				var dayStart = exchGlobalFunctions.safeGetIntPref(null,"calendar.view.daystarthour", 8);
-				this._entryDate.hour = dayStart;
-				this._dueDate.hour = dayStart;
-				this._calEvent.dueDate = this._dueDate.clone();
-			}
-
-			var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._entryDate);
-			if (timezone) {
-				this._entryDate = this._entryDate.getInTimezone(timezone);
-			}
-			this._calEvent.entryDate = this._entryDate.clone();
-		}
-		
-		switch(this.itemClass){
-		case "IPM.Note":
-			var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34071']");
-			if (tmpObject.length > 0) {
-				this._dueDate = this.tryToSetDateValue(xml2json.getTagValue(tmpObject[0], "t:Value", null),this._calEvent.dueDate);
- 			} 
- 		break;
-		default: 
-			this._dueDate = this.tryToSetDateValue(this.getTagValue("t:DueDate", null), this._calEvent.dueDate);
-		}
-	  
-		if (this._dueDate) {
-			var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._dueDate);
-			if (timezone) {
-				this._dueDate = this._dueDate.getInTimezone(timezone);
-			}
-			this._calEvent.dueDate = this._dueDate.clone();
-		}
-	},
-
-	postLoad: function _postLoad()
-	{	
-		
-		switch(this.itemClass){
-		case "IPM.Note":
-			var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33039']");
-			if (tmpObject.length > 0) {
-				this._completedDate = this.tryToSetDateValue(xml2json.getTagValue(tmpObject[0], "t:Value", null), this._calEvent.completedDate); 
- 			} 
- 		break;
-		default: 
-			this._completedDate = this.tryToSetDateValue(this.getTagValue("t:CompleteDate", null), this._calEvent.completedDate); 	 
-		}
-	  
-		if (this._completedDate) {
-			var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._completedDate);
-			if (timezone) {
-				this._completedDate = this._completedDate.getInTimezone(timezone);
-			}
-			this._calEvent.completedDate = this._completedDate.clone();
-		}
-		
-		switch(this.itemClass){
-		case "IPM.Note":
-			var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33026']");
-			if (tmpObject.length > 0) {
-				this._percentComplete = xml2json.getTagValue(tmpObject[0], "t:Value", this._calEvent.percentComplete );
-				this._percentComplete = this._percentComplete * 100;
- 			} 
- 		break;
-		default: 
-				this._percentComplete = this.getTagValue("t:PercentComplete", this._calEvent.percentComplete);  
-		}
-		if (this._percentComplete) {
-			this._calEvent.percentComplete = this._percentComplete;
-		}
-
-		const statusMap = {
-			"NotStarted"	: "NONE",
-			"InProgress" : "IN-PROCESS",
-			"Completed"	: "COMPLETED",
-			"WaitingOnOthers"	: "NEEDS-ACTION",
-			"Deferred"	: "CANCELLED",
-			null: "NONE"
-		};
-
-		switch(this.itemClass){
-		case "IPM.Note":
-			var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33025']");
-			if (tmpObject.length > 0) {
-				var statusInt = xml2json.getTagValue(tmpObject[0], "t:Value", null );  
-				var noteStatus;
-					if( statusInt  === "2"  ){ 
-						noteStatus = "Completed"; 
-				    } 
-					else if( statusInt  ===  "1" ) 	{
-						noteStatus = "InProgress"; 
-					}
-					else if( statusInt  === "3"  ) 	{
-						noteStatus = "WaitingOnOthers"; 
-					}
-					else if( statusInt  ===  "4"  )	{
-						noteStatus = "Deferred"; 
-					}
-					else if( statusInt  ===  "0" )	{
-						noteStatus = "NotStarted"; 
-					} 
-					else {  
-						noteStatus = "NotStarted"; 
-					}
-				} 
-				else
-				{
-					noteStatus = "NotStarted"; 
-				}
-			
-				if( noteStatus != "Completed" ){
-					var tmpObject_2 = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33052']");
-					if (tmpObject_2.length > 0) {
-						 let noteCompleted = xml2json.getTagValue(tmpObject_2[0], "t:Value",  null );  
- 						 if( noteCompleted ===  true  ){
- 							noteStatus = "Completed";
-						 }
-					}
-				}
-				
-			this._status = noteStatus;  
- 		break;
-		default: 
-			this._status = this.getTagValue("t:Status", "NotStarted");
-		}  
-		
- 		this._calEvent.status = statusMap[this._status];
- 		
-		this._calEvent.setProperty("STATUS", statusMap[this._status]); 
-	    this._isCompleted = ( this._status  == "Completed" ); 
- 
-		this._calEvent.isCompleted = this._isCompleted; 
-		//dump("postLoad: title:"+this.title+", this._percentComplete:"+this._percentComplete+", isCompleted:"+this.isCompleted+", getProperty:"+this._calEvent.getProperty("STATUS")+", this.status:"+this.status+", entryDate:"+this.entryDate+"\n");
-
-		this._totalWork = this.getTagValue("t:TotalWork", 0);
-
-		this._actualWork = this.getTagValue("t:ActualWork", 0);
-
-		this._mileage = this.getTagValue("t:Mileage", "");
-
-		this._billingInformation = this.getTagValue("t:BillingInformation", "");
-
-		this._companies = [];
-		if (this._exchangeData) {
-			var tmpStr = xml2json.XPath(this.exchangeData, "/t:Companies/t:String");
-			for each(var string in tmpStr) {
-				this._companies.push(xml2json.getValue(string));
-			}
-			tmpStr = null;
-		}
-
-		if ((!this._duration) && (!this._newEndDate) && (!this._newStartDate)) {
-			this._duration = this.getTagValue("t:Duration", null);
-			if (this._duration) {
-				//dump("get duration: title:"+this.title+", value:"+cal.createDuration(this._duration));
-				this._duration = cal.createDuration(this._duration);
-			}
-		}
-
-		if (!this._owner) {
-			this._owner = this.getTagValue("t:Owner", "(unknown)");
-		}
-
-
-	},
+    __proto__: mivExchangeBaseItem.prototype,
+
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeTodo,
+        Ci.mivExchangeBaseItem,
+        Ci.calIInternalShallowCopy,
+        Ci.calITodo,
+        Ci.calIItemBase,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    _className: "mivExchangeTodo",
+    _mainTag: "Task",
+
+    classDescription: "Exchange calendar todo/task.",
+
+    classID: components.ID("{" + mivExchangeTodoGUID + "}"),
+    contractID: "@1st-setup.nl/exchange/calendartodo;1",
+    flags: 0,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivExchangeTodo,
+            Ci.mivExchangeBaseItem,
+            Ci.calIInternalShallowCopy,
+            Ci.calITodo,
+            Ci.calIItemBase,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    initialize: function _initialize() {
+        this._calEvent = null;
+        this._calEvent = Cc["@mozilla.org/calendar/todo;1"]
+            .createInstance(Ci.calITodo);
+    },
+
+    cloneFrom: function _cloneFrom(aItem) {
+        //dump(" mivExchangeTodo: cloneFrom1\n");
+        try {
+            this.baseCloneFrom(aItem);
+            if (aItem._entryDate) this._entryDate = aItem._entryDate;
+            if (aItem._dueDate) this._dueDate = aItem._dueDate;
+            if (aItem._completedDate) this._completedDate = aItem._completedDate;
+
+            this._percentComplete = aItem._percentComplete;
+            this._isCompleted = aItem._isCompleted;
+            if (aItem._duration) this._duration = aItem._duration.clone();
+            this._owner = aItem._owner;
+            this._totalWork = aItem._totalWork;
+            this._actualWork = aItem._actualWork;
+            this._mileage = aItem._mileage;
+            this._billingInformation = aItem._billingInformation;
+            this._companies = [];
+            if (aItem._companies) {
+                for each(var company in aItem._companies) {
+                    this._companies.push(company);
+                }
+            }
+            this._status = null;
+            if (aItem._status) this._status = aItem._status;
+        }
+        catch (err) {
+            dump(" @@@@@@@@@@@@@ mivExchangeTodo: cloneFrom Error:" + err + "\n");
+        }
+        //dump(" mivExchangeTodo: cloneFrom2\n");
+    },
+
+    clone: function _clone() {
+        try {
+            //dump("mivExchangeTodo: clone 1: title:"+this.title+", contractId:"+this.contractID+"\n");
+
+            var result = new mivExchangeTodo();
+
+            result.baseClone(this);
+
+            if (this._newStartDate !== undefined) result.startDate = this.startDate.clone();
+            if (this._newEndDate !== undefined) result.endDate = this.endDate.clone();
+
+            if (this._newStatus) {
+                const statusMap = {
+                    "NotStarted": "NONE",
+                    "InProgress": "IN-PROCESS",
+                    "Completed": "COMPLETED",
+                    "WaitingOnOthers": "NEEDS-ACTION",
+                    "Deferred": "CANCELLED",
+                    null: "NONE"
+                };
+
+                result.status = statusMap[this._newStatus];
+            }
+
+            if (this._newEntryDate !== undefined) {
+                if (this.entryDate) {
+                    result.entryDate = this.entryDate.clone();
+                }
+                else {
+                    result.entryDate = null;
+                }
+            }
+
+            if (this._newDueDate !== undefined) {
+                if (this.dueDate) {
+                    result.dueDate = this.dueDate.clone();
+                }
+                else {
+                    result.dueDate = null;
+                }
+            }
+            if (this._newCompletedDate !== undefined) {
+                if (this.completedDate) {
+                    result.completedDate = this.completedDate.clone();
+                }
+                else {
+                    result.completedDate = null;
+                }
+            }
+            if (this._newPercentComplete) result.percentComplete = this._newPercentComplete;
+            if (this._newDuration) result.duration = this._newDuration;
+            if (this._newTotalWork) result.totalWork = this._newTotalWork;
+            if (this._newActualWork) result.actualWork = this._newActualWork;
+            if (this._newMileage) result.mileage = this._newMileage;
+            if (this._newBillingInformation) result.billingInformation = this._newBillingInformation;
+            if (this._newCompanies) result.companies = this.companies;
+            if (this._newIsCompleted !== null) result.isCompleted = this._newIsCompleted;
+        }
+        catch (err) {
+            dump("mivExchangeTodo: Clone: error:" + err + "\n");
+        }
+        //dump("mivExchangeTodo: clone 2: title:"+this.title+", contractId:"+this.contractID+"\n");
+        return result;
+    },
+
+
+    //attribute calIDateTime entryDate;
+    get entryDate() {
+        //dump("get entryDate 2: title:"+this.title+", this._calEvent.entryDate:"+this._calEvent.entryDate+"\n");
+        if (this._newEntryDate !== undefined) {
+            return this._newEntryDate;
+        }
+
+        if (this._entryDate !== undefined) {
+            return this._entryDate;
+        }
+
+        return this._calEvent.entryDate;
+    },
+
+    set entryDate(aValue) {
+        //dump("set entryDate 1: title:"+this.title+", aValue:"+aValue+"\n");
+        //dump("set entryDate x:"+exchGlobalFunctions.STACK()+"\n");
+        if (aValue) {
+            if ((!this.entryDate) || ((aValue.compare(this.entryDate) != 0) || (!this._newEntryDate) || (aValue.compare(this._newEntryDate) != 0))) {
+                //if ((!this.entryDate) || (aValue.compare(this.entryDate) != 0)) {
+                //dump("set entryDate 2: title:"+this.title+", aValue:"+aValue+"\n");
+                this._newEntryDate = aValue.clone();
+                this._calEvent.entryDate = aValue.clone();
+            }
+        }
+        else {
+            if (this.entryDate !== null) {
+                //dump("this._newEntryDate becomes '"+aValue+"'\n");
+                this._newEntryDate = aValue;
+                this._calEvent.entryDate = aValue;
+            }
+        }
+        //dump("set entryDate 3: title:"+this.title+", this._newEntryDate:"+this._newEntryDate+", this._calEvent.entryDate:"+this._calEvent.entryDate+"\n");
+    },
+
+    //attribute calIDateTime dueDate;
+    get dueDate() {
+        //dump("get dueDate 2: title:"+this.title+", this._calEvent.dueDate:"+this._calEvent.dueDate+"\n");
+        if (this._newDueDate !== undefined) {
+            return this._newDueDate;
+        }
+
+        if (this._dueDate !== undefined) {
+            return this._dueDate;
+        }
+
+        return this._calEvent.dueDate;
+    },
+
+    set dueDate(aValue) {
+        //dump("set dueDate 1: title:"+this.title+", aValue:"+aValue+", this.dueDate="+this.dueDate+", this._newDueDate="+this._newDueDate+"\n");
+        if (aValue) {
+            if ((!this.dueDate) || ((aValue.compare(this.dueDate) != 0) || (!this._newDueDate) || (aValue.compare(this._newDueDate) != 0))) {
+                //dump("set dueDate 2: title:"+this.title+", aValue:"+aValue+"\n");
+                this._newDueDate = aValue.clone();
+                this._calEvent.dueDate = aValue.clone();
+            }
+        }
+        else {
+            if (this.dueDate !== null) {
+                this._newDueDate = aValue;
+                this._calEvent.dueDate = aValue;
+            }
+        }
+        //dump("set dueDate 3: title:"+this.title+", this._newDueDate:"+this._newDueDate+", this._calEvent.dueDate:"+this._calEvent.dueDate+"\n");
+    },
+
+    //attribute calIDateTime completedDate;
+    get completedDate() {
+        //dump("get completedDate 2: title:"+this.title+", completedDate=="+this._calEvent.completedDate+"\n");
+        if (this._newCompletedDate !== undefined) {
+            return this._newCompletedDate;
+        }
+
+        if (this._completedDate !== undefined) {
+            return this._completedDate;
+        }
+
+        return this._calEvent.completedDate;
+    },
+
+    set completedDate(aValue) {
+        //dump("set completedDate: title:"+this.title+", aValue:"+aValue+"\n");
+        if (aValue) {
+            //			if ((!this._newCompletedDate) || (aValue.compare(this._newCompletedDate) != 0)) {
+            if ((!this.completedDate) || (aValue.compare(this.completedDate) != 0)) {
+                this._newCompletedDate = aValue.clone();
+                this._calEvent.completedDate = aValue.clone();
+            }
+        }
+        else {
+            if (this.completedDate !== null) {
+                this._newCompletedDate = aValue;
+                this._calEvent.completedDate = aValue;
+            }
+        }
+    },
+
+    //attribute short percentComplete;
+    get percentComplete() {
+        if (this._newPercentComplete !== undefined) {
+            //dump("get percentComplete 1: title:"+this.title+", this._newPercentComplete:"+this._newPercentComplete+"\n");
+            return this._newPercentComplete;
+        }
+
+        if (this._percentComplete !== undefined) {
+            //dump("get percentComplete 1: title:"+this.title+", this._percentComplete:"+this._percentComplete+"\n");
+            return this._percentComplete;
+        }
+
+        //dump("get percentComplete 1: title:"+this.title+", this._calEvent.percentComplete:"+this._calEvent.percentComplete+"\n");
+        return this._calEvent.percentComplete;
+    },
+
+    set percentComplete(aValue) {
+        //dump("set percentComplete: title:"+this.title+", aValue:"+aValue+", this.percentComplete:"+this.percentComplete+"\n");
+        if (aValue != this.percentComplete) {
+            this._newPercentComplete = aValue;
+            this._calEvent.percentComplete = aValue;
+        }
+    },
+
+    get isCompleted() {
+        if (this._newIsCompleted !== undefined) {
+            return this._newIsCompleted;
+        }
+
+        if (this._isCompleted !== undefined) {
+            return this._isCompleted;
+        }
+
+        return this._calEvent.isCompleted;
+    },
+
+    set isCompleted(aValue) {
+        if (aValue != this.isCompleted) {
+            this._newIsCompleted = aValue;
+        }
+        this._calEvent.isCompleted = aValue;
+    },
+
+    //attribute long totalWork;
+    get totalWork() {
+        if (this._newTotalWork !== undefined) {
+            return this._newTotalWork;
+        }
+
+        return this._totalWork;
+    },
+
+    set totalWork(aValue) {
+        if (aValue != this.totalWork) {
+            this._newTotalWork = aValue;
+            this._totalWork = aValue;
+        }
+    },
+
+    //attribute long totalWork;
+    get actualWork() {
+        if (this._newActualWork !== undefined) {
+            return this._newActualWork;
+        }
+
+        return this._actualWork;
+    },
+
+    set actualWork(aValue) {
+        if (aValue != this.actualWork) {
+            this._newActualWork = aValue;
+            this._actualWork = aValue;
+        }
+    },
+
+    //attribute AUTF8String mileage;
+    get mileage() {
+        if (this._newMileage !== undefined) {
+            return this._newMileage;
+        }
+
+        return this._mileage;
+    },
+
+    set mileage(aValue) {
+        if (aValue != this.mileage) {
+            this._newMileage = aValue;
+            this._mileage = aValue;
+        }
+    },
+
+    //attribute AUTF8String billingInformation;
+    get billingInformation() {
+        if (this._newBillingInformation !== undefined) {
+            return this._newBillingInformation;
+        }
+
+        return this._billingInformation;
+    },
+
+    set billingInformation(aValue) {
+        if (aValue != this.billingInformation) {
+            this._newBillingInformation = aValue;
+            this._billingInformation = aValue;
+        }
+    },
+
+    //void getCompanies(out PRUint32 count, [array, size_is(count), retval] out AUTF8String aCompanies);
+    get companies() {
+        var tmpCompanies = this.getCompanies({});
+        var result = "";
+        for (var index in tmpCompanies) {
+            if (result != "") {
+                result += ", ";
+            }
+            result += tmpCompanies[index];
+        }
+
+        return result;
+    },
+
+    set companies(aValue) {
+        // Replace ", " (comma + space) by only comma.
+        var tmpStr = aValue;
+
+        while (tmpStr.indexOf(", ") >= 0) {
+            tmpStr = tmpStr.replace(/, /g, ",");
+        }
+
+        var newArray = tmpStr.split(",");
+        var newResult = "";
+        for (var index in newArray) {
+            if (newResult != "") {
+                newResult += ", ";
+            }
+            newResult += newArray[index];
+        }
+
+        if (this.companies != newResult) {
+            this.clearCompanies();
+            for (var index in newArray) {
+                this.addCompany(newArray[index]);
+            }
+        }
+
+    },
+
+    getCompanies: function _getCompanies(aCount) {
+        if (this._newCompanies) {
+            aCount.value = this._newCompanies.length;
+            return this._newCompanies;
+        }
+
+        if (!this._companies) {
+            aCount.value = 0;
+            return [];
+        }
+
+        aCount.value = this._companies.length;
+        return this._companies;
+    },
+
+    //void addCompany(in AUTF8String aCompany);
+    addCompany: function _addCompany(aCompany) {
+        if (!this._newCompanies) {
+            this._newCompanies = [];
+        }
+
+        this._newCompanies.push(aCompany);
+    },
+
+    //void clearCompanies();
+    clearCompanies: function _clearCompanies() {
+        this._newCompanies = [];
+    },
+
+    get duration() {
+        if (this._newDuration !== undefined) {
+            return this._newDuration;
+        }
+
+        if (this._duration !== undefined) {
+            return this._duration;
+        }
+
+        return this._calEvent.duration;
+    },
+
+    set duration(aValue) {
+        if (aValue.toString() != this.duration.toString()) {
+            this._newDuration = aValue;
+            this._calEvent.duration = aValue;
+        }
+    },
+
+    // status of the event
+    //attribute AUTF8String status;
+    get status() {
+        const statusMap = {
+            "NotStarted": "NONE",
+            "InProgress": "IN-PROCESS",
+            "Completed": "COMPLETED",
+            "WaitingOnOthers": "NEEDS-ACTION",
+            "Deferred": "CANCELLED",
+            null: "NONE"
+        };
+
+        if (this._newStatus !== undefined) {
+            //dump("mivExchangeTodo: get status: title:"+this.title+", this._newStatus:"+this._newStatus+", return:"+statusMap[this._newStatus]+"\n");
+            return statusMap[this._newStatus];
+        }
+
+        if (this._status !== undefined) {
+            //dump("mivExchangeTodo: get status: title:"+this.title+", this._status:"+this._status+", return:"+statusMap[this._status]+"\n");
+            return statusMap[this._status];
+        }
+
+        //dump("mivExchangeTodo: get status: title:"+this.title+", this._calEvent.status:"+this._calEvent.status+", return:"+this._calEvent.status+"\n");
+        return this._calEvent.status;
+    },
+
+    set status(aValue) {
+        //dump("mivExchangeTodo: set status: title:"+this.title+", aValue:"+aValue+", this.status:"+this.status+"\n");
+        if (aValue != this.status) {
+
+            const statuses = {
+                "NONE": "NotStarted",
+                "IN-PROCESS": "InProgress",
+                "COMPLETED": "Completed",
+                "NEEDS-ACTION": "WaitingOnOthers",
+                "CANCELLED": "Deferred",
+                null: "NotStarted"
+            };
+
+            this._newStatus = statuses[aValue];
+            this._calEvent.status = aValue;
+            this._calEvent.setProperty("STATUS", aValue);
+        }
+    },
+
+    //readonly attribute AUTF8String owner;
+    get owner() {
+        return this._owner;
+    },
+
+    get updateXML() {
+        this._nonPersonalDataChanged = false;
+
+        const statusMapInt = {
+            "NotStarted": "0",
+            "InProgress": "1",
+            "Completed": "2",
+            "WaitingOnOthers": "3",
+            "Deferred": "4",
+            null: "0"
+        };
+
+        var updates = exchGlobalFunctions.xmlToJxon('<t:Updates xmlns:m="' + nsMessagesStr + '" xmlns:t="' + nsTypesStr + '"/>');
+
+        if (this._newTitle !== undefined) {
+            this._nonPersonalDataChanged = true;
+            this.addSetItemField(updates, "Subject", this._newTitle);
+        }
+        if (this._newPrivacy) {
+            this.addSetItemField(updates, "Sensitivity", this._newPrivacy);
+        }
+
+        /*		if (this._newBody !== undefined) {
+        			this._nonPersonalDataChanged = true;
+        			this.addSetItemField(updates, "Body", this._newBody, { BodyType: "Text" });
+        		}*/
+
+        if (this.bodyType == "HTML") {
+            if (this._newBody2 !== undefined) {
+                this._nonPersonalDataChanged = true;
+                if (this._newBody2 === null) {
+                    this.addDeleteItemField(updates, "Body");
+                }
+                else {
+                    this.addSetItemField(updates, "Body", this._newBody2, {
+                        BodyType: "HTML"
+                    });
+                }
+            }
+        }
+        else {
+            if (this._newBody !== undefined) {
+                this._nonPersonalDataChanged = true;
+                if (this._newBody === null) {
+                    this.addDeleteItemField(updates, "Body");
+                }
+                else {
+                    this.addSetItemField(updates, "Body", this._newBody, {
+                        BodyType: "Text"
+                    });
+                }
+            }
+        }
+
+        if ((this._newPercentComplete) || ((this._newIsCompleted) && (this._newIsCompleted === true))) {
+            this._nonPersonalDataChanged = true;
+            switch (this.itemClass) {
+            case "IPM.Note":
+                //Email Todo
+                let percentComplete = this.percentComplete / 100.0;
+                this.addSetItemField(updates, "ExtendedFieldURI", percentComplete, {
+                    "DistinguishedPropertySetId": "Task",
+                    "PropertyId": "33026",
+                    "PropertyType": "Double"
+                });
+                break;
+            default:
+                this.addSetItemField(updates, "PercentComplete", this.percentComplete);
+            }
+        }
+
+        if ((this._newStatus) || (this._newIsCompleted !== undefined)) {
+            this._nonPersonalDataChanged = true;
+
+            if (this._newStatus) {
+                switch (this.itemClass) {
+                case "IPM.Note":
+                    //Email Todo
+                    if (this._newIsCompleted === true) {
+                        let percentComplete = 1;
+                        this.addSetItemField(updates, "ExtendedFieldURI", percentComplete, {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33026",
+                            "PropertyType": "Double"
+                        });
+                        this.addSetItemField(updates, "ExtendedFieldURI", "1", {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33052",
+                            "PropertyType": "Boolean"
+                        });
+                    }
+                    else {
+                        let percentComplete;
+                        if (this._newStatus == "InProgress") {
+                            percentComplete = this.percentComplete / 100.0;
+
+                        }
+                        else {
+                            percentComplete = 0;
+                        }
+                        this.addSetItemField(updates, "ExtendedFieldURI", percentComplete, {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33026",
+                            "PropertyType": "Double"
+                        });
+                        this.addSetItemField(updates, "ExtendedFieldURI", "0", {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33052",
+                            "PropertyType": "Boolean"
+                        });
+                    }
+                    this.addSetItemField(updates, "ExtendedFieldURI", statusMapInt[this._newStatus], {
+                        "DistinguishedPropertySetId": "Task",
+                        "PropertyId": "33025",
+                        "PropertyType": "Integer"
+                    });
+                    break;
+                default:
+                    this.addSetItemField(updates, "Status", this._newStatus);
+                }
+            }
+            else {
+                if (this._newIsCompleted === false) {
+                    switch (this.itemClass) {
+                    case "IPM.Note":
+                        //Email Todo
+                        let percentComplete = 0;
+                        this.addSetItemField(updates, "ExtendedFieldURI", percentComplete, {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33026",
+                            "PropertyType": "Double"
+                        });
+                        this.addSetItemField(updates, "ExtendedFieldURI", statusMapInt["NotStarted"], {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33025",
+                            "PropertyType": "Integer"
+                        });
+                        this.addSetItemField(updates, "ExtendedFieldURI", "0", {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33052",
+                            "PropertyType": "Boolean"
+                        });
+                        break;
+                    default:
+                        this.addSetItemField(updates, "Status", "NotStarted");
+                    }
+                }
+                else {
+                    switch (this.itemClass) {
+                    case "IPM.Note":
+                        //Email Todo
+                        this.addSetItemField(updates, "ExtendedFieldURI", statusMapInt["Completed"], {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33025",
+                            "PropertyType": "Integer"
+                        });
+                        this.addSetItemField(updates, "ExtendedFieldURI", "1", {
+                            "DistinguishedPropertySetId": "Task",
+                            "PropertyId": "33052",
+                            "PropertyType": "Boolean"
+                        });
+                        break;
+                    default:
+                        this.addSetItemField(updates, "Status", "Completed");
+                    }
+                }
+            }
+        }
+
+        if (this._newTotalWork) {
+            this._nonPersonalDataChanged = true;
+            this.addSetItemField(updates, "TotalWork", this._newTotalWork);
+        }
+
+        if (this._newActualWork) {
+            this._nonPersonalDataChanged = true;
+            this.addSetItemField(updates, "ActualWork", this._newActualWork);
+        }
+
+        if (this._newMileage !== undefined) {
+            this._nonPersonalDataChanged = true;
+            this.addSetItemField(updates, "Mileage", this._newMileage);
+        }
+
+        if (this._newBillingInformation !== undefined) {
+            this._nonPersonalDataChanged = true;
+            this.addSetItemField(updates, "BillingInformation", this._newBillingInformation);
+        }
+
+        // Categories
+        this.getCategories({});
+        if (this._changesCategories) {
+            var categoriesXML = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
+                .createInstance(Ci.mivIxml2jxon);
+            var categories = this.getCategories({});
+            var first = true;
+            for each(var category in categories) {
+                if (first) {
+                    first = false;
+                    categoriesXML.processXMLString("<t:String>" + category + "</t:String>", 0, null);
+                }
+                else {
+                    categoriesXML.addSibblingTag("String", "t", category);
+                }
+            }
+            if (categories.length > 0) {
+                this.addSetItemField(updates, "Categories", categoriesXML);
+            }
+            else {
+                if (this._categories.length > 0) {
+                    this.addDeleteItemField(updates, "Categories");
+                }
+            }
+        }
+
+        // Companies
+        if (this._newCompanies) {
+            var companiesXML = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
+                .createInstance(Ci.mivIxml2jxon);
+            var companies = this.getCompanies({});
+            //var companies = this.companies;
+            var first = true;
+            for each(var company in companies) {
+                if (first) {
+                    first = false;
+                    companiesXML.processXMLString("<t:String>" + company + "</t:String>", 0, null);
+                }
+                else {
+                    companiesXML.addSibblingTag("String", "t", company);
+                }
+            }
+            if (companies.length > 0) {
+                this.addSetItemField(updates, "Companies", companiesXML);
+            }
+            else {
+                if (this._companies.length > 0) {
+                    this.addDeleteItemField(updates, "Companies");
+                }
+            }
+        }
+
+        if (this._newPriority) {
+            this.addSetItemField(updates, "Importance", this._newPriority);
+        }
+
+
+        // Recurrence rule. Michel
+        var recurrenceInfoChanged;
+        if (this._recurrenceInfo) {
+            // We had recurrenceInfo. Lets see if it changed.
+            //dump("We had recurrenceInfo. Lets see if it changed.");
+            if (this._newRecurrenceInfo !== undefined) {
+                // It was changed or removed
+                if (this._newRecurrenceInfo === null) {
+                    // It was removed
+                    //dump("We had recurrenceInfo. And it is removed.");
+                    recurrenceInfoChanged = false;
+                    this._nonPersonalDataChanged = true;
+                    this.addDeleteItemField(updates, "Recurrence");
+                }
+                else {
+                    // See if something changed
+                    //dump("We had recurrenceInfo. And it was changed.");
+                    recurrenceInfoChanged = true;
+                }
+            }
+            else {
+                // It could be that the content of the recurrenceInfo was changed
+                if (this._recurrenceInfo.toString() != this.recurrenceInfo.toString()) {
+                    //dump("We had recurrenceInfo. And it was changed. 2.\n");
+                    recurrenceInfoChanged = true;
+                }
+            }
+        }
+        else {
+            // We did not have recurrence info. Check if we have now
+            //dump("We did not have recurrenceInfo. See if it was added.");
+            if (this._newRecurrenceInfo) {
+                //dump("We did not have recurrenceInfo. But we do have now.");
+                recurrenceInfoChanged = true;
+            }
+        }
+
+        if (recurrenceInfoChanged) {
+            var recurrenceXML = this.makeRecurrenceRule();
+            this._nonPersonalDataChanged = true;
+            this.addSetItemField(updates, "Recurrence", recurrenceXML, null, true);
+
+            // Next is to trigger sending the start and end dates when we have a changed reccurrence.
+            if ((!this._newEntryDate) && (this.entryDate)) this._newEntryDate = this.entryDate.clone();
+            if ((!this._newDueDate) && (this.dueDate)) this._newDueDate = this.dueDate.clone();
+
+        }
+
+        this.entryDate;
+        if (this._newEntryDate) {
+            var tmpStart = this._newEntryDate.clone();
+            if (this._newEntryDate.isDate) {
+                tmpStart.isDate = false;
+                /*				var tmpDuration = cal.createDuration();
+                				tmpDuration.minutes = -60;
+                				tmpStart.addDuration(tmpDuration);*/
+
+                // We make a non-UTC datetime value for exchGlobalFunctions.
+                // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+                //				var exchStart = cal.toRFC3339(tmpStart).substr(0, 19)+"Z"; //cal.toRFC3339(tmpStart).length-6);
+                var exchStart = cal.toRFC3339(tmpStart).substr(0, 19); //cal.toRFC3339(tmpStart).length-6);
+            }
+            else {
+                // We set in bias advanced to UCT datetime values for exchGlobalFunctions.
+                //				var exchStart = cal.toRFC3339(tmpStart).substr(0, 19)+"Z";
+                var exchStart = cal.toRFC3339(tmpStart).substr(0, 19);
+            }
+            this._nonPersonalDataChanged = true;
+            switch (this.itemClass) {
+            case "IPM.Note":
+                //Email Todo
+                this.addSetItemField(updates, "ExtendedFieldURI", exchStart, {
+                    "DistinguishedPropertySetId": "Common",
+                    "PropertyId": "34070",
+                    "PropertyType": "SystemTime"
+                });
+                break;
+            default:
+                this.addSetItemField(updates, "StartDate", exchStart);
+            }
+        }
+        else {
+            if (((this._entryDate)) || (this._entryDate === undefined)) {
+                this._nonPersonalDataChanged = true;
+                switch (this.itemClass) {
+                case "IPM.Note":
+                    //Email Todo
+                    break;
+                default:
+                    this.addDeleteItemField(updates, "StartDate");
+                }
+            }
+        }
+
+        this.dueDate;
+        if (this._newDueDate) {
+            var tmpEnd = this._newDueDate.clone();
+
+            if (this._newDueDate.isDate) {
+                tmpEnd.isDate = false;
+                /*				var tmpDuration = cal.createDuration();
+                				tmpDuration.minutes = -61;
+                				tmpEnd.addDuration(tmpDuration);*/
+
+                // We make a non-UTC datetime value for exchGlobalFunctions.
+                // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+                //				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
+                var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
+            }
+            else {
+                // We set in bias advanced to UCT datetime values for exchGlobalFunctions.
+                //				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z";
+                var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
+            }
+            this._nonPersonalDataChanged = true;
+            switch (this.itemClass) {
+            case "IPM.Note":
+                //Email Todo
+                this.addSetItemField(updates, "ExtendedFieldURI", exchEnd, {
+                    "DistinguishedPropertySetId": "Common",
+                    "PropertyId": "34071",
+                    "PropertyType": "SystemTime"
+                });
+                break;
+            default:
+                this.addSetItemField(updates, "DueDate", exchEnd);
+            }
+        }
+        else {
+            if (((this._dueDate) && (this._newDueDate === null)) || (this._dueDate === undefined)) {
+                this._nonPersonalDataChanged = true;
+                switch (this.itemClass) {
+                case "IPM.Note":
+                    //Email Todo
+                    break;
+                default:
+                    this.addDeleteItemField(updates, "DueDate");
+                }
+            }
+        }
+
+        this.completedDate;
+        if ((this._newCompletedDate) && ((this._newIsCompleted) && (this._newIsCompleted === true))) {
+            //			var tmpEnd = this._newCompletedDate.clone();
+            var tmpEnd = this.completedDate.clone();
+
+            if (this.completedDate.isDate) {
+                tmpEnd.isDate = false;
+                /*				var tmpDuration = cal.createDuration();
+                				tmpDuration.minutes = -61;
+                				tmpEnd.addDuration(tmpDuration);*/
+
+                // We make a non-UTC datetime value for exchGlobalFunctions.
+                // EWS will use the MeetingTimeZone or StartTimeZone and EndTimeZone to convert.
+                //				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z"; //cal.toRFC3339(tmpEnd).length-6);
+                var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
+            }
+            else {
+                // We set in bias advanced to UCT datetime values for exchGlobalFunctions.
+                //				var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19)+"Z";
+                var exchEnd = cal.toRFC3339(tmpEnd).substr(0, 19);
+            }
+            this._nonPersonalDataChanged = true;
+            switch (this.itemClass) {
+            case "IPM.Note":
+                //Email Todo
+                this.addSetItemField(updates, "ExtendedFieldURI", exchEnd, {
+                    "DistinguishedPropertySetId": "Task",
+                    "PropertyId": "33039",
+                    "PropertyType": "SystemTime"
+                });
+                break;
+            default:
+                this.addSetItemField(updates, "CompleteDate", exchEnd);
+            }
+        }
+        else {
+            if (((this._completedDate) && (this._newCompletedDate === null)) || (this._completedDate === undefined) || ((this._newIsCompleted) && (this._newIsCompleted === false))) {
+                this._nonPersonalDataChanged = true;
+                switch (this.itemClass) {
+                case "IPM.Note":
+                    //Email Todo
+                    //this.addSetItemField(updates,"ExtendedFieldURI",exchEnd,{"DistinguishedPropertySetId":"Task","PropertyId":"33039","PropertyType":"SystemTime"});
+                    break;
+                default:
+                    this.addDeleteItemField(updates, "CompleteDate");
+                }
+            }
+        }
+
+        if (this._newLegacyFreeBusyStatus) {
+            this.addSetItemField(updates, "LegacyFreeBusyStatus", this._newLegacyFreeBusyStatus);
+        }
+
+        // Alarms and snoozes
+        this.checkAlarmChange(updates);
+
+        //  dump("\nupdates:"+updates.toString()+"\n");
+        return updates;
+    },
+
+    preLoad: function _preLoad() {
+        switch (this.itemClass) {
+        case "IPM.Note":
+            var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34070']");
+            if (tmpObject.length > 0) {
+                this._entryDate = this.tryToSetDateValue(xml2json.getTagValue(tmpObject[0], "t:Value", null), this._calEvent.entryDate);
+            }
+            break;
+        default:
+            this._entryDate = this.tryToSetDateValue(this.getTagValue("t:StartDate", null), this._calEvent.entryDate);
+        }
+
+        if (this._entryDate) {
+            /*				this._entryDate.hour = 0;
+            			this._entryDate.minute = 0;
+            			this._entryDate.second = 0;
+            			this._entryDate.isDate = false;
+            */
+            if ((this._entryDate.hour === 0) && (this._entryDate.minute === 0) && (this.dueDate) && (this.dueDate.hour === 0) && (this.dueDate.minute === 0)) {
+                // When a new task is created in outlook it will have entryDate en dueDate times set to 00:00.
+                // We change this to the start of the working day..
+                var dayStart = exchGlobalFunctions.safeGetIntPref(null, "calendar.view.daystarthour", 8);
+                this._entryDate.hour = dayStart;
+                this._dueDate.hour = dayStart;
+                this._calEvent.dueDate = this._dueDate.clone();
+            }
+
+            var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._entryDate);
+            if (timezone) {
+                this._entryDate = this._entryDate.getInTimezone(timezone);
+            }
+            this._calEvent.entryDate = this._entryDate.clone();
+        }
+
+        switch (this.itemClass) {
+        case "IPM.Note":
+            var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '34071']");
+            if (tmpObject.length > 0) {
+                this._dueDate = this.tryToSetDateValue(xml2json.getTagValue(tmpObject[0], "t:Value", null), this._calEvent.dueDate);
+            }
+            break;
+        default:
+            this._dueDate = this.tryToSetDateValue(this.getTagValue("t:DueDate", null), this._calEvent.dueDate);
+        }
+
+        if (this._dueDate) {
+            var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._dueDate);
+            if (timezone) {
+                this._dueDate = this._dueDate.getInTimezone(timezone);
+            }
+            this._calEvent.dueDate = this._dueDate.clone();
+        }
+    },
+
+    postLoad: function _postLoad() {
+
+        switch (this.itemClass) {
+        case "IPM.Note":
+            var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33039']");
+            if (tmpObject.length > 0) {
+                this._completedDate = this.tryToSetDateValue(xml2json.getTagValue(tmpObject[0], "t:Value", null), this._calEvent.completedDate);
+            }
+            break;
+        default:
+            this._completedDate = this.tryToSetDateValue(this.getTagValue("t:CompleteDate", null), this._calEvent.completedDate);
+        }
+
+        if (this._completedDate) {
+            var timezone = exchTimeZones.getCalTimeZoneByExchangeTimeZone(this.getTag("t:StartTimeZone"), "", this._completedDate);
+            if (timezone) {
+                this._completedDate = this._completedDate.getInTimezone(timezone);
+            }
+            this._calEvent.completedDate = this._completedDate.clone();
+        }
+
+        switch (this.itemClass) {
+        case "IPM.Note":
+            var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33026']");
+            if (tmpObject.length > 0) {
+                this._percentComplete = xml2json.getTagValue(tmpObject[0], "t:Value", this._calEvent.percentComplete);
+                this._percentComplete = this._percentComplete * 100;
+            }
+            break;
+        default:
+            this._percentComplete = this.getTagValue("t:PercentComplete", this._calEvent.percentComplete);
+        }
+        if (this._percentComplete) {
+            this._calEvent.percentComplete = this._percentComplete;
+        }
+
+        const statusMap = {
+            "NotStarted": "NONE",
+            "InProgress": "IN-PROCESS",
+            "Completed": "COMPLETED",
+            "WaitingOnOthers": "NEEDS-ACTION",
+            "Deferred": "CANCELLED",
+            null: "NONE"
+        };
+
+        switch (this.itemClass) {
+        case "IPM.Note":
+            var tmpObject = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33025']");
+            if (tmpObject.length > 0) {
+                var statusInt = xml2json.getTagValue(tmpObject[0], "t:Value", null);
+                var noteStatus;
+                if (statusInt === "2") {
+                    noteStatus = "Completed";
+                }
+                else if (statusInt === "1") {
+                    noteStatus = "InProgress";
+                }
+                else if (statusInt === "3") {
+                    noteStatus = "WaitingOnOthers";
+                }
+                else if (statusInt === "4") {
+                    noteStatus = "Deferred";
+                }
+                else if (statusInt === "0") {
+                    noteStatus = "NotStarted";
+                }
+                else {
+                    noteStatus = "NotStarted";
+                }
+            }
+            else {
+                noteStatus = "NotStarted";
+            }
+
+            if (noteStatus != "Completed") {
+                var tmpObject_2 = this.XPath("/t:ExtendedProperty[t:ExtendedFieldURI/@PropertyId = '33052']");
+                if (tmpObject_2.length > 0) {
+                    let noteCompleted = xml2json.getTagValue(tmpObject_2[0], "t:Value", null);
+                    if (noteCompleted === true) {
+                        noteStatus = "Completed";
+                    }
+                }
+            }
+
+            this._status = noteStatus;
+            break;
+        default:
+            this._status = this.getTagValue("t:Status", "NotStarted");
+        }
+
+        this._calEvent.status = statusMap[this._status];
+
+        this._calEvent.setProperty("STATUS", statusMap[this._status]);
+        this._isCompleted = (this._status == "Completed");
+
+        this._calEvent.isCompleted = this._isCompleted;
+        //dump("postLoad: title:"+this.title+", this._percentComplete:"+this._percentComplete+", isCompleted:"+this.isCompleted+", getProperty:"+this._calEvent.getProperty("STATUS")+", this.status:"+this.status+", entryDate:"+this.entryDate+"\n");
+
+        this._totalWork = this.getTagValue("t:TotalWork", 0);
+
+        this._actualWork = this.getTagValue("t:ActualWork", 0);
+
+        this._mileage = this.getTagValue("t:Mileage", "");
+
+        this._billingInformation = this.getTagValue("t:BillingInformation", "");
+
+        this._companies = [];
+        if (this._exchangeData) {
+            var tmpStr = xml2json.XPath(this.exchangeData, "/t:Companies/t:String");
+            for each(var string in tmpStr) {
+                this._companies.push(xml2json.getValue(string));
+            }
+            tmpStr = null;
+        }
+
+        if ((!this._duration) && (!this._newEndDate) && (!this._newStartDate)) {
+            this._duration = this.getTagValue("t:Duration", null);
+            if (this._duration) {
+                //dump("get duration: title:"+this.title+", value:"+cal.createDuration(this._duration));
+                this._duration = cal.createDuration(this._duration);
+            }
+        }
+
+        if (!this._owner) {
+            this._owner = this.getTagValue("t:Owner", "(unknown)");
+        }
+
+
+    },
 
 };
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivExchangeTodo) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivExchangeTodo = XPCOMUtils.generateNSGetFactory([mivExchangeTodo]);
-
-	}
+    try {
+        if (!NSGetFactory.mivExchangeTodo) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivExchangeTodo = XPCOMUtils.generateNSGetFactory([mivExchangeTodo]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivExchangeTodo(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivExchangeTodo(cid);
+}
diff --git a/interfaces/global/mivFunctions.js b/interfaces/global/mivFunctions.js
index c4e00028..b1b2794c 100644
--- a/interfaces/global/mivFunctions.js
+++ b/interfaces/global/mivFunctions.js
@@ -33,880 +33,875 @@ Cu.import("resource:///modules/Services.jsm");
 Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
-function mivFunctions()
-{
-	// Mozilla helpers
-	this.domParser = Cc["@mozilla.org/xmlextras/domparser;1"]
-		.getService(Ci.nsIDOMParser);
-	this.xmlSerializer = Cc["@mozilla.org/xmlextras/xmlserializer;1"]
-		.createInstance(Ci.nsIDOMSerializer);
+function mivFunctions() {
+    // Mozilla helpers
+    this.domParser = Cc["@mozilla.org/xmlextras/domparser;1"]
+        .getService(Ci.nsIDOMParser);
+    this.xmlSerializer = Cc["@mozilla.org/xmlextras/xmlserializer;1"]
+        .createInstance(Ci.nsIDOMSerializer);
 }
 
 mivFunctions.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivFunctions,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Global functions.",
-	classID: components.ID("{c7543f10-e2d1-44b3-ae37-9221e0d5b524}"),
-	contractID: "@1st-setup.nl/global/functions;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	doEncodeFolderSpecialChars: function _doEncodeFolderSpecialChars(str, r1)
-	{
-		var result = str;
-		switch (r1) {
-		case "/": result = "%2F"; break;
-		case "%": result = "%25"; break;
-		}
-
-		return result;
-	},
-
-	encodeFolderSpecialChars: function _encodeFolderSpecialChars(aStr)
-	{
-		// characters like "/" (forward slash) is converted to %2F
-		// Character "%" (percentage) is converted to %25
-		var result = aStr.toString();
-		result = result.replace(/([\x2F|\x25])/g, this.doEncodeFolderSpecialChars);
-		return result;
-	},
-
-	doDecodeFolderSpecialChars: function _doDecodeFolderSpecialChars(str, r1)
-	{
-		var result = str;
-		switch (r1) {
-		case "%2F": result = "/"; break;
-		case "%25": result = "%"; break;
-		}
-		return result;
-	},
-
-	decodeFolderSpecialChars: function _decodeFolderSpecialChars(aStr)
-	{
-		// Does the oposit of encodeFolderSpecialChars
-		var result = aStr.toString();
-		result = result.replace(/(\x252F|\x2525)/g, this.doDecodeFolderSpecialChars);
-		return result;
-	},
-
-	ecTZService: function _ecTZService()
-	{
-		if (Cc["@mozilla.org/calendar/timezone-service;1"]) {
-			return Cc["@mozilla.org/calendar/timezone-service;1"]
-		                     .getService(Ci.calITimezoneService);
-		}
-	
-		return null;
-	},
-
-	ecDefaultTimeZone: function _ecDefaultTimeZone()
-	{
-		if (this.ecTZService()) {
-			return this.ecTZService().defaultTimezone;
-		}
-		return null;
-	},
-
-	ecUTC: function _ecUTC()
-	{
-		if (this.ecTZService()) {
-			return this.ecTZService().UTC;
-		}	
-
-		return null;
-	},
-
-	convertDurationToSeconds: function _convertDurationToSeconds(aDuration)
-	{
-		if (!aDuration) return null;
-
-		var tmpStr = aDuration;
-		var multiplier = 1;
-		if (tmpStr.substr(0,1) == "-") {
-			multiplier = -1;
-			tmpStr = tmpStr.substr(1);
-		}
-
-		var total = 0;
-		var subtotal = 0;
-
-		if (tmpStr.substr(0,2) == "PT") {
-			tmpStr = tmpStr.substr(2);
-
-			var counter = 0;
-			while (counter < tmpStr.length) {
-				if (isNaN(tmpStr.substr(counter, 1))) {
-					switch (tmpStr.substr(counter, 1).toUpperCase()) {
-						case "D":
-							subtotal = subtotal * 3600 * 24;
-							break;
-						case "H":
-							subtotal = subtotal * 3600;
-							break;
-						case "M":
-							subtotal = subtotal * 60;
-							break;
-						case "S":
-							subtotal = subtotal;
-							break;
-					}
-					total = total + subtotal;
-					subtotal = 0;
-					//if (this.debug) this.logInfo(" ++ total:"+total);
-				}
-				else {
-					subtotal = (subtotal * 10) + Number(tmpStr.substr(counter, 1));
-					//if (this.debug) this.logInfo(" ++ subtotal:"+subtotal);
-				}
-				counter = counter + 1;
-			}
-
-		}
-
-
-		return total * multiplier;
-		
-	},
-
-	splitUriGetParams: function _splitUriGetParams(aUri)
-	{
-		if (aUri.path.indexOf("?") > -1) {
-			// We have get params.
-			let getParamsStr = aUri.path.substr(aUri.path.indexOf("?")+1);
-			// Split is in the individual params.
-			var getParams = {};
-			while (getParamsStr.indexOf("&") > -1) {
-				var tmpParam = getParamsStr.substr(0, getParamsStr.indexOf("&"));
-				getParamsStr = getParamsStr.substr(getParamsStr.indexOf("&")+1);
-				if (tmpParam.indexOf("=") > -1) {
-					getParams[tmpParam.substr(0,tmpParam.indexOf("="))] = decodeURIComponent(tmpParam.substr(tmpParam.indexOf("=")+1));
-				}
-			}
-			if (getParamsStr.indexOf("=") > -1) {
-				getParams[getParamsStr.substr(0,getParamsStr.indexOf("="))] = decodeURIComponent(getParamsStr.substr(getParamsStr.indexOf("=")+1));
-			}
-
-			return getParams;
-		}
-		
-		return null;
-	},
-
-
-	getBranch: function _getBranche(aName)
-	{
-		var lBranche = "";
-		var lName = "";
-		var lastIndexOf = aName.lastIndexOf(".");
-		if (lastIndexOf > -1) {
-			lBranche = aName.substr(0,lastIndexOf+1);
-			lName = aName.substr(lastIndexOf+1); 
-		}
-		else {
-			lName = aName;
-		}
-
-		//this.LOG("aName:"+aName+", lBranche:"+lBranche+", lName:"+lName+"|");
-
-		return { branch: Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService)
-				    .getBranch(lBranche),
-			   name: lName };
-	},
-
-	safeGetCharPref: function _safeGetCharPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable)
-	{
-		if (!aBranch) {
-//			return aDefaultValue;
-			var realBranche = this.getBranch(aName);
-			if (!realBranche.branch) {
-				return aDefaultValue;
-			}
-			aBranch = realBranche.branch;
-			aName = realBranche.name;
-		}
-	
-		if (!aCreateWhenNotAvailable) { aCreateWhenNotAvailable = false; }
-
-		try {
-			return aBranch.getCharPref(aName);
-		}
-		catch(err) {
-			if (aCreateWhenNotAvailable) { 
-				try {
-					aBranch.setCharPref(aName, aDefaultValue); 
-				}
-				catch(er) {
-					aBranch.deleteBranch(aName);
-					aBranch.setCharPref(aName, aDefaultValue); 
-				}
-			}
-			return aDefaultValue;
-		}
-	},
-
-	safeGetBoolPref: function _safeGetBoolPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable)
-	{
-		if (!aBranch) {
-//			return aDefaultValue;
-			var realBranche = this.getBranch(aName);
-			if (!realBranche.branch) {
-				return aDefaultValue;
-			}
-			aBranch = realBranche.branch;
-			aName = realBranche.name;
-		}
-	
-		if (!aCreateWhenNotAvailable) { aCreateWhenNotAvailable = false; }
-
-		try {
-			return aBranch.getBoolPref(aName);
-		}
-		catch(err) {
-			if (aCreateWhenNotAvailable) { 
-				try {
-					aBranch.setBoolPref(aName, aDefaultValue); 
-				}
-				catch(er) {
-					aBranch.deleteBranch(aName);
-					aBranch.setBoolPref(aName, aDefaultValue); 
-				}
-			}
-			return aDefaultValue;
-		}
-	},
-
-	safeGetIntPref: function _safeGetIntPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable)
-	{
-		if (!aBranch) {
-//			return aDefaultValue;
-			var realBranche = this.getBranch(aName);
-			if (!realBranche.branch) {
-				return aDefaultValue;
-			}
-			aBranch = realBranche.branch;
-			aName = realBranche.name;
-		}
-	
-		if (!aCreateWhenNotAvailable) {  aCreateWhenNotAvailable = false; }
-
-		try {
-			return aBranch.getIntPref(aName);
-		}
-		catch(err) {
-			if (aCreateWhenNotAvailable) { 
-				try {
-					aBranch.setIntPref(aName, aDefaultValue); 
-				}
-				catch(er) {
-					aBranch.deleteBranch(aName);
-					aBranch.setIntPref(aName, aDefaultValue); 
-				}
-			}
-			return aDefaultValue;
-		}
-	},
-
-// Following code was taken from calUtils.jsm in Lightning
-
-// Code from calUtils.jsm
-
-// Following code was taken from calUtils.js in Lightning and modified
-
-/**
- * Creates a string bundle.
- *
- * @param bundleURL The bundle URL
- * @return string bundle
- */
-	getStringBundle: function _getStringBundle(bundleURL) {
-	    let service = Cc["@mozilla.org/intl/stringbundle;1"]
-	                            .getService(Ci.nsIStringBundleService);
-	    return service.createBundle(bundleURL);
-	},
-
-/**
- * Gets the value of a string in a .properties file from the calendar bundle
- *
- * @param aBundleName  the name of the properties file.  It is assumed that the
- *                     file lives in chrome://calendar/locale/
- * @param aStringName  the name of the string within the properties file
- * @param aParams      optional array of parameters to format the string
- * @param aComponent   required stringbundle component name
- */
-	getString: function _getString(aBundleName, aStringName, aParams, aComponent) {
-	    try {
-	        if (!aComponent) {
-	            return "";
-	        }
-	        var propName = "chrome://" + aComponent + "/locale/" + aBundleName + ".properties";
-	        var props = this.getStringBundle(propName);
-	
-	        if (aParams && aParams.length) {
-	            return props.formatStringFromName(aStringName, aParams, aParams.length);
-	        } else {
-	            return props.GetStringFromName(aStringName);
-	        }
-	    } catch (ex) {
-	        var s = ("Failed to read '" + aStringName + "' from " + propName + ".");
-	        Cu.reportError(s + " Error: " + ex);
-	        return s;
-	    }
-	},
-
-/**
- * Make a UUID using the UUIDGenerator service available, we'll use that.
- */
-	getUUID: function _getUUID() {
-	    // generate uuids without braces to avoid problems with
-		if (!this.uuidGen) {
-			this.uuidGen = Cc["@mozilla.org/uuid-generator;1"]
-					.getService(Ci.nsIUUIDGenerator);
-		}
-		return this.uuidGen.generateUUID().toString().replace(/[{}]/g, '');
-	},
-
-
-	/* Shortcut to the console service */
-	getConsoleService: function _getConsoleService() {
-	    return Cc["@mozilla.org/consoleservice;1"]
-	                     .getService(Ci.nsIConsoleService);
-	},
-
-
-/****
- **** debug code
- ****/
-
-/**
- * Logs a string or an object to both stderr and the js-console only in the case
- * where the calendar.debug.log pref is set to true.
- *
- * @param aArg  either a string to log or an object whose entire set of
- *              properties should be logged.
- */
-	shouldLog: function _shouldLog()
-	{
-	    var prefB = Cc["@mozilla.org/preferences-service;1"].
-	                getService(Ci.nsIPrefBranch);
-	    return this.safeGetBoolPref(prefB, "extensions.1st-setup.debug.log", false, true);
-	},
-
-	LOG: function _LOG(aArg) {
-	    //var prefB = Cc["@mozilla.org/preferences-service;1"].
-	    //            getService(Ci.nsIPrefBranch);
-	    //var shouldLog = this.safeGetBoolPref(prefB, "extensions.1st-setup.debug.log", false, true);
-
-	    if (!this.shouldLog()) {
-	        return;
-	    }
-		
-		try {
-			this.ASSERT(aArg, "Bad log argument.", true);
-		}
-		catch(exc) {
-			aArg = exc;
-		}
-
-	    var string;
-	    // We should just dump() both String objects, and string primitives.
-	    if (!(aArg instanceof String) && !(typeof(aArg) == "string")) {
-	        var string = "1st-setup: Logging object...\n";
-	        for (var prop in aArg) {
-	            string += prop + ': ' + aArg[prop] + '\n';
-	        }
-	        string += "End object\n";
-	    } else {
-		var dt = new Date();
-	        string = "1st-setup:"+dt.getFullYear()+"-"+dt.getMonth()+"-"+dt.getDay()+" "+dt.getHours()+":"+dt.getMinutes()+":"+dt.getSeconds()+"."+dt.getMilliseconds()+":" + aArg;
-	    }
-
-	    // xxx todo consider using function debug()
-	    dump(string + '\n');
-	    this.getConsoleService().logStringMessage(string);
-
-		this.writeToLogFile(string);
-
-	},
-
-	writeToLogFile: function _writeToLogFile(aString)
-	{
-		var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-
-		var file = this.safeGetCharPref(prefB, "extensions.1st-setup.debug.file", "/tmp/exchangecalendar.log", true);
-		if (file != "") {
-			// file is nsIFile, data is a string  
-//this.getConsoleService().logStringMessage(" >>>>>>>>>>>>>>>");
-
-			var localFile = Cc["@mozilla.org/file/local;1"]
-					.createInstance(Ci.nsILocalFile);
-
-			try {
-				localFile.initWithPath(file); 
-			}
-			catch(er) {
-				return;
-			}
-
-			var foStream = Cc["@mozilla.org/network/file-output-stream;1"].  
-				       createInstance(Ci.nsIFileOutputStream);  
-			      
-			try {
-				// On startup create a new file otherwise append.  
-				if (!this.debugFileInitialized) {
-					foStream.init(localFile, 0x02 | 0x08 | 0x20,  parseInt("0666", 8), 0);
-					this.debugFileInitialized = true;   
-				}
-				else {
-					foStream.init(localFile, 0x02 | 0x08 | 0x10,  parseInt("0666", 8), 0);   
-				}
-			}
-			catch(er) {
-				return;
-			}
-			      
-			// if you are sure there will never ever be any non-ascii text in data you can   
-			// also call foStream.writeData directly  
-			var converter = Cc["@mozilla.org/intl/converter-output-stream;1"].  
-					createInstance(Ci.nsIConverterOutputStream);  
-			converter.init(foStream, "UTF-8", 0, 0);  
-			converter.writeString(aString+"\n");  
-			converter.close(); // this closes foStream  
-		}
-	},
-
-/**
- * Dumps a warning to both console and js console.
- *
- * @param aMessage warning message
- */
-	WARN: function _WARN(aMessage) {
-	    dump("1st-setup: Warning: " + aMessage + '\n');
-	    var scriptError = Cc["@mozilla.org/scripterror;1"]
-	                                .createInstance(Ci.nsIScriptError);
-	    scriptError.init("1st-setup: " + aMessage, null, null, 0, 0,
-	                     Ci.nsIScriptError.warningFlag,
-	                     "component javascript");
-	    this.getConsoleService().logMessage(scriptError);
-	},
-
-/**
- * Dumps an error to both console and js console.
- *
- * @param aMessage error message
- */
-	ERROR: function _ERROR(aMessage) {
-	    dump("1st-setup: Error: " + aMessage + '\n');
-	    var scriptError = Cc["@mozilla.org/scripterror;1"]
-	                                .createInstance(Ci.nsIScriptError);
-	    scriptError.init("1st-setup: " + aMessage, null, null, 0, 0,
-	                     Ci.nsIScriptError.errorFlag,
-	                     "component javascript");
-	    this.getConsoleService().logMessage(scriptError);
-	},
-
-/**
- * Returns a string describing the current js-stack with filename and line
- * numbers.
- *
- * @param aDepth (optional) The number of frames to include. Defaults to 5.
- * @param aSkip  (optional) Number of frames to skip
- */
-	STACK: function _STACK(aDepth, aSkip) {
-	    let depth = aDepth || 10;
-	    let skip = aSkip || 0;
-	    let stack = "";
-	    let frame = components.stack.caller;
-	    for (let i = 1; i <= depth + skip && frame; i++) {
-	        if (i > skip) {
-	            stack += i + ": [" + frame.filename + ":" +
-	                     frame.lineNumber + "] " + frame.name + "\n";
-	        }
-	        frame = frame.caller;
-	    }
-	    return stack;
-	},
-
-	STACKshort: function _STACKshort() {
-
-	    let depth = 1;
-	    let skip = 1;
-	    let stack = "";
-	    let frame = components.stack.caller;
-	    for (let i = 1; i <= depth + skip && frame; i++) {
-	        if (i > skip) {
-			var filename;
-			if (frame.filename) {
-				filename = frame.filename.replace(/^.*(\\|\/|\:)/, '');
-			}
-			else {
-				filename = "(null)";
-			}
-			stack += frame.name+ " in " + filename + ":" + frame.lineNumber;
-		}
-	        frame = frame.caller;
-	    }
-
-	    return stack;
-	},
-
-/**
- * Logs a message and the current js-stack, if aCondition fails
- *
- * @param aCondition  the condition to test for
- * @param aMessage    the message to report in the case the assert fails
- * @param aCritical   if true, throw an error to stop current code execution
- *                    if false, code flow will continue
- *                    may be a result code
- */
-	ASSERT: function _ASSERT(aCondition, aMessage, aCritical) {
-	    if (aCondition) {
-	        return;
-	    }
-
-	    let string = "Assert failed: " + aMessage + '\n' + this.STACK(0, 1);
-	    if (aCritical) {
-	        throw new components.Exception(string,
-	                                       aCritical === true ? Cr.NS_ERROR_UNEXPECTED : aCritical);
-	    } else {
-	        Cu.reportError(string);
-	    }
-	},
-
-// End of functions from calUtils.js
-
-	CreateSimpleEnumerator: function _CreateSimpleEnumerator(aArray) {
-	  return {
-	    _i: 0,
-	    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
-	    hasMoreElements: function CSE_hasMoreElements() {
-	      return this._i < aArray.length;
-	    },
-	    getNext: function CSE_getNext() {
-	      return aArray[this._i++];
-	    }
-	  };
-	},
-
-	CreateSimpleObjectEnumerator: function _CreateSimpleObjectEnumerator(aObj) {
-	  return {
-	    _i: 0,
-	    _keys: Object.keys(aObj),
-	    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
-	    hasMoreElements: function CSOE_hasMoreElements() {
-	      return this._i < this._keys.length;
-	    },
-	    getNext: function CSOE_getNext() {
-	      return aObj[this._keys[this._i++]];
-	    }
-	  };
-	},
-
-	trim: function _trim (str) {
-		str = str.replace(/^\s+/, '');
-		for (var i = str.length - 1; i >= 0; i--) {
-			if (/\S/.test(str.charAt(i))) {
-				str = str.substring(0, i + 1);
-				break;
-			}
-		}
-		return str;
-	},
-
-	copyPreferences: function _copyPreferences(aFromPrefs, aToPrefs)
-	{
-		var children = aFromPrefs.getChildList("");
-		var count = 0;
-		if (children.length > 0) {
-			// Move prefs from old location to new location.
-			for (var index in children) {
-				count++;
-				switch (aFromPrefs.getPrefType(children[index])) {
-				case aFromPrefs.PREF_STRING:
-					aToPrefs.setCharPref(children[index], aFromPrefs.getCharPref(children[index]));
-					break;
-				case aFromPrefs.PREF_INT:
-					aToPrefs.setIntPref(children[index], aFromPrefs.getIntPref(children[index]));
-					break;
-				case aFromPrefs.PREF_BOOL:
-					aToPrefs.setBoolPref(children[index], aFromPrefs.getBoolPref(children[index]));
-					break;
-				}
-			}
-		
-		}
-		return count;
-	},
-
-	xmlToJxon: function _xmlToJxon(aXMLString) 
-	{
-		if ((!aXMLString) || (aXMLString == "")) { return null;}
-		
-		try {
-			var result = new mivIxml2jxon(aXMLString, 0, null);
-		}
-		catch(exc) {
-			this.LOG("xmlToJxon: Error processXMLString:"+exc+".("+aXMLString+")");
-			result = null;
-		}
-
-		return result;
-	},
-
-	urlToPath: function _urlToPath(aPath) 
-	{
-
-		if (!aPath || !/^file:/.test(aPath))
-			return ;
-		var rv;
-		var ph = Cc["@mozilla.org/network/protocol;1?name=file"]
-				.createInstance(Ci.nsIFileProtocolHandler);
-		rv = ph.getFileFromURLSpec(aPath).path;
-		return rv;
-	},
-
-	chromeToPath: function _chromeToPath(aPath) 
-	{
-
-		if (!aPath || !(/^chrome:/.test(aPath)))
-			return; //not a chrome url
-		var rv;
-
-		var ios = Cc['@mozilla.org/network/io-service;1'].getService(Ci["nsIIOService"]);
-		var uri = ios.newURI(aPath, "UTF-8", null);
-		var cr = Cc['@mozilla.org/chrome/chrome-registry;1'].getService(Ci["nsIChromeRegistry"]);
-		rv = cr.convertChromeURL(uri).spec;
-
-		if (/^file:/.test(rv))
-			rv = this.urlToPath(rv);
-		else
-			rv = this.urlToPath("file://"+rv);
-
-		return rv;
-	},
-
-	splitOnCharacter: function _splitOnCharacter(aString, aStartPos, aSplitCharacter)
-	{
-		if (!aString) {
-			return null;
-		}
-
-		var tmpPos = aStartPos;
-		var result = "";
-		var notClosed = true;
-		var notQuoteOpen = true;
-		var quotesUsed = "";
-		var strLen = aString.length;
-		var splitCharIsArray = Array.isArray(aSplitCharacter);
-		while ((tmpPos < strLen) && (notClosed)) {
-			if ((aString[tmpPos] == "'") || (aString[tmpPos] == '"')) {
-				// We found quotes. Do they belong to our string.
-				if (notQuoteOpen) {
-					quotesUsed = aString[tmpPos];
-					notQuoteOpen = false;
-				}
-				else {
-					if (aString[tmpPos] == quotesUsed) {
-						quotesUsed = "";
-						notQuoteOpen = true;
-					}
-				}
-			}
-
-			var hitSplitCharacter = false;
-			if (notQuoteOpen) {
-				if (splitCharIsArray) {
-					for (var index in aSplitCharacter) {
-						if (aString.substr(tmpPos,aSplitCharacter[index].length) == aSplitCharacter[index]) {
-							hitSplitCharacter = true;
-							break;
-						}
-					}
-				}
-				else {
-					if (aString.substr(tmpPos,aSplitCharacter.length) == aSplitCharacter) {
-						hitSplitCharacter = true;
-					}
-				}
-			}
-
-			if (hitSplitCharacter) {
-				notClosed = false;
-			}
-			else {
-				result += aString[tmpPos];
-			}
-			tmpPos++;
-		}
-
-		if (!notClosed) {
-			return result;
-		}
-		else {
-			return null;
-		}
-	},
-
-	findCharacter: function _findCharacter(aString, aStartPos, aChar)
-	{
-		if (!aString) return -1;
-
-		var pos = aStartPos;
-		var strLength = aString.length;
-		while ((pos < strLength) && (aString[pos] != aChar)) {
-			pos++;
-		}
-
-		if (pos < strLength) {
-			return pos;
-		}
-	
-		return -1;
-	},
-
-	findString: function _findString(aString, aStartPos, aNeedle)
-	{
-		if (!aString) return -1;
-
-		if (aNeedle.length == 1) {
-			return this.findCharacter(aString, aStartPos, aNeedle[0]);
-		}
-
-		var pos = aStartPos;
-		var needleLength = aNeedle.length;
-		var strLength = aString.length - needleLength + 1;
-		while ((pos < strLength) && (aString.substr(pos, needleLength) != aNeedle)) {
-			pos++;
-		}
-
-		if (pos < strLength) {
-			return pos;
-		}
-	
-		return -1;
-	},
-
-	copyCalendarSettings: function _copyCalendarSettings(aFromId, aToId)
-	{
-		var fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+aFromId+".");
-
-		if (aToId == undefined) {
-			var toId = this.getUUID();
-		}
-		else {
-			var toId = aToId;
-		}
-
-		var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl."+toId+".");
-
-		
-		this.copyPreferences(fromCalPrefs, toCalPrefs);
-		toCalPrefs.deleteBranch("folderProperties");
-
-		fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+aFromId+".");
-
-		toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
-		            .getService(Ci.nsIPrefService)
-			    .getBranch("calendar.registry."+toId+".");
-
-		this.copyPreferences(fromCalPrefs, toCalPrefs);
-
-		return toId;
-	},
-
-	addCalendarById: function _addCalendarById(aId)
-	{
-		var ioService = Cc["@mozilla.org/network/io-service;1"]  
-				.getService(Ci.nsIIOService);  
-		var tmpURI = ioService.newURI("https://auto/"+aId, null, null);  
-
-		var calManager = Cc["@mozilla.org/calendar/manager;1"]
-			.getService(Ci.calICalendarManager);
-		var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
-
-		newCal.id = aId;
-
-		calManager.registerCalendar(newCal);
-	},
-
-	fromOctal: function _fromOctal(aStr)
-	{
-		var len = aStr.length;
-		var result = 0;
-		var counter = 0;
-		while (len > 0) {
-			result += aStr[len-1]*Math.pow(8,counter);
-			counter++;
-			len--;
-		}
-		return result;
-	},
-
-	fromHTML2Text: function _fromHTML2Text(aString)
-	{
-//dump("-."+aString+".-\n\n");
-		var html = aString.replace(/<style([\s\S]*?)<\/style>/gi, '');
-		html = html.replace(/<script([\s\S]*?)<\/script>/gi, '');
-		html = html.replace(/\n/g, '');
-		html = html.replace(/\r/g, '');
-		html = html.replace(/<\/div>/ig, '\n');
-		html = html.replace(/<\/li>/ig, '\n');
-		html = html.replace(/<li>/ig, '  *  ');
-		html = html.replace(/<\/ul>/ig, '\n');
-		html = html.replace(/<\/p>/ig, '\n');
-		html = html.replace(/<br\s*[\/]?>/gi, "\n");
-		html = html.replace(/<[^>]+>/ig, '');
-		html = html.replace(/\&nbsp\;/g, '');
-
-		return convertSpecialCharatersFromXML(html);
-	},
-
-	fromText2HTML: function _fromText2HTML(aString)
-	{
-		let parsedHtml = null;
-
-		if (!aString) {
-			aString = "";
-		}
-
-		parsedHtml = this.domParser.parseFromString(aString, 'text/html');
-
-		return this.xmlSerializer.serializeToString(parsedHtml);
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivFunctions,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Global functions.",
+    classID: components.ID("{c7543f10-e2d1-44b3-ae37-9221e0d5b524}"),
+    contractID: "@1st-setup.nl/global/functions;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    doEncodeFolderSpecialChars: function _doEncodeFolderSpecialChars(str, r1) {
+        var result = str;
+        switch (r1) {
+        case "/":
+            result = "%2F";
+            break;
+        case "%":
+            result = "%25";
+            break;
+        }
+
+        return result;
+    },
+
+    encodeFolderSpecialChars: function _encodeFolderSpecialChars(aStr) {
+        // characters like "/" (forward slash) is converted to %2F
+        // Character "%" (percentage) is converted to %25
+        var result = aStr.toString();
+        result = result.replace(/([\x2F|\x25])/g, this.doEncodeFolderSpecialChars);
+        return result;
+    },
+
+    doDecodeFolderSpecialChars: function _doDecodeFolderSpecialChars(str, r1) {
+        var result = str;
+        switch (r1) {
+        case "%2F":
+            result = "/";
+            break;
+        case "%25":
+            result = "%";
+            break;
+        }
+        return result;
+    },
+
+    decodeFolderSpecialChars: function _decodeFolderSpecialChars(aStr) {
+        // Does the oposit of encodeFolderSpecialChars
+        var result = aStr.toString();
+        result = result.replace(/(\x252F|\x2525)/g, this.doDecodeFolderSpecialChars);
+        return result;
+    },
+
+    ecTZService: function _ecTZService() {
+        if (Cc["@mozilla.org/calendar/timezone-service;1"]) {
+            return Cc["@mozilla.org/calendar/timezone-service;1"]
+                .getService(Ci.calITimezoneService);
+        }
+
+        return null;
+    },
+
+    ecDefaultTimeZone: function _ecDefaultTimeZone() {
+        if (this.ecTZService()) {
+            return this.ecTZService().defaultTimezone;
+        }
+        return null;
+    },
+
+    ecUTC: function _ecUTC() {
+        if (this.ecTZService()) {
+            return this.ecTZService().UTC;
+        }
+
+        return null;
+    },
+
+    convertDurationToSeconds: function _convertDurationToSeconds(aDuration) {
+        if (!aDuration) return null;
+
+        var tmpStr = aDuration;
+        var multiplier = 1;
+        if (tmpStr.substr(0, 1) == "-") {
+            multiplier = -1;
+            tmpStr = tmpStr.substr(1);
+        }
+
+        var total = 0;
+        var subtotal = 0;
+
+        if (tmpStr.substr(0, 2) == "PT") {
+            tmpStr = tmpStr.substr(2);
+
+            var counter = 0;
+            while (counter < tmpStr.length) {
+                if (isNaN(tmpStr.substr(counter, 1))) {
+                    switch (tmpStr.substr(counter, 1).toUpperCase()) {
+                    case "D":
+                        subtotal = subtotal * 3600 * 24;
+                        break;
+                    case "H":
+                        subtotal = subtotal * 3600;
+                        break;
+                    case "M":
+                        subtotal = subtotal * 60;
+                        break;
+                    case "S":
+                        subtotal = subtotal;
+                        break;
+                    }
+                    total = total + subtotal;
+                    subtotal = 0;
+                    //if (this.debug) this.logInfo(" ++ total:"+total);
+                }
+                else {
+                    subtotal = (subtotal * 10) + Number(tmpStr.substr(counter, 1));
+                    //if (this.debug) this.logInfo(" ++ subtotal:"+subtotal);
+                }
+                counter = counter + 1;
+            }
+
+        }
+
+
+        return total * multiplier;
+
+    },
+
+    splitUriGetParams: function _splitUriGetParams(aUri) {
+        if (aUri.path.indexOf("?") > -1) {
+            // We have get params.
+            let getParamsStr = aUri.path.substr(aUri.path.indexOf("?") + 1);
+            // Split is in the individual params.
+            var getParams = {};
+            while (getParamsStr.indexOf("&") > -1) {
+                var tmpParam = getParamsStr.substr(0, getParamsStr.indexOf("&"));
+                getParamsStr = getParamsStr.substr(getParamsStr.indexOf("&") + 1);
+                if (tmpParam.indexOf("=") > -1) {
+                    getParams[tmpParam.substr(0, tmpParam.indexOf("="))] = decodeURIComponent(tmpParam.substr(tmpParam.indexOf("=") + 1));
+                }
+            }
+            if (getParamsStr.indexOf("=") > -1) {
+                getParams[getParamsStr.substr(0, getParamsStr.indexOf("="))] = decodeURIComponent(getParamsStr.substr(getParamsStr.indexOf("=") + 1));
+            }
+
+            return getParams;
+        }
+
+        return null;
+    },
+
+
+    getBranch: function _getBranche(aName) {
+        var lBranche = "";
+        var lName = "";
+        var lastIndexOf = aName.lastIndexOf(".");
+        if (lastIndexOf > -1) {
+            lBranche = aName.substr(0, lastIndexOf + 1);
+            lName = aName.substr(lastIndexOf + 1);
+        }
+        else {
+            lName = aName;
+        }
+
+        //this.LOG("aName:"+aName+", lBranche:"+lBranche+", lName:"+lName+"|");
+
+        return {
+            branch: Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch(lBranche),
+            name: lName
+        };
+    },
+
+    safeGetCharPref: function _safeGetCharPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable) {
+        if (!aBranch) {
+            //			return aDefaultValue;
+            var realBranche = this.getBranch(aName);
+            if (!realBranche.branch) {
+                return aDefaultValue;
+            }
+            aBranch = realBranche.branch;
+            aName = realBranche.name;
+        }
+
+        if (!aCreateWhenNotAvailable) {
+            aCreateWhenNotAvailable = false;
+        }
+
+        try {
+            return aBranch.getCharPref(aName);
+        }
+        catch (err) {
+            if (aCreateWhenNotAvailable) {
+                try {
+                    aBranch.setCharPref(aName, aDefaultValue);
+                }
+                catch (er) {
+                    aBranch.deleteBranch(aName);
+                    aBranch.setCharPref(aName, aDefaultValue);
+                }
+            }
+            return aDefaultValue;
+        }
+    },
+
+    safeGetBoolPref: function _safeGetBoolPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable) {
+        if (!aBranch) {
+            //			return aDefaultValue;
+            var realBranche = this.getBranch(aName);
+            if (!realBranche.branch) {
+                return aDefaultValue;
+            }
+            aBranch = realBranche.branch;
+            aName = realBranche.name;
+        }
+
+        if (!aCreateWhenNotAvailable) {
+            aCreateWhenNotAvailable = false;
+        }
+
+        try {
+            return aBranch.getBoolPref(aName);
+        }
+        catch (err) {
+            if (aCreateWhenNotAvailable) {
+                try {
+                    aBranch.setBoolPref(aName, aDefaultValue);
+                }
+                catch (er) {
+                    aBranch.deleteBranch(aName);
+                    aBranch.setBoolPref(aName, aDefaultValue);
+                }
+            }
+            return aDefaultValue;
+        }
+    },
+
+    safeGetIntPref: function _safeGetIntPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable) {
+        if (!aBranch) {
+            //			return aDefaultValue;
+            var realBranche = this.getBranch(aName);
+            if (!realBranche.branch) {
+                return aDefaultValue;
+            }
+            aBranch = realBranche.branch;
+            aName = realBranche.name;
+        }
+
+        if (!aCreateWhenNotAvailable) {
+            aCreateWhenNotAvailable = false;
+        }
+
+        try {
+            return aBranch.getIntPref(aName);
+        }
+        catch (err) {
+            if (aCreateWhenNotAvailable) {
+                try {
+                    aBranch.setIntPref(aName, aDefaultValue);
+                }
+                catch (er) {
+                    aBranch.deleteBranch(aName);
+                    aBranch.setIntPref(aName, aDefaultValue);
+                }
+            }
+            return aDefaultValue;
+        }
+    },
+
+    // Following code was taken from calUtils.jsm in Lightning
+
+    // Code from calUtils.jsm
+
+    // Following code was taken from calUtils.js in Lightning and modified
+
+    /**
+     * Creates a string bundle.
+     *
+     * @param bundleURL The bundle URL
+     * @return string bundle
+     */
+    getStringBundle: function _getStringBundle(bundleURL) {
+        let service = Cc["@mozilla.org/intl/stringbundle;1"]
+            .getService(Ci.nsIStringBundleService);
+        return service.createBundle(bundleURL);
+    },
+
+    /**
+     * Gets the value of a string in a .properties file from the calendar bundle
+     *
+     * @param aBundleName  the name of the properties file.  It is assumed that the
+     *                     file lives in chrome://calendar/locale/
+     * @param aStringName  the name of the string within the properties file
+     * @param aParams      optional array of parameters to format the string
+     * @param aComponent   required stringbundle component name
+     */
+    getString: function _getString(aBundleName, aStringName, aParams, aComponent) {
+        try {
+            if (!aComponent) {
+                return "";
+            }
+            var propName = "chrome://" + aComponent + "/locale/" + aBundleName + ".properties";
+            var props = this.getStringBundle(propName);
+
+            if (aParams && aParams.length) {
+                return props.formatStringFromName(aStringName, aParams, aParams.length);
+            }
+            else {
+                return props.GetStringFromName(aStringName);
+            }
+        }
+        catch (ex) {
+            var s = ("Failed to read '" + aStringName + "' from " + propName + ".");
+            Cu.reportError(s + " Error: " + ex);
+            return s;
+        }
+    },
+
+    /**
+     * Make a UUID using the UUIDGenerator service available, we'll use that.
+     */
+    getUUID: function _getUUID() {
+        // generate uuids without braces to avoid problems with
+        if (!this.uuidGen) {
+            this.uuidGen = Cc["@mozilla.org/uuid-generator;1"]
+                .getService(Ci.nsIUUIDGenerator);
+        }
+        return this.uuidGen.generateUUID().toString().replace(/[{}]/g, '');
+    },
+
+
+    /* Shortcut to the console service */
+    getConsoleService: function _getConsoleService() {
+        return Cc["@mozilla.org/consoleservice;1"]
+            .getService(Ci.nsIConsoleService);
+    },
+
+
+    /****
+     **** debug code
+     ****/
+
+    /**
+     * Logs a string or an object to both stderr and the js-console only in the case
+     * where the calendar.debug.log pref is set to true.
+     *
+     * @param aArg  either a string to log or an object whose entire set of
+     *              properties should be logged.
+     */
+    shouldLog: function _shouldLog() {
+        var prefB = Cc["@mozilla.org/preferences-service;1"].
+        getService(Ci.nsIPrefBranch);
+        return this.safeGetBoolPref(prefB, "extensions.1st-setup.debug.log", false, true);
+    },
+
+    LOG: function _LOG(aArg) {
+        //var prefB = Cc["@mozilla.org/preferences-service;1"].
+        //            getService(Ci.nsIPrefBranch);
+        //var shouldLog = this.safeGetBoolPref(prefB, "extensions.1st-setup.debug.log", false, true);
+
+        if (!this.shouldLog()) {
+            return;
+        }
+
+        try {
+            this.ASSERT(aArg, "Bad log argument.", true);
+        }
+        catch (exc) {
+            aArg = exc;
+        }
+
+        var string;
+        // We should just dump() both String objects, and string primitives.
+        if (!(aArg instanceof String) && !(typeof (aArg) == "string")) {
+            var string = "1st-setup: Logging object...\n";
+            for (var prop in aArg) {
+                string += prop + ': ' + aArg[prop] + '\n';
+            }
+            string += "End object\n";
+        }
+        else {
+            var dt = new Date();
+            string = "1st-setup:" + dt.getFullYear() + "-" + dt.getMonth() + "-" + dt.getDay() + " " + dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds() + "." + dt.getMilliseconds() + ":" + aArg;
+        }
+
+        // xxx todo consider using function debug()
+        dump(string + '\n');
+        this.getConsoleService().logStringMessage(string);
+
+        this.writeToLogFile(string);
+
+    },
+
+    writeToLogFile: function _writeToLogFile(aString) {
+        var prefB = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+        var file = this.safeGetCharPref(prefB, "extensions.1st-setup.debug.file", "/tmp/exchangecalendar.log", true);
+        if (file != "") {
+            // file is nsIFile, data is a string  
+            //this.getConsoleService().logStringMessage(" >>>>>>>>>>>>>>>");
+
+            var localFile = Cc["@mozilla.org/file/local;1"]
+                .createInstance(Ci.nsILocalFile);
+
+            try {
+                localFile.initWithPath(file);
+            }
+            catch (er) {
+                return;
+            }
+
+            var foStream = Cc["@mozilla.org/network/file-output-stream;1"].
+            createInstance(Ci.nsIFileOutputStream);
+
+            try {
+                // On startup create a new file otherwise append.  
+                if (!this.debugFileInitialized) {
+                    foStream.init(localFile, 0x02 | 0x08 | 0x20, parseInt("0666", 8), 0);
+                    this.debugFileInitialized = true;
+                }
+                else {
+                    foStream.init(localFile, 0x02 | 0x08 | 0x10, parseInt("0666", 8), 0);
+                }
+            }
+            catch (er) {
+                return;
+            }
+
+            // if you are sure there will never ever be any non-ascii text in data you can   
+            // also call foStream.writeData directly  
+            var converter = Cc["@mozilla.org/intl/converter-output-stream;1"].
+            createInstance(Ci.nsIConverterOutputStream);
+            converter.init(foStream, "UTF-8", 0, 0);
+            converter.writeString(aString + "\n");
+            converter.close(); // this closes foStream  
+        }
+    },
+
+    /**
+     * Dumps a warning to both console and js console.
+     *
+     * @param aMessage warning message
+     */
+    WARN: function _WARN(aMessage) {
+        dump("1st-setup: Warning: " + aMessage + '\n');
+        var scriptError = Cc["@mozilla.org/scripterror;1"]
+            .createInstance(Ci.nsIScriptError);
+        scriptError.init("1st-setup: " + aMessage, null, null, 0, 0,
+            Ci.nsIScriptError.warningFlag,
+            "component javascript");
+        this.getConsoleService().logMessage(scriptError);
+    },
+
+    /**
+     * Dumps an error to both console and js console.
+     *
+     * @param aMessage error message
+     */
+    ERROR: function _ERROR(aMessage) {
+        dump("1st-setup: Error: " + aMessage + '\n');
+        var scriptError = Cc["@mozilla.org/scripterror;1"]
+            .createInstance(Ci.nsIScriptError);
+        scriptError.init("1st-setup: " + aMessage, null, null, 0, 0,
+            Ci.nsIScriptError.errorFlag,
+            "component javascript");
+        this.getConsoleService().logMessage(scriptError);
+    },
+
+    /**
+     * Returns a string describing the current js-stack with filename and line
+     * numbers.
+     *
+     * @param aDepth (optional) The number of frames to include. Defaults to 5.
+     * @param aSkip  (optional) Number of frames to skip
+     */
+    STACK: function _STACK(aDepth, aSkip) {
+        let depth = aDepth || 10;
+        let skip = aSkip || 0;
+        let stack = "";
+        let frame = components.stack.caller;
+        for (let i = 1; i <= depth + skip && frame; i++) {
+            if (i > skip) {
+                stack += i + ": [" + frame.filename + ":"
+                    + frame.lineNumber + "] " + frame.name + "\n";
+            }
+            frame = frame.caller;
+        }
+        return stack;
+    },
+
+    STACKshort: function _STACKshort() {
+
+        let depth = 1;
+        let skip = 1;
+        let stack = "";
+        let frame = components.stack.caller;
+        for (let i = 1; i <= depth + skip && frame; i++) {
+            if (i > skip) {
+                var filename;
+                if (frame.filename) {
+                    filename = frame.filename.replace(/^.*(\\|\/|\:)/, '');
+                }
+                else {
+                    filename = "(null)";
+                }
+                stack += frame.name + " in " + filename + ":" + frame.lineNumber;
+            }
+            frame = frame.caller;
+        }
+
+        return stack;
+    },
+
+    /**
+     * Logs a message and the current js-stack, if aCondition fails
+     *
+     * @param aCondition  the condition to test for
+     * @param aMessage    the message to report in the case the assert fails
+     * @param aCritical   if true, throw an error to stop current code execution
+     *                    if false, code flow will continue
+     *                    may be a result code
+     */
+    ASSERT: function _ASSERT(aCondition, aMessage, aCritical) {
+        if (aCondition) {
+            return;
+        }
+
+        let string = "Assert failed: " + aMessage + '\n' + this.STACK(0, 1);
+        if (aCritical) {
+            throw new components.Exception(string,
+                aCritical === true ? Cr.NS_ERROR_UNEXPECTED : aCritical);
+        }
+        else {
+            Cu.reportError(string);
+        }
+    },
+
+    // End of functions from calUtils.js
+
+    CreateSimpleEnumerator: function _CreateSimpleEnumerator(aArray) {
+        return {
+            _i: 0,
+            QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+            hasMoreElements: function CSE_hasMoreElements() {
+                return this._i < aArray.length;
+            },
+            getNext: function CSE_getNext() {
+                return aArray[this._i++];
+            }
+        };
+    },
+
+    CreateSimpleObjectEnumerator: function _CreateSimpleObjectEnumerator(aObj) {
+        return {
+            _i: 0,
+            _keys: Object.keys(aObj),
+            QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+            hasMoreElements: function CSOE_hasMoreElements() {
+                return this._i < this._keys.length;
+            },
+            getNext: function CSOE_getNext() {
+                return aObj[this._keys[this._i++]];
+            }
+        };
+    },
+
+    trim: function _trim(str) {
+        str = str.replace(/^\s+/, '');
+        for (var i = str.length - 1; i >= 0; i--) {
+            if (/\S/.test(str.charAt(i))) {
+                str = str.substring(0, i + 1);
+                break;
+            }
+        }
+        return str;
+    },
+
+    copyPreferences: function _copyPreferences(aFromPrefs, aToPrefs) {
+        var children = aFromPrefs.getChildList("");
+        var count = 0;
+        if (children.length > 0) {
+            // Move prefs from old location to new location.
+            for (var index in children) {
+                count++;
+                switch (aFromPrefs.getPrefType(children[index])) {
+                case aFromPrefs.PREF_STRING:
+                    aToPrefs.setCharPref(children[index], aFromPrefs.getCharPref(children[index]));
+                    break;
+                case aFromPrefs.PREF_INT:
+                    aToPrefs.setIntPref(children[index], aFromPrefs.getIntPref(children[index]));
+                    break;
+                case aFromPrefs.PREF_BOOL:
+                    aToPrefs.setBoolPref(children[index], aFromPrefs.getBoolPref(children[index]));
+                    break;
+                }
+            }
+
+        }
+        return count;
+    },
+
+    xmlToJxon: function _xmlToJxon(aXMLString) {
+        if ((!aXMLString) || (aXMLString == "")) {
+            return null;
+        }
+
+        try {
+            var result = new mivIxml2jxon(aXMLString, 0, null);
+        }
+        catch (exc) {
+            this.LOG("xmlToJxon: Error processXMLString:" + exc + ".(" + aXMLString + ")");
+            result = null;
+        }
+
+        return result;
+    },
+
+    urlToPath: function _urlToPath(aPath) {
+
+        if (!aPath || !/^file:/.test(aPath))
+            return;
+        var rv;
+        var ph = Cc["@mozilla.org/network/protocol;1?name=file"]
+            .createInstance(Ci.nsIFileProtocolHandler);
+        rv = ph.getFileFromURLSpec(aPath).path;
+        return rv;
+    },
+
+    chromeToPath: function _chromeToPath(aPath) {
+
+        if (!aPath || !(/^chrome:/.test(aPath)))
+            return; //not a chrome url
+        var rv;
+
+        var ios = Cc['@mozilla.org/network/io-service;1'].getService(Ci["nsIIOService"]);
+        var uri = ios.newURI(aPath, "UTF-8", null);
+        var cr = Cc['@mozilla.org/chrome/chrome-registry;1'].getService(Ci["nsIChromeRegistry"]);
+        rv = cr.convertChromeURL(uri).spec;
+
+        if (/^file:/.test(rv))
+            rv = this.urlToPath(rv);
+        else
+            rv = this.urlToPath("file://" + rv);
+
+        return rv;
+    },
+
+    splitOnCharacter: function _splitOnCharacter(aString, aStartPos, aSplitCharacter) {
+        if (!aString) {
+            return null;
+        }
+
+        var tmpPos = aStartPos;
+        var result = "";
+        var notClosed = true;
+        var notQuoteOpen = true;
+        var quotesUsed = "";
+        var strLen = aString.length;
+        var splitCharIsArray = Array.isArray(aSplitCharacter);
+        while ((tmpPos < strLen) && (notClosed)) {
+            if ((aString[tmpPos] == "'") || (aString[tmpPos] == '"')) {
+                // We found quotes. Do they belong to our string.
+                if (notQuoteOpen) {
+                    quotesUsed = aString[tmpPos];
+                    notQuoteOpen = false;
+                }
+                else {
+                    if (aString[tmpPos] == quotesUsed) {
+                        quotesUsed = "";
+                        notQuoteOpen = true;
+                    }
+                }
+            }
+
+            var hitSplitCharacter = false;
+            if (notQuoteOpen) {
+                if (splitCharIsArray) {
+                    for (var index in aSplitCharacter) {
+                        if (aString.substr(tmpPos, aSplitCharacter[index].length) == aSplitCharacter[index]) {
+                            hitSplitCharacter = true;
+                            break;
+                        }
+                    }
+                }
+                else {
+                    if (aString.substr(tmpPos, aSplitCharacter.length) == aSplitCharacter) {
+                        hitSplitCharacter = true;
+                    }
+                }
+            }
+
+            if (hitSplitCharacter) {
+                notClosed = false;
+            }
+            else {
+                result += aString[tmpPos];
+            }
+            tmpPos++;
+        }
+
+        if (!notClosed) {
+            return result;
+        }
+        else {
+            return null;
+        }
+    },
+
+    findCharacter: function _findCharacter(aString, aStartPos, aChar) {
+        if (!aString) return -1;
+
+        var pos = aStartPos;
+        var strLength = aString.length;
+        while ((pos < strLength) && (aString[pos] != aChar)) {
+            pos++;
+        }
+
+        if (pos < strLength) {
+            return pos;
+        }
+
+        return -1;
+    },
+
+    findString: function _findString(aString, aStartPos, aNeedle) {
+        if (!aString) return -1;
+
+        if (aNeedle.length == 1) {
+            return this.findCharacter(aString, aStartPos, aNeedle[0]);
+        }
+
+        var pos = aStartPos;
+        var needleLength = aNeedle.length;
+        var strLength = aString.length - needleLength + 1;
+        while ((pos < strLength) && (aString.substr(pos, needleLength) != aNeedle)) {
+            pos++;
+        }
+
+        if (pos < strLength) {
+            return pos;
+        }
+
+        return -1;
+    },
+
+    copyCalendarSettings: function _copyCalendarSettings(aFromId, aToId) {
+        var fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + aFromId + ".");
+
+        if (aToId == undefined) {
+            var toId = this.getUUID();
+        }
+        else {
+            var toId = aToId;
+        }
+
+        var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("extensions.exchangecalendar@extensions.1st-setup.nl." + toId + ".");
+
+
+        this.copyPreferences(fromCalPrefs, toCalPrefs);
+        toCalPrefs.deleteBranch("folderProperties");
+
+        fromCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry." + aFromId + ".");
+
+        toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+            .getService(Ci.nsIPrefService)
+            .getBranch("calendar.registry." + toId + ".");
+
+        this.copyPreferences(fromCalPrefs, toCalPrefs);
+
+        return toId;
+    },
+
+    addCalendarById: function _addCalendarById(aId) {
+        var ioService = Cc["@mozilla.org/network/io-service;1"]
+            .getService(Ci.nsIIOService);
+        var tmpURI = ioService.newURI("https://auto/" + aId, null, null);
+
+        var calManager = Cc["@mozilla.org/calendar/manager;1"]
+            .getService(Ci.calICalendarManager);
+        var newCal = calManager.createCalendar("exchangecalendar", tmpURI);
+
+        newCal.id = aId;
+
+        calManager.registerCalendar(newCal);
+    },
+
+    fromOctal: function _fromOctal(aStr) {
+        var len = aStr.length;
+        var result = 0;
+        var counter = 0;
+        while (len > 0) {
+            result += aStr[len - 1] * Math.pow(8, counter);
+            counter++;
+            len--;
+        }
+        return result;
+    },
+
+    fromHTML2Text: function _fromHTML2Text(aString) {
+        //dump("-."+aString+".-\n\n");
+        var html = aString.replace(/<style([\s\S]*?)<\/style>/gi, '');
+        html = html.replace(/<script([\s\S]*?)<\/script>/gi, '');
+        html = html.replace(/\n/g, '');
+        html = html.replace(/\r/g, '');
+        html = html.replace(/<\/div>/ig, '\n');
+        html = html.replace(/<\/li>/ig, '\n');
+        html = html.replace(/<li>/ig, '  *  ');
+        html = html.replace(/<\/ul>/ig, '\n');
+        html = html.replace(/<\/p>/ig, '\n');
+        html = html.replace(/<br\s*[\/]?>/gi, "\n");
+        html = html.replace(/<[^>]+>/ig, '');
+        html = html.replace(/\&nbsp\;/g, '');
+
+        return convertSpecialCharatersFromXML(html);
+    },
+
+    fromText2HTML: function _fromText2HTML(aString) {
+        let parsedHtml = null;
+
+        if (!aString) {
+            aString = "";
+        }
+
+        parsedHtml = this.domParser.parseFromString(aString, 'text/html');
+
+        return this.xmlSerializer.serializeToString(parsedHtml);
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivFunctions) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivFunctions = XPCOMUtils.generateNSGetFactory([mivFunctions]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivFunctions) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivFunctions = XPCOMUtils.generateNSGetFactory([mivFunctions]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivFunctions(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivFunctions(cid);
+}
diff --git a/interfaces/updater/mivUpdater.js b/interfaces/updater/mivUpdater.js
index 5d054d84..614ea9f4 100644
--- a/interfaces/updater/mivUpdater.js
+++ b/interfaces/updater/mivUpdater.js
@@ -27,108 +27,95 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-function installListener(aUpdater)
-{
-	this._updater = aUpdater;
+function installListener(aUpdater) {
+    this._updater = aUpdater;
 }
 
 installListener.prototype = {
 
-	prompts: Cc["@mozilla.org/embedcomp/prompt-service;1"].  
-			getService(Ci.nsIPromptService),
-
-	onNewInstall: function _onNewInstall(aInstall)
-	{
-		//dump("installListener: onNewInstall\n");
-	},
-
-	onDownloadStarted: function _onDownloadStarted(aInstall)
-	{
-		//dump("installListener: onDownloadStarted\n");
-	},
-
-	onDownloadProgress: function _onDownloadProgress(aInstall)
-	{
-		//dump("installListener: onDownloadProgress: "+aInstall.progress+" of "+aInstall.maxProgress+"\n");
-	},
-
-	onDownloadEnded: function _onDownloadEnded(aInstall)
-	{
-		//dump("installListener: onDownloadEnded\n");
-	},
-
-	onDownloadCancelled: function _onDownloadCancelled(aInstall)
-	{
-		//dump("installListener: onDownloadCancelled\n");
-		this.stopListener(aInstall);
-		this.prompts.alert(null, "Addon update canceled", "Download of addon has been canceled by user."); 
-	},
-
-	onDownloadFailed: function _onDownloadFailed(aInstall)
-	{
-		//dump("installListener: onDownloadFailed\n");
-		this.stopListener(aInstall);
-		this.prompts.alert(null, "Addon update failed", "Download of addon failed. Error: "+aInstall.error); 
-	},
-
-	onInstallStarted: function _onInstallStarted(aInstall)
-	{
-		//dump("installListener: onInstallStarted\n");
-	},
-
-	stopListener: function _stopListener(aInstall)
-	{
-		if (this._updater.installListener) {
-			//dump("stopListener: Going to stop listener.\n");
-			aInstall.removeListener(this._updater.installListener);
-		}	
-	},
-
-	onInstallEnded: function _onInstallEnded(aInstall, aAddon)
-	{
-		//dump("installListener: onInstallEnded\n");
-		this.stopListener(aInstall);
-
-		if (this._updater.needsReboot) {
-			dump("installListener: needsReboot\n");
-			var result = this.prompts.confirm(null, "Restart Thunderbird", "To activate the new version of the Exchange Calendar add-on you need to restart Thunderbird.\n\nDo you want to restart Thunderbird?");
-//			this.prompts.alert(null, "Addon updated", "1. Addon has been updated to version: "+aAddon.version+".\n\nThunderbird will be restarted to activate new version."); 
-			if (result) {
-				var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
-				appStartup.quit(0x12);
-			}
-		}
-		else {
-			dump("installListener: Does not need a Reboot\n");
-		}
-//		this.prompts.alert(null, "Addon updated", "Addon has been updated to version: "+aAddon.version+".\n\nThunderbird will be restarted to activate new version."); 
-//		var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
-//		appStartup.quit(0x12);
-	},
-
-	onInstallCancelled: function _onInstallCancelled(aInstall)
-	{
-		//dump("installListener: onInstallCancelled\n");
-		this.stopListener(aInstall);
-		this.prompts.alert(null, "Addon update canceled", "Update of addon has been canceled by user."); 
-	},
-
-	onInstallFailed: function _onInstallFailed(aInstall)
-	{
-		//dump("installListener: onInstallFailed\n");
-		this.stopListener(aInstall);
-		this.prompts.alert(null, "Addon update failed", "Update of addon failed. Error: "+aInstall.error); 
-	},
-
-	onExternalInstall: function _onExternalInstall(aInstall, aExistingAddon, aNeedsRestart)
-	{
-		//dump("installListener: onExternalInstall\n");
-	},
+    prompts: Cc["@mozilla.org/embedcomp/prompt-service;1"].
+    getService(Ci.nsIPromptService),
+
+    onNewInstall: function _onNewInstall(aInstall) {
+        //dump("installListener: onNewInstall\n");
+    },
+
+    onDownloadStarted: function _onDownloadStarted(aInstall) {
+        //dump("installListener: onDownloadStarted\n");
+    },
+
+    onDownloadProgress: function _onDownloadProgress(aInstall) {
+        //dump("installListener: onDownloadProgress: "+aInstall.progress+" of "+aInstall.maxProgress+"\n");
+    },
+
+    onDownloadEnded: function _onDownloadEnded(aInstall) {
+        //dump("installListener: onDownloadEnded\n");
+    },
+
+    onDownloadCancelled: function _onDownloadCancelled(aInstall) {
+        //dump("installListener: onDownloadCancelled\n");
+        this.stopListener(aInstall);
+        this.prompts.alert(null, "Addon update canceled", "Download of addon has been canceled by user.");
+    },
+
+    onDownloadFailed: function _onDownloadFailed(aInstall) {
+        //dump("installListener: onDownloadFailed\n");
+        this.stopListener(aInstall);
+        this.prompts.alert(null, "Addon update failed", "Download of addon failed. Error: " + aInstall.error);
+    },
+
+    onInstallStarted: function _onInstallStarted(aInstall) {
+        //dump("installListener: onInstallStarted\n");
+    },
+
+    stopListener: function _stopListener(aInstall) {
+        if (this._updater.installListener) {
+            //dump("stopListener: Going to stop listener.\n");
+            aInstall.removeListener(this._updater.installListener);
+        }
+    },
+
+    onInstallEnded: function _onInstallEnded(aInstall, aAddon) {
+        //dump("installListener: onInstallEnded\n");
+        this.stopListener(aInstall);
+
+        if (this._updater.needsReboot) {
+            dump("installListener: needsReboot\n");
+            var result = this.prompts.confirm(null, "Restart Thunderbird", "To activate the new version of the Exchange Calendar add-on you need to restart Thunderbird.\n\nDo you want to restart Thunderbird?");
+            //			this.prompts.alert(null, "Addon updated", "1. Addon has been updated to version: "+aAddon.version+".\n\nThunderbird will be restarted to activate new version."); 
+            if (result) {
+                var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
+                appStartup.quit(0x12);
+            }
+        }
+        else {
+            dump("installListener: Does not need a Reboot\n");
+        }
+        //		this.prompts.alert(null, "Addon updated", "Addon has been updated to version: "+aAddon.version+".\n\nThunderbird will be restarted to activate new version."); 
+        //		var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
+        //		appStartup.quit(0x12);
+    },
+
+    onInstallCancelled: function _onInstallCancelled(aInstall) {
+        //dump("installListener: onInstallCancelled\n");
+        this.stopListener(aInstall);
+        this.prompts.alert(null, "Addon update canceled", "Update of addon has been canceled by user.");
+    },
+
+    onInstallFailed: function _onInstallFailed(aInstall) {
+        //dump("installListener: onInstallFailed\n");
+        this.stopListener(aInstall);
+        this.prompts.alert(null, "Addon update failed", "Update of addon failed. Error: " + aInstall.error);
+    },
+
+    onExternalInstall: function _onExternalInstall(aInstall, aExistingAddon, aNeedsRestart) {
+        //dump("installListener: onExternalInstall\n");
+    },
 
 }
 
 function mivUpdater() {
-	this._callBack = null;
+    this._callBack = null;
 }
 
 var EXTENSION_MAINPART = 'extensions.1st-setup.updater.';
@@ -137,310 +124,357 @@ var mivUpdateGUID = "fb9aeba0-152a-11e2-892e-0800200c9a66";
 
 mivUpdater.prototype = {
 
-	// methods from nsISupport
-
-	_refCount: 0,
-
-	_lastCheckDate: null,
-
-	//nsrefcnt AddRef();
-	AddRef: function _AddRef()
-	{
-		this._refCount++;
-		return this._refCount;
-	},
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivUpdater,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	//nsrefcnt Release();
-	Release: function _Release()
-	{
-		this._refCount--;
-		return this._refCount;
-	},
-
-	// methods from nsIClassInfo
-
-	// nsISupports getHelperForLanguage(in PRUint32 language);
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivUpdater,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "Extensions update checker.",
-	classID: components.ID("{"+mivUpdateGUID+"}"),
-	contractID: "@1st-setup.nl/checkers/updater;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-
-	// Internal methods.
-
-	_needsReboot: false,
-
-	get needsReboot()
-	{
-		//dump(" -- needsReboot:"+this._needsReboot+"\n");
-		return this._needsReboot;
-	},
-
-	get installListener()
-	{
-		return this._installListener;
-	},
-
-	// boolean checkForUpdate(in AUTF8String aExtension, in jsval aCallBack);
-	checkForUpdate: function _checkForUpdate(aExtensionID, aCallBack)
-	{
-		if (this._lastCheckDate) {
-			var now = new Date();
-
-			// If we are called within the hour again we do not check.
-			if ((now.getTime() - this._lastCheckDate.getTime()) < 3600000) {
-				dump(" !!!!!!! WHOA another check within the hour.\n");
-				return false;
-			}
-		}
-
-		this._lastCheckDate = new Date();
-
-		this._callBack = aCallBack;
-		this._extensionID = aExtensionID;
-
-		Cu.import("resource://gre/modules/AddonManager.jsm");
-		var self = this;
-		AddonManager.getAddonByID(aExtensionID, function(aAddon) { self.addonByIDCallback(aAddon);});
-	},
-
-	getUUID: function _getUUID() {
-	    var uuidGen = Cc["@mozilla.org/uuid-generator;1"]
-	                  .getService(Ci.nsIUUIDGenerator);
-	    // generate uuids without braces
-	    return uuidGen.generateUUID().toString().replace(/[{}]/g, '');
-	},
-
-	addonByIDCallback: function _addonByIDCallback(aAddon)
-	{
-		if (aAddon) {
-			var url="https://api.github.com/repos/ExchangeCalendar/exchangecalendar/releases";
-			this._addon = aAddon;
-			this._updateURL = this.safeGetCharPref(null, EXTENSION_MAINPART+this._extensionID, url, true);
-			this._updateURL = url;
-			this.xmlReq = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
-
-			this.preRelease =  this.safeGetBoolPref(null, "extensions.1st-setup.others.warnAboutPrereleaseVersion",  true,  true); 
- 			var tmp = this;
-			this.xmlReq.addEventListener("error", function(evt) { tmp.onUpdateDetailsError(evt); }, false);
-			this.xmlReq.addEventListener("load", function(evt) { tmp.onUpdateDetailsLoad(evt, tmp.xmlReq); }, false);
-			this.xmlReq.addEventListener("progress", function(evt) { tmp.onUpdateDetailsProgress(evt); }, false);
-
-			var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
-
-			var xulRuntime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
-
-			var id = this.safeGetCharPref(null, EXTENSION_MAINPART+"id", this.getUUID(), true);
-			var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"].getService(Ci.nsILocaleService);  
-
-			this.xmlReq.open("GET", this._updateURL, true);
-
-			this.xmlReq.setRequestHeader("User-Agent", "1st-setup.nl/extensionupdatercheck");
-			this.xmlReq.send();
-		}
-		else {
-			if (this._callBack) {
-				this._callBack({addon: null, extensionID: this._extensionID, versionChanged: 0, error: Ci.mivUpdater.ERR_ADDON_NOT_FOUND_BY_ID});
-			}
-		}
-	},
-	
-	onUpdateDetailsProgress: function _onUpdateDetailsProgress(evt)
-	{
-		dump("\nonUpdateDetailsProgress- total: " + evt.total + " loaded: " +evt.loaded );
-	},
-	
-	onUpdateDetailsError: function _onUpdateDetailsError(evt)
-	{
-		//dump("\nonUpdateDetailsError");  
-		this._callBack({addon: this._addon, extensionID: this._extensionID, versionChanged: 0, error: Ci.mivUpdater.ERR_ADDON_NOT_FOUND_BY_ID});
-	},
-
-	onUpdateDetailsLoad: function _onUpdateDetailsLoad(evt, xmlReq)
-	{
-		//dump("\nonUpdateDetailsLoad"); 
-		if (xmlReq.readyState != 4) {
-			this._callBack({addon: null, extensionID: this._extensionID, versionChanged: 0, error: Ci.mivUpdater.ERR_WRONG_READYSTATE});
-		}
-
-		var actualJson=JSON.parse(xmlReq.responseText);
-		var latest = 0;
-		var updateDetails = [];
- 		updateDetails[3]='https://github.com/ExchangeCalendar/exchangecalendar/wiki'; 
-		if( actualJson.length > 0 ){
-			updateDetails[0]=actualJson[latest].prerelease; 
-			updateDetails[1]=actualJson[latest].tag_name;
-			updateDetails[2]=actualJson[latest].assets[0].browser_download_url;
-			updateDetails[4]=actualJson[latest].body;
-		}
-		
-		if (this._callBack) {
-			if ( updateDetails[1] ) {
-				var versionChecker = Cc["@mozilla.org/xpcom/version-comparator;1"].getService(Ci.nsIVersionComparator);
-
-				var tmpMsg = "";
-				if (updateDetails.length > 4) {
-					var counter = 4;
-					while (counter < updateDetails.length) {
-						tmpMsg = tmpMsg + updateDetails[counter]+"\n";
-						counter++;
-					}
-				}
- 
-				//Update stable versions or if pre release is allowed then show update alerts **extensions.1st-setup.others.warnAboutPrereleaseVersion
-				if( ( updateDetails[0] == false )  || 	( this.preRelease && ( updateDetails[0] == true ) )  ){
-					if(  this.preRelease && ( updateDetails[0] == true )){
-						//dump("\nxxxxxxxxxIts a prerelease");
-					}
-					this._callBack({updater: this, addon: this._addon, extensionID: this._extensionID, versionChanged: versionChecker.compare(updateDetails[1], this._addon.version), error: 0, updateDetails: {newVersion: updateDetails[1], updateURL: updateDetails[2], infoURL:updateDetails[3], msg: tmpMsg}});
-				}
-				else{
-					this._callBack({updater: this, addon: this._addon, extensionID: this._extensionID, versionChanged: 0 , error: 0, updateDetails: {newVersion: updateDetails[1], updateURL: updateDetails[2], infoURL:updateDetails[3], msg: tmpMsg}});
-				}
-			}
-			else {
-				this._callBack({addon: this._addon, extensionID: this._extensionID, versionChanged: 0, error: Ci.mivUpdater.ERR_GETTING_REMOTE_UPDATE_DETAILS});
-			}
-		}
-	},
-
-	installNewVersion: function _installNewVersion(aDetails, aNeedsReboot)
-	{
-		this._needsReboot = aNeedsReboot;
-		//dump("installNewVersion: needsReboot:"+this.needsReboot+"\n");
-		var self = this;
-		AddonManager.getInstallForURL(aDetails.updateDetails.updateURL, function(aInstall) { self.installCallBack(aInstall);}, "application/x-xpinstall", null, null, null, aDetails.updateDetails.newVersion, null);
-	},
-
-	installCallBack: function _installCallBack(aInstall)
-	{
-		this._installListener = new installListener(this);
-		aInstall.addListener(this._installListener);
-		aInstall.install();
-	},
-
-	getBranch: function _getBranche(aName)
-	{
-		var lBranche = "";
-		var lName = "";
-		var lastIndexOf = aName.lastIndexOf(".");
-		if (lastIndexOf > -1) {
-			lBranche = aName.substr(0,lastIndexOf+1);
-			lName = aName.substr(lastIndexOf+1); 
-		}
-		else {
-			lName = aName;
-		}
-
-		return { branch: Cc["@mozilla.org/preferences-service;1"]
-		                    .getService(Ci.nsIPrefService)
-				    .getBranch(lBranche),
-			   name: lName };
-	},
-
-	safeGetCharPref: function _safeGetCharPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable)
-	{
-		if (!aBranch) {
-			var realBranche = this.getBranch(aName);
-			if (!realBranche.branch) {
-				return aDefaultValue;
-			}
-			var aBranch = realBranche.branch;
-			var aName = realBranche.name;
-		}
-	
-		if (!aCreateWhenNotAvailable) { var aCreateWhenNotAvailable = false; }
-
-		try {
-			return aBranch.getCharPref(aName);
-		}
-		catch(err) {
-			if (aCreateWhenNotAvailable) { 
-				try {
-					aBranch.setCharPref(aName, aDefaultValue); 
-				}
-				catch(er) {
-					aBranch.deleteBranch(aName);
-					aBranch.setCharPref(aName, aDefaultValue); 
-				}
-			}
-			return aDefaultValue;
-		}
-	},
-
-	safeGetBoolPref: function _safeGetBoolPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable)
-	{
-		if (!aBranch) {
-			var realBranche = this.getBranch(aName);
-			if (!realBranche.branch) {
-				return aDefaultValue;
-			}
-			var aBranch = realBranche.branch;
-			var aName = realBranche.name;
-		}
-	
-		if (!aCreateWhenNotAvailable) { var aCreateWhenNotAvailable = false; }
-
-		try {
-			return aBranch.getBoolPref(aName);
-		}
-		catch(err) {
-			if (aCreateWhenNotAvailable) { 
-				try {
-					aBranch.setBoolPref(aName, aDefaultValue); 
-				}
-				catch(er) {
-					aBranch.deleteBranch(aName);
-					aBranch.setBoolPref(aName, aDefaultValue); 
-				}
-			}
-			return aDefaultValue;
-		}
-	},
-	
+    // methods from nsISupport
+
+    _refCount: 0,
+
+    _lastCheckDate: null,
+
+    //nsrefcnt AddRef();
+    AddRef: function _AddRef() {
+        this._refCount++;
+        return this._refCount;
+    },
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivUpdater,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    //nsrefcnt Release();
+    Release: function _Release() {
+        this._refCount--;
+        return this._refCount;
+    },
+
+    // methods from nsIClassInfo
+
+    // nsISupports getHelperForLanguage(in PRUint32 language);
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivUpdater,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "Extensions update checker.",
+    classID: components.ID("{" + mivUpdateGUID + "}"),
+    contractID: "@1st-setup.nl/checkers/updater;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // External methods
+
+    // Internal methods.
+
+    _needsReboot: false,
+
+    get needsReboot() {
+        //dump(" -- needsReboot:"+this._needsReboot+"\n");
+        return this._needsReboot;
+    },
+
+    get installListener() {
+        return this._installListener;
+    },
+
+    // boolean checkForUpdate(in AUTF8String aExtension, in jsval aCallBack);
+    checkForUpdate: function _checkForUpdate(aExtensionID, aCallBack) {
+        if (this._lastCheckDate) {
+            var now = new Date();
+
+            // If we are called within the hour again we do not check.
+            if ((now.getTime() - this._lastCheckDate.getTime()) < 3600000) {
+                dump(" !!!!!!! WHOA another check within the hour.\n");
+                return false;
+            }
+        }
+
+        this._lastCheckDate = new Date();
+
+        this._callBack = aCallBack;
+        this._extensionID = aExtensionID;
+
+        Cu.import("resource://gre/modules/AddonManager.jsm");
+        var self = this;
+        AddonManager.getAddonByID(aExtensionID, function (aAddon) {
+            self.addonByIDCallback(aAddon);
+        });
+    },
+
+    getUUID: function _getUUID() {
+        var uuidGen = Cc["@mozilla.org/uuid-generator;1"]
+            .getService(Ci.nsIUUIDGenerator);
+        // generate uuids without braces
+        return uuidGen.generateUUID().toString().replace(/[{}]/g, '');
+    },
+
+    addonByIDCallback: function _addonByIDCallback(aAddon) {
+        if (aAddon) {
+            var url = "https://api.github.com/repos/ExchangeCalendar/exchangecalendar/releases";
+            this._addon = aAddon;
+            this._updateURL = this.safeGetCharPref(null, EXTENSION_MAINPART + this._extensionID, url, true);
+            this._updateURL = url;
+            this.xmlReq = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
+
+            this.preRelease = this.safeGetBoolPref(null, "extensions.1st-setup.others.warnAboutPrereleaseVersion", true, true);
+            var tmp = this;
+            this.xmlReq.addEventListener("error", function (evt) {
+                tmp.onUpdateDetailsError(evt);
+            }, false);
+            this.xmlReq.addEventListener("load", function (evt) {
+                tmp.onUpdateDetailsLoad(evt, tmp.xmlReq);
+            }, false);
+            this.xmlReq.addEventListener("progress", function (evt) {
+                tmp.onUpdateDetailsProgress(evt);
+            }, false);
+
+            var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
+
+            var xulRuntime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
+
+            var id = this.safeGetCharPref(null, EXTENSION_MAINPART + "id", this.getUUID(), true);
+            var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"].getService(Ci.nsILocaleService);
+
+            this.xmlReq.open("GET", this._updateURL, true);
+
+            this.xmlReq.setRequestHeader("User-Agent", "1st-setup.nl/extensionupdatercheck");
+            this.xmlReq.send();
+        }
+        else {
+            if (this._callBack) {
+                this._callBack({
+                    addon: null,
+                    extensionID: this._extensionID,
+                    versionChanged: 0,
+                    error: Ci.mivUpdater.ERR_ADDON_NOT_FOUND_BY_ID
+                });
+            }
+        }
+    },
+
+    onUpdateDetailsProgress: function _onUpdateDetailsProgress(evt) {
+        dump("\nonUpdateDetailsProgress- total: " + evt.total + " loaded: " + evt.loaded);
+    },
+
+    onUpdateDetailsError: function _onUpdateDetailsError(evt) {
+        //dump("\nonUpdateDetailsError");  
+        this._callBack({
+            addon: this._addon,
+            extensionID: this._extensionID,
+            versionChanged: 0,
+            error: Ci.mivUpdater.ERR_ADDON_NOT_FOUND_BY_ID
+        });
+    },
+
+    onUpdateDetailsLoad: function _onUpdateDetailsLoad(evt, xmlReq) {
+        //dump("\nonUpdateDetailsLoad"); 
+        if (xmlReq.readyState != 4) {
+            this._callBack({
+                addon: null,
+                extensionID: this._extensionID,
+                versionChanged: 0,
+                error: Ci.mivUpdater.ERR_WRONG_READYSTATE
+            });
+        }
+
+        var actualJson = JSON.parse(xmlReq.responseText);
+        var latest = 0;
+        var updateDetails = [];
+        updateDetails[3] = 'https://github.com/ExchangeCalendar/exchangecalendar/wiki';
+        if (actualJson.length > 0) {
+            updateDetails[0] = actualJson[latest].prerelease;
+            updateDetails[1] = actualJson[latest].tag_name;
+            updateDetails[2] = actualJson[latest].assets[0].browser_download_url;
+            updateDetails[4] = actualJson[latest].body;
+        }
+
+        if (this._callBack) {
+            if (updateDetails[1]) {
+                var versionChecker = Cc["@mozilla.org/xpcom/version-comparator;1"].getService(Ci.nsIVersionComparator);
+
+                var tmpMsg = "";
+                if (updateDetails.length > 4) {
+                    var counter = 4;
+                    while (counter < updateDetails.length) {
+                        tmpMsg = tmpMsg + updateDetails[counter] + "\n";
+                        counter++;
+                    }
+                }
+
+                //Update stable versions or if pre release is allowed then show update alerts **extensions.1st-setup.others.warnAboutPrereleaseVersion
+                if ((updateDetails[0] == false) || (this.preRelease && (updateDetails[0] == true))) {
+                    if (this.preRelease && (updateDetails[0] == true)) {
+                        //dump("\nxxxxxxxxxIts a prerelease");
+                    }
+                    this._callBack({
+                        updater: this,
+                        addon: this._addon,
+                        extensionID: this._extensionID,
+                        versionChanged: versionChecker.compare(updateDetails[1], this._addon.version),
+                        error: 0,
+                        updateDetails: {
+                            newVersion: updateDetails[1],
+                            updateURL: updateDetails[2],
+                            infoURL: updateDetails[3],
+                            msg: tmpMsg
+                        }
+                    });
+                }
+                else {
+                    this._callBack({
+                        updater: this,
+                        addon: this._addon,
+                        extensionID: this._extensionID,
+                        versionChanged: 0,
+                        error: 0,
+                        updateDetails: {
+                            newVersion: updateDetails[1],
+                            updateURL: updateDetails[2],
+                            infoURL: updateDetails[3],
+                            msg: tmpMsg
+                        }
+                    });
+                }
+            }
+            else {
+                this._callBack({
+                    addon: this._addon,
+                    extensionID: this._extensionID,
+                    versionChanged: 0,
+                    error: Ci.mivUpdater.ERR_GETTING_REMOTE_UPDATE_DETAILS
+                });
+            }
+        }
+    },
+
+    installNewVersion: function _installNewVersion(aDetails, aNeedsReboot) {
+        this._needsReboot = aNeedsReboot;
+        //dump("installNewVersion: needsReboot:"+this.needsReboot+"\n");
+        var self = this;
+        AddonManager.getInstallForURL(aDetails.updateDetails.updateURL, function (aInstall) {
+            self.installCallBack(aInstall);
+        }, "application/x-xpinstall", null, null, null, aDetails.updateDetails.newVersion, null);
+    },
+
+    installCallBack: function _installCallBack(aInstall) {
+        this._installListener = new installListener(this);
+        aInstall.addListener(this._installListener);
+        aInstall.install();
+    },
+
+    getBranch: function _getBranche(aName) {
+        var lBranche = "";
+        var lName = "";
+        var lastIndexOf = aName.lastIndexOf(".");
+        if (lastIndexOf > -1) {
+            lBranche = aName.substr(0, lastIndexOf + 1);
+            lName = aName.substr(lastIndexOf + 1);
+        }
+        else {
+            lName = aName;
+        }
+
+        return {
+            branch: Cc["@mozilla.org/preferences-service;1"]
+                .getService(Ci.nsIPrefService)
+                .getBranch(lBranche),
+            name: lName
+        };
+    },
+
+    safeGetCharPref: function _safeGetCharPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable) {
+        if (!aBranch) {
+            var realBranche = this.getBranch(aName);
+            if (!realBranche.branch) {
+                return aDefaultValue;
+            }
+            var aBranch = realBranche.branch;
+            var aName = realBranche.name;
+        }
+
+        if (!aCreateWhenNotAvailable) {
+            var aCreateWhenNotAvailable = false;
+        }
+
+        try {
+            return aBranch.getCharPref(aName);
+        }
+        catch (err) {
+            if (aCreateWhenNotAvailable) {
+                try {
+                    aBranch.setCharPref(aName, aDefaultValue);
+                }
+                catch (er) {
+                    aBranch.deleteBranch(aName);
+                    aBranch.setCharPref(aName, aDefaultValue);
+                }
+            }
+            return aDefaultValue;
+        }
+    },
+
+    safeGetBoolPref: function _safeGetBoolPref(aBranch, aName, aDefaultValue, aCreateWhenNotAvailable) {
+        if (!aBranch) {
+            var realBranche = this.getBranch(aName);
+            if (!realBranche.branch) {
+                return aDefaultValue;
+            }
+            var aBranch = realBranche.branch;
+            var aName = realBranche.name;
+        }
+
+        if (!aCreateWhenNotAvailable) {
+            var aCreateWhenNotAvailable = false;
+        }
+
+        try {
+            return aBranch.getBoolPref(aName);
+        }
+        catch (err) {
+            if (aCreateWhenNotAvailable) {
+                try {
+                    aBranch.setBoolPref(aName, aDefaultValue);
+                }
+                catch (er) {
+                    aBranch.deleteBranch(aName);
+                    aBranch.setBoolPref(aName, aDefaultValue);
+                }
+            }
+            return aDefaultValue;
+        }
+    },
+
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivUpdater) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivUpdater = XPCOMUtils.generateNSGetFactory([mivUpdater]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivUpdater) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivUpdater = XPCOMUtils.generateNSGetFactory([mivUpdater]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivUpdater(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivUpdater(cid);
+}
diff --git a/interfaces/xml2json/xml2json.js b/interfaces/xml2json/xml2json.js
index 64229672..f513fa92 100644
--- a/interfaces/xml2json/xml2json.js
+++ b/interfaces/xml2json/xml2json.js
@@ -11,8 +11,8 @@ function STACK(aDepth, aSkip) {
     let frame = components.stack.caller;
     for (let i = 1; i <= depth + skip && frame; i++) {
         if (i > skip) {
-            stack += i + ": [" + frame.filename + ":" +
-                     frame.lineNumber + "] " + frame.name + "\n";
+            stack += i + ": [" + frame.filename + ":"
+                + frame.lineNumber + "] " + frame.name + "\n";
         }
         frame = frame.caller;
     }
@@ -20,633 +20,716 @@ function STACK(aDepth, aSkip) {
 }
 
 function typeString(o) {
-	if (typeof o != 'object')
-		return typeof o;
-
-	if (o === null)
-		return "null";
-  //object, array, function, date, regexp, string, number, boolean, error
-	var internalClass = Object.prototype.toString.call(o)
-                                               .match(/\[object\s(\w+)\]/)[1];
-	return internalClass.toLowerCase();
+    if (typeof o != 'object')
+        return typeof o;
+
+    if (o === null)
+        return "null";
+    //object, array, function, date, regexp, string, number, boolean, error
+    var internalClass = Object.prototype.toString.call(o)
+        .match(/\[object\s(\w+)\]/)[1];
+    return internalClass.toLowerCase();
 }
 
 function isObject(obj) {
-	return (typeString(obj) == "object");
+    return (typeString(obj) == "object");
 }
 
 function isArray(obj) {
-	return (typeString(obj) == "array");
+    return (typeString(obj) == "array");
 }
 
-function isInList(inArray, inStr)
-{
-	return (inArray[inStr] !== undefined);
+function isInList(inArray, inStr) {
+    return (inArray[inStr] !== undefined);
 }
 
-const specialChars1 = {	" ": true, 
-			"\n" : true, 
-			"\r" : true, 
-			"\t" : true };
+const specialChars1 = {
+    " ": true,
+    "\n": true,
+    "\r": true,
+    "\t": true
+};
+
+function findCharacter(aXMLString, aSP, aChar) {
+    if (!aXMLString) return -1;
+
+    var pos = aSP;
+    var strLength = aXMLString.length;
+    //	while ((pos < strLength) && (aXMLString[pos] != aChar)) {
+    while ((pos < strLength) && (aXMLString.charAt(pos) != aChar)) {
+        pos++;
+    }
+
+    if (pos < strLength) {
+        return pos;
+    }
+
+    return -1;
+}
 
-function findCharacter(aXMLString, aSP, aChar)
-{
-	if (!aXMLString) return -1;
+function findString(aXMLString, aSP, aNeedle) {
+    if (!aXMLString) return -1;
 
-	var pos = aSP;
-	var strLength = aXMLString.length;
-//	while ((pos < strLength) && (aXMLString[pos] != aChar)) {
-	while ((pos < strLength) && (aXMLString.charAt(pos) != aChar)) {
-		pos++;
-	}
+    var pos = aSP;
+    var needleLength = aNeedle.length;
+    var strLength = aXMLString.length - needleLength + 1;
+    while ((pos < strLength) && (aXMLString.substr(pos, needleLength) != aNeedle)) {
+        pos++;
+    }
 
-	if (pos < strLength) {
-		return pos;
-	}
+    if (pos < strLength) {
+        return pos;
+    }
 
-	return -1;
+    return -1;
 }
 
-function findString(aXMLString, aSP, aNeedle)
-{
-	if (!aXMLString) return -1;
+function splitOnCharacter(aXMLString, aSP, aSplitCharacter) {
+    if (!aXMLString) {
+        return null;
+    }
 
-	var pos = aSP;
-	var needleLength = aNeedle.length;
-	var strLength = aXMLString.length - needleLength + 1;
-	while ((pos < strLength) && (aXMLString.substr(pos, needleLength) != aNeedle)) {
-		pos++;
-	}
+    var tmpPos = aSP;
+    var result = "";
+    var notClosed = true;
+    var notQuoteOpen = true;
+    var quotesUsed = "";
+    var strLen = aXMLString.length;
+    var splitCharIsArray = isArray(aSplitCharacter);
+    while ((tmpPos < strLen) && (notClosed)) {
+        //		if ((aXMLString[tmpPos] == "'") || (aXMLString[tmpPos] == '"')) {
+        if ((aXMLString.charAt(tmpPos) == "'") || (aXMLString.charAt(tmpPos) == '"')) {
+            // We found quotes. Do they belong to our string.
+            if (notQuoteOpen) {
+                quotesUsed = aXMLString.charAt(tmpPos);
+                notQuoteOpen = false;
+            }
+            else {
+                //				if (aXMLString[tmpPos] == quotesUsed) {
+                if (aXMLString.charAt(tmpPos) == quotesUsed) {
+                    quotesUsed = "";
+                    notQuoteOpen = true;
+                }
+            }
+        }
 
-	if (pos < strLength) {
-		return pos;
-	}
+        var hitSplitCharacter = false;
+        if (notQuoteOpen) {
+            if (splitCharIsArray) {
+                for (var index in aSplitCharacter) {
+                    if (aXMLString.substr(tmpPos, aSplitCharacter[index].length) == aSplitCharacter[index]) {
+                        hitSplitCharacter = true;
+                        break;
+                    }
+                }
+            }
+            else {
+                if (aXMLString.substr(tmpPos, aSplitCharacter.length) == aSplitCharacter) {
+                    hitSplitCharacter = true;
+                }
+            }
+        }
 
-	return -1;
-}
+        if (hitSplitCharacter) {
+            notClosed = false;
+        }
+        else {
+            //			result += aXMLString[tmpPos];
+            result += aXMLString.charAt(tmpPos);
+        }
+        tmpPos++;
+    }
 
-function splitOnCharacter(aXMLString, aSP, aSplitCharacter)
-{
-	if (!aXMLString) {
-		return null;
-	}
-
-	var tmpPos = aSP;
-	var result = "";
-	var notClosed = true;
-	var notQuoteOpen = true;
-	var quotesUsed = "";
-	var strLen = aXMLString.length;
-	var splitCharIsArray = isArray(aSplitCharacter);
-	while ((tmpPos < strLen) && (notClosed)) {
-//		if ((aXMLString[tmpPos] == "'") || (aXMLString[tmpPos] == '"')) {
-		if ((aXMLString.charAt(tmpPos) == "'") || (aXMLString.charAt(tmpPos) == '"')) {
-			// We found quotes. Do they belong to our string.
-			if (notQuoteOpen) {
-				quotesUsed = aXMLString.charAt(tmpPos);
-				notQuoteOpen = false;
-			}
-			else {
-//				if (aXMLString[tmpPos] == quotesUsed) {
-				if (aXMLString.charAt(tmpPos) == quotesUsed) {
-					quotesUsed = "";
-					notQuoteOpen = true;
-				}
-			}
-		}
-
-		var hitSplitCharacter = false;
-		if (notQuoteOpen) {
-			if (splitCharIsArray) {
-				for (var index in aSplitCharacter) {
-					if (aXMLString.substr(tmpPos,aSplitCharacter[index].length) == aSplitCharacter[index]) {
-						hitSplitCharacter = true;
-						break;
-					}
-				}
-			}
-			else {
-				if (aXMLString.substr(tmpPos,aSplitCharacter.length) == aSplitCharacter) {
-					hitSplitCharacter = true;
-				}
-			}
-		}
-
-		if (hitSplitCharacter) {
-			notClosed = false;
-		}
-		else {
-//			result += aXMLString[tmpPos];
-			result += aXMLString.charAt(tmpPos);
-		}
-		tmpPos++;
-	}
-
-	if (!notClosed) {
-		return result;
-	}
-	else {
-		return null;
-	}
+    if (!notClosed) {
+        return result;
+    }
+    else {
+        return null;
+    }
 }
 
-var replaceFromXML = function _replaceFromXML(str, r1)
-{
-	var result = str;
-	if (r1[0] == "#") {
-		if (r1[1] == "x") {
-			// hexadecimal
-			result = String.fromCharCode(parseInt(r1.substr(2),16))
-		}
-		else {
-			// Decimal
-			result = String.fromCharCode(parseInt(r1.substr(1),10))
-		}
-	}
-	else {
-		switch (r1) {
-		case "amp": result = "&"; break;
-		case "quot": result = '"'; break;
-		case "apos": result = "'"; break;
-		case "lt": result = "<"; break;
-		case "gt": result = ">"; break;
-		}
-	}
-	return result;
+var replaceFromXML = function _replaceFromXML(str, r1) {
+    var result = str;
+    if (r1[0] == "#") {
+        if (r1[1] == "x") {
+            // hexadecimal
+            result = String.fromCharCode(parseInt(r1.substr(2), 16))
+        }
+        else {
+            // Decimal
+            result = String.fromCharCode(parseInt(r1.substr(1), 10))
+        }
+    }
+    else {
+        switch (r1) {
+        case "amp":
+            result = "&";
+            break;
+        case "quot":
+            result = '"';
+            break;
+        case "apos":
+            result = "'";
+            break;
+        case "lt":
+            result = "<";
+            break;
+        case "gt":
+            result = ">";
+            break;
+        }
+    }
+    return result;
 }
 
-function convertSpecialCharatersFromXML(aXMLString)
-{
-	if (!aXMLString) return aXMLString;
+function convertSpecialCharatersFromXML(aXMLString) {
+    if (!aXMLString) return aXMLString;
 
-	var result = aXMLString;
-	// Convert special characters
-	result = result.replace(/&(quot|apos|lt|gt|amp|#x[0123456789ancdefABCDEF][0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?|#[0123456789][0123456789]?[0123456789]?[0123456789]?);/g, replaceFromXML); 
+    var result = aXMLString;
+    // Convert special characters
+    result = result.replace(/&(quot|apos|lt|gt|amp|#x[0123456789ancdefABCDEF][0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?|#[0123456789][0123456789]?[0123456789]?[0123456789]?);/g, replaceFromXML);
 
-	return result;
+    return result;
 }
 
-var replaceToXML = function _replaceToXML(str, r1)
-{
-	var result = str;
-	switch (r1) {
-	case "&": result = "&amp;"; break;
-	case '"': result = "&quot;"; break;
-	case "'": result = "&apos;"; break;
-	case "<": result = "&lt;"; break;
-	case ">": result = "&gt;"; break;
-	}
-
-	return result;
+var replaceToXML = function _replaceToXML(str, r1) {
+    var result = str;
+    switch (r1) {
+    case "&":
+        result = "&amp;";
+        break;
+    case '"':
+        result = "&quot;";
+        break;
+    case "'":
+        result = "&apos;";
+        break;
+    case "<":
+        result = "&lt;";
+        break;
+    case ">":
+        result = "&gt;";
+        break;
+    }
+
+    return result;
 }
 
-function convertSpecialCharatersToXML(aXMLString)
-{
-	if ((aXMLString === null) || (aXMLString === undefined)) return aXMLString;
+function convertSpecialCharatersToXML(aXMLString) {
+    if ((aXMLString === null) || (aXMLString === undefined)) return aXMLString;
 
-	var result = aXMLString.toString();
-	// Convert special characters
-	result = result.replace(/(&|\x22|\x27|<|>)/g, replaceToXML);  
+    var result = aXMLString.toString();
+    // Convert special characters
+    result = result.replace(/(&|\x22|\x27|<|>)/g, replaceToXML);
 
-	return result;
+    return result;
 }
 
-function trim(aValue)
-{
-	var strLength = aValue.length;
-	var leftPos = 0;
-	while ((leftPos < strLength) && (aValue.charAt(leftPos) == " ")) {
-		leftPos++;
-	}
-	var rightPos = strLength-1;
-	while ((rightPos >= 0) && (aValue.charAt(rightPos) == " ")) {
-		rightPos--;
-	}
-	return aValue.substr(leftPos, rightPos - leftPos + 1);
+function trim(aValue) {
+    var strLength = aValue.length;
+    var leftPos = 0;
+    while ((leftPos < strLength) && (aValue.charAt(leftPos) == " ")) {
+        leftPos++;
+    }
+    var rightPos = strLength - 1;
+    while ((rightPos >= 0) && (aValue.charAt(rightPos) == " ")) {
+        rightPos--;
+    }
+    return aValue.substr(leftPos, rightPos - leftPos + 1);
 }
 
-function hasXMLHeader(aStr, aSP)
-{
-	if (!aStr) return 0;
-
-	var pos = findCharacter(aStr, aSP, "<");
-	var strLength = aStr.length;
-	if (pos > -1) {
-		pos++;
-		var tc = aStr.charAt(pos);
-
-		if ( (pos < strLength) && (tc == "?")) {
-			pos++;
-			if (aStr.substr(pos, 4) == "xml ") {
-				var tmpPos = findString(aStr, pos, "?>");
-				if (tmpPos == -1) {throw -20;} // Error invalid special tag
-				else {
-					return (tmpPos+2);						
-				}
-			}
-			else {throw -21;} //ERR_MISSING_SPECIAL_TAG
-		}
-	}
-	return 0;
+function hasXMLHeader(aStr, aSP) {
+    if (!aStr) return 0;
+
+    var pos = findCharacter(aStr, aSP, "<");
+    var strLength = aStr.length;
+    if (pos > -1) {
+        pos++;
+        var tc = aStr.charAt(pos);
+
+        if ((pos < strLength) && (tc == "?")) {
+            pos++;
+            if (aStr.substr(pos, 4) == "xml ") {
+                var tmpPos = findString(aStr, pos, "?>");
+                if (tmpPos == -1) {
+                    throw -20;
+                } // Error invalid special tag
+                else {
+                    return (tmpPos + 2);
+                }
+            }
+            else {
+                throw -21;
+            } //ERR_MISSING_SPECIAL_TAG
+        }
+    }
+    return 0;
 }
 
 function splitTagName(aTagName) {
-	var ns = null;
-	var tn = null;
-	var sepPos = aTagName.indexOf(tsep);
-	if (sepPos > -1) {
-		ns = aTagName.substr(0,sepPos);
-		tn = aTagName.substr(sepPos+1);
-	}
-	else {
-		tn = aTagName;
-	}
-
-	return { tagName: tn, nameSpace: ns };
+    var ns = null;
+    var tn = null;
+    var sepPos = aTagName.indexOf(tsep);
+    if (sepPos > -1) {
+        ns = aTagName.substr(0, sepPos);
+        tn = aTagName.substr(sepPos + 1);
+    }
+    else {
+        tn = aTagName;
+    }
+
+    return {
+        tagName: tn,
+        nameSpace: ns
+    };
 }
 
-function convertComparisonPart(a, aJSONObject){
-	var r = [];
-	var tc = a[0];
-	if ((tc == "/") || (tc == ".") || (tc == "@")) {
-		r = realXPath(aJSONObject, a);
-	}
-	else {
-		r = [];
-		if ( (tc == "'") || (tc == '"')) {
-			r.push(a.substr(1,a.length-2));
-		}
-		else {
-			if (isNaN(a)) {
-				r = realXPath(aJSONObject, a);
-			}
-			else {
-				r.push(Number(a));
-			}
-		}
-	}
-	return r;
+function convertComparisonPart(a, aJSONObject) {
+    var r = [];
+    var tc = a[0];
+    if ((tc == "/") || (tc == ".") || (tc == "@")) {
+        r = realXPath(aJSONObject, a);
+    }
+    else {
+        r = [];
+        if ((tc == "'") || (tc == '"')) {
+            r.push(a.substr(1, a.length - 2));
+        }
+        else {
+            if (isNaN(a)) {
+                r = realXPath(aJSONObject, a);
+            }
+            else {
+                r.push(Number(a));
+            }
+        }
+    }
+    return r;
 }
 
 
-function ifFunction(aCondition, aJSONObject){
-	var level = 0;
-	var tmpCondition = trim(aCondition);
-	var compareList = [];
-	while (tmpCondition != "") {
-		var startPos = 0;
-		var weHaveSubCondition = false;
-		if (tmpCondition[0] == "(") {
-			var subCondition = splitOnCharacter(tmpCondition.substr(1), 0, ")");
-			if (subCondition) {
-				startPos = subCondition.length;
-				weHaveSubCondition = true;
-			}
-			else {
-				throw "XPath error: Did not find closing round bracket '"+aJSONObject.tagName+"' for condition:"+aCondition;
-			}
-		}
-
-		var splitPart = splitOnCharacter(tmpCondition.toLowerCase(), startPos, [" and ", " or "]);
-		var operator = null;
-		var comparison = null;
-		if (splitPart) {
-			splitPart = tmpCondition.substr(0, splitPart.length);
-			tmpCondition = tmpCondition.substr(splitPart.length + 1);
-
-			if (tmpCondition[0] == "a") {
-				operator = "and";
-				tmpCondition = tmpCondition.substr(4);
-			}
-			else {
-				operator = "or";
-				tmpCondition = tmpCondition.substr(3);
-			}
-		}
-		else {
-			splitPart = tmpCondition;
-			tmpCondition = "";
-		}
-		if (weHaveSubCondition) {
-			compareList.push( { left: subCondition, right: "", operator: operator, comparison: comparison, subCondition: subCondition} );
-		}
-		else {
-			var splitPart2 = splitOnCharacter(splitPart, 0, ["!=", "<=", ">=", "<", "=", ">"]);
-			if (splitPart2) {
-				// Get comparison type
-				var smallerThen = false;
-				var equalTo = false;
-				var biggerThen = false;
-				var splitPos2 = splitPart2.length;
-				switch (splitPart.charAt(splitPos2)) {
-					case "!":comparison = "!=";break;
-					case "<":comparison = "<";if (splitPart.charAt(splitPos2+1) == "=") comparison = "<=";break;
-					case "=":comparison = "=";break;
-					case ">":comparison = ">";if (splitPart.charAt(splitPos2+1) == "=") comparison = ">=";break;
-				}
-				compareList.push( { left: trim(splitPart2), right: trim(splitPart.substr(splitPart2.length+comparison.length)), operator: operator, comparison: comparison, subCondition: subCondition} );
-			}
-			else {
-				compareList.push( { left: trim(splitPart), right: "", operator: operator, comparison: comparison, subCondition: subCondition} );
-			}
-		}
-	}
-	var totalResult = true;
-	var lastOperator = null;
-	for (let index in compareList) {
-		var tmpResult = false;
-		if (compareList[index].subCondition) {tmpResult = ifFunction(compareList[index].left, aJSONObject);}
-		else {
-			let tmpLeft = convertComparisonPart(compareList[index].left, aJSONObject);
-			let tmpRight = convertComparisonPart(compareList[index].right, aJSONObject);
-			if (tmpLeft.length > 0) {
-				if (compareList[index].comparison) {
-					// Filter out ony the valid ones.
-					if (tmpRight.length > 0) {
-						var x = 0;
-						tmpResult = false;
-						while ((x < tmpLeft.length) && (!tmpResult)) {
-							if ((typeof tmpLeft[x] === "string") || (tmpLeft[x] instanceof String) || (typeof tmpLeft[x] === "number")) {
-								var evalConditionLeft = tmpLeft[x].toString();
-							}
-							else {
-								var evalConditionLeft = realGetValue(tmpLeft[x]).toString();
-							}
-							var y = 0;
-							while ((y < tmpRight.length) && (!tmpResult)) {
-								if ((typeof tmpRight[y] === "string") || (tmpRight[y] instanceof String) || (typeof tmpRight[y] === "number")) {
-									var evalConditionRight = tmpRight[y].toString();
-								}
-								else {var evalConditionRight = realGetValue(tmpRight[y]).toString();}
-								switch (compareList[index].comparison) {
-								case "!=":tmpResult = (evalConditionLeft != evalConditionRight);break;
-								case "<=":tmpResult = (evalConditionLeft <= evalConditionRight);break;
-								case ">=":tmpResult = (evalConditionLeft >= evalConditionRight);break;
-								case "<":tmpResult = (evalConditionLeft < evalConditionRight);break;
-								case "=":tmpResult = (evalConditionLeft==evalConditionRight);break;
-								case ">":tmpResult = (evalConditionLeft > evalConditionRight);break;
-								}
-								y++;
-							}
-							x++;
-						}
-					}
-				}
-				else {
-					tmpResult = true;
-				}
-			}
-			else {tmpResult = false;}
-			tmpLeft = null;
-			tmpRight = null;
-		}
-		switch (lastOperator) {
-		case "and":totalResult = (totalResult && tmpResult);break;
-		case "or":totalResult = (totalResult || tmpResult);break;
-		case null:totalResult = tmpResult;break;
-		}
-		if (compareList[index].operator) {
-			if ((compareList[index].operator == "and") && (!totalResult)) {return false;}
-			if ((compareList[index].operator == "or") && (totalResult)) {return true;}
-		}
-		lastOperator = compareList[index].operator;
-	}
-	return totalResult;
+function ifFunction(aCondition, aJSONObject) {
+    var level = 0;
+    var tmpCondition = trim(aCondition);
+    var compareList = [];
+    while (tmpCondition != "") {
+        var startPos = 0;
+        var weHaveSubCondition = false;
+        if (tmpCondition[0] == "(") {
+            var subCondition = splitOnCharacter(tmpCondition.substr(1), 0, ")");
+            if (subCondition) {
+                startPos = subCondition.length;
+                weHaveSubCondition = true;
+            }
+            else {
+                throw "XPath error: Did not find closing round bracket '" + aJSONObject.tagName + "' for condition:" + aCondition;
+            }
+        }
+
+        var splitPart = splitOnCharacter(tmpCondition.toLowerCase(), startPos, [" and ", " or "]);
+        var operator = null;
+        var comparison = null;
+        if (splitPart) {
+            splitPart = tmpCondition.substr(0, splitPart.length);
+            tmpCondition = tmpCondition.substr(splitPart.length + 1);
+
+            if (tmpCondition[0] == "a") {
+                operator = "and";
+                tmpCondition = tmpCondition.substr(4);
+            }
+            else {
+                operator = "or";
+                tmpCondition = tmpCondition.substr(3);
+            }
+        }
+        else {
+            splitPart = tmpCondition;
+            tmpCondition = "";
+        }
+        if (weHaveSubCondition) {
+            compareList.push({
+                left: subCondition,
+                right: "",
+                operator: operator,
+                comparison: comparison,
+                subCondition: subCondition
+            });
+        }
+        else {
+            var splitPart2 = splitOnCharacter(splitPart, 0, ["!=", "<=", ">=", "<", "=", ">"]);
+            if (splitPart2) {
+                // Get comparison type
+                var smallerThen = false;
+                var equalTo = false;
+                var biggerThen = false;
+                var splitPos2 = splitPart2.length;
+                switch (splitPart.charAt(splitPos2)) {
+                case "!":
+                    comparison = "!=";
+                    break;
+                case "<":
+                    comparison = "<";
+                    if (splitPart.charAt(splitPos2 + 1) == "=") comparison = "<=";
+                    break;
+                case "=":
+                    comparison = "=";
+                    break;
+                case ">":
+                    comparison = ">";
+                    if (splitPart.charAt(splitPos2 + 1) == "=") comparison = ">=";
+                    break;
+                }
+                compareList.push({
+                    left: trim(splitPart2),
+                    right: trim(splitPart.substr(splitPart2.length + comparison.length)),
+                    operator: operator,
+                    comparison: comparison,
+                    subCondition: subCondition
+                });
+            }
+            else {
+                compareList.push({
+                    left: trim(splitPart),
+                    right: "",
+                    operator: operator,
+                    comparison: comparison,
+                    subCondition: subCondition
+                });
+            }
+        }
+    }
+    var totalResult = true;
+    var lastOperator = null;
+    for (let index in compareList) {
+        var tmpResult = false;
+        if (compareList[index].subCondition) {
+            tmpResult = ifFunction(compareList[index].left, aJSONObject);
+        }
+        else {
+            let tmpLeft = convertComparisonPart(compareList[index].left, aJSONObject);
+            let tmpRight = convertComparisonPart(compareList[index].right, aJSONObject);
+            if (tmpLeft.length > 0) {
+                if (compareList[index].comparison) {
+                    // Filter out ony the valid ones.
+                    if (tmpRight.length > 0) {
+                        var x = 0;
+                        tmpResult = false;
+                        while ((x < tmpLeft.length) && (!tmpResult)) {
+                            if ((typeof tmpLeft[x] === "string") || (tmpLeft[x] instanceof String) || (typeof tmpLeft[x] === "number")) {
+                                var evalConditionLeft = tmpLeft[x].toString();
+                            }
+                            else {
+                                var evalConditionLeft = realGetValue(tmpLeft[x]).toString();
+                            }
+                            var y = 0;
+                            while ((y < tmpRight.length) && (!tmpResult)) {
+                                if ((typeof tmpRight[y] === "string") || (tmpRight[y] instanceof String) || (typeof tmpRight[y] === "number")) {
+                                    var evalConditionRight = tmpRight[y].toString();
+                                }
+                                else {
+                                    var evalConditionRight = realGetValue(tmpRight[y]).toString();
+                                }
+                                switch (compareList[index].comparison) {
+                                case "!=":
+                                    tmpResult = (evalConditionLeft != evalConditionRight);
+                                    break;
+                                case "<=":
+                                    tmpResult = (evalConditionLeft <= evalConditionRight);
+                                    break;
+                                case ">=":
+                                    tmpResult = (evalConditionLeft >= evalConditionRight);
+                                    break;
+                                case "<":
+                                    tmpResult = (evalConditionLeft < evalConditionRight);
+                                    break;
+                                case "=":
+                                    tmpResult = (evalConditionLeft == evalConditionRight);
+                                    break;
+                                case ">":
+                                    tmpResult = (evalConditionLeft > evalConditionRight);
+                                    break;
+                                }
+                                y++;
+                            }
+                            x++;
+                        }
+                    }
+                }
+                else {
+                    tmpResult = true;
+                }
+            }
+            else {
+                tmpResult = false;
+            }
+            tmpLeft = null;
+            tmpRight = null;
+        }
+        switch (lastOperator) {
+        case "and":
+            totalResult = (totalResult && tmpResult);
+            break;
+        case "or":
+            totalResult = (totalResult || tmpResult);
+            break;
+        case null:
+            totalResult = tmpResult;
+            break;
+        }
+        if (compareList[index].operator) {
+            if ((compareList[index].operator == "and") && (!totalResult)) {
+                return false;
+            }
+            if ((compareList[index].operator == "or") && (totalResult)) {
+                return true;
+            }
+        }
+        lastOperator = compareList[index].operator;
+    }
+    return totalResult;
 }
 
 function realGetValue(aParent) {
-	if (!aParent) throw -60;
-	if (!aParent[tcontent]) return "";
-
-	let result = "";
-	let i = 0;
-	while (i < aParent[tcontent].length) {
-		result = result + aParent[tcontent][i];
-		i++;
-	}
-	return convertSpecialCharatersFromXML(result);
+    if (!aParent) throw -60;
+    if (!aParent[tcontent]) return "";
+
+    let result = "";
+    let i = 0;
+    while (i < aParent[tcontent].length) {
+        result = result + aParent[tcontent][i];
+        i++;
+    }
+    return convertSpecialCharatersFromXML(result);
 }
 
 function realGetTags(aParent, aTagName) {
-	if ((!aParent) || (!aParent[telements])) throw -54;
-	let result = [];
-
-	var tmpTN = splitTagName(aTagName);
-
-	var i = 0;
-	while (i < aParent[telements].length) {
-//			if ((aParent[telements][i][tnamespace] == tmpTN.nameSpace) && (aParent[telements][i].tagName == tmpTN.tagName)) {
-		if (aParent[telements][i].tagName == tmpTN.tagName) {  // We ignore the namespace for now.
-			result.push(aParent[telements][i]);
-		}
-		i++;
-	}
-	return result;
+    if ((!aParent) || (!aParent[telements])) throw -54;
+    let result = [];
+
+    var tmpTN = splitTagName(aTagName);
+
+    var i = 0;
+    while (i < aParent[telements].length) {
+        //			if ((aParent[telements][i][tnamespace] == tmpTN.nameSpace) && (aParent[telements][i].tagName == tmpTN.tagName)) {
+        if (aParent[telements][i].tagName == tmpTN.tagName) { // We ignore the namespace for now.
+            result.push(aParent[telements][i]);
+        }
+        i++;
+    }
+    return result;
 }
 
 
-function realXPath(aParent, aPath){
-	//dump("XPath:"+aPath+"("+STACK(6)+")\n");
-	//dump("aParent:"+JSON.stringify(aParent)+"\n");
-	//dump("..\n");
-	var tmpPath = aPath;
-	var result = [];
-	if (tmpPath[0] == "/") {
-		tmpPath = tmpPath.substr(1);
-	}
-
-	switch (tmpPath[0]) {
-	case "@" : // Find attribute within this element
-		let attrName = tmpPath.substr(1);
-		if ((aParent[tattributes]) && (aParent[tattributes][attrName])) {
-			//dump("XPath:found attribute. value="+String(aParent[tattributes][attrName])+"\n");
-			result.push(String(aParent[tattributes][attrName]));
-		}
-		//dump("XPath find attribute '"+attrName+"'. result.length='"+result.length+"'\n");
-		tmpPath = "";
-		break;
-	case "*" : // Wildcard. Will parse all children.
-		tmpPath = tmpPath.substr(1);
-		let i = 0;
-		while (i < aParent[telements].length) {
-			result.push(aParent[telements][i]);
-			i++;
-		}
-		break;
-	case "[" : // Compare/match function
-		let index = splitOnCharacter(tmpPath.substr(1), 0, "]");
-		if (!index) {throw "XPath error: Did not find closing square bracket. tagName:"+aParent.tagName+", tmpPath:"+tmpPath;}
-		tmpPath = tmpPath.substr(index.length+2);
-		index = trim(index); 
-		if (index != "") {
-			if (ifFunction(index, aParent)) {
-				result.push(aParent);
-			}
-			else {
-				return result;
-			}
-		}
-		else {
-			throw "XPath compare error:No Value between square brackets:"+aParent.tagName+"["+index+"]";
-		}
-		break;
-	default:
-		let bracketPos = tmpPath.indexOf("[");
-		let forwardSlashPos = tmpPath.indexOf("/");
-		let splitPos = tmpPath.length;
-		if ((bracketPos < splitPos) && (bracketPos > -1)) {splitPos = bracketPos;}
-		if ((forwardSlashPos < splitPos) && (forwardSlashPos > -1)) {splitPos = forwardSlashPos;}
-		let tmpPath2 = tmpPath.substr(0, splitPos);
-		tmpPath = tmpPath.substr(splitPos);
-		let equalTags = [];
-		equalTags = realGetTags(aParent,tmpPath2);
-		result = equalTags;
-	}
-
-	if ((result.length > 0) && (tmpPath != "")) {
-		let finalResult = [];
-		let i = 0;
-		while (i < result.length) {
-			var tmpResult = realXPath(result[i], tmpPath);
-			if (!isArray(tmpResult)) { // Check if answer is an Array or a String. String is returned on attribute search.
-				finalResult = tmpResult;
-			}
-			else {
-				let j = 0;
-				while (j < tmpResult.length) {
-					finalResult.push(tmpResult[j]);
-					j++;
-				}
-			}
-			i++;
-		}
-		result = finalResult;
-	}
-
-	return result;
+function realXPath(aParent, aPath) {
+    //dump("XPath:"+aPath+"("+STACK(6)+")\n");
+    //dump("aParent:"+JSON.stringify(aParent)+"\n");
+    //dump("..\n");
+    var tmpPath = aPath;
+    var result = [];
+    if (tmpPath[0] == "/") {
+        tmpPath = tmpPath.substr(1);
+    }
+
+    switch (tmpPath[0]) {
+    case "@": // Find attribute within this element
+        let attrName = tmpPath.substr(1);
+        if ((aParent[tattributes]) && (aParent[tattributes][attrName])) {
+            //dump("XPath:found attribute. value="+String(aParent[tattributes][attrName])+"\n");
+            result.push(String(aParent[tattributes][attrName]));
+        }
+        //dump("XPath find attribute '"+attrName+"'. result.length='"+result.length+"'\n");
+        tmpPath = "";
+        break;
+    case "*": // Wildcard. Will parse all children.
+        tmpPath = tmpPath.substr(1);
+        let i = 0;
+        while (i < aParent[telements].length) {
+            result.push(aParent[telements][i]);
+            i++;
+        }
+        break;
+    case "[": // Compare/match function
+        let index = splitOnCharacter(tmpPath.substr(1), 0, "]");
+        if (!index) {
+            throw "XPath error: Did not find closing square bracket. tagName:" + aParent.tagName + ", tmpPath:" + tmpPath;
+        }
+        tmpPath = tmpPath.substr(index.length + 2);
+        index = trim(index);
+        if (index != "") {
+            if (ifFunction(index, aParent)) {
+                result.push(aParent);
+            }
+            else {
+                return result;
+            }
+        }
+        else {
+            throw "XPath compare error:No Value between square brackets:" + aParent.tagName + "[" + index + "]";
+        }
+        break;
+    default:
+        let bracketPos = tmpPath.indexOf("[");
+        let forwardSlashPos = tmpPath.indexOf("/");
+        let splitPos = tmpPath.length;
+        if ((bracketPos < splitPos) && (bracketPos > -1)) {
+            splitPos = bracketPos;
+        }
+        if ((forwardSlashPos < splitPos) && (forwardSlashPos > -1)) {
+            splitPos = forwardSlashPos;
+        }
+        let tmpPath2 = tmpPath.substr(0, splitPos);
+        tmpPath = tmpPath.substr(splitPos);
+        let equalTags = [];
+        equalTags = realGetTags(aParent, tmpPath2);
+        result = equalTags;
+    }
+
+    if ((result.length > 0) && (tmpPath != "")) {
+        let finalResult = [];
+        let i = 0;
+        while (i < result.length) {
+            var tmpResult = realXPath(result[i], tmpPath);
+            if (!isArray(tmpResult)) { // Check if answer is an Array or a String. String is returned on attribute search.
+                finalResult = tmpResult;
+            }
+            else {
+                let j = 0;
+                while (j < tmpResult.length) {
+                    finalResult.push(tmpResult[j]);
+                    j++;
+                }
+            }
+            i++;
+        }
+        result = finalResult;
+    }
+
+    return result;
 }
 
 function realElementToString(aElement) {
-	if (!aElement.tagName) return "";
-
-	//dump(" @@@@@:"+JSON.stringify(aElement)+"\n");
-
-	let result = "<";
-	if (aElement[tnamespace]) result = result + aElement[tnamespace] + tsep;
-	result = result + aElement.tagName;
-
-	if (aElement[tattributes]) {
-		for (var attrName in aElement[tattributes]) {
-			result = result + " " + attrName + "="+'"' + aElement[tattributes][attrName]+'"';
-		}
-	}
-
-	if ((aElement[tcontent]) || (aElement[telements].length > 0)) {
-		result = result + ">";
-		if ((aElement[tcontent]) && (aElement[tcontent].length > 0)) {
-			let i = 0;
-			while (i < aElement[tcontent].length) {
-				result = result + aElement[tcontent][i];
-				i++;
-			}
-		}
-
-		let i = 0;
-		while (i < aElement[telements].length) {
-			result = result + realElementToString(aElement[telements][i]);
-			i++;
-		}
-
-		result = result + "</";
-		if (aElement[tnamespace]) result = result + aElement[tnamespace] + tsep;
-		result = result + aElement.tagName + ">";
-		
-
-	}
-	else {
-		result = result + "/>";
-	}
-
-	return result;
+    if (!aElement.tagName) return "";
+
+    //dump(" @@@@@:"+JSON.stringify(aElement)+"\n");
+
+    let result = "<";
+    if (aElement[tnamespace]) result = result + aElement[tnamespace] + tsep;
+    result = result + aElement.tagName;
+
+    if (aElement[tattributes]) {
+        for (var attrName in aElement[tattributes]) {
+            result = result + " " + attrName + "=" + '"' + aElement[tattributes][attrName] + '"';
+        }
+    }
+
+    if ((aElement[tcontent]) || (aElement[telements].length > 0)) {
+        result = result + ">";
+        if ((aElement[tcontent]) && (aElement[tcontent].length > 0)) {
+            let i = 0;
+            while (i < aElement[tcontent].length) {
+                result = result + aElement[tcontent][i];
+                i++;
+            }
+        }
+
+        let i = 0;
+        while (i < aElement[telements].length) {
+            result = result + realElementToString(aElement[telements][i]);
+            i++;
+        }
+
+        result = result + "</";
+        if (aElement[tnamespace]) result = result + aElement[tnamespace] + tsep;
+        result = result + aElement.tagName + ">";
+
+
+    }
+    else {
+        result = result + "/>";
+    }
+
+    return result;
 }
 
 function realSetAttribute(aParent, aName, aValue) {
-	if ((!aParent) || (!aParent[telements])) throw -51;
-	if (!aParent[tattributes]) {
-		aParent[tattributes] = {};
-	}
-	aParent[tattributes][aName] = aValue;
+    if ((!aParent) || (!aParent[telements])) throw -51;
+    if (!aParent[tattributes]) {
+        aParent[tattributes] = {};
+    }
+    aParent[tattributes][aName] = aValue;
 }
 
 function realAddContent(aParent, aString) {
-	//dump("addContent: aString="+aString+"\n");
-	if ((!aParent) || (!aParent[telements])) throw -55;
-	if (!aParent[tcontent]) {
-		aParent[tcontent] = [];
-	}
-	aParent[tcontent].push(aString);
+    //dump("addContent: aString="+aString+"\n");
+    if ((!aParent) || (!aParent[telements])) throw -55;
+    if (!aParent[tcontent]) {
+        aParent[tcontent] = [];
+    }
+    aParent[tcontent].push(aString);
 }
 
 function realClosingTag(aParent, aTagName) {
-	//dump("closingTag: aTagName="+aTagName+"\n");
-	var tmpTN = splitTagName(aTagName);
-
-	let closingMatchesOpening = false;
-	if (tmpTN.tagName == aParent.tagName) {
-		if (tmpTN.nameSpace == aParent[tnamespace]) {
-			closingMatchesOpening = true;
-		}
-	}
-
-	if (!closingMatchesOpening) {
-		throw -5; // Closing element does not match opening element.
-	}
-	else {
-		if (aParent.parent) {
-			let result = aParent.parent;
-			aParent.parent = null;
-			delete aParent['parent'];
-			return result;
-		}
-		else {
-			throw -6; // We should never get here. But in case we do. Wee see a closing element for which no opening element was seen.
-		}
-	}
+    //dump("closingTag: aTagName="+aTagName+"\n");
+    var tmpTN = splitTagName(aTagName);
+
+    let closingMatchesOpening = false;
+    if (tmpTN.tagName == aParent.tagName) {
+        if (tmpTN.nameSpace == aParent[tnamespace]) {
+            closingMatchesOpening = true;
+        }
+    }
+
+    if (!closingMatchesOpening) {
+        throw -5; // Closing element does not match opening element.
+    }
+    else {
+        if (aParent.parent) {
+            let result = aParent.parent;
+            aParent.parent = null;
+            delete aParent['parent'];
+            return result;
+        }
+        else {
+            throw -6; // We should never get here. But in case we do. Wee see a closing element for which no opening element was seen.
+        }
+    }
 }
 
 function realOpeningTag(aParent, aTagName) {
-	//dump("openingTag: aTagName="+aTagName+"\n");
-	var tmpTN = splitTagName(aTagName);
-	let tmpElement = { parent: aParent,
-				e: [],
-				n: tmpTN.nameSpace,
-				tagName: tmpTN.tagName};
-	aParent[telements].push(tmpElement);
-	return tmpElement;
+    //dump("openingTag: aTagName="+aTagName+"\n");
+    var tmpTN = splitTagName(aTagName);
+    let tmpElement = {
+        parent: aParent,
+        e: [],
+        n: tmpTN.nameSpace,
+        tagName: tmpTN.tagName
+    };
+    aParent[telements].push(tmpElement);
+    return tmpElement;
 }
 
 function realSetAttributeStr(aParent, aString) {
-	//dump("setAttributeStr 1: aString="+aString+"\n");
-	aString = aString.replace(/\n/g, "").replace(/\r/g, "").replace(/\t/g, "");
-	var sp = aString.indexOf("=");
-	if (sp == -1) {
-		throw -13; // Equal sign not found.
-	}
-	var an = trim(aString.substr(0, sp));
-	var av = trim(aString.substr(sp+1));
-	var tc = av[0];
-	if ((tc == "'") || (tc == '"')) {
-		let vl = av.length;
-		if (tc == av.charAt(vl-1)) {
-			av = av.substr(1, vl-2);
-		}
-		else {
-			throw -14; // Did not find closing quote
-		}
-	}
-
-	//dump("setAttributeStr 2: name="+an+", value="+av+"\n");
-	realSetAttribute(aParent, an, av);
+    //dump("setAttributeStr 1: aString="+aString+"\n");
+    aString = aString.replace(/\n/g, "").replace(/\r/g, "").replace(/\t/g, "");
+    var sp = aString.indexOf("=");
+    if (sp == -1) {
+        throw -13; // Equal sign not found.
+    }
+    var an = trim(aString.substr(0, sp));
+    var av = trim(aString.substr(sp + 1));
+    var tc = av[0];
+    if ((tc == "'") || (tc == '"')) {
+        let vl = av.length;
+        if (tc == av.charAt(vl - 1)) {
+            av = av.substr(1, vl - 2);
+        }
+        else {
+            throw -14; // Did not find closing quote
+        }
+    }
+
+    //dump("setAttributeStr 2: name="+an+", value="+av+"\n");
+    realSetAttribute(aParent, an, av);
 }
 
 var EXPORTED_SYMBOLS = ["xml2json", "telements", "tattributes", "tcontent", "convertSpecialCharatersFromXML", "convertSpecialCharatersToXML"];
@@ -659,295 +742,305 @@ const tnamespace = "n";
 
 var xml2json = {
 
-	newJSON: function _newJSON() {
-		return { e: [] };
-	},
-
-	addTagObject: function _addTagObject(aParent, aChildObject) {
-		if ((!aParent) || (!aParent[telements])) throw -52;
-		aParent[telements].push(aChildObject);
-
-		return aParent[telements][aParent[telements].length-1];
-	},
-
-	getTags: function _getTags(aParent, aTagName) {
-		return this.clone(realGetTags(aParent, aTagName));
-	},
-
-	getValue: function _getValue(aParent) {
-		return realGetValue(aParent);
-	},
-
-	getTagValue: function _getTagValue(aParent, aTagName, aDefault) {
-		if ((!aParent) || (!aParent[telements]) || (!aTagName)) throw "-62 aParent:"+aParent+", aTagName="+aTagName;
-
-		let result = null;
-		let i = 0;
-		var tmpTN = splitTagName(aTagName);
-		while ((!result) && (i < aParent[telements].length)) {
-			if (aParent[telements][i].tagName == tmpTN.tagName) {  // We ignore the namespace for now.
-				result = realGetValue(aParent[telements][i]);
-			}
-			i++;
-		}
-		if (!result) result = aDefault;
-		return result;
-	},
-
-	clone: function _clone(aElement) {
-		return JSON.parse(JSON.stringify(aElement));
-	},
-
-	getTag: function _getTag(aParent, aTagName) {
-		let result = null;
-
-		var tmpTN = splitTagName(aTagName);
-
-		var i = 0;
-		while ((!result) && (i < aParent[telements].length)) {
-//			if ((aParent[telements][i][tnamespace] == tmpTN.nameSpace) && (aParent[telements][i].tagName == tmpTN.tagName)) {
-			if (aParent[telements][i].tagName == tmpTN.tagName) { // Namespace is ignored for now.
-				return this.clone(aParent[telements][i]);
-			}
-			i++;
-		}
-		return null;
-	},
-
-	addTag: function _addTag(aParent, aTagName, aNameSpace, aValue) {
-		if ((!aParent) || (!aParent[telements])) throw -53;
-		var tmpJson = {tagName: aTagName,
-				n: aNameSpace,
-				e: []};
-		if (aValue) {
-			realAddContent(tmpJson, convertSpecialCharatersToXML(aValue));
-		}
-		aParent[telements].push(tmpJson);
-
-		return aParent[telements][aParent[telements].length-1];
-	},
-
-	elementToString: function _elementToString(aElement) {
-		return realElementToString(aElement);
-	},
-
-	toString: function _toString(aParent) {
-		var result = "";
-		var i = 0;
-		//dump(" !!!!!:"+JSON.stringify(aParent)+"\n");
-		if (aParent["tagName"]) {
-			result = result + realElementToString(aParent);
-		}
-		else {
-			while (i < aParent[telements].length) {
-				result = result + realElementToString(aParent[telements][i]);
-				i++;
-			}
-		}
-
-		return result;
-	},
-
-	openingTag: function _openingTag(aParent, aTagName) {
-		return realOpeningTag(aParent, aTagName);
-	},
-
-	addContent: function _addContent(aParent, aString) {
-		realAddContent(aParent, aString);
-	},
-
-	closingTag: function _closingTag(aParent, aTagName) {
-		return realClosingTag(aParent, aTagName);
-	},
-
-	getAttributeByTag: function _getAttributeByTag(aParent, aTagName, aName) {
-//dump("getAttributeByTag 1: aParent:"+aParent+", aTagName="+aTagName+", aName="+aName+"\n");
-		if ((!aParent) || (!aParent[telements]) || (!aTagName)) throw -80;
-
-		let i = 0;
-		var tmpTN = splitTagName(aTagName);
-
-		while (i < aParent[telements].length) {
-			if ((tmpTN.tagName == aParent[telements][i].tagName) && (aParent[telements][i][tattributes])) { // We ignore namespace for now.
-				if (aParent[telements][i][tattributes][aName]) {
-					return aParent[telements][i][tattributes][aName];
-				}
-			}
-			i++;
-		}
-		return null;
-	},
-
-	getAttribute: function _getAttribute(aParent, aName, aDefault) {
-		if (!aParent) throw -70;
-
-		if ((!aParent[tattributes]) || (!aParent[tattributes][aName])) {
-			if (aDefault) {
-				return aDefault;
-			}
-			return null;
-		}
-
-		return convertSpecialCharatersFromXML(aParent[tattributes][aName]);
-	},
-
-	setAttribute: function _setAttribute(aParent, aName, aValue) {
-		realSetAttribute(aParent, aName, convertSpecialCharatersToXML(aValue));
-	},
-
-	setAttributeStr: function _setAttributeStr(aParent, aString) {
-		realSetAttributeStr(aParent, aString);
-	},
-
-	parseXML: function _parseXML(aJSONObject, aXMLString) {
-
-		var currentjson = aJSONObject;
-
-		if (!aXMLString) return;
-
-	try{
-		var pos = 0;
-		var xmlHeaderPos = hasXMLHeader(aXMLString, pos);
-		if (xmlHeaderPos > 0) {
-			//dump("We have an XML header. Going to strip it.\n");
-			pos = xmlHeaderPos;
-		}
-
-		var strLength = aXMLString.length;
-		while (pos < strLength) {
-			var tmpPos = findCharacter(aXMLString, pos, "<");
-			if (tmpPos > -1) {
-				// Found openingcharacter of element.
-				let skipped = tmpPos - pos;
-				if (skipped > 0) {
-					// Found data before element.
-					realAddContent(currentjson,aXMLString.substr(pos, skipped));
-				}
-				pos = tmpPos + 1;
-			}
-			//var tc = aXMLString[pos];
-			var tc = aXMLString.charAt(pos);
-
-			if ( (pos < strLength) && (tc == "/")) {
-				// Found character for closing element
-				pos++;
-				tmpPos = findCharacter(aXMLString, pos, ">");
-				if (tmpPos > -1) {
-					// found end character of closing element.
-					currentjson = realClosingTag(currentjson, aXMLString.substr(pos, tmpPos-pos)); 
-				}
-				else {
-					// Did not find end character of closing element. Error.
-					throw -7;
-				}
-				pos = tmpPos + 1;
-			}
-			else {
-				// Check element name
-				if (pos < strLength) {
-					let tmpPos = findCharacter(aXMLString, pos, ">");
-					if (tmpPos > -1) {
-						let elementName = "";
-						//tc = aXMLString[pos];
-						tc = aXMLString.charAt(pos);
-						while ((pos < strLength) && (tc != ">") && 
-							(tc != "/") && (!(isInList(specialChars1,tc)))) {
-							elementName = elementName + tc;
-							pos++;
-							//tc = aXMLString[pos];
-							tc = aXMLString.charAt(pos);
-						}
-						currentjson = realOpeningTag(currentjson, elementName);
-
-						// We have an element name. Let see if it contains data or is closed.
-						if ((pos < strLength) && (tc == "/")) {
-							// It is closed.
-							currentjson = realClosingTag(currentjson, elementName);
-							pos++; pos++;
-						}
-						else {
-							// Element is not closed. Let see if it contains attributes.
-							if ((pos < strLength) && (isInList(specialChars1,tc))) {
-								var attribute = "";
-								pos++;
-								//tc = aXMLString[pos];
-								tc = aXMLString.charAt(pos);
-								var quoteOpen = false;
-								var seenAttributeSeparator = false;
-								var quoteChar = "";
-								while ((pos < strLength) && 
-									(((tc != ">") && (tc != "/")) || (quoteOpen)) ) {
-									attribute = attribute + tc;
-									if ((!seenAttributeSeparator) && (tc == "=") && (!quoteOpen)){seenAttributeSeparator = true;}
-									else {
-										if (seenAttributeSeparator) {
-											if ((tc == '"') || (tc == "'")) {
-												if ((!quoteOpen) || ((quoteOpen) && (quoteChar == tc))) {
-													quoteOpen = !quoteOpen;
-													if (quoteOpen) {quoteChar = tc;}
-												}
-											}
-										}
-									}
-									pos++;
-									//tc = aXMLString[pos];
-									tc = aXMLString.charAt(pos);
-									if ((seenAttributeSeparator) && (pos < strLength) && (isInList(specialChars1,tc)) && (!quoteOpen)) {
-										realSetAttributeStr(currentjson, attribute);
-										attribute = "";
-										seenAttributeSeparator = false;
-										pos++;
-										//tc = aXMLString[pos];
-										tc = aXMLString.charAt(pos);
-									}
-								}
-								if ((seenAttributeSeparator) && (!quoteOpen) && (pos < strLength) && (attribute.length > 0)) {
-									realSetAttributeStr(currentjson, attribute);
-									seenAttributeSeparator = false;
-									attribute = "";
-								}
-								if ((pos < strLength) && (tc == "/")) {
-									// Found opening tag with attributes which is also closed.
-									currentjson = realClosingTag(currentjson, elementName);
-									pos++;
-									//tc = aXMLString[pos];
-									tc = aXMLString.charAt(pos);
-								}
-							
-								if (!((pos < strLength) && (tc == ">"))) {
-									throw -8; // Expected closing character of element field
-								}
-								pos++;
-							}
-							else {
-								if (!((pos < strLength) && (tc == ">"))) {
-									throw -9; // Expected closing character of element field
-								}
-								pos++;
-							}
-						}
-					}
-					else {
-						throw -10; // Expected closing character of element field but did not find it.
-					}
-				}
-				else {
-					throw -11; // No more characters left
-				}
-			}
-		} // While.
-	}
-	catch(err){ dump(" !! Err:"+err+"("+STACK()+"\n");}
-
-	},
-
-	XPath: function _XPath(aParent, aPath){
-		//dump("XPath:"+aPath+"\n");
-		//dump("aParent:"+JSON.stringify(aParent)+"\n");
-		//dump("..\n");
-
-		return this.clone(realXPath(aParent, aPath));
-	},
+    newJSON: function _newJSON() {
+        return {
+            e: []
+        };
+    },
+
+    addTagObject: function _addTagObject(aParent, aChildObject) {
+        if ((!aParent) || (!aParent[telements])) throw -52;
+        aParent[telements].push(aChildObject);
+
+        return aParent[telements][aParent[telements].length - 1];
+    },
+
+    getTags: function _getTags(aParent, aTagName) {
+        return this.clone(realGetTags(aParent, aTagName));
+    },
+
+    getValue: function _getValue(aParent) {
+        return realGetValue(aParent);
+    },
+
+    getTagValue: function _getTagValue(aParent, aTagName, aDefault) {
+        if ((!aParent) || (!aParent[telements]) || (!aTagName)) throw "-62 aParent:" + aParent + ", aTagName=" + aTagName;
+
+        let result = null;
+        let i = 0;
+        var tmpTN = splitTagName(aTagName);
+        while ((!result) && (i < aParent[telements].length)) {
+            if (aParent[telements][i].tagName == tmpTN.tagName) { // We ignore the namespace for now.
+                result = realGetValue(aParent[telements][i]);
+            }
+            i++;
+        }
+        if (!result) result = aDefault;
+        return result;
+    },
+
+    clone: function _clone(aElement) {
+        return JSON.parse(JSON.stringify(aElement));
+    },
+
+    getTag: function _getTag(aParent, aTagName) {
+        let result = null;
+
+        var tmpTN = splitTagName(aTagName);
+
+        var i = 0;
+        while ((!result) && (i < aParent[telements].length)) {
+            //			if ((aParent[telements][i][tnamespace] == tmpTN.nameSpace) && (aParent[telements][i].tagName == tmpTN.tagName)) {
+            if (aParent[telements][i].tagName == tmpTN.tagName) { // Namespace is ignored for now.
+                return this.clone(aParent[telements][i]);
+            }
+            i++;
+        }
+        return null;
+    },
+
+    addTag: function _addTag(aParent, aTagName, aNameSpace, aValue) {
+        if ((!aParent) || (!aParent[telements])) throw -53;
+        var tmpJson = {
+            tagName: aTagName,
+            n: aNameSpace,
+            e: []
+        };
+        if (aValue) {
+            realAddContent(tmpJson, convertSpecialCharatersToXML(aValue));
+        }
+        aParent[telements].push(tmpJson);
 
-}
+        return aParent[telements][aParent[telements].length - 1];
+    },
+
+    elementToString: function _elementToString(aElement) {
+        return realElementToString(aElement);
+    },
+
+    toString: function _toString(aParent) {
+        var result = "";
+        var i = 0;
+        //dump(" !!!!!:"+JSON.stringify(aParent)+"\n");
+        if (aParent["tagName"]) {
+            result = result + realElementToString(aParent);
+        }
+        else {
+            while (i < aParent[telements].length) {
+                result = result + realElementToString(aParent[telements][i]);
+                i++;
+            }
+        }
+
+        return result;
+    },
+
+    openingTag: function _openingTag(aParent, aTagName) {
+        return realOpeningTag(aParent, aTagName);
+    },
+
+    addContent: function _addContent(aParent, aString) {
+        realAddContent(aParent, aString);
+    },
 
+    closingTag: function _closingTag(aParent, aTagName) {
+        return realClosingTag(aParent, aTagName);
+    },
+
+    getAttributeByTag: function _getAttributeByTag(aParent, aTagName, aName) {
+        //dump("getAttributeByTag 1: aParent:"+aParent+", aTagName="+aTagName+", aName="+aName+"\n");
+        if ((!aParent) || (!aParent[telements]) || (!aTagName)) throw -80;
+
+        let i = 0;
+        var tmpTN = splitTagName(aTagName);
+
+        while (i < aParent[telements].length) {
+            if ((tmpTN.tagName == aParent[telements][i].tagName) && (aParent[telements][i][tattributes])) { // We ignore namespace for now.
+                if (aParent[telements][i][tattributes][aName]) {
+                    return aParent[telements][i][tattributes][aName];
+                }
+            }
+            i++;
+        }
+        return null;
+    },
+
+    getAttribute: function _getAttribute(aParent, aName, aDefault) {
+        if (!aParent) throw -70;
+
+        if ((!aParent[tattributes]) || (!aParent[tattributes][aName])) {
+            if (aDefault) {
+                return aDefault;
+            }
+            return null;
+        }
+
+        return convertSpecialCharatersFromXML(aParent[tattributes][aName]);
+    },
+
+    setAttribute: function _setAttribute(aParent, aName, aValue) {
+        realSetAttribute(aParent, aName, convertSpecialCharatersToXML(aValue));
+    },
+
+    setAttributeStr: function _setAttributeStr(aParent, aString) {
+        realSetAttributeStr(aParent, aString);
+    },
+
+    parseXML: function _parseXML(aJSONObject, aXMLString) {
+
+        var currentjson = aJSONObject;
+
+        if (!aXMLString) return;
+
+        try {
+            var pos = 0;
+            var xmlHeaderPos = hasXMLHeader(aXMLString, pos);
+            if (xmlHeaderPos > 0) {
+                //dump("We have an XML header. Going to strip it.\n");
+                pos = xmlHeaderPos;
+            }
+
+            var strLength = aXMLString.length;
+            while (pos < strLength) {
+                var tmpPos = findCharacter(aXMLString, pos, "<");
+                if (tmpPos > -1) {
+                    // Found openingcharacter of element.
+                    let skipped = tmpPos - pos;
+                    if (skipped > 0) {
+                        // Found data before element.
+                        realAddContent(currentjson, aXMLString.substr(pos, skipped));
+                    }
+                    pos = tmpPos + 1;
+                }
+                //var tc = aXMLString[pos];
+                var tc = aXMLString.charAt(pos);
+
+                if ((pos < strLength) && (tc == "/")) {
+                    // Found character for closing element
+                    pos++;
+                    tmpPos = findCharacter(aXMLString, pos, ">");
+                    if (tmpPos > -1) {
+                        // found end character of closing element.
+                        currentjson = realClosingTag(currentjson, aXMLString.substr(pos, tmpPos - pos));
+                    }
+                    else {
+                        // Did not find end character of closing element. Error.
+                        throw -7;
+                    }
+                    pos = tmpPos + 1;
+                }
+                else {
+                    // Check element name
+                    if (pos < strLength) {
+                        let tmpPos = findCharacter(aXMLString, pos, ">");
+                        if (tmpPos > -1) {
+                            let elementName = "";
+                            //tc = aXMLString[pos];
+                            tc = aXMLString.charAt(pos);
+                            while ((pos < strLength) && (tc != ">")
+                                && (tc != "/") && (!(isInList(specialChars1, tc)))) {
+                                elementName = elementName + tc;
+                                pos++;
+                                //tc = aXMLString[pos];
+                                tc = aXMLString.charAt(pos);
+                            }
+                            currentjson = realOpeningTag(currentjson, elementName);
+
+                            // We have an element name. Let see if it contains data or is closed.
+                            if ((pos < strLength) && (tc == "/")) {
+                                // It is closed.
+                                currentjson = realClosingTag(currentjson, elementName);
+                                pos++;
+                                pos++;
+                            }
+                            else {
+                                // Element is not closed. Let see if it contains attributes.
+                                if ((pos < strLength) && (isInList(specialChars1, tc))) {
+                                    var attribute = "";
+                                    pos++;
+                                    //tc = aXMLString[pos];
+                                    tc = aXMLString.charAt(pos);
+                                    var quoteOpen = false;
+                                    var seenAttributeSeparator = false;
+                                    var quoteChar = "";
+                                    while ((pos < strLength)
+                                        && (((tc != ">") && (tc != "/")) || (quoteOpen))) {
+                                        attribute = attribute + tc;
+                                        if ((!seenAttributeSeparator) && (tc == "=") && (!quoteOpen)) {
+                                            seenAttributeSeparator = true;
+                                        }
+                                        else {
+                                            if (seenAttributeSeparator) {
+                                                if ((tc == '"') || (tc == "'")) {
+                                                    if ((!quoteOpen) || ((quoteOpen) && (quoteChar == tc))) {
+                                                        quoteOpen = !quoteOpen;
+                                                        if (quoteOpen) {
+                                                            quoteChar = tc;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        pos++;
+                                        //tc = aXMLString[pos];
+                                        tc = aXMLString.charAt(pos);
+                                        if ((seenAttributeSeparator) && (pos < strLength) && (isInList(specialChars1, tc)) && (!quoteOpen)) {
+                                            realSetAttributeStr(currentjson, attribute);
+                                            attribute = "";
+                                            seenAttributeSeparator = false;
+                                            pos++;
+                                            //tc = aXMLString[pos];
+                                            tc = aXMLString.charAt(pos);
+                                        }
+                                    }
+                                    if ((seenAttributeSeparator) && (!quoteOpen) && (pos < strLength) && (attribute.length > 0)) {
+                                        realSetAttributeStr(currentjson, attribute);
+                                        seenAttributeSeparator = false;
+                                        attribute = "";
+                                    }
+                                    if ((pos < strLength) && (tc == "/")) {
+                                        // Found opening tag with attributes which is also closed.
+                                        currentjson = realClosingTag(currentjson, elementName);
+                                        pos++;
+                                        //tc = aXMLString[pos];
+                                        tc = aXMLString.charAt(pos);
+                                    }
+
+                                    if (!((pos < strLength) && (tc == ">"))) {
+                                        throw -8; // Expected closing character of element field
+                                    }
+                                    pos++;
+                                }
+                                else {
+                                    if (!((pos < strLength) && (tc == ">"))) {
+                                        throw -9; // Expected closing character of element field
+                                    }
+                                    pos++;
+                                }
+                            }
+                        }
+                        else {
+                            throw -10; // Expected closing character of element field but did not find it.
+                        }
+                    }
+                    else {
+                        throw -11; // No more characters left
+                    }
+                }
+            } // While.
+        }
+        catch (err) {
+            dump(" !! Err:" + err + "(" + STACK() + "\n");
+        }
+
+    },
+
+    XPath: function _XPath(aParent, aPath) {
+        //dump("XPath:"+aPath+"\n");
+        //dump("aParent:"+JSON.stringify(aParent)+"\n");
+        //dump("..\n");
+
+        return this.clone(realXPath(aParent, aPath));
+    },
+
+}
diff --git a/interfaces/xml2jxon/mivIxml2jxon.js b/interfaces/xml2jxon/mivIxml2jxon.js
index 5f6b990d..c06a8ee9 100644
--- a/interfaces/xml2jxon/mivIxml2jxon.js
+++ b/interfaces/xml2jxon/mivIxml2jxon.js
@@ -30,895 +30,1168 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 function typeString(o) {
-	if (typeof o != 'object')
-		return typeof o;
-
-	if (o === null)
-		return "null";
-  //object, array, function, date, regexp, string, number, boolean, error
-	var internalClass = Object.prototype.toString.call(o)
-                                               .match(/\[object\s(\w+)\]/)[1];
-	return internalClass.toLowerCase();
+    if (typeof o != 'object')
+        return typeof o;
+
+    if (o === null)
+        return "null";
+    //object, array, function, date, regexp, string, number, boolean, error
+    var internalClass = Object.prototype.toString.call(o)
+        .match(/\[object\s(\w+)\]/)[1];
+    return internalClass.toLowerCase();
 }
 
 function isArray(obj) {
-	return (typeString(obj) == "array");
+    return (typeString(obj) == "array");
 }
 
-function isInList(inArray, inStr)
-{
-	return (inArray[inStr] !== undefined);
+function isInList(inArray, inStr) {
+    return (inArray[inStr] !== undefined);
 }
 
-const specialChars1 = {	" ": true, 
-			"\n" : true, 
-			"\r" : true, 
-			"\t" : true };
+const specialChars1 = {
+    " ": true,
+    "\n": true,
+    "\r": true,
+    "\t": true
+};
 
-function findCharacter(aStr, aSP, aChar)
-{
-	if (!aStr) return -1;
+function findCharacter(aStr, aSP, aChar) {
+    if (!aStr) return -1;
 
-	var pos = aSP;
-	var strLength = aStr.length;
-	while ((pos < strLength) && (aStr[pos] != aChar)) {
-		pos++;
-	}
+    var pos = aSP;
+    var strLength = aStr.length;
+    while ((pos < strLength) && (aStr[pos] != aChar)) {
+        pos++;
+    }
 
-	if (pos < strLength) {
-		return pos;
-	}
+    if (pos < strLength) {
+        return pos;
+    }
 
-	return -1;
+    return -1;
 }
 
-function findString(aStr, aSP, aNeedle)
-{
-	if (!aStr) return -1;
+function findString(aStr, aSP, aNeedle) {
+    if (!aStr) return -1;
 
-	var pos = aSP;
-	var needleLength = aNeedle.length;
-	var strLength = aStr.length - needleLength + 1;
-	while ((pos < strLength) && (aStr.substr(pos, needleLength) != aNeedle)) {
-		pos++;
-	}
+    var pos = aSP;
+    var needleLength = aNeedle.length;
+    var strLength = aStr.length - needleLength + 1;
+    while ((pos < strLength) && (aStr.substr(pos, needleLength) != aNeedle)) {
+        pos++;
+    }
 
-	if (pos < strLength) {
-		return pos;
-	}
+    if (pos < strLength) {
+        return pos;
+    }
 
-	return -1;
+    return -1;
 }
 
-function splitOnCharacter(aStr, aSP, aSplitCharacter)
-{
-	if (!aStr) {
-		return null;
-	}
-
-	var tmpPos = aSP;
-	var result = "";
-	var notClosed = true;
-	var notQuoteOpen = true;
-	var quotesUsed = "";
-	var strLen = aStr.length;
-	var splitCharIsArray = isArray(aSplitCharacter);
-	while ((tmpPos < strLen) && (notClosed)) {
-		if ((aStr[tmpPos] == "'") || (aStr[tmpPos] == '"')) {
-			// We found quotes. Do they belong to our string.
-			if (notQuoteOpen) {
-				quotesUsed = aStr[tmpPos];
-				notQuoteOpen = false;
-			}
-			else {
-				if (aStr[tmpPos] == quotesUsed) {
-					quotesUsed = "";
-					notQuoteOpen = true;
-				}
-			}
-		}
-
-		var hitSplitCharacter = false;
-		if (notQuoteOpen) {
-			if (splitCharIsArray) {
-				for (var index in aSplitCharacter) {
-					if (aStr.substr(tmpPos,aSplitCharacter[index].length) == aSplitCharacter[index]) {
-						hitSplitCharacter = true;
-						break;
-					}
-				}
-			}
-			else {
-				if (aStr.substr(tmpPos,aSplitCharacter.length) == aSplitCharacter) {
-					hitSplitCharacter = true;
-				}
-			}
-		}
-
-		if (hitSplitCharacter) {
-			notClosed = false;
-		}
-		else {
-			result += aStr[tmpPos];
-		}
-		tmpPos++;
-	}
-
-	if (!notClosed) {
-		return result;
-	}
-	else {
-		return null;
-	}
+function splitOnCharacter(aStr, aSP, aSplitCharacter) {
+    if (!aStr) {
+        return null;
+    }
+
+    var tmpPos = aSP;
+    var result = "";
+    var notClosed = true;
+    var notQuoteOpen = true;
+    var quotesUsed = "";
+    var strLen = aStr.length;
+    var splitCharIsArray = isArray(aSplitCharacter);
+    while ((tmpPos < strLen) && (notClosed)) {
+        if ((aStr[tmpPos] == "'") || (aStr[tmpPos] == '"')) {
+            // We found quotes. Do they belong to our string.
+            if (notQuoteOpen) {
+                quotesUsed = aStr[tmpPos];
+                notQuoteOpen = false;
+            }
+            else {
+                if (aStr[tmpPos] == quotesUsed) {
+                    quotesUsed = "";
+                    notQuoteOpen = true;
+                }
+            }
+        }
+
+        var hitSplitCharacter = false;
+        if (notQuoteOpen) {
+            if (splitCharIsArray) {
+                for (var index in aSplitCharacter) {
+                    if (aStr.substr(tmpPos, aSplitCharacter[index].length) == aSplitCharacter[index]) {
+                        hitSplitCharacter = true;
+                        break;
+                    }
+                }
+            }
+            else {
+                if (aStr.substr(tmpPos, aSplitCharacter.length) == aSplitCharacter) {
+                    hitSplitCharacter = true;
+                }
+            }
+        }
+
+        if (hitSplitCharacter) {
+            notClosed = false;
+        }
+        else {
+            result += aStr[tmpPos];
+        }
+        tmpPos++;
+    }
+
+    if (!notClosed) {
+        return result;
+    }
+    else {
+        return null;
+    }
 }
 
-var replaceFromXML = function _replaceFromXML(str, r1)
-{
-	var result = str;
-	if (r1[0] == "#") {
-		if (r1[1] == "x") {
-			// hexadecimal
-			result = String.fromCharCode(parseInt(r1.substr(2),16))
-		}
-		else {
-			// Decimal
-			result = String.fromCharCode(parseInt(r1.substr(1),10))
-		}
-	}
-	else {
-		switch (r1) {
-		case "amp": result = "&"; break;
-		case "quot": result = '"'; break;
-		case "apos": result = "'"; break;
-		case "lt": result = "<"; break;
-		case "gt": result = ">"; break;
-		}
-	}
-	return result;
+var replaceFromXML = function _replaceFromXML(str, r1) {
+    var result = str;
+    if (r1[0] == "#") {
+        if (r1[1] == "x") {
+            // hexadecimal
+            result = String.fromCharCode(parseInt(r1.substr(2), 16))
+        }
+        else {
+            // Decimal
+            result = String.fromCharCode(parseInt(r1.substr(1), 10))
+        }
+    }
+    else {
+        switch (r1) {
+        case "amp":
+            result = "&";
+            break;
+        case "quot":
+            result = '"';
+            break;
+        case "apos":
+            result = "'";
+            break;
+        case "lt":
+            result = "<";
+            break;
+        case "gt":
+            result = ">";
+            break;
+        }
+    }
+    return result;
 }
 
-function convertSpecialCharatersFromXML(aStr)
-{
-	if (!aStr) return aStr;
+function convertSpecialCharatersFromXML(aStr) {
+    if (!aStr) return aStr;
 
-	var result = aStr;
-	// Convert special characters
-	result = result.replace(/&(quot|apos|lt|gt|amp|#x[0123456789ancdefABCDEF][0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?|#[0123456789][0123456789]?[0123456789]?[0123456789]?);/g, replaceFromXML); 
+    var result = aStr;
+    // Convert special characters
+    result = result.replace(/&(quot|apos|lt|gt|amp|#x[0123456789ancdefABCDEF][0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?|#[0123456789][0123456789]?[0123456789]?[0123456789]?);/g, replaceFromXML);
 
-	return result;
+    return result;
 }
 
-var replaceToXML = function _replaceToXML(str, r1)
-{
-	var result = str;
-	switch (r1) {
-	case "&": result = "&amp;"; break;
-	case '"': result = "&quot;"; break;
-	case "'": result = "&apos;"; break;
-	case "<": result = "&lt;"; break;
-	case ">": result = "&gt;"; break;
-	}
-
-	return result;
+var replaceToXML = function _replaceToXML(str, r1) {
+    var result = str;
+    switch (r1) {
+    case "&":
+        result = "&amp;";
+        break;
+    case '"':
+        result = "&quot;";
+        break;
+    case "'":
+        result = "&apos;";
+        break;
+    case "<":
+        result = "&lt;";
+        break;
+    case ">":
+        result = "&gt;";
+        break;
+    }
+
+    return result;
 }
 
-function convertSpecialCharatersToXML(aStr)
-{
-	if ((aStr === null) || (aStr === undefined)) return aStr;
+function convertSpecialCharatersToXML(aStr) {
+    if ((aStr === null) || (aStr === undefined)) return aStr;
 
-	var result = aStr.toString();
-	// Convert special characters
-	result = result.replace(/(&|\x22|\x27|<|>)/g, replaceToXML);  
+    var result = aStr.toString();
+    // Convert special characters
+    result = result.replace(/(&|\x22|\x27|<|>)/g, replaceToXML);
 
-	return result;
+    return result;
 }
 
-function trim(aValue)
-{
-	var strLength = aValue.length;
-	var leftPos = 0;
-	while ((leftPos < strLength) && (aValue[leftPos] == " ")) {
-		leftPos++;
-	}
-	var rightPos = strLength-1;
-	while ((rightPos >= 0) && (aValue[rightPos] == " ")) {
-		rightPos--;
-	}
-	return aValue.substr(leftPos, rightPos - leftPos + 1);
+function trim(aValue) {
+    var strLength = aValue.length;
+    var leftPos = 0;
+    while ((leftPos < strLength) && (aValue[leftPos] == " ")) {
+        leftPos++;
+    }
+    var rightPos = strLength - 1;
+    while ((rightPos >= 0) && (aValue[rightPos] == " ")) {
+        rightPos--;
+    }
+    return aValue.substr(leftPos, rightPos - leftPos + 1);
 }
 
 var nameSpaceMgr = Cc["@1st-setup.nl/conversion/namespaces;1"]
-			.getService(Ci.mivNameSpaces);
+    .getService(Ci.mivNameSpaces);
 
 var tagNameMgr = Cc["@1st-setup.nl/conversion/tagnames;1"]
-			.getService(Ci.mivTagNames);
+    .getService(Ci.mivTagNames);
 
 const cId = "@1st-setup.nl/conversion/xml2jxon;1";
 
 var EXPORTED_SYMBOLS = ["mivIxml2jxon"];
 
 function mivIxml2jxon(aXMLString, aSP, aParent) {
-	this.nameSpaces = {};
-	this.tags = {};
-	this.attr = {};
-	this._siblings = [];
-	this._c1 = false;
-	if (aXMLString) {this.processXMLString(aXMLString, aSP, aParent);}
+    this.nameSpaces = {};
+    this.tags = {};
+    this.attr = {};
+    this._siblings = [];
+    this._c1 = false;
+    if (aXMLString) {
+        this.processXMLString(aXMLString, aSP, aParent);
+    }
 }
 
 const xguid = "d7165a60-7d64-42b2-ac48-6ccfc0962abb";
 const tsep = ":";
 
 mivIxml2jxon.prototype = {
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivIxml2jxon,Ci.nsIClassInfo,Ci.nsISupports]),
-	getHelperForLanguage: function _getHelperForLanguage(language) {return null;},
-	getInterfaces: function _getInterfaces(c){c.value = 3;return [Ci.mivIxml2jxon,Ci.nsIClassInfo,Ci.nsISupports];},
-	classDescription: "XML2JXON",
-	classID: components.ID("{"+xguid+"}"),
-	contractID: cId,
-	flags: Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-	get closed(){return this._c1;},
-	set closed(a){this._c1 = a;},
-	addToContent: function _addToContent(a){
-		if (this.content === undefined) this.content = []; this.content.push(a);
-	},
-	explodeAttribute: function _explodeAttribute(a){
-		a = a.replace(/\n/g, "").replace(/\r/g, "").replace(/\t/g, "");
-		var sp = a.indexOf("=");
-		if (sp == -1) {throw Ci.mivIxml2jxon.ERR_WRONG_ATTRIBUTE_SEPARATOR;}
-		var an = trim(a.substr(0, sp));
-		var av = trim(a.substr(sp+1));
-		var tc = av[0];
-		if ((tc == "'") || (tc == '"')) {
-			let vl = av.length;
-			if (tc == av[vl-1]) {av = av.substr(1, vl-2);}
-			else {throw Ci.mivIxml2jxon.ERR_ATTRIBUTE_VALUE_QUOTES;}
-		}
-		if (an.toLowerCase().indexOf("xmlns") == 0) {
-			let xp = an.indexOf(":");
-			if (xp > -1) {this.addNameSpace(an.substr(xp+1), av);}
-			else {this.addNameSpace("_default_" , av);}
-		}
-		else {this.attr[an] = av;}
-	},
-	getNameSpace: function _getNameSpace(a){
-		if ((a === undefined) || (a === null)) {return null;}
-		if (a == "") {a = "_default_";}
-		if (!this.nameSpaces[a]) {return nameSpaceMgr.findNameSpaceByAlias(a);}
-		else {return nameSpaceMgr.getNameSpace(this.nameSpaces[a]);}
-	},
-	addNameSpace: function _addNameSpace(a, b){
-		var index = a;
-		if ((a == "") || (a === undefined)) {index = "_default_";}
-		this.nameSpaces[index] = nameSpaceMgr.addNameSpace(index, b);
-		for each(var child in this.tags) {child.addNameSpace(index, b);}
-	},
-	setAttribute: function _setAttribute(a, b){this.attr[a] = convertSpecialCharatersToXML(b);},
-	getAttribute: function _getAttribute(a, b){
-		if (this.attr[a]) {return convertSpecialCharatersFromXML(this.attr[a]);}
-		else {return b;}
-	},
-	getAttributeByTag: function _getAttributeByTag(a, b, c){
-		var to = this.getTag(a);
-		if (to) {return to.getAttribute(b, c);}
-		else {return c;}
-	},
-	get tagName(){
-		if (this._tagNameIndex === undefined) return "";
-		return tagNameMgr.getTagName(this._tagNameIndex);
-	},
-	set tagName(a){this._tagNameIndex = tagNameMgr.addTagName(a);},
-	getTag: function _getTag(a){
-		if (this.tags[a]) {return this.tags[a];}
-		var it = a;
-		var sp = it.indexOf(tsep);
-		if (sp > -1) {it = it.substr(sp);}
-		var ri;
-		var rt;
-		for (let index in this.tags) {
-			let childTag = this.tags[index];
-			if ((childTag instanceof Ci.mivIxml2jxon) || (childTag instanceof mivIxml2jxon)) {
-				ri = childTag.realTagName(index);
-				rt = childTag.realTagName(a);
-				if (ri == rt) {return childTag;}
-			}
-			else {for (let arrayIndex in childTag) {
-					ri = childTag[arrayIndex].realTagName(index);
-					rt = childTag[arrayIndex].realTagName(a);
-					if (ri == rt) {return childTag;}
-				}
-			}
-		}
-		return null;
-	},
-	getTags: function _getTags(a)	{
-		var to = this.getTag(a);
-		if (!to) {return [];}
-		if (isArray(to)) {return to;}
-		var r = [];
-		r.push(to);
-		return r;
-	},
-	getTagValue: function _getTagValue(a, b){
-		var to = this.getTag(a);
-		if (to) {return to.value;}
-		else {return b;}
-	},
-	getTagValueByXPath: function _getTagValueByXPath(a, b)	{
-		var rs = this.XPath(a);
-		var r = b;
-		if (rs.length > 0) {r = rs[0].value;}
-		rs = null;
-		return r;
-	},
-	addParentNameSpaces: function _addParentNameSpaces(a){
-		if (!a.nameSpaces) return;
-		if (!this.nameSpaces) {this.nameSpaces = {};}
-		for (let index in a.nameSpaces) {
-			if (!this.nameSpaces[index]) {this.nameSpaces[index] = a.nameSpaces[index];}
-		}
-	},
-	addChildTagObject: function _addChildTagObject(a){
-		if (!a) {return;}
-		a.addParentNameSpaces(this);
-		var ntn = a.nameSpace+tsep+a.tagName;
-		if (!this.tags[ntn]) {this.tags[ntn] = a;}
-		else { if (!isArray(this.tags[ntn])) {
-				let fo = this.tags[ntn];
-				this.tags[ntn] = [];
-				this.tags[ntn].push(fo);
-			}
-			this.tags[ntn].push(a);
-		}
-	},
-	addChildTag: function _addChildTag(a, b, c){
-		var ns;
-		if (b) {ns = b;}
-		else {if (this.nameSpace) {ns = this.nameSpace;}
-			else {ns = "_default_";}
-		}
-		if (c === false) {c = "false";}
-		if (c === 0) { c = "0";}
-		if ((c !== undefined) && (c !== null) && (c != "")) {var xml = "<"+ns+tsep+a+">"+convertSpecialCharatersToXML(c)+"</"+ns+tsep+a+">"}
-		else {var xml = "<"+ns+tsep+a+"/>"}
-		var r = new mivIxml2jxon(xml,0, this);
-		return r;
-	},
-	addSibblingTag: function _addSibblingTag(a, b, c){
-		if (b) {var nameSpace = b;}
-		else {var nameSpace = "_default_";}
-		var r = new mivIxml2jxon("<"+nameSpace+tsep+a+"/>", 0, null);
-		r.addToContent(c);
-		this._siblings.push(r);
-		return r;
-	},
-	contentStr: function _contentStr(){
-		if ((this.content) && (this.content[0])) {return this.content[0];} else {return "";}
-	},
-	get value(){return convertSpecialCharatersFromXML(this.contentStr().toString());},
-	attributesToString: function _attributesToString(){
-		var r = "";
-		for (let i in this.attr) {r += " "+i + '="'+this.attr[i]+'"';}
-		return r;
-	},
-	nameSpacesToString: function _nameSpacesToString(){
-		var r = "";
-		for (let i in this.nameSpaces) {
-			if (i == "_default_") {r += ' xmlns="'+nameSpaceMgr.getNameSpace(this.nameSpaces[i])+'"';}
-			else {r += " xmlns:"+i+'="'+nameSpaceMgr.getNameSpace(this.nameSpaces[i])+'"';}
-		}
-		return r;
-	},
-	clone: function _clone(){return new mivIxml2jxon(this.toString(), 0, null);},
-	toString: function _toString(a){
-		var nss = this.nameSpacesToString();
-		var r = "";
-		var cc = 0;
-		for (let index in this.tags) {
-			cc++;
-			if (isArray(this.tags[index])) {
-				for each(let tag in this.tags[index]) {
-					r += tag.toString(nss);
-				}
-			}
-			else {
-				r += this.tags[index].toString(nss);
-			}
-			
-		}
-		if (this.content) {
-			for (let index in this.content) {
-				cc++;
-				if ((typeof this.content[index] === "string") || (this.content[index] instanceof String)) {
-					r += this.content[index];
-				}
-			}
-		}
-		if ((a) && (nss == a)) {nss = "";}
-		var at = this.attributesToString();
-		var ns = this.nameSpace;
-		if (ns == "_default_") {ns = "";}
-		else {ns += tsep;}
-		if (cc == 0) {
-			r = "<"+ns+this.tagName+at+nss+"/>";
-		}
-		else {
-			r = "<"+ns+this.tagName+at+nss+">" + r + "</"+ns+this.tagName+">";
-		}
-		for each(let s in this._siblings) {r = r + s.toString();}
-		return r;
-	},
-	realTagName: function _realTagName(a){
-		var r = a;
-		var ta = "_default_";
-		var tn = "";
-		var ap = a.indexOf(tsep);
-		if (ap > -1) {
-			ta = a.substr(0,ap);
-			tn = a.substr(ap+1);
-		}
-		else {tn = a;}
-		var ns = this.getNameSpace(ta);
-		if (ns) {r = ns + tsep + tn;}
-		return r;
-	},
-	XPath: function XPath(aPath){
-		var tmpPath = aPath;
-		var result = [];
-		if (tmpPath[0] == "/") {tmpPath = tmpPath.substr(1);}
-
-		switch (tmpPath[0]) {
-		case "/" : // Find all elements by specified element name
-			var allTag = splitOnCharacter(tmpPath.substr(1), 0, ["/", "["]);
-			if (!allTag) {allTag = tmpPath.substr(1);}
-			for (let index in this.tags) {result.push(this.tags[index]);}
-			tmpPath = "/"+tmpPath;
-			break;
-		case "@" : // Find attribute within this element
-			if (this.attr[tmpPath.substr(1)]) {result.push(this.attr[tmpPath.substr(1)]);}
-			tmpPath = "";
-			break;
-		case "*" : // Wildcard. Will parse all children.
-			tmpPath = tmpPath.substr(1);
-			for (let index in this.tags) {
-				let tmpTagName = "";
-				var tmpIsArray = isArray(this.tags[index]);
-				if (tmpIsArray) {tmpTagName = this.tags[index][0].tagName;}
-				else {tmpTagName = this.tags[index].tagName;}
-
-				if (tmpTagName != this.tagName) {
-					if (tmpIsArray) {for (let index2 in this.tags[index]) {result.push(this.tags[index][index2]);}}
-					else {result.push(this.tags[index]);}
-				}
-			}
-			break;
-		case "[" : // Compare/match function
-			var index = splitOnCharacter(tmpPath.substr(1), 0, "]");
-			if (!index) {throw "XPath error: Did not find closing square bracket. tagName:"+this.tagName+", tmpPath:"+tmpPath;}
-			tmpPath = tmpPath.substr(index.length+2);
-			index = trim(index); 
-			if (index != "") {
-				if (ifFunction(index, this)) {result.push(this);}
-				else {return result;}
-			}
-			else {throw "XPath compare error:No Value between square brackets:"+this.tagName+"["+index+"]";}
-			break;
-		default:
-			var bracketPos = tmpPath.indexOf("[");
-			var forwardSlashPos = tmpPath.indexOf("/");
-			var splitPos = tmpPath.length;
-			if ((bracketPos < splitPos) && (bracketPos > -1)) {splitPos = bracketPos;}
-			if ((forwardSlashPos < splitPos) && (forwardSlashPos > -1)) {splitPos = forwardSlashPos;}
-			var tmpPath2 = tmpPath.substr(0, splitPos);
-			tmpPath = tmpPath.substr(splitPos);
-			if (tmpPath2 != "") {
-				var equalTags = this.getTags(tmpPath2);
-				for (let index in equalTags) {result.push(equalTags[index]);}
-			}
-		}
-		if ((result.length > 0) && (tmpPath != "")) {
-			var finalResult = [];
-			for (let index in result) {
-				if ((typeof result[index] === "string") || (result[index] instanceof String)) {finalResult.push(result[index]);}
-				else {
-					if (isArray(result[index])) {
-						for (let index2 in result[index]) {
-							let tmpResult = result[index][index2].XPath(tmpPath);
-							if (tmpResult) {
-								for (let index3 in tmpResult) {
-									finalResult.push(tmpResult[index3]);
-									tmpResult[index3] = null;
-								}
-							}
-							tmpResult = null;
-						}
-					}
-					else {
-						let tmpResult = result[index].XPath(tmpPath);
-						if (tmpResult) {
-							for (let index2 in tmpResult) {
-								finalResult.push(tmpResult[index2]);
-								tmpResult[index2] = null;
-							}
-						}
-						tmpResult = null;
-					}
-				}
-			}
-			result = finalResult;
-		}
-		else {
-			if ((tmpPath != "") && (tmpPath.substr(0,2) != "//")) {
-				var finalResult = [];
-				let tmpResult = this.XPath(tmpPath);
-				if (tmpResult) {
-					for (let index2 in tmpResult) {
-						finalResult.push(tmpResult[index2]);
-						tmpResult[index2] = null;
-					}
-				}
-				tmpResult = null;
-				result = finalResult;
-			}
-		}
-		if ((tmpPath != "") && (tmpPath.substr(0,2) == "//") && (this.tags[allTag]) && (this.tagName == this.tags[allTag].tagName)) {
-			tmpPath = tmpPath.substr(1);
-			if ((tmpPath != "") && (tmpPath.substr(0,2) != "//")) {
-				var finalResult = [];
-				let tmpResult = this.XPath(tmpPath);
-				if (tmpResult) {
-					for (let index2 in tmpResult) {
-						finalResult.push(tmpResult[index2]);
-						tmpResult[index2] = null;
-					}
-				}
-				tmpResult = null;
-				result = finalResult;
-			}
-		}
-		return result;
-	},
-	get lastPos(){return this._lastPos;},
-	set lastPos(aValue){this._lastPos = aValue;},
-	processXMLString: function _processXMLString(aStr, aSP, aParent){processXMLStringEXT(aStr, aSP, aParent, this);},
-}
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivIxml2jxon, Ci.nsIClassInfo, Ci.nsISupports]),
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+    getInterfaces: function _getInterfaces(c) {
+        c.value = 3;
+        return [Ci.mivIxml2jxon, Ci.nsIClassInfo, Ci.nsISupports];
+    },
+    classDescription: "XML2JXON",
+    classID: components.ID("{" + xguid + "}"),
+    contractID: cId,
+    flags: Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+    get closed() {
+        return this._c1;
+    },
+    set closed(a) {
+        this._c1 = a;
+    },
+    addToContent: function _addToContent(a) {
+        if (this.content === undefined) this.content = [];
+        this.content.push(a);
+    },
+    explodeAttribute: function _explodeAttribute(a) {
+        a = a.replace(/\n/g, "").replace(/\r/g, "").replace(/\t/g, "");
+        var sp = a.indexOf("=");
+        if (sp == -1) {
+            throw Ci.mivIxml2jxon.ERR_WRONG_ATTRIBUTE_SEPARATOR;
+        }
+        var an = trim(a.substr(0, sp));
+        var av = trim(a.substr(sp + 1));
+        var tc = av[0];
+        if ((tc == "'") || (tc == '"')) {
+            let vl = av.length;
+            if (tc == av[vl - 1]) {
+                av = av.substr(1, vl - 2);
+            }
+            else {
+                throw Ci.mivIxml2jxon.ERR_ATTRIBUTE_VALUE_QUOTES;
+            }
+        }
+        if (an.toLowerCase().indexOf("xmlns") == 0) {
+            let xp = an.indexOf(":");
+            if (xp > -1) {
+                this.addNameSpace(an.substr(xp + 1), av);
+            }
+            else {
+                this.addNameSpace("_default_", av);
+            }
+        }
+        else {
+            this.attr[an] = av;
+        }
+    },
+    getNameSpace: function _getNameSpace(a) {
+        if ((a === undefined) || (a === null)) {
+            return null;
+        }
+        if (a == "") {
+            a = "_default_";
+        }
+        if (!this.nameSpaces[a]) {
+            return nameSpaceMgr.findNameSpaceByAlias(a);
+        }
+        else {
+            return nameSpaceMgr.getNameSpace(this.nameSpaces[a]);
+        }
+    },
+    addNameSpace: function _addNameSpace(a, b) {
+        var index = a;
+        if ((a == "") || (a === undefined)) {
+            index = "_default_";
+        }
+        this.nameSpaces[index] = nameSpaceMgr.addNameSpace(index, b);
+        for each(var child in this.tags) {
+            child.addNameSpace(index, b);
+        }
+    },
+    setAttribute: function _setAttribute(a, b) {
+        this.attr[a] = convertSpecialCharatersToXML(b);
+    },
+    getAttribute: function _getAttribute(a, b) {
+        if (this.attr[a]) {
+            return convertSpecialCharatersFromXML(this.attr[a]);
+        }
+        else {
+            return b;
+        }
+    },
+    getAttributeByTag: function _getAttributeByTag(a, b, c) {
+        var to = this.getTag(a);
+        if (to) {
+            return to.getAttribute(b, c);
+        }
+        else {
+            return c;
+        }
+    },
+    get tagName() {
+        if (this._tagNameIndex === undefined) return "";
+        return tagNameMgr.getTagName(this._tagNameIndex);
+    },
+    set tagName(a) {
+        this._tagNameIndex = tagNameMgr.addTagName(a);
+    },
+    getTag: function _getTag(a) {
+        if (this.tags[a]) {
+            return this.tags[a];
+        }
+        var it = a;
+        var sp = it.indexOf(tsep);
+        if (sp > -1) {
+            it = it.substr(sp);
+        }
+        var ri;
+        var rt;
+        for (let index in this.tags) {
+            let childTag = this.tags[index];
+            if ((childTag instanceof Ci.mivIxml2jxon) || (childTag instanceof mivIxml2jxon)) {
+                ri = childTag.realTagName(index);
+                rt = childTag.realTagName(a);
+                if (ri == rt) {
+                    return childTag;
+                }
+            }
+            else {
+                for (let arrayIndex in childTag) {
+                    ri = childTag[arrayIndex].realTagName(index);
+                    rt = childTag[arrayIndex].realTagName(a);
+                    if (ri == rt) {
+                        return childTag;
+                    }
+                }
+            }
+        }
+        return null;
+    },
+    getTags: function _getTags(a) {
+        var to = this.getTag(a);
+        if (!to) {
+            return [];
+        }
+        if (isArray(to)) {
+            return to;
+        }
+        var r = [];
+        r.push(to);
+        return r;
+    },
+    getTagValue: function _getTagValue(a, b) {
+        var to = this.getTag(a);
+        if (to) {
+            return to.value;
+        }
+        else {
+            return b;
+        }
+    },
+    getTagValueByXPath: function _getTagValueByXPath(a, b) {
+        var rs = this.XPath(a);
+        var r = b;
+        if (rs.length > 0) {
+            r = rs[0].value;
+        }
+        rs = null;
+        return r;
+    },
+    addParentNameSpaces: function _addParentNameSpaces(a) {
+        if (!a.nameSpaces) return;
+        if (!this.nameSpaces) {
+            this.nameSpaces = {};
+        }
+        for (let index in a.nameSpaces) {
+            if (!this.nameSpaces[index]) {
+                this.nameSpaces[index] = a.nameSpaces[index];
+            }
+        }
+    },
+    addChildTagObject: function _addChildTagObject(a) {
+        if (!a) {
+            return;
+        }
+        a.addParentNameSpaces(this);
+        var ntn = a.nameSpace + tsep + a.tagName;
+        if (!this.tags[ntn]) {
+            this.tags[ntn] = a;
+        }
+        else {
+            if (!isArray(this.tags[ntn])) {
+                let fo = this.tags[ntn];
+                this.tags[ntn] = [];
+                this.tags[ntn].push(fo);
+            }
+            this.tags[ntn].push(a);
+        }
+    },
+    addChildTag: function _addChildTag(a, b, c) {
+        var ns;
+        if (b) {
+            ns = b;
+        }
+        else {
+            if (this.nameSpace) {
+                ns = this.nameSpace;
+            }
+            else {
+                ns = "_default_";
+            }
+        }
+        if (c === false) {
+            c = "false";
+        }
+        if (c === 0) {
+            c = "0";
+        }
+        if ((c !== undefined) && (c !== null) && (c != "")) {
+            var xml = "<" + ns + tsep + a + ">" + convertSpecialCharatersToXML(c) + "</" + ns + tsep + a + ">"
+        }
+        else {
+            var xml = "<" + ns + tsep + a + "/>"
+        }
+        var r = new mivIxml2jxon(xml, 0, this);
+        return r;
+    },
+    addSibblingTag: function _addSibblingTag(a, b, c) {
+        if (b) {
+            var nameSpace = b;
+        }
+        else {
+            var nameSpace = "_default_";
+        }
+        var r = new mivIxml2jxon("<" + nameSpace + tsep + a + "/>", 0, null);
+        r.addToContent(c);
+        this._siblings.push(r);
+        return r;
+    },
+    contentStr: function _contentStr() {
+        if ((this.content) && (this.content[0])) {
+            return this.content[0];
+        }
+        else {
+            return "";
+        }
+    },
+    get value() {
+        return convertSpecialCharatersFromXML(this.contentStr().toString());
+    },
+    attributesToString: function _attributesToString() {
+        var r = "";
+        for (let i in this.attr) {
+            r += " " + i + '="' + this.attr[i] + '"';
+        }
+        return r;
+    },
+    nameSpacesToString: function _nameSpacesToString() {
+        var r = "";
+        for (let i in this.nameSpaces) {
+            if (i == "_default_") {
+                r += ' xmlns="' + nameSpaceMgr.getNameSpace(this.nameSpaces[i]) + '"';
+            }
+            else {
+                r += " xmlns:" + i + '="' + nameSpaceMgr.getNameSpace(this.nameSpaces[i]) + '"';
+            }
+        }
+        return r;
+    },
+    clone: function _clone() {
+        return new mivIxml2jxon(this.toString(), 0, null);
+    },
+    toString: function _toString(a) {
+        var nss = this.nameSpacesToString();
+        var r = "";
+        var cc = 0;
+        for (let index in this.tags) {
+            cc++;
+            if (isArray(this.tags[index])) {
+                for each(let tag in this.tags[index]) {
+                    r += tag.toString(nss);
+                }
+            }
+            else {
+                r += this.tags[index].toString(nss);
+            }
+
+        }
+        if (this.content) {
+            for (let index in this.content) {
+                cc++;
+                if ((typeof this.content[index] === "string") || (this.content[index] instanceof String)) {
+                    r += this.content[index];
+                }
+            }
+        }
+        if ((a) && (nss == a)) {
+            nss = "";
+        }
+        var at = this.attributesToString();
+        var ns = this.nameSpace;
+        if (ns == "_default_") {
+            ns = "";
+        }
+        else {
+            ns += tsep;
+        }
+        if (cc == 0) {
+            r = "<" + ns + this.tagName + at + nss + "/>";
+        }
+        else {
+            r = "<" + ns + this.tagName + at + nss + ">" + r + "</" + ns + this.tagName + ">";
+        }
+        for each(let s in this._siblings) {
+            r = r + s.toString();
+        }
+        return r;
+    },
+    realTagName: function _realTagName(a) {
+        var r = a;
+        var ta = "_default_";
+        var tn = "";
+        var ap = a.indexOf(tsep);
+        if (ap > -1) {
+            ta = a.substr(0, ap);
+            tn = a.substr(ap + 1);
+        }
+        else {
+            tn = a;
+        }
+        var ns = this.getNameSpace(ta);
+        if (ns) {
+            r = ns + tsep + tn;
+        }
+        return r;
+    },
+    XPath: function XPath(aPath) {
+        var tmpPath = aPath;
+        var result = [];
+        if (tmpPath[0] == "/") {
+            tmpPath = tmpPath.substr(1);
+        }
 
-function checkClosingElement(aStr, aPos, aXMLObject, aParent)
-{
-	var strLength = aStr.length;
-	var tmpStartPos = aPos;
-	if (aPos < strLength) {
-		var tmpPos = findCharacter(aStr, aPos, ">");
-		if (tmpPos > -1) {
-			var closingTag = aStr.substr(tmpStartPos, tmpPos-tmpStartPos);
-			var xmlnsPos = closingTag.indexOf(tsep);
-			if (xmlnsPos > -1) {
-				var nameSpace = closingTag.substr(0, xmlnsPos);
-				closingTag = closingTag.substr(xmlnsPos+1);
-			}
-			else {var nameSpace = "_default_";}
-
-			if ((aParent) && (closingTag == aParent.tagName) && (nameSpace == aParent.nameSpace)) {
-				aXMLObject.lastPos = tmpPos;
-				aXMLObject.closed = true;
-				return true;
-			}
-			else {throw Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG;}
-		}
-		else {throw Ci.mivIxml2jxon.ERR_INVALID_TAG;}
-	}
-	else {throw Ci.mivIxml2jxon.ERR_INVALID_TAG;}
+        switch (tmpPath[0]) {
+        case "/": // Find all elements by specified element name
+            var allTag = splitOnCharacter(tmpPath.substr(1), 0, ["/", "["]);
+            if (!allTag) {
+                allTag = tmpPath.substr(1);
+            }
+            for (let index in this.tags) {
+                result.push(this.tags[index]);
+            }
+            tmpPath = "/" + tmpPath;
+            break;
+        case "@": // Find attribute within this element
+            if (this.attr[tmpPath.substr(1)]) {
+                result.push(this.attr[tmpPath.substr(1)]);
+            }
+            tmpPath = "";
+            break;
+        case "*": // Wildcard. Will parse all children.
+            tmpPath = tmpPath.substr(1);
+            for (let index in this.tags) {
+                let tmpTagName = "";
+                var tmpIsArray = isArray(this.tags[index]);
+                if (tmpIsArray) {
+                    tmpTagName = this.tags[index][0].tagName;
+                }
+                else {
+                    tmpTagName = this.tags[index].tagName;
+                }
+
+                if (tmpTagName != this.tagName) {
+                    if (tmpIsArray) {
+                        for (let index2 in this.tags[index]) {
+                            result.push(this.tags[index][index2]);
+                        }
+                    }
+                    else {
+                        result.push(this.tags[index]);
+                    }
+                }
+            }
+            break;
+        case "[": // Compare/match function
+            var index = splitOnCharacter(tmpPath.substr(1), 0, "]");
+            if (!index) {
+                throw "XPath error: Did not find closing square bracket. tagName:" + this.tagName + ", tmpPath:" + tmpPath;
+            }
+            tmpPath = tmpPath.substr(index.length + 2);
+            index = trim(index);
+            if (index != "") {
+                if (ifFunction(index, this)) {
+                    result.push(this);
+                }
+                else {
+                    return result;
+                }
+            }
+            else {
+                throw "XPath compare error:No Value between square brackets:" + this.tagName + "[" + index + "]";
+            }
+            break;
+        default:
+            var bracketPos = tmpPath.indexOf("[");
+            var forwardSlashPos = tmpPath.indexOf("/");
+            var splitPos = tmpPath.length;
+            if ((bracketPos < splitPos) && (bracketPos > -1)) {
+                splitPos = bracketPos;
+            }
+            if ((forwardSlashPos < splitPos) && (forwardSlashPos > -1)) {
+                splitPos = forwardSlashPos;
+            }
+            var tmpPath2 = tmpPath.substr(0, splitPos);
+            tmpPath = tmpPath.substr(splitPos);
+            if (tmpPath2 != "") {
+                var equalTags = this.getTags(tmpPath2);
+                for (let index in equalTags) {
+                    result.push(equalTags[index]);
+                }
+            }
+        }
+        if ((result.length > 0) && (tmpPath != "")) {
+            var finalResult = [];
+            for (let index in result) {
+                if ((typeof result[index] === "string") || (result[index] instanceof String)) {
+                    finalResult.push(result[index]);
+                }
+                else {
+                    if (isArray(result[index])) {
+                        for (let index2 in result[index]) {
+                            let tmpResult = result[index][index2].XPath(tmpPath);
+                            if (tmpResult) {
+                                for (let index3 in tmpResult) {
+                                    finalResult.push(tmpResult[index3]);
+                                    tmpResult[index3] = null;
+                                }
+                            }
+                            tmpResult = null;
+                        }
+                    }
+                    else {
+                        let tmpResult = result[index].XPath(tmpPath);
+                        if (tmpResult) {
+                            for (let index2 in tmpResult) {
+                                finalResult.push(tmpResult[index2]);
+                                tmpResult[index2] = null;
+                            }
+                        }
+                        tmpResult = null;
+                    }
+                }
+            }
+            result = finalResult;
+        }
+        else {
+            if ((tmpPath != "") && (tmpPath.substr(0, 2) != "//")) {
+                var finalResult = [];
+                let tmpResult = this.XPath(tmpPath);
+                if (tmpResult) {
+                    for (let index2 in tmpResult) {
+                        finalResult.push(tmpResult[index2]);
+                        tmpResult[index2] = null;
+                    }
+                }
+                tmpResult = null;
+                result = finalResult;
+            }
+        }
+        if ((tmpPath != "") && (tmpPath.substr(0, 2) == "//") && (this.tags[allTag]) && (this.tagName == this.tags[allTag].tagName)) {
+            tmpPath = tmpPath.substr(1);
+            if ((tmpPath != "") && (tmpPath.substr(0, 2) != "//")) {
+                var finalResult = [];
+                let tmpResult = this.XPath(tmpPath);
+                if (tmpResult) {
+                    for (let index2 in tmpResult) {
+                        finalResult.push(tmpResult[index2]);
+                        tmpResult[index2] = null;
+                    }
+                }
+                tmpResult = null;
+                result = finalResult;
+            }
+        }
+        return result;
+    },
+    get lastPos() {
+        return this._lastPos;
+    },
+    set lastPos(aValue) {
+        this._lastPos = aValue;
+    },
+    processXMLString: function _processXMLString(aStr, aSP, aParent) {
+        processXMLStringEXT(aStr, aSP, aParent, this);
+    },
 }
 
-function hasXMLHeader(aStr, aSP)
-{
-	if (!aStr) return 0;
-
-	var pos = findCharacter(aStr, aSP, "<");
-	var strLength = aStr.length;
-	if (pos > -1) {
-		pos++;
-		var tc = aStr[pos];
-
-		if ( (pos < strLength) && (tc == "?")) {
-			pos++;
-			if (aStr.substr(pos, 4) == "xml ") {
-				var tmpPos = findString(aStr, pos, "?>");
-				if (tmpPos == -1) {throw Ci.mivIxml2jxon.ERR_INVALID_SPECIAL_TAG;}
-				else {
-					return (tmpPos+2);						
-				}
-			}
-			else {throw Ci.mivIxml2jxon.ERR_MISSING_SPECIAL_TAG;}
-		}
-	}
-	return 0;
+function checkClosingElement(aStr, aPos, aXMLObject, aParent) {
+    var strLength = aStr.length;
+    var tmpStartPos = aPos;
+    if (aPos < strLength) {
+        var tmpPos = findCharacter(aStr, aPos, ">");
+        if (tmpPos > -1) {
+            var closingTag = aStr.substr(tmpStartPos, tmpPos - tmpStartPos);
+            var xmlnsPos = closingTag.indexOf(tsep);
+            if (xmlnsPos > -1) {
+                var nameSpace = closingTag.substr(0, xmlnsPos);
+                closingTag = closingTag.substr(xmlnsPos + 1);
+            }
+            else {
+                var nameSpace = "_default_";
+            }
+
+            if ((aParent) && (closingTag == aParent.tagName) && (nameSpace == aParent.nameSpace)) {
+                aXMLObject.lastPos = tmpPos;
+                aXMLObject.closed = true;
+                return true;
+            }
+            else {
+                throw Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG;
+            }
+        }
+        else {
+            throw Ci.mivIxml2jxon.ERR_INVALID_TAG;
+        }
+    }
+    else {
+        throw Ci.mivIxml2jxon.ERR_INVALID_TAG;
+    }
 }
 
-function processXMLStringEXT(aStr, aSP, aParent, aXMLObject)
-{
-	if (!aStr) return;
-try{
-	var tmpSP = aSP;
-	var xmlHeaderPos = hasXMLHeader(aStr, aSP);
-	if (xmlHeaderPos > 0) {
-		//dump("We have an XML header. Going to strip it.\n");
-		tmpSP = xmlHeaderPos;
-	}
-
-	var pos = findCharacter(aStr, tmpSP, "<");
-	var strLength = aStr.length;
-	if (pos > -1) {
-		aXMLObject.startPos = pos;
-		let skipped = pos - tmpSP;
-		if ((skipped > 0) && (aParent)) {
-			aParent.addToContent(aStr.substr(tmpSP, skipped));
-		}
-		pos++;
-		var tc = aStr[pos];
-
-		if ( (pos < strLength) && (tc == "/")) {
-			pos++;
-			checkClosingElement(aStr, pos, aXMLObject, aParent);
-			return;
-		}
-		else {if (pos < strLength) {
-				var tmpPos = findCharacter(aStr, pos, ">");
-				if (tmpPos > -1) {
-					var tmpStart = aXMLObject.startPos + 1;
-					let tmpTagName = "";
-					tc = aStr[tmpStart];
-					while ((tmpStart < strLength) && (tc != ">") && 
-						(tc != "/") && (!(isInList(specialChars1,tc)))) {
-						tmpTagName = tmpTagName + tc;
-						tmpStart++;
-						tc = aStr[tmpStart];
-					}
-					var xmlnsPos = tmpTagName.indexOf(tsep);
-					if (xmlnsPos > -1) {
-						aXMLObject.nameSpace = tmpTagName.substr(0, xmlnsPos);
-						tmpTagName = tmpTagName.substr(xmlnsPos+1);
-					}
-					else {aXMLObject.nameSpace = "_default_";}
-					aXMLObject.tagName = tmpTagName;
-					if (aParent) {aParent.addChildTagObject(aXMLObject);}
-					if ((tmpStart < strLength) && (tc == "/")) {
-						aXMLObject.lastPos = tmpStart+1;
-						return;
-					}
-					else {if ((tmpStart < strLength) && (isInList(specialChars1,tc))) {
-							var attribute = "";
-							tmpStart++;
-							tc = aStr[tmpStart];
-							var quoteOpen = false;
-							var seenAttributeSeparator = false;
-							var quoteChar = "";
-							while ((tmpStart < strLength) && 
-								(((tc != ">") && (tc != "/")) || (quoteOpen)) ) {
-								attribute = attribute + tc;
-								if ((!seenAttributeSeparator) && (tc == "=") && (!quoteOpen)){seenAttributeSeparator = true;}
-								else {if (seenAttributeSeparator) {
-										if ((tc == '"') || (tc == "'")) {
-											if ((!quoteOpen) || ((quoteOpen) && (quoteChar == tc))) {
-												quoteOpen = !quoteOpen;
-												if (quoteOpen) {quoteChar = tc;}
-											}
-										}
-									}
-								}
-								tmpStart++;
-								tc = aStr[tmpStart];
-								if ((seenAttributeSeparator) && (tmpStart < strLength) && (isInList(specialChars1,tc)) && (!quoteOpen)) {
-									aXMLObject.explodeAttribute(attribute);
-									attribute = "";
-									seenAttributeSeparator = false;
-									tmpStart++;
-									tc = aStr[tmpStart];
-								}
-							}
-							if ((seenAttributeSeparator) && (!quoteOpen) && (tmpStart < strLength) && (attribute.length > 0)) {
-								aXMLObject.explodeAttribute(attribute);
-								seenAttributeSeparator = false;
-								attribute = "";
-							}
-							if ((tmpStart < strLength) && (tc == "/")) {
-								// Found opening tag with attributes which is also closed.
-								aXMLObject.lastPos = tmpStart+1;
-								return;
-							}
-							else {if (!((tmpStart < strLength) && (tc == ">"))) {throw Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG;}}
-
-						}
-						else {if (!((tmpStart < strLength) && (tc == ">"))) {throw Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG;}}
-					}
-					var tmpChild = null;
-					while (((!tmpChild) || (!tmpChild.closed)) && (tmpPos)) {
-						tmpChild = new mivIxml2jxon(aStr,tmpPos+1, aXMLObject);
-						tmpPos = tmpChild.lastPos;
-
-						if ((tmpChild) && (!tmpChild.closed)) {
-							if (aStr.substr(tmpPos+1, 2) == "</") {
-								checkClosingElement(aStr, tmpPos+3, tmpChild, aXMLObject);									
-								tmpPos = tmpChild.lastPos;
-							}
-						}
-					}
-					tmpChild = null;
-					aXMLObject.lastPos = tmpPos;
-				}
-				else {throw Ci.mivIxml2jxon.ERR_INVALID_TAG;}
-			}
-			else {throw Ci.mivIxml2jxon.ERR_INVALID_TAG;}
-		}
-	}
-	else {
-//dump("nothing left.\n");
-		if (aParent) {
-			aParent.addToContent(aStr);
-		}
-		aXMLObject.lastPos = aStr.length - 1;
-		aXMLObject.closed = true;
-	}
+function hasXMLHeader(aStr, aSP) {
+    if (!aStr) return 0;
+
+    var pos = findCharacter(aStr, aSP, "<");
+    var strLength = aStr.length;
+    if (pos > -1) {
+        pos++;
+        var tc = aStr[pos];
+
+        if ((pos < strLength) && (tc == "?")) {
+            pos++;
+            if (aStr.substr(pos, 4) == "xml ") {
+                var tmpPos = findString(aStr, pos, "?>");
+                if (tmpPos == -1) {
+                    throw Ci.mivIxml2jxon.ERR_INVALID_SPECIAL_TAG;
+                }
+                else {
+                    return (tmpPos + 2);
+                }
+            }
+            else {
+                throw Ci.mivIxml2jxon.ERR_MISSING_SPECIAL_TAG;
+            }
+        }
+    }
+    return 0;
 }
-catch(err){ dump(" !! err:"+err+"\n");}
+
+function processXMLStringEXT(aStr, aSP, aParent, aXMLObject) {
+    if (!aStr) return;
+    try {
+        var tmpSP = aSP;
+        var xmlHeaderPos = hasXMLHeader(aStr, aSP);
+        if (xmlHeaderPos > 0) {
+            //dump("We have an XML header. Going to strip it.\n");
+            tmpSP = xmlHeaderPos;
+        }
+
+        var pos = findCharacter(aStr, tmpSP, "<");
+        var strLength = aStr.length;
+        if (pos > -1) {
+            aXMLObject.startPos = pos;
+            let skipped = pos - tmpSP;
+            if ((skipped > 0) && (aParent)) {
+                aParent.addToContent(aStr.substr(tmpSP, skipped));
+            }
+            pos++;
+            var tc = aStr[pos];
+
+            if ((pos < strLength) && (tc == "/")) {
+                pos++;
+                checkClosingElement(aStr, pos, aXMLObject, aParent);
+                return;
+            }
+            else {
+                if (pos < strLength) {
+                    var tmpPos = findCharacter(aStr, pos, ">");
+                    if (tmpPos > -1) {
+                        var tmpStart = aXMLObject.startPos + 1;
+                        let tmpTagName = "";
+                        tc = aStr[tmpStart];
+                        while ((tmpStart < strLength) && (tc != ">")
+                            && (tc != "/") && (!(isInList(specialChars1, tc)))) {
+                            tmpTagName = tmpTagName + tc;
+                            tmpStart++;
+                            tc = aStr[tmpStart];
+                        }
+                        var xmlnsPos = tmpTagName.indexOf(tsep);
+                        if (xmlnsPos > -1) {
+                            aXMLObject.nameSpace = tmpTagName.substr(0, xmlnsPos);
+                            tmpTagName = tmpTagName.substr(xmlnsPos + 1);
+                        }
+                        else {
+                            aXMLObject.nameSpace = "_default_";
+                        }
+                        aXMLObject.tagName = tmpTagName;
+                        if (aParent) {
+                            aParent.addChildTagObject(aXMLObject);
+                        }
+                        if ((tmpStart < strLength) && (tc == "/")) {
+                            aXMLObject.lastPos = tmpStart + 1;
+                            return;
+                        }
+                        else {
+                            if ((tmpStart < strLength) && (isInList(specialChars1, tc))) {
+                                var attribute = "";
+                                tmpStart++;
+                                tc = aStr[tmpStart];
+                                var quoteOpen = false;
+                                var seenAttributeSeparator = false;
+                                var quoteChar = "";
+                                while ((tmpStart < strLength)
+                                    && (((tc != ">") && (tc != "/")) || (quoteOpen))) {
+                                    attribute = attribute + tc;
+                                    if ((!seenAttributeSeparator) && (tc == "=") && (!quoteOpen)) {
+                                        seenAttributeSeparator = true;
+                                    }
+                                    else {
+                                        if (seenAttributeSeparator) {
+                                            if ((tc == '"') || (tc == "'")) {
+                                                if ((!quoteOpen) || ((quoteOpen) && (quoteChar == tc))) {
+                                                    quoteOpen = !quoteOpen;
+                                                    if (quoteOpen) {
+                                                        quoteChar = tc;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    tmpStart++;
+                                    tc = aStr[tmpStart];
+                                    if ((seenAttributeSeparator) && (tmpStart < strLength) && (isInList(specialChars1, tc)) && (!quoteOpen)) {
+                                        aXMLObject.explodeAttribute(attribute);
+                                        attribute = "";
+                                        seenAttributeSeparator = false;
+                                        tmpStart++;
+                                        tc = aStr[tmpStart];
+                                    }
+                                }
+                                if ((seenAttributeSeparator) && (!quoteOpen) && (tmpStart < strLength) && (attribute.length > 0)) {
+                                    aXMLObject.explodeAttribute(attribute);
+                                    seenAttributeSeparator = false;
+                                    attribute = "";
+                                }
+                                if ((tmpStart < strLength) && (tc == "/")) {
+                                    // Found opening tag with attributes which is also closed.
+                                    aXMLObject.lastPos = tmpStart + 1;
+                                    return;
+                                }
+                                else {
+                                    if (!((tmpStart < strLength) && (tc == ">"))) {
+                                        throw Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG;
+                                    }
+                                }
+
+                            }
+                            else {
+                                if (!((tmpStart < strLength) && (tc == ">"))) {
+                                    throw Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG;
+                                }
+                            }
+                        }
+                        var tmpChild = null;
+                        while (((!tmpChild) || (!tmpChild.closed)) && (tmpPos)) {
+                            tmpChild = new mivIxml2jxon(aStr, tmpPos + 1, aXMLObject);
+                            tmpPos = tmpChild.lastPos;
+
+                            if ((tmpChild) && (!tmpChild.closed)) {
+                                if (aStr.substr(tmpPos + 1, 2) == "</") {
+                                    checkClosingElement(aStr, tmpPos + 3, tmpChild, aXMLObject);
+                                    tmpPos = tmpChild.lastPos;
+                                }
+                            }
+                        }
+                        tmpChild = null;
+                        aXMLObject.lastPos = tmpPos;
+                    }
+                    else {
+                        throw Ci.mivIxml2jxon.ERR_INVALID_TAG;
+                    }
+                }
+                else {
+                    throw Ci.mivIxml2jxon.ERR_INVALID_TAG;
+                }
+            }
+        }
+        else {
+            //dump("nothing left.\n");
+            if (aParent) {
+                aParent.addToContent(aStr);
+            }
+            aXMLObject.lastPos = aStr.length - 1;
+            aXMLObject.closed = true;
+        }
+    }
+    catch (err) {
+        dump(" !! err:" + err + "\n");
+    }
 }
 
-function convertComparisonPart(a, aXMLObject){
-	var r = [];
-	var tc = a[0];
-	if ((tc == "/") || (tc == ".") || (tc == "@")) {r = aXMLObject.XPath(a);}
-	else {
-		r = [];
-		if ( (tc == "'") || (tc == '"')) {
-			r.push(a.substr(1,a.length-2));
-		}
-		else {
-			if (isNaN(a)) {r = aXMLObject.XPath(a);}
-			else {r.push(Number(a));}
-		}
-	}
-	return r;
+function convertComparisonPart(a, aXMLObject) {
+    var r = [];
+    var tc = a[0];
+    if ((tc == "/") || (tc == ".") || (tc == "@")) {
+        r = aXMLObject.XPath(a);
+    }
+    else {
+        r = [];
+        if ((tc == "'") || (tc == '"')) {
+            r.push(a.substr(1, a.length - 2));
+        }
+        else {
+            if (isNaN(a)) {
+                r = aXMLObject.XPath(a);
+            }
+            else {
+                r.push(Number(a));
+            }
+        }
+    }
+    return r;
 }
 
-function ifFunction(aCondition, aXMLObject){
-	var level = 0;
-	var tmpCondition = trim(aCondition);
-	var compareList = [];
-	while (tmpCondition != "") {
-		var startPos = 0;
-		var weHaveSubCondition = false;
-		if (tmpCondition[0] == "(") {
-			var subCondition = splitOnCharacter(tmpCondition.substr(1), 0, ")");
-			if (subCondition) {
-				startPos = subCondition.length;
-				weHaveSubCondition = true;
-			}
-			else {
-				throw "XPath error: Did not find closing round bracket '"+aXMLObject.tagName+"' for condition:"+aCondition;
-			}
-		}
-
-		var splitPart = splitOnCharacter(tmpCondition.toLowerCase(), startPos, [" and ", " or "]);
-		var operator = null;
-		var comparison = null;
-		if (splitPart) {
-			splitPart = tmpCondition.substr(0, splitPart.length);
-			tmpCondition = tmpCondition.substr(splitPart.length + 1);
-
-			if (tmpCondition[0] == "a") {
-				operator = "and";
-				tmpCondition = tmpCondition.substr(4);
-			}
-			else {
-				operator = "or";
-				tmpCondition = tmpCondition.substr(3);
-			}
-		}
-		else {
-			splitPart = tmpCondition;
-			tmpCondition = "";
-		}
-		if (weHaveSubCondition) {
-			compareList.push( { left: subCondition, right: "", operator: operator, comparison: comparison, subCondition: subCondition} );
-		}
-		else {
-			var splitPart2 = splitOnCharacter(splitPart, 0, ["!=", "<=", ">=", "<", "=", ">"]);
-			if (splitPart2) {
-				// Get comparison type
-				var smallerThen = false;
-				var equalTo = false;
-				var biggerThen = false;
-				var splitPos2 = splitPart2.length;
-				switch (splitPart[splitPos2]) {
-					case "!":comparison = "!=";break;
-					case "<":comparison = "<";if (splitPart[splitPos2+1] == "=") comparison = "<=";break;
-					case "=":comparison = "=";break;
-					case ">":comparison = ">";if (splitPart[splitPos2+1] == "=") comparison = ">=";break;
-				}
-				compareList.push( { left: trim(splitPart2), right: trim(splitPart.substr(splitPart2.length+comparison.length)), operator: operator, comparison: comparison, subCondition: subCondition} );
-			}
-			else {
-				compareList.push( { left: trim(splitPart), right: "", operator: operator, comparison: comparison, subCondition: subCondition} );
-			}
-		}
-	}
-	var totalResult = true;
-	var lastOperator = null;
-	for (let index in compareList) {
-		var tmpResult = false;
-		if (compareList[index].subCondition) {tmpResult = ifFunction(compareList[index].left, aXMLObject);}
-		else {
-			let tmpLeft = convertComparisonPart(compareList[index].left, aXMLObject);
-			let tmpRight = convertComparisonPart(compareList[index].right, aXMLObject);
-			if (tmpLeft.length > 0) {
-				if (compareList[index].comparison) {
-					// Filter out ony the valid ones.
-					if (tmpRight.length > 0) {
-						var x = 0;
-						tmpResult = false;
-						while ((x < tmpLeft.length) && (!tmpResult)) {
-							if ((typeof tmpLeft[x] === "string") || (tmpLeft[x] instanceof String) || (typeof tmpLeft[x] === "number")) {
-								var evalConditionLeft = tmpLeft[x].toString();
-							}
-							else {
-								var evalConditionLeft = tmpLeft[x].value.toString();
-							}
-							var y = 0;
-							while ((y < tmpRight.length) && (!tmpResult)) {
-								if ((typeof tmpRight[y] === "string") || (tmpRight[y] instanceof String) || (typeof tmpRight[y] === "number")) {
-									var evalConditionRight = tmpRight[y].toString();
-								}
-								else {var evalConditionRight = tmpRight[y].value.toString();}
-								switch (compareList[index].comparison) {
-								case "!=":tmpResult = (evalConditionLeft != evalConditionRight);break;
-								case "<=":tmpResult = (evalConditionLeft <= evalConditionRight);break;
-								case ">=":tmpResult = (evalConditionLeft >= evalConditionRight);break;
-								case "<":tmpResult = (evalConditionLeft < evalConditionRight);break;
-								case "=":tmpResult = (evalConditionLeft==evalConditionRight);break;
-								case ">":tmpResult = (evalConditionLeft > evalConditionRight);break;
-								}
-								y++;
-							}
-							x++;
-						}
-					}
-				}
-				else {tmpResult = true;}
-			}
-			else {tmpResult = false;}
-			tmpLeft = null;
-			tmpRight = null;
-		}
-		switch (lastOperator) {
-		case "and":totalResult = (totalResult && tmpResult);break;
-		case "or":totalResult = (totalResult || tmpResult);break;
-		case null:totalResult = tmpResult;break;
-		}
-		if (compareList[index].operator) {
-			if ((compareList[index].operator == "and") && (!totalResult)) {return false;}
-			if ((compareList[index].operator == "or") && (totalResult)) {return true;}
-		}
-		lastOperator = compareList[index].operator;
-	}
-	return totalResult;
+function ifFunction(aCondition, aXMLObject) {
+    var level = 0;
+    var tmpCondition = trim(aCondition);
+    var compareList = [];
+    while (tmpCondition != "") {
+        var startPos = 0;
+        var weHaveSubCondition = false;
+        if (tmpCondition[0] == "(") {
+            var subCondition = splitOnCharacter(tmpCondition.substr(1), 0, ")");
+            if (subCondition) {
+                startPos = subCondition.length;
+                weHaveSubCondition = true;
+            }
+            else {
+                throw "XPath error: Did not find closing round bracket '" + aXMLObject.tagName + "' for condition:" + aCondition;
+            }
+        }
+
+        var splitPart = splitOnCharacter(tmpCondition.toLowerCase(), startPos, [" and ", " or "]);
+        var operator = null;
+        var comparison = null;
+        if (splitPart) {
+            splitPart = tmpCondition.substr(0, splitPart.length);
+            tmpCondition = tmpCondition.substr(splitPart.length + 1);
+
+            if (tmpCondition[0] == "a") {
+                operator = "and";
+                tmpCondition = tmpCondition.substr(4);
+            }
+            else {
+                operator = "or";
+                tmpCondition = tmpCondition.substr(3);
+            }
+        }
+        else {
+            splitPart = tmpCondition;
+            tmpCondition = "";
+        }
+        if (weHaveSubCondition) {
+            compareList.push({
+                left: subCondition,
+                right: "",
+                operator: operator,
+                comparison: comparison,
+                subCondition: subCondition
+            });
+        }
+        else {
+            var splitPart2 = splitOnCharacter(splitPart, 0, ["!=", "<=", ">=", "<", "=", ">"]);
+            if (splitPart2) {
+                // Get comparison type
+                var smallerThen = false;
+                var equalTo = false;
+                var biggerThen = false;
+                var splitPos2 = splitPart2.length;
+                switch (splitPart[splitPos2]) {
+                case "!":
+                    comparison = "!=";
+                    break;
+                case "<":
+                    comparison = "<";
+                    if (splitPart[splitPos2 + 1] == "=") comparison = "<=";
+                    break;
+                case "=":
+                    comparison = "=";
+                    break;
+                case ">":
+                    comparison = ">";
+                    if (splitPart[splitPos2 + 1] == "=") comparison = ">=";
+                    break;
+                }
+                compareList.push({
+                    left: trim(splitPart2),
+                    right: trim(splitPart.substr(splitPart2.length + comparison.length)),
+                    operator: operator,
+                    comparison: comparison,
+                    subCondition: subCondition
+                });
+            }
+            else {
+                compareList.push({
+                    left: trim(splitPart),
+                    right: "",
+                    operator: operator,
+                    comparison: comparison,
+                    subCondition: subCondition
+                });
+            }
+        }
+    }
+    var totalResult = true;
+    var lastOperator = null;
+    for (let index in compareList) {
+        var tmpResult = false;
+        if (compareList[index].subCondition) {
+            tmpResult = ifFunction(compareList[index].left, aXMLObject);
+        }
+        else {
+            let tmpLeft = convertComparisonPart(compareList[index].left, aXMLObject);
+            let tmpRight = convertComparisonPart(compareList[index].right, aXMLObject);
+            if (tmpLeft.length > 0) {
+                if (compareList[index].comparison) {
+                    // Filter out ony the valid ones.
+                    if (tmpRight.length > 0) {
+                        var x = 0;
+                        tmpResult = false;
+                        while ((x < tmpLeft.length) && (!tmpResult)) {
+                            if ((typeof tmpLeft[x] === "string") || (tmpLeft[x] instanceof String) || (typeof tmpLeft[x] === "number")) {
+                                var evalConditionLeft = tmpLeft[x].toString();
+                            }
+                            else {
+                                var evalConditionLeft = tmpLeft[x].value.toString();
+                            }
+                            var y = 0;
+                            while ((y < tmpRight.length) && (!tmpResult)) {
+                                if ((typeof tmpRight[y] === "string") || (tmpRight[y] instanceof String) || (typeof tmpRight[y] === "number")) {
+                                    var evalConditionRight = tmpRight[y].toString();
+                                }
+                                else {
+                                    var evalConditionRight = tmpRight[y].value.toString();
+                                }
+                                switch (compareList[index].comparison) {
+                                case "!=":
+                                    tmpResult = (evalConditionLeft != evalConditionRight);
+                                    break;
+                                case "<=":
+                                    tmpResult = (evalConditionLeft <= evalConditionRight);
+                                    break;
+                                case ">=":
+                                    tmpResult = (evalConditionLeft >= evalConditionRight);
+                                    break;
+                                case "<":
+                                    tmpResult = (evalConditionLeft < evalConditionRight);
+                                    break;
+                                case "=":
+                                    tmpResult = (evalConditionLeft == evalConditionRight);
+                                    break;
+                                case ">":
+                                    tmpResult = (evalConditionLeft > evalConditionRight);
+                                    break;
+                                }
+                                y++;
+                            }
+                            x++;
+                        }
+                    }
+                }
+                else {
+                    tmpResult = true;
+                }
+            }
+            else {
+                tmpResult = false;
+            }
+            tmpLeft = null;
+            tmpRight = null;
+        }
+        switch (lastOperator) {
+        case "and":
+            totalResult = (totalResult && tmpResult);
+            break;
+        case "or":
+            totalResult = (totalResult || tmpResult);
+            break;
+        case null:
+            totalResult = tmpResult;
+            break;
+        }
+        if (compareList[index].operator) {
+            if ((compareList[index].operator == "and") && (!totalResult)) {
+                return false;
+            }
+            if ((compareList[index].operator == "or") && (totalResult)) {
+                return true;
+            }
+        }
+        lastOperator = compareList[index].operator;
+    }
+    return totalResult;
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.xml2json) {
-			// Load main script from lightning that we need.
-			NSGetFactory.xml2json = XPCOMUtils.generateNSGetFactory([mivIxml2jxon]);
-			
-	}
+    try {
+        if (!NSGetFactory.xml2json) {
+            // Load main script from lightning that we need.
+            NSGetFactory.xml2json = XPCOMUtils.generateNSGetFactory([mivIxml2jxon]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.xml2json(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.xml2json(cid);
+}
diff --git a/interfaces/xml2jxon/mivNameSpaces.js b/interfaces/xml2jxon/mivNameSpaces.js
index c2bc33af..c10c50a1 100644
--- a/interfaces/xml2jxon/mivNameSpaces.js
+++ b/interfaces/xml2jxon/mivNameSpaces.js
@@ -38,108 +38,108 @@ const nsXSIStr = "http://www.w3.org/2001/XMLSchema-instance";
 const nsErrors = "http://schemas.microsoft.com/exchange/services/2006/errors";
 
 function mivNameSpaces() {
-	this.nameSpaces = new Array();
+    this.nameSpaces = new Array();
 
-	this.addNameSpace("s", nsSoapStr);
-	this.addNameSpace("m", nsMessagesStr);
-	this.addNameSpace("t", nsTypesStr);
-	this.addNameSpace("a1", nsAutodiscoverResponseStr1);
-	this.addNameSpace("a2", nsAutodiscoverResponseStr2);
+    this.addNameSpace("s", nsSoapStr);
+    this.addNameSpace("m", nsMessagesStr);
+    this.addNameSpace("t", nsTypesStr);
+    this.addNameSpace("a1", nsAutodiscoverResponseStr1);
+    this.addNameSpace("a2", nsAutodiscoverResponseStr2);
 }
 
 var mivNameSpacesGUID = "c58005d7-70c2-4f2e-935a-af11333f8964";
 
 mivNameSpaces.prototype = {
 
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivNameSpaces,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "XML NameSpace manager.",
-	classID: components.ID("{"+mivNameSpacesGUID+"}"),
-	contractID: "@1st-setup.nl/conversion/namespaces;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivNameSpaces,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-	// External methods
-
-	getNameSpace: function _getNameSpace(aIndex)
-	{
-		if (aIndex >= this.nameSpaces.length) return null;
-
-		return this.nameSpaces[aIndex].value;
-	},
-
-	addNameSpace: function _addNameSpace(aAlias, aValue)
-	{
-		var tmpAlias = aAlias;
-		if ((tmpAlias == "") || (tmpAlias === undefined)) {
-			tmpAlias = "_default_";
-		}
-
-		// find if we already have this namespace and value.
-		for (var index in this.nameSpaces) {
-			if (this.nameSpaces[index].alias == tmpAlias) {
-				if (this.nameSpaces[index].value == aValue) {
-					return index;
-				}
-			}
-		}
-
-		this.nameSpaces.push({ alias: tmpAlias,
-				       value: aValue});
-		return (this.nameSpaces.length-1);
-	},
-
-	findNameSpaceByAlias: function _findNameSpaceByAlias(aAlias)
-	{
-		for each(var record in this.nameSpaces) {
-			if (record.alias == aAlias) {
-				return record.value;
-			}
-		}
-		// When not found return null;
-		return null;
-	},
+    // methods from nsISupport
+
+    /* void QueryInterface(
+      in nsIIDRef uuid,
+      [iid_is(uuid),retval] out nsQIResult result
+    );	 */
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivNameSpaces,
+        Ci.nsIClassInfo,
+        Ci.nsISupports
+    ]),
+
+    // Attributes from nsIClassInfo
+
+    classDescription: "XML NameSpace manager.",
+    classID: components.ID("{" + mivNameSpacesGUID + "}"),
+    contractID: "@1st-setup.nl/conversion/namespaces;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+
+    // void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivNameSpaces,
+            Ci.nsIClassInfo,
+            Ci.nsISupports
+        ];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+    // External methods
+
+    getNameSpace: function _getNameSpace(aIndex) {
+        if (aIndex >= this.nameSpaces.length) return null;
+
+        return this.nameSpaces[aIndex].value;
+    },
+
+    addNameSpace: function _addNameSpace(aAlias, aValue) {
+        var tmpAlias = aAlias;
+        if ((tmpAlias == "") || (tmpAlias === undefined)) {
+            tmpAlias = "_default_";
+        }
+
+        // find if we already have this namespace and value.
+        for (var index in this.nameSpaces) {
+            if (this.nameSpaces[index].alias == tmpAlias) {
+                if (this.nameSpaces[index].value == aValue) {
+                    return index;
+                }
+            }
+        }
+
+        this.nameSpaces.push({
+            alias: tmpAlias,
+            value: aValue
+        });
+        return (this.nameSpaces.length - 1);
+    },
+
+    findNameSpaceByAlias: function _findNameSpaceByAlias(aAlias) {
+        for each(var record in this.nameSpaces) {
+                if (record.alias == aAlias) {
+                    return record.value;
+                }
+            }
+            // When not found return null;
+        return null;
+    },
 
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivNameSpaces) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivNameSpaces = XPCOMUtils.generateNSGetFactory([mivNameSpaces]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivNameSpaces) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivNameSpaces = XPCOMUtils.generateNSGetFactory([mivNameSpaces]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivNameSpaces(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivNameSpaces(cid);
+}
diff --git a/interfaces/xml2jxon/mivTagNames.js b/interfaces/xml2jxon/mivTagNames.js
index dfb33860..f4dd6d50 100644
--- a/interfaces/xml2jxon/mivTagNames.js
+++ b/interfaces/xml2jxon/mivTagNames.js
@@ -38,53 +38,56 @@ const nsXSIStr = "http://www.w3.org/2001/XMLSchema-instance";
 const nsErrors = "http://schemas.microsoft.com/exchange/services/2006/errors";
 
 function mivTagNames() {
-	this.tagNames = new Array();
+    this.tagNames = new Array();
 }
 
 var mivTagNamesGUID = "b7309b24-96c6-4393-9ae4-05f3e7e8a4ac";
 
 mivTagNames.prototype = {
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivTagNames,Ci.nsIClassInfo,Ci.nsISupports]),
-	classDescription: "XML TagNames manager.",
-	classID: components.ID("{"+mivTagNamesGUID+"}"),
-	contractID: "@1st-setup.nl/conversion/tagnames;1",
-	flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivTagNames,Ci.nsIClassInfo,Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-	getHelperForLanguage: function _getHelperForLanguage(language) {return null;},
-	getTagName: function _getTagName(aIndex)
-	{
-		if (aIndex >= this.tagNames.length) return "";
-		return this.tagNames[aIndex];
-	},
-	addTagName: function _addTagName(aValue)
-	{
-		for (let index in this.tagNames) {if (this.tagNames[index] == aValue) {return index;}}
-		this.tagNames.push(aValue);
-		return (this.tagNames.length-1);
-	},
+    QueryInterface: XPCOMUtils.generateQI([Ci.mivTagNames, Ci.nsIClassInfo, Ci.nsISupports]),
+    classDescription: "XML TagNames manager.",
+    classID: components.ID("{" + mivTagNamesGUID + "}"),
+    contractID: "@1st-setup.nl/conversion/tagnames;1",
+    flags: Ci.nsIClassInfo.SINGLETON || Ci.nsIClassInfo.THREADSAFE,
+    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+    getInterfaces: function _getInterfaces(count) {
+        var ifaces = [Ci.mivTagNames, Ci.nsIClassInfo, Ci.nsISupports];
+        count.value = ifaces.length;
+        return ifaces;
+    },
+    getHelperForLanguage: function _getHelperForLanguage(language) {
+        return null;
+    },
+    getTagName: function _getTagName(aIndex) {
+        if (aIndex >= this.tagNames.length) return "";
+        return this.tagNames[aIndex];
+    },
+    addTagName: function _addTagName(aValue) {
+        for (let index in this.tagNames) {
+            if (this.tagNames[index] == aValue) {
+                return index;
+            }
+        }
+        this.tagNames.push(aValue);
+        return (this.tagNames.length - 1);
+    },
 }
 
 function NSGetFactory(cid) {
 
-	try {
-		if (!NSGetFactory.mivTagNames) {
-			// Load main script from lightning that we need.
-			NSGetFactory.mivTagNames = XPCOMUtils.generateNSGetFactory([mivTagNames]);
-			
-	}
+    try {
+        if (!NSGetFactory.mivTagNames) {
+            // Load main script from lightning that we need.
+            NSGetFactory.mivTagNames = XPCOMUtils.generateNSGetFactory([mivTagNames]);
 
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
+        }
 
-	return NSGetFactory.mivTagNames(cid);
-} 
+    }
+    catch (e) {
+        Components.utils.reportError(e);
+        dump(e);
+        throw e;
+    }
 
+    return NSGetFactory.mivTagNames(cid);
+}

From c0847eaab49e63ca5884c76176780b316054e081 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 14:48:35 +0100
Subject: [PATCH 143/222] ecExchangeRequest.js: hide password in logs.

The observer created on 'http-on-modify-request' was showing password in logs
even if the user asked to not show password in logs.

This patch automatically replaces password by `***` in the URIs before logging them.

Fix #100
---
 components/ecExchangeRequest.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/components/ecExchangeRequest.js b/components/ecExchangeRequest.js
index 5ff412b8..a0d20ac7 100644
--- a/components/ecExchangeRequest.js
+++ b/components/ecExchangeRequest.js
@@ -108,6 +108,7 @@ function ExchangeRequest(aArgument, aCbOk, aCbError, aListener) {
     this.exchangeBadCertListener2 = Cc["@1st-setup.nl/exchange/badcertlistener2;1"]
         .getService(Ci.mivExchangeBadCertListener2);
 
+    this.showPassword = this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.authentication.showpassword", false, true);
     this.observerService = Cc["@mozilla.org/observer-service;1"]
         .getService(Ci.nsIObserverService);
     this.observerService.addObserver(this, "http-on-modify-request", true);
@@ -170,24 +171,39 @@ ExchangeRequest.prototype = {
     */
     observe(aSubject, aTopic, aData) {
         let channel = aSubject.QueryInterface(Components.interfaces.nsIHttpChannel);
-        this.logInfo("ecExchangeRequest observing http-on-modify-request for URI " + channel.URI.spec
-            + " originalURI " + (channel.originalURI ? channel.originalURI.spec : "none"));
+
+        // Local variables to display URIs in logs according to showPassword preference
+        let chanURI = channel.URI.spec;
+        let chanOrigURI = (channel.originalURI ? channel.originalURI.spec : 'none');
+
+        if (!this.showPassword) {
+            if (channel.URI.password) {
+                chanURI = chanURI.replace(channel.URI.password, '***');
+            }
+
+            if (channel.originalURI.password) {
+                chanOrigURI = chanOrigURI.replace(channel.originalURI.password, '***');
+            }
+        }
+
+        this.logInfo("ecExchangeRequest observe: http-on-modify-request for URI " + chanURI + ", originalURI " + chanOrigURI);
 
         // Only respond to our host
         let myHost = this.xmlReq && this.xmlReq.channel && this.xmlReq.channel.URI.host;
         let theirHost = channel.URI.host;
         if (myHost && (myHost != theirHost)) {
-            this.logInfo("Host does not match, theirs: " + theirHost + " mine: " + myHost);
+            this.logInfo("ecExchangeRequest observe: Host does not match, theirs: " + theirHost + " mine: " + myHost);
             return;
         }
 
         let internalChannel = channel.QueryInterface(Ci.nsIHttpChannelInternal);
         if (internalChannel.blockAuthPrompt) {
-            this.logInfo("unblocking request");
+            this.logInfo("ecExchangeRequest observe: unblocking request");
             internalChannel.blockAuthPrompt = false;
         }
-        else
-            this.logInfo("Already unblocked");
+        else {
+            this.logInfo("ecExchangeRequest observe: already unblocked");
+        }
     },
 
     get debug() {

From c79bc3f55c9ec77c1e1d8506943a3d9c2228e439 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 16:07:51 +0100
Subject: [PATCH 144/222] addressbook: move files according to the new code
 tree structure

---
 .../chrome => addressbook}/content/abCardOverlay.js |   0
 .../content/abCardOverlay.xul                       |   0
 .../content/addressbookOverlay.css                  |   0
 .../content/addressbookOverlay.js                   |   0
 .../content/addressbookOverlay.xul                  |   0
 .../content/button-addcontact.22x22.png             | Bin
 .../content/button-addcontact.png                   | Bin
 .../content/button-deletecontact.22x22.png          | Bin
 .../content/error-loading-from-server.png           | Bin
 .../content/exchangeContactSettings.js              |   0
 .../content/exchangeContactSettings.xul             |   0
 .../content/exchangeContactsInit.js                 |   0
 .../content/exchangeContactsInit.xul                |   0
 .../content/exchangecontacts.png                    | Bin
 .../content/loading-from-server.png                 | Bin
 .../exchangeAddressBook.manifest                    |   0
 .../interface}/exchangeAbCard/mivExchangeAbCard.idl |   0
 .../interface}/exchangeAbCard/mivExchangeAbCard.js  |   0
 .../exchangeAbCard/mivExchangeAbCard.manifest       |   0
 .../interface}/exchangeAbCard/mivExchangeAbCard.xpt | Bin
 .../exchangeAbDirFactory/exchangeAbDirFactory.idl   |   0
 .../exchangeAbDirFactory/exchangeAbDirFactory.js    |   0
 .../exchangeAbDirFactory.manifest                   |   0
 .../exchangeAbDirFactory/exchangeAbDirFactory.xpt   | Bin
 .../exchangeAbDistListDirectory.idl                 |   0
 .../exchangeAbDistListDirectory.js                  |   0
 .../exchangeAbDistListDirectory.manifest            |   0
 .../exchangeAbDistListDirectory.xpt                 | Bin
 .../exchangeAbFolderDirectory.idl                   |   0
 .../exchangeAbFolderDirectory.js                    |   0
 .../exchangeAbFolderDirectory.manifest              |   0
 .../exchangeAbFolderDirectory.xpt                   | Bin
 .../exchangeAbRootDirectory.idl                     |   0
 .../exchangeAbRootDirectory.js                      |   0
 .../exchangeAbRootDirectory.manifest                |   0
 .../exchangeAbRootDirectory.xpt                     | Bin
 .../locale}/de/ExchangeContacts.properties          |   0
 .../locale}/de/ExchangeDistLists.properties         |   0
 .../locale}/de/addressbookOverlay.dtd               |   0
 .../locale}/de/exchangeContactSettings.dtd          |   0
 .../locale}/en/ExchangeContacts.properties          |   0
 .../locale}/en/ExchangeDistLists.properties         |   0
 .../locale}/en/addressbookOverlay.dtd               |   0
 .../locale}/en/exchangeContactSettings.dtd          |   0
 .../locale}/en_US/ExchangeContacts.properties       |   0
 .../locale}/en_US/ExchangeDistLists.properties      |   0
 .../locale}/en_US/addressbookOverlay.dtd            |   0
 .../locale}/en_US/exchangeContactSettings.dtd       |   0
 .../locale}/fr_FR/ExchangeContacts.properties       |   0
 .../locale}/fr_FR/ExchangeDistLists.properties      |   0
 .../locale}/fr_FR/addressbookOverlay.dtd            |   0
 .../locale}/fr_FR/exchangeContactSettings.dtd       |   0
 .../locale}/ja_JP/ExchangeContacts.properties       |   0
 .../locale}/ja_JP/ExchangeDistLists.properties      |   0
 .../locale}/ja_JP/addressbookOverlay.dtd            |   0
 .../locale}/ja_JP/exchangeContactSettings.dtd       |   0
 .../locale}/nl/ExchangeContacts.properties          |   0
 .../locale}/nl/ExchangeDistLists.properties         |   0
 .../locale}/nl/addressbookOverlay.dtd               |   0
 .../locale}/nl/exchangeContactSettings.dtd          |   0
 .../locale}/ru/ExchangeContacts.properties          |   0
 .../locale}/ru/ExchangeDistLists.properties         |   0
 .../locale}/ru/addressbookOverlay.dtd               |   0
 .../locale}/ru/exchangeContactSettings.dtd          |   0
 .../locale}/sv/ExchangeContacts.properties          |   0
 .../locale}/sv/ExchangeDistLists.properties         |   0
 .../locale}/sv/addressbookOverlay.dtd               |   0
 .../locale}/sv/exchangeContactSettings.dtd          |   0
 68 files changed, 0 insertions(+), 0 deletions(-)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/abCardOverlay.js (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/abCardOverlay.xul (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/addressbookOverlay.css (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/addressbookOverlay.js (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/addressbookOverlay.xul (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/button-addcontact.22x22.png (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/button-addcontact.png (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/button-deletecontact.22x22.png (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/error-loading-from-server.png (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/exchangeContactSettings.js (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/exchangeContactSettings.xul (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/exchangeContactsInit.js (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/exchangeContactsInit.xul (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/exchangecontacts.png (100%)
 rename {interfaces/exchangeAddressBook/chrome => addressbook}/content/loading-from-server.png (100%)
 rename {interfaces/exchangeAddressBook => addressbook}/exchangeAddressBook.manifest (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbCard/mivExchangeAbCard.idl (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbCard/mivExchangeAbCard.js (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbCard/mivExchangeAbCard.manifest (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbCard/mivExchangeAbCard.xpt (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDirFactory/exchangeAbDirFactory.idl (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDirFactory/exchangeAbDirFactory.js (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDirFactory/exchangeAbDirFactory.manifest (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDirFactory/exchangeAbDirFactory.xpt (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDistListDirectory/exchangeAbDistListDirectory.idl (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbDistListDirectory/exchangeAbDistListDirectory.xpt (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbFolderDirectory/exchangeAbFolderDirectory.idl (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbFolderDirectory/exchangeAbFolderDirectory.xpt (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbRootDirectory/exchangeAbRootDirectory.idl (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbRootDirectory/exchangeAbRootDirectory.js (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest (100%)
 rename {interfaces/exchangeAddressBook => addressbook/interface}/exchangeAbRootDirectory/exchangeAbRootDirectory.xpt (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/de/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/de/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/de/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/de/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en_US/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en_US/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en_US/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/en_US/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/fr_FR/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/fr_FR/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/fr_FR/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/fr_FR/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ja_JP/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ja_JP/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ja_JP/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ja_JP/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/nl/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/nl/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/nl/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/nl/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ru/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ru/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ru/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/ru/exchangeContactSettings.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/sv/ExchangeContacts.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/sv/ExchangeDistLists.properties (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/sv/addressbookOverlay.dtd (100%)
 rename {interfaces/exchangeAddressBook/locale/exchangecontacts => addressbook/locale}/sv/exchangeContactSettings.dtd (100%)

diff --git a/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js b/addressbook/content/abCardOverlay.js
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js
rename to addressbook/content/abCardOverlay.js
diff --git a/interfaces/exchangeAddressBook/chrome/content/abCardOverlay.xul b/addressbook/content/abCardOverlay.xul
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/abCardOverlay.xul
rename to addressbook/content/abCardOverlay.xul
diff --git a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.css b/addressbook/content/addressbookOverlay.css
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.css
rename to addressbook/content/addressbookOverlay.css
diff --git a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js b/addressbook/content/addressbookOverlay.js
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js
rename to addressbook/content/addressbookOverlay.js
diff --git a/interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.xul b/addressbook/content/addressbookOverlay.xul
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.xul
rename to addressbook/content/addressbookOverlay.xul
diff --git a/interfaces/exchangeAddressBook/chrome/content/button-addcontact.22x22.png b/addressbook/content/button-addcontact.22x22.png
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/button-addcontact.22x22.png
rename to addressbook/content/button-addcontact.22x22.png
diff --git a/interfaces/exchangeAddressBook/chrome/content/button-addcontact.png b/addressbook/content/button-addcontact.png
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/button-addcontact.png
rename to addressbook/content/button-addcontact.png
diff --git a/interfaces/exchangeAddressBook/chrome/content/button-deletecontact.22x22.png b/addressbook/content/button-deletecontact.22x22.png
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/button-deletecontact.22x22.png
rename to addressbook/content/button-deletecontact.22x22.png
diff --git a/interfaces/exchangeAddressBook/chrome/content/error-loading-from-server.png b/addressbook/content/error-loading-from-server.png
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/error-loading-from-server.png
rename to addressbook/content/error-loading-from-server.png
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.js b/addressbook/content/exchangeContactSettings.js
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.js
rename to addressbook/content/exchangeContactSettings.js
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul b/addressbook/content/exchangeContactSettings.xul
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul
rename to addressbook/content/exchangeContactSettings.xul
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.js b/addressbook/content/exchangeContactsInit.js
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.js
rename to addressbook/content/exchangeContactsInit.js
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.xul b/addressbook/content/exchangeContactsInit.xul
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/exchangeContactsInit.xul
rename to addressbook/content/exchangeContactsInit.xul
diff --git a/interfaces/exchangeAddressBook/chrome/content/exchangecontacts.png b/addressbook/content/exchangecontacts.png
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/exchangecontacts.png
rename to addressbook/content/exchangecontacts.png
diff --git a/interfaces/exchangeAddressBook/chrome/content/loading-from-server.png b/addressbook/content/loading-from-server.png
similarity index 100%
rename from interfaces/exchangeAddressBook/chrome/content/loading-from-server.png
rename to addressbook/content/loading-from-server.png
diff --git a/interfaces/exchangeAddressBook/exchangeAddressBook.manifest b/addressbook/exchangeAddressBook.manifest
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAddressBook.manifest
rename to addressbook/exchangeAddressBook.manifest
diff --git a/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.idl b/addressbook/interface/exchangeAbCard/mivExchangeAbCard.idl
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.idl
rename to addressbook/interface/exchangeAbCard/mivExchangeAbCard.idl
diff --git a/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.js b/addressbook/interface/exchangeAbCard/mivExchangeAbCard.js
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.js
rename to addressbook/interface/exchangeAbCard/mivExchangeAbCard.js
diff --git a/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.manifest b/addressbook/interface/exchangeAbCard/mivExchangeAbCard.manifest
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.manifest
rename to addressbook/interface/exchangeAbCard/mivExchangeAbCard.manifest
diff --git a/interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.xpt b/addressbook/interface/exchangeAbCard/mivExchangeAbCard.xpt
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbCard/mivExchangeAbCard.xpt
rename to addressbook/interface/exchangeAbCard/mivExchangeAbCard.xpt
diff --git a/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.idl b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.idl
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.idl
rename to addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.idl
diff --git a/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.js b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.js
rename to addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
diff --git a/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.manifest b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.manifest
rename to addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
diff --git a/interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.xpt b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.xpt
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDirFactory/exchangeAbDirFactory.xpt
rename to addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.xpt
diff --git a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.idl b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.idl
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.idl
rename to addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.idl
diff --git a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
rename to addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
diff --git a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
rename to addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
diff --git a/interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.xpt b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.xpt
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbDistListDirectory/exchangeAbDistListDirectory.xpt
rename to addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.xpt
diff --git a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.idl b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.idl
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.idl
rename to addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.idl
diff --git a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
rename to addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
diff --git a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
rename to addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
diff --git a/interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.xpt b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.xpt
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbFolderDirectory/exchangeAbFolderDirectory.xpt
rename to addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.xpt
diff --git a/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.idl b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.idl
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.idl
rename to addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.idl
diff --git a/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.js b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.js
rename to addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
diff --git a/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
rename to addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
diff --git a/interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.xpt b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.xpt
similarity index 100%
rename from interfaces/exchangeAddressBook/exchangeAbRootDirectory/exchangeAbRootDirectory.xpt
rename to addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.xpt
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/de/ExchangeContacts.properties b/addressbook/locale/de/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/de/ExchangeContacts.properties
rename to addressbook/locale/de/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/de/ExchangeDistLists.properties b/addressbook/locale/de/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/de/ExchangeDistLists.properties
rename to addressbook/locale/de/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/de/addressbookOverlay.dtd b/addressbook/locale/de/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/de/addressbookOverlay.dtd
rename to addressbook/locale/de/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/de/exchangeContactSettings.dtd b/addressbook/locale/de/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/de/exchangeContactSettings.dtd
rename to addressbook/locale/de/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties b/addressbook/locale/en/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
rename to addressbook/locale/en/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties b/addressbook/locale/en/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
rename to addressbook/locale/en/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd b/addressbook/locale/en/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
rename to addressbook/locale/en/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd b/addressbook/locale/en/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
rename to addressbook/locale/en/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeContacts.properties b/addressbook/locale/en_US/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeContacts.properties
rename to addressbook/locale/en_US/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeDistLists.properties b/addressbook/locale/en_US/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/ExchangeDistLists.properties
rename to addressbook/locale/en_US/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/addressbookOverlay.dtd b/addressbook/locale/en_US/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/addressbookOverlay.dtd
rename to addressbook/locale/en_US/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/exchangeContactSettings.dtd b/addressbook/locale/en_US/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/en_US/exchangeContactSettings.dtd
rename to addressbook/locale/en_US/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeContacts.properties b/addressbook/locale/fr_FR/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeContacts.properties
rename to addressbook/locale/fr_FR/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeDistLists.properties b/addressbook/locale/fr_FR/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/ExchangeDistLists.properties
rename to addressbook/locale/fr_FR/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/addressbookOverlay.dtd b/addressbook/locale/fr_FR/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/addressbookOverlay.dtd
rename to addressbook/locale/fr_FR/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/exchangeContactSettings.dtd b/addressbook/locale/fr_FR/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/fr_FR/exchangeContactSettings.dtd
rename to addressbook/locale/fr_FR/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeContacts.properties b/addressbook/locale/ja_JP/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeContacts.properties
rename to addressbook/locale/ja_JP/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeDistLists.properties b/addressbook/locale/ja_JP/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/ExchangeDistLists.properties
rename to addressbook/locale/ja_JP/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/addressbookOverlay.dtd b/addressbook/locale/ja_JP/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/addressbookOverlay.dtd
rename to addressbook/locale/ja_JP/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/exchangeContactSettings.dtd b/addressbook/locale/ja_JP/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ja_JP/exchangeContactSettings.dtd
rename to addressbook/locale/ja_JP/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/nl/ExchangeContacts.properties b/addressbook/locale/nl/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/nl/ExchangeContacts.properties
rename to addressbook/locale/nl/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/nl/ExchangeDistLists.properties b/addressbook/locale/nl/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/nl/ExchangeDistLists.properties
rename to addressbook/locale/nl/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/nl/addressbookOverlay.dtd b/addressbook/locale/nl/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/nl/addressbookOverlay.dtd
rename to addressbook/locale/nl/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/nl/exchangeContactSettings.dtd b/addressbook/locale/nl/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/nl/exchangeContactSettings.dtd
rename to addressbook/locale/nl/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ru/ExchangeContacts.properties b/addressbook/locale/ru/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ru/ExchangeContacts.properties
rename to addressbook/locale/ru/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ru/ExchangeDistLists.properties b/addressbook/locale/ru/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ru/ExchangeDistLists.properties
rename to addressbook/locale/ru/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ru/addressbookOverlay.dtd b/addressbook/locale/ru/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ru/addressbookOverlay.dtd
rename to addressbook/locale/ru/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/ru/exchangeContactSettings.dtd b/addressbook/locale/ru/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/ru/exchangeContactSettings.dtd
rename to addressbook/locale/ru/exchangeContactSettings.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/sv/ExchangeContacts.properties b/addressbook/locale/sv/ExchangeContacts.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/sv/ExchangeContacts.properties
rename to addressbook/locale/sv/ExchangeContacts.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/sv/ExchangeDistLists.properties b/addressbook/locale/sv/ExchangeDistLists.properties
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/sv/ExchangeDistLists.properties
rename to addressbook/locale/sv/ExchangeDistLists.properties
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/sv/addressbookOverlay.dtd b/addressbook/locale/sv/addressbookOverlay.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/sv/addressbookOverlay.dtd
rename to addressbook/locale/sv/addressbookOverlay.dtd
diff --git a/interfaces/exchangeAddressBook/locale/exchangecontacts/sv/exchangeContactSettings.dtd b/addressbook/locale/sv/exchangeContactSettings.dtd
similarity index 100%
rename from interfaces/exchangeAddressBook/locale/exchangecontacts/sv/exchangeContactSettings.dtd
rename to addressbook/locale/sv/exchangeContactSettings.dtd

From ed8f0ce425ae1bb66825ba40f35e359c0a764ada Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 16:56:45 +0100
Subject: [PATCH 145/222] addressbook: move Exchange API JS implementation
 according to the Cu.import() ressource lines in addressbook/interface

---
 {components => addressbook/exchangeapi}/erExpandDL.js           | 0
 {components => addressbook/exchangeapi}/erFindContacts.js       | 0
 {components => addressbook/exchangeapi}/erGetContacts.js        | 0
 {components => addressbook/exchangeapi}/erResolveNames.js       | 0
 {components => addressbook/exchangeapi}/erSyncContactsFolder.js | 0
 {components => addressbook/exchangeapi}/exchangeAbFunctions.js  | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename {components => addressbook/exchangeapi}/erExpandDL.js (100%)
 rename {components => addressbook/exchangeapi}/erFindContacts.js (100%)
 rename {components => addressbook/exchangeapi}/erGetContacts.js (100%)
 rename {components => addressbook/exchangeapi}/erResolveNames.js (100%)
 rename {components => addressbook/exchangeapi}/erSyncContactsFolder.js (100%)
 rename {components => addressbook/exchangeapi}/exchangeAbFunctions.js (100%)

diff --git a/components/erExpandDL.js b/addressbook/exchangeapi/erExpandDL.js
similarity index 100%
rename from components/erExpandDL.js
rename to addressbook/exchangeapi/erExpandDL.js
diff --git a/components/erFindContacts.js b/addressbook/exchangeapi/erFindContacts.js
similarity index 100%
rename from components/erFindContacts.js
rename to addressbook/exchangeapi/erFindContacts.js
diff --git a/components/erGetContacts.js b/addressbook/exchangeapi/erGetContacts.js
similarity index 100%
rename from components/erGetContacts.js
rename to addressbook/exchangeapi/erGetContacts.js
diff --git a/components/erResolveNames.js b/addressbook/exchangeapi/erResolveNames.js
similarity index 100%
rename from components/erResolveNames.js
rename to addressbook/exchangeapi/erResolveNames.js
diff --git a/components/erSyncContactsFolder.js b/addressbook/exchangeapi/erSyncContactsFolder.js
similarity index 100%
rename from components/erSyncContactsFolder.js
rename to addressbook/exchangeapi/erSyncContactsFolder.js
diff --git a/components/exchangeAbFunctions.js b/addressbook/exchangeapi/exchangeAbFunctions.js
similarity index 100%
rename from components/exchangeAbFunctions.js
rename to addressbook/exchangeapi/exchangeAbFunctions.js

From 06a2e7d02ad844af809c9313f4f16b96fff4131e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 16:58:50 +0100
Subject: [PATCH 146/222] addressbook: move exchangeAutoCompleteResult to
 addressbook interfaces as the idl definition file directly depends on 
 mivExchangeAbCard.idl

---
 .../mivExchangeAutoCompleteResult.idl               |   0
 .../mivExchangeAutoCompleteResult.js                |   0
 .../mivExchangeAutoCompleteResult.manifest          |   0
 .../mivExchangeAutoCompleteResult.xpt               | Bin
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.idl (100%)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js (100%)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest (100%)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.xpt (100%)

diff --git a/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.idl b/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.idl
similarity index 100%
rename from interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.idl
rename to addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.idl
diff --git a/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js b/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
similarity index 100%
rename from interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
rename to addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
diff --git a/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest b/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
similarity index 100%
rename from interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
rename to addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
diff --git a/interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.xpt b/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.xpt
similarity index 100%
rename from interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.xpt
rename to addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.xpt

From f1fac9cf62a309b98ff3bdbdfbfce6548106c357 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 16:09:39 +0100
Subject: [PATCH 147/222] addressbook: update reference in main chrome.manifest

---
 chrome.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome.manifest b/chrome.manifest
index 91434d6c..7a7d8713 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -77,7 +77,7 @@ manifest interfaces/exchangeBaseItem/mivExchangeBaseItem.manifest
 manifest interfaces/exchangeEvent/mivExchangeEvent.manifest
 manifest interfaces/exchangeTodo/mivExchangeTodo.manifest
 
-manifest interfaces/exchangeAddressBook/exchangeAddressBook.manifest
+manifest addressbook/exchangeAddressBook.manifest
 
 manifest interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 manifest interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest

From ba125f4bd32e45791a5d132fe02bfa3cabf13f12 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 16:12:09 +0100
Subject: [PATCH 148/222] addressbook: update chrome.manifest in addressbook
 directory

---
 addressbook/exchangeAddressBook.manifest | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/addressbook/exchangeAddressBook.manifest b/addressbook/exchangeAddressBook.manifest
index f9eae155..bd78ef0f 100644
--- a/addressbook/exchangeAddressBook.manifest
+++ b/addressbook/exchangeAddressBook.manifest
@@ -1,21 +1,21 @@
-content exchangecontacts chrome/content/
+content exchangecontacts content/
 
-overlay chrome://messenger/content/messenger.xul               chrome://exchangecontacts/content/exchangeContactsInit.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangecontacts/content/exchangeContactsInit.xul
 overlay chrome://messenger/content/addressbook/addressbook.xul chrome://exchangecontacts/content/addressbookOverlay.xul
 overlay chrome://messenger/content/addressbook/abCardOverlay.xul chrome://exchangecontacts/content/abCardOverlay.xul
 
-manifest exchangeAbCard/mivExchangeAbCard.manifest
-manifest exchangeAbDirFactory/exchangeAbDirFactory.manifest
-manifest exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
-manifest exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
-manifest exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
+manifest interface/exchangeAbCard/mivExchangeAbCard.manifest
+manifest interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
+manifest interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
+manifest interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
+manifest interface/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
 
-locale exchangecontacts en    locale/exchangecontacts/en/
+locale exchangecontacts en    locale/en/
 
-locale exchangecontacts de    locale/exchangecontacts/de/
-locale exchangecontacts en-US locale/exchangecontacts/en_US/
-locale exchangecontacts fr-FR locale/exchangecontacts/fr_FR/
-locale exchangecontacts ja-JP locale/exchangecontacts/ja_JP/
-locale exchangecontacts nl    locale/exchangecontacts/nl/
-locale exchangecontacts ru    locale/exchangecontacts/ru/
-locale exchangecontacts sv    locale/exchangecontacts/sv/
+locale exchangecontacts de    locale/de/
+locale exchangecontacts en-US locale/en_US/
+locale exchangecontacts fr-FR locale/fr_FR/
+locale exchangecontacts ja-JP locale/ja_JP/
+locale exchangecontacts nl    locale/nl/
+locale exchangecontacts ru    locale/ru/
+locale exchangecontacts sv    locale/sv/

From 8580320a841a3e01059c512443a3186f6ca9e749 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 16:14:30 +0100
Subject: [PATCH 149/222] addressbook: update Transifex configuration

---
 .tx/config | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.tx/config b/.tx/config
index 7f48efbf..488fd346 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,26 +2,26 @@
 host = https://www.transifex.com
 
 [exchangecalendar.addressbook-addressbookOverlay]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/addressbookOverlay.dtd
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
+file_filter = addressbook/locale/<lang>/addressbookOverlay.dtd
+source_file = addressbook/locale/en/addressbookOverlay.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.addressbook-exchangeContactSettings]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/exchangeContactSettings.dtd
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
+file_filter = addressbook/locale/<lang>/exchangeContactSettings.dtd
+source_file = addressbook/locale/en/exchangeContactSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.addressbook-ExchangeContacts]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/ExchangeContacts.properties
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
+file_filter = addressbook/locale/<lang>/ExchangeContacts.properties
+source_file = addressbook/locale/en/ExchangeContacts.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.addressbook-ExchangeDistLists]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/ExchangeDistLists.properties
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
+file_filter = addressbook/locale/<lang>/ExchangeDistLists.properties
+source_file = addressbook/locale/en/ExchangeDistLists.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 

From be9d9197e14e5745459b16df804f12c00136a767 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 17:01:28 +0100
Subject: [PATCH 150/222] addressbook: add exchangeAutoCompleteSearch to
 addressbook interface as it imports exchangeAbFunctions.js and it runs GAL
 (Global Address List) search

---
 .../mivExchangeAutoCompleteSearch.idl               |   0
 .../mivExchangeAutoCompleteSearch.js                |   0
 .../mivExchangeAutoCompleteSearch.manifest          |   0
 .../mivExchangeAutoCompleteSearch.xpt               | Bin
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.idl (100%)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js (100%)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest (100%)
 rename {interfaces => addressbook/interface}/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.xpt (100%)

diff --git a/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.idl b/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.idl
similarity index 100%
rename from interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.idl
rename to addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.idl
diff --git a/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js b/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
similarity index 100%
rename from interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
rename to addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
diff --git a/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest b/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
similarity index 100%
rename from interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
rename to addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
diff --git a/interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.xpt b/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.xpt
similarity index 100%
rename from interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.xpt
rename to addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.xpt

From e9acaf4fab5f5792c91e8cf92faaf53d88a95f40 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 17:04:56 +0100
Subject: [PATCH 151/222] addressbook: move GAL search from main
 chrome.manifest to addressbook manifest

---
 addressbook/exchangeAddressBook.manifest | 2 ++
 chrome.manifest                          | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addressbook/exchangeAddressBook.manifest b/addressbook/exchangeAddressBook.manifest
index bd78ef0f..783f9623 100644
--- a/addressbook/exchangeAddressBook.manifest
+++ b/addressbook/exchangeAddressBook.manifest
@@ -9,6 +9,8 @@ manifest interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
 manifest interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
 manifest interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
 manifest interface/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
+manifest interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
+manifest interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
 
 locale exchangecontacts en    locale/en/
 
diff --git a/chrome.manifest b/chrome.manifest
index 7a7d8713..321b67e7 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -82,6 +82,3 @@ manifest addressbook/exchangeAddressBook.manifest
 manifest interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 manifest interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
 
-manifest interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
-manifest interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
-

From e57868c5ffcd7879f3c55cd0cf275f46ddce0a5c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 20:59:04 +0100
Subject: [PATCH 152/222] addressbook: reference addressbook/exchangeapi inside
 the addressbook manifest

Manifest files can create only one reference by namespace, so I had to use another namespace than exchangecalendar.
To keep it simple, I've decided to use exchangeaddress namespace so the user can directly that's related to our Exchange plugin and to the addressbook part
---
 addressbook/content/abCardOverlay.js               |  2 +-
 addressbook/content/addressbookOverlay.js          |  2 +-
 addressbook/exchangeAddressBook.manifest           |  2 ++
 .../exchangeAbDirFactory/exchangeAbDirFactory.js   |  2 +-
 .../exchangeAbDistListDirectory.js                 | 12 ++++++------
 .../exchangeAbFolderDirectory.js                   | 14 +++++++-------
 .../exchangeAbRootDirectory.js                     |  2 +-
 .../mivExchangeAutoCompleteSearch.js               |  2 +-
 8 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/addressbook/content/abCardOverlay.js b/addressbook/content/abCardOverlay.js
index a14eea12..92fd8e20 100644
--- a/addressbook/content/abCardOverlay.js
+++ b/addressbook/content/abCardOverlay.js
@@ -32,7 +32,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/mailServices.js");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 Cu.import("resource://exchangecalendar/erGetAttachments.js");
 
 var photoHandlerInline = {
diff --git a/addressbook/content/addressbookOverlay.js b/addressbook/content/addressbookOverlay.js
index ad5fec4e..de9697c0 100644
--- a/addressbook/content/addressbookOverlay.js
+++ b/addressbook/content/addressbookOverlay.js
@@ -32,7 +32,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/mailServices.js");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 Cu.import("resource://exchangecalendar/erGetAttachments.js");
 
 function exchAddressbookOverlay(aDocument, aWindow) {
diff --git a/addressbook/exchangeAddressBook.manifest b/addressbook/exchangeAddressBook.manifest
index 783f9623..5ec2af32 100644
--- a/addressbook/exchangeAddressBook.manifest
+++ b/addressbook/exchangeAddressBook.manifest
@@ -4,6 +4,8 @@ overlay chrome://messenger/content/messenger.xul chrome://exchangecontacts/conte
 overlay chrome://messenger/content/addressbook/addressbook.xul chrome://exchangecontacts/content/addressbookOverlay.xul
 overlay chrome://messenger/content/addressbook/abCardOverlay.xul chrome://exchangecontacts/content/abCardOverlay.xul
 
+resource exchangeaddress exchangeapi/
+
 manifest interface/exchangeAbCard/mivExchangeAbCard.manifest
 manifest interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
 manifest interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
diff --git a/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
index c945fa92..79a93bd6 100644
--- a/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
+++ b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
@@ -32,7 +32,7 @@ Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
 
 Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 
 
 function exchangeAbDirFactory() {}
diff --git a/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
index 38a70183..d548ff87 100644
--- a/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
+++ b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
@@ -35,13 +35,13 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
 
-Cu.import("resource://exchangecalendar/erFindContacts.js");
-Cu.import("resource://exchangecalendar/erGetContacts.js");
-Cu.import("resource://exchangecalendar/erSyncContactsFolder.js");
-Cu.import("resource://exchangecalendar/erExpandDL.js");
-Cu.import("resource://exchangecalendar/erResolveNames.js");
+Cu.import("resource://exchangeaddress/erFindContacts.js");
+Cu.import("resource://exchangeaddress/erGetContacts.js");
+Cu.import("resource://exchangeaddress/erSyncContactsFolder.js");
+Cu.import("resource://exchangeaddress/erExpandDL.js");
+Cu.import("resource://exchangeaddress/erResolveNames.js");
 
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 
 const nsIAP = Ci.nsIActivityProcess;
 const nsIAE = Ci.nsIActivityEvent;
diff --git a/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
index 75b895ff..d81e66a0 100644
--- a/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
+++ b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
@@ -35,15 +35,15 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
 
-Cu.import("resource://exchangecalendar/erFindContacts.js");
-Cu.import("resource://exchangecalendar/erGetContacts.js");
-Cu.import("resource://exchangecalendar/erSyncContactsFolder.js");
-Cu.import("resource://exchangecalendar/erExpandDL.js");
-Cu.import("resource://exchangecalendar/erResolveNames.js");
+Cu.import("resource://exchangeaddress/erFindContacts.js");
+Cu.import("resource://exchangeaddress/erGetContacts.js");
+Cu.import("resource://exchangeaddress/erSyncContactsFolder.js");
+Cu.import("resource://exchangeaddress/erExpandDL.js");
+Cu.import("resource://exchangeaddress/erResolveNames.js");
 
-//Cu.import("resource://exchangecalendar/exchangeAbDistListDirectory.js");
+//Cu.import("resource://exchangeaddress/exchangeAbDistListDirectory.js");
 
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 
 const nsIAP = Ci.nsIActivityProcess;
 const nsIAE = Ci.nsIActivityEvent;
diff --git a/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
index a145f3f0..897bc22e 100644
--- a/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
+++ b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
@@ -35,7 +35,7 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
 
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 
 //
 // exchangeAbRootDirectory
diff --git a/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js b/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
index 41b87916..fb56ac7d 100644
--- a/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
+++ b/addressbook/interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource:///modules/mailServices.js");
 
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 
 function mivExchangeAutoCompleteSearch() {
 

From 9351261ccb9ec71b509418ac14b98b9571dfd513 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 21:21:04 +0100
Subject: [PATCH 153/222] theme: move all files related to theming inside the
 main sub-directory theme

---
 .../common/addressingWidgetOverlay.css              |   0
 {chrome/skins => theme}/common/browseFolder.css     |   0
 .../common/calendar-calendars-list.css              |   0
 .../common/calendar-event-dialog-attendees.css      |   0
 .../common/calendar-summary-dialog.css              |   0
 {chrome/skins => theme}/common/delegateCalendar.css |   0
 .../skins => theme}/common/exchWebServiceEditor.css |   0
 .../skins => theme}/common/extras-preferences.css   |   0
 .../common/images/Fugue Icons README.txt            |   0
 {chrome/skins => theme}/common/images/accepted.png  | Bin
 .../skins => theme}/common/images/address-book.png  | Bin
 .../common/images/arrow-circle-135.png              | Bin
 .../common/images/arrow-circle-225.png              | Bin
 .../common/images/arrow-circle-315.png              | Bin
 .../skins => theme}/common/images/arrow-circle.png  | Bin
 .../common/images/asterisk-small-yellow.png         | Bin
 {chrome/skins => theme}/common/images/blog.png      | Bin
 .../common/images/calendar-month.png                | Bin
 {chrome/skins => theme}/common/images/cancelled.png | Bin
 .../skins => theme}/common/images/certificate.png   | Bin
 .../skins => theme}/common/images/chain--minus.png  | Bin
 .../skins => theme}/common/images/chain--pencil.png | Bin
 .../skins => theme}/common/images/chain--plus.png   | Bin
 {chrome/skins => theme}/common/images/cross.png     | Bin
 {chrome/skins => theme}/common/images/declined.png  | Bin
 .../common/images/document--exclamation.png         | Bin
 .../common/images/document-binary.png               | Bin
 .../common/images/document-excel-csv.png            | Bin
 .../common/images/document-excel.png                | Bin
 .../common/images/document-flash-movie.png          | Bin
 .../common/images/document-image.png                | Bin
 .../common/images/document-office.png               | Bin
 .../skins => theme}/common/images/document-pdf.png  | Bin
 .../common/images/document-photoshop.png            | Bin
 .../skins => theme}/common/images/document-php.png  | Bin
 .../common/images/document-powerpoint.png           | Bin
 .../skins => theme}/common/images/document-tex.png  | Bin
 .../skins => theme}/common/images/document-text.png | Bin
 .../skins => theme}/common/images/document-word.png | Bin
 .../common/images/edit-alignment-center.png         | Bin
 .../common/images/edit-alignment-justify.png        | Bin
 .../common/images/edit-alignment-right.png          | Bin
 .../common/images/edit-alignment.png                | Bin
 {chrome/skins => theme}/common/images/edit-bold.png | Bin
 .../skins => theme}/common/images/edit-color.png    | Bin
 .../skins => theme}/common/images/edit-indent.png   | Bin
 .../skins => theme}/common/images/edit-italic.png   | Bin
 .../common/images/edit-list-order.png               | Bin
 {chrome/skins => theme}/common/images/edit-list.png | Bin
 .../skins => theme}/common/images/edit-outdent.png  | Bin
 .../common/images/edit-size-down.png                | Bin
 .../skins => theme}/common/images/edit-size-up.png  | Bin
 .../common/images/edit-underline.png                | Bin
 .../common/images/exchange-addrbook.png             | Bin
 .../skins => theme}/common/images/extra-icon.png    | Bin
 {chrome/skins => theme}/common/images/feed.png      | Bin
 .../skins => theme}/common/images/folder-open.png   | Bin
 {chrome/skins => theme}/common/images/folder.png    | Bin
 {chrome/skins => theme}/common/images/high.gif      | Bin
 {chrome/skins => theme}/common/images/highest.gif   | Bin
 {chrome/skins => theme}/common/images/invited.png   | Bin
 .../common/images/lightningexchangecalendar.png     | Bin
 {chrome/skins => theme}/common/images/low.gif       | Bin
 {chrome/skins => theme}/common/images/lowest.gif    | Bin
 {chrome/skins => theme}/common/images/mail.png      | Bin
 .../skins => theme}/common/images/notify-icon.png   | Bin
 .../skins => theme}/common/images/plug-connect.png  | Bin
 .../common/images/plug-disconnect-prohibition.png   | Bin
 {chrome/skins => theme}/common/images/scissors.png  | Bin
 .../skins => theme}/common/images/sticky-notes.png  | Bin
 {chrome/skins => theme}/common/images/task.png      | Bin
 {chrome/skins => theme}/common/images/tentative.png | Bin
 .../common/images/threadCol-PriorityIcon.gif        | Bin
 .../common/images/threadcol-invite.gif              | Bin
 {chrome/skins => theme}/common/images/tick.png      | Bin
 {chrome/skins => theme}/common/images/updated.png   | Bin
 .../skins => theme}/common/images/view-refresh.png  | Bin
 .../common/images/wrench-screwdriver.png            | Bin
 {chrome/skins => theme}/common/invite-style.css     |   0
 {chrome/skins => theme}/common/itemBodyEditor.css   |   0
 .../skins => theme}/common/manageEWSAccounts.css    |   0
 {chrome/skins => theme}/common/oofSettings.css      |   0
 {chrome/skins => theme}/common/preferences.css      |   0
 {chrome/skins => theme}/common/priority-display.css |   0
 {chrome/skins => theme}/common/progress_panel.css   |   0
 .../skins => theme}/common/sharedCalendarParser.css |   0
 .../skins => theme}/mac/addressingWidgetOverlay.css |   0
 {chrome/skins => theme}/mac/attachments-view.css    |   0
 {chrome/skins => theme}/mac/browseFolder.css        |   0
 .../skins => theme}/mac/calendar-calendars-list.css |   0
 .../mac/calendar-event-dialog-attendees.css         |   0
 .../skins => theme}/mac/calendar-summary-dialog.css |   0
 {chrome/skins => theme}/mac/delegateCalendar.css    |   0
 .../skins => theme}/mac/exchWebServiceEditor.css    |   0
 {chrome/skins => theme}/mac/extras-preferences.css  |   0
 {chrome/skins => theme}/mac/invite-style.css        |   0
 {chrome/skins => theme}/mac/itemBodyEditor.css      |   0
 {chrome/skins => theme}/mac/manageEWSAccounts.css   |   0
 {chrome/skins => theme}/mac/oofSettings.css         |   0
 {chrome/skins => theme}/mac/preferences.css         |   0
 {chrome/skins => theme}/mac/priority-display.css    |   0
 {chrome/skins => theme}/mac/progress_panel.css      |   0
 .../skins => theme}/mac/sharedCalendarParser.css    |   0
 .../unix/addressingWidgetOverlay.css                |   0
 {chrome/skins => theme}/unix/attachments-view.css   |   0
 {chrome/skins => theme}/unix/browseFolder.css       |   0
 .../unix/calendar-calendars-list.css                |   0
 .../unix/calendar-event-dialog-attendees.css        |   0
 .../unix/calendar-summary-dialog.css                |   0
 {chrome/skins => theme}/unix/delegateCalendar.css   |   0
 .../skins => theme}/unix/exchWebServiceEditor.css   |   0
 {chrome/skins => theme}/unix/extras-preferences.css |   0
 {chrome/skins => theme}/unix/invite-style.css       |   0
 {chrome/skins => theme}/unix/itemBodyEditor.css     |   0
 {chrome/skins => theme}/unix/manageEWSAccounts.css  |   0
 {chrome/skins => theme}/unix/oofSettings.css        |   0
 {chrome/skins => theme}/unix/preferences.css        |   0
 {chrome/skins => theme}/unix/priority-display.css   |   0
 {chrome/skins => theme}/unix/progress_panel.css     |   0
 .../skins => theme}/unix/sharedCalendarParser.css   |   0
 .../skins => theme}/win/addressingWidgetOverlay.css |   0
 {chrome/skins => theme}/win/attachments-view.css    |   0
 {chrome/skins => theme}/win/browseFolder.css        |   0
 .../skins => theme}/win/calendar-calendars-list.css |   0
 .../win/calendar-event-dialog-attendees.css         |   0
 .../skins => theme}/win/calendar-summary-dialog.css |   0
 {chrome/skins => theme}/win/delegateCalendar.css    |   0
 .../skins => theme}/win/exchWebServiceEditor.css    |   0
 {chrome/skins => theme}/win/extras-preferences.css  |   0
 {chrome/skins => theme}/win/invite-style.css        |   0
 {chrome/skins => theme}/win/itemBodyEditor.css      |   0
 {chrome/skins => theme}/win/manageEWSAccounts.css   |   0
 {chrome/skins => theme}/win/oofSettings.css         |   0
 {chrome/skins => theme}/win/preferences.css         |   0
 {chrome/skins => theme}/win/priority-display.css    |   0
 {chrome/skins => theme}/win/progress_panel.css      |   0
 .../skins => theme}/win/sharedCalendarParser.css    |   0
 .../winaero/addressingWidgetOverlay.css             |   0
 .../skins => theme}/winaero/attachments-view.css    |   0
 {chrome/skins => theme}/winaero/browseFolder.css    |   0
 .../winaero/calendar-calendars-list.css             |   0
 .../winaero/calendar-event-dialog-attendees.css     |   0
 .../winaero/calendar-summary-dialog.css             |   0
 .../skins => theme}/winaero/delegateCalendar.css    |   0
 .../winaero/exchWebServiceEditor.css                |   0
 .../skins => theme}/winaero/extras-preferences.css  |   0
 {chrome/skins => theme}/winaero/invite-style.css    |   0
 {chrome/skins => theme}/winaero/itemBodyEditor.css  |   0
 .../skins => theme}/winaero/manageEWSAccounts.css   |   0
 {chrome/skins => theme}/winaero/oofSettings.css     |   0
 {chrome/skins => theme}/winaero/preferences.css     |   0
 .../skins => theme}/winaero/priority-display.css    |   0
 {chrome/skins => theme}/winaero/progress_panel.css  |   0
 .../winaero/sharedCalendarParser.css                |   0
 154 files changed, 0 insertions(+), 0 deletions(-)
 rename {chrome/skins => theme}/common/addressingWidgetOverlay.css (100%)
 rename {chrome/skins => theme}/common/browseFolder.css (100%)
 rename {chrome/skins => theme}/common/calendar-calendars-list.css (100%)
 rename {chrome/skins => theme}/common/calendar-event-dialog-attendees.css (100%)
 rename {chrome/skins => theme}/common/calendar-summary-dialog.css (100%)
 rename {chrome/skins => theme}/common/delegateCalendar.css (100%)
 rename {chrome/skins => theme}/common/exchWebServiceEditor.css (100%)
 rename {chrome/skins => theme}/common/extras-preferences.css (100%)
 rename {chrome/skins => theme}/common/images/Fugue Icons README.txt (100%)
 rename {chrome/skins => theme}/common/images/accepted.png (100%)
 rename {chrome/skins => theme}/common/images/address-book.png (100%)
 rename {chrome/skins => theme}/common/images/arrow-circle-135.png (100%)
 rename {chrome/skins => theme}/common/images/arrow-circle-225.png (100%)
 rename {chrome/skins => theme}/common/images/arrow-circle-315.png (100%)
 rename {chrome/skins => theme}/common/images/arrow-circle.png (100%)
 rename {chrome/skins => theme}/common/images/asterisk-small-yellow.png (100%)
 rename {chrome/skins => theme}/common/images/blog.png (100%)
 rename {chrome/skins => theme}/common/images/calendar-month.png (100%)
 rename {chrome/skins => theme}/common/images/cancelled.png (100%)
 rename {chrome/skins => theme}/common/images/certificate.png (100%)
 rename {chrome/skins => theme}/common/images/chain--minus.png (100%)
 rename {chrome/skins => theme}/common/images/chain--pencil.png (100%)
 rename {chrome/skins => theme}/common/images/chain--plus.png (100%)
 rename {chrome/skins => theme}/common/images/cross.png (100%)
 rename {chrome/skins => theme}/common/images/declined.png (100%)
 rename {chrome/skins => theme}/common/images/document--exclamation.png (100%)
 rename {chrome/skins => theme}/common/images/document-binary.png (100%)
 rename {chrome/skins => theme}/common/images/document-excel-csv.png (100%)
 rename {chrome/skins => theme}/common/images/document-excel.png (100%)
 rename {chrome/skins => theme}/common/images/document-flash-movie.png (100%)
 rename {chrome/skins => theme}/common/images/document-image.png (100%)
 rename {chrome/skins => theme}/common/images/document-office.png (100%)
 rename {chrome/skins => theme}/common/images/document-pdf.png (100%)
 rename {chrome/skins => theme}/common/images/document-photoshop.png (100%)
 rename {chrome/skins => theme}/common/images/document-php.png (100%)
 rename {chrome/skins => theme}/common/images/document-powerpoint.png (100%)
 rename {chrome/skins => theme}/common/images/document-tex.png (100%)
 rename {chrome/skins => theme}/common/images/document-text.png (100%)
 rename {chrome/skins => theme}/common/images/document-word.png (100%)
 rename {chrome/skins => theme}/common/images/edit-alignment-center.png (100%)
 rename {chrome/skins => theme}/common/images/edit-alignment-justify.png (100%)
 rename {chrome/skins => theme}/common/images/edit-alignment-right.png (100%)
 rename {chrome/skins => theme}/common/images/edit-alignment.png (100%)
 rename {chrome/skins => theme}/common/images/edit-bold.png (100%)
 rename {chrome/skins => theme}/common/images/edit-color.png (100%)
 rename {chrome/skins => theme}/common/images/edit-indent.png (100%)
 rename {chrome/skins => theme}/common/images/edit-italic.png (100%)
 rename {chrome/skins => theme}/common/images/edit-list-order.png (100%)
 rename {chrome/skins => theme}/common/images/edit-list.png (100%)
 rename {chrome/skins => theme}/common/images/edit-outdent.png (100%)
 rename {chrome/skins => theme}/common/images/edit-size-down.png (100%)
 rename {chrome/skins => theme}/common/images/edit-size-up.png (100%)
 rename {chrome/skins => theme}/common/images/edit-underline.png (100%)
 rename {chrome/skins => theme}/common/images/exchange-addrbook.png (100%)
 rename {chrome/skins => theme}/common/images/extra-icon.png (100%)
 rename {chrome/skins => theme}/common/images/feed.png (100%)
 rename {chrome/skins => theme}/common/images/folder-open.png (100%)
 rename {chrome/skins => theme}/common/images/folder.png (100%)
 rename {chrome/skins => theme}/common/images/high.gif (100%)
 rename {chrome/skins => theme}/common/images/highest.gif (100%)
 rename {chrome/skins => theme}/common/images/invited.png (100%)
 rename {chrome/skins => theme}/common/images/lightningexchangecalendar.png (100%)
 rename {chrome/skins => theme}/common/images/low.gif (100%)
 rename {chrome/skins => theme}/common/images/lowest.gif (100%)
 rename {chrome/skins => theme}/common/images/mail.png (100%)
 rename {chrome/skins => theme}/common/images/notify-icon.png (100%)
 rename {chrome/skins => theme}/common/images/plug-connect.png (100%)
 rename {chrome/skins => theme}/common/images/plug-disconnect-prohibition.png (100%)
 rename {chrome/skins => theme}/common/images/scissors.png (100%)
 rename {chrome/skins => theme}/common/images/sticky-notes.png (100%)
 rename {chrome/skins => theme}/common/images/task.png (100%)
 rename {chrome/skins => theme}/common/images/tentative.png (100%)
 rename {chrome/skins => theme}/common/images/threadCol-PriorityIcon.gif (100%)
 rename {chrome/skins => theme}/common/images/threadcol-invite.gif (100%)
 rename {chrome/skins => theme}/common/images/tick.png (100%)
 rename {chrome/skins => theme}/common/images/updated.png (100%)
 rename {chrome/skins => theme}/common/images/view-refresh.png (100%)
 rename {chrome/skins => theme}/common/images/wrench-screwdriver.png (100%)
 rename {chrome/skins => theme}/common/invite-style.css (100%)
 rename {chrome/skins => theme}/common/itemBodyEditor.css (100%)
 rename {chrome/skins => theme}/common/manageEWSAccounts.css (100%)
 rename {chrome/skins => theme}/common/oofSettings.css (100%)
 rename {chrome/skins => theme}/common/preferences.css (100%)
 rename {chrome/skins => theme}/common/priority-display.css (100%)
 rename {chrome/skins => theme}/common/progress_panel.css (100%)
 rename {chrome/skins => theme}/common/sharedCalendarParser.css (100%)
 rename {chrome/skins => theme}/mac/addressingWidgetOverlay.css (100%)
 rename {chrome/skins => theme}/mac/attachments-view.css (100%)
 rename {chrome/skins => theme}/mac/browseFolder.css (100%)
 rename {chrome/skins => theme}/mac/calendar-calendars-list.css (100%)
 rename {chrome/skins => theme}/mac/calendar-event-dialog-attendees.css (100%)
 rename {chrome/skins => theme}/mac/calendar-summary-dialog.css (100%)
 rename {chrome/skins => theme}/mac/delegateCalendar.css (100%)
 rename {chrome/skins => theme}/mac/exchWebServiceEditor.css (100%)
 rename {chrome/skins => theme}/mac/extras-preferences.css (100%)
 rename {chrome/skins => theme}/mac/invite-style.css (100%)
 rename {chrome/skins => theme}/mac/itemBodyEditor.css (100%)
 rename {chrome/skins => theme}/mac/manageEWSAccounts.css (100%)
 rename {chrome/skins => theme}/mac/oofSettings.css (100%)
 rename {chrome/skins => theme}/mac/preferences.css (100%)
 rename {chrome/skins => theme}/mac/priority-display.css (100%)
 rename {chrome/skins => theme}/mac/progress_panel.css (100%)
 rename {chrome/skins => theme}/mac/sharedCalendarParser.css (100%)
 rename {chrome/skins => theme}/unix/addressingWidgetOverlay.css (100%)
 rename {chrome/skins => theme}/unix/attachments-view.css (100%)
 rename {chrome/skins => theme}/unix/browseFolder.css (100%)
 rename {chrome/skins => theme}/unix/calendar-calendars-list.css (100%)
 rename {chrome/skins => theme}/unix/calendar-event-dialog-attendees.css (100%)
 rename {chrome/skins => theme}/unix/calendar-summary-dialog.css (100%)
 rename {chrome/skins => theme}/unix/delegateCalendar.css (100%)
 rename {chrome/skins => theme}/unix/exchWebServiceEditor.css (100%)
 rename {chrome/skins => theme}/unix/extras-preferences.css (100%)
 rename {chrome/skins => theme}/unix/invite-style.css (100%)
 rename {chrome/skins => theme}/unix/itemBodyEditor.css (100%)
 rename {chrome/skins => theme}/unix/manageEWSAccounts.css (100%)
 rename {chrome/skins => theme}/unix/oofSettings.css (100%)
 rename {chrome/skins => theme}/unix/preferences.css (100%)
 rename {chrome/skins => theme}/unix/priority-display.css (100%)
 rename {chrome/skins => theme}/unix/progress_panel.css (100%)
 rename {chrome/skins => theme}/unix/sharedCalendarParser.css (100%)
 rename {chrome/skins => theme}/win/addressingWidgetOverlay.css (100%)
 rename {chrome/skins => theme}/win/attachments-view.css (100%)
 rename {chrome/skins => theme}/win/browseFolder.css (100%)
 rename {chrome/skins => theme}/win/calendar-calendars-list.css (100%)
 rename {chrome/skins => theme}/win/calendar-event-dialog-attendees.css (100%)
 rename {chrome/skins => theme}/win/calendar-summary-dialog.css (100%)
 rename {chrome/skins => theme}/win/delegateCalendar.css (100%)
 rename {chrome/skins => theme}/win/exchWebServiceEditor.css (100%)
 rename {chrome/skins => theme}/win/extras-preferences.css (100%)
 rename {chrome/skins => theme}/win/invite-style.css (100%)
 rename {chrome/skins => theme}/win/itemBodyEditor.css (100%)
 rename {chrome/skins => theme}/win/manageEWSAccounts.css (100%)
 rename {chrome/skins => theme}/win/oofSettings.css (100%)
 rename {chrome/skins => theme}/win/preferences.css (100%)
 rename {chrome/skins => theme}/win/priority-display.css (100%)
 rename {chrome/skins => theme}/win/progress_panel.css (100%)
 rename {chrome/skins => theme}/win/sharedCalendarParser.css (100%)
 rename {chrome/skins => theme}/winaero/addressingWidgetOverlay.css (100%)
 rename {chrome/skins => theme}/winaero/attachments-view.css (100%)
 rename {chrome/skins => theme}/winaero/browseFolder.css (100%)
 rename {chrome/skins => theme}/winaero/calendar-calendars-list.css (100%)
 rename {chrome/skins => theme}/winaero/calendar-event-dialog-attendees.css (100%)
 rename {chrome/skins => theme}/winaero/calendar-summary-dialog.css (100%)
 rename {chrome/skins => theme}/winaero/delegateCalendar.css (100%)
 rename {chrome/skins => theme}/winaero/exchWebServiceEditor.css (100%)
 rename {chrome/skins => theme}/winaero/extras-preferences.css (100%)
 rename {chrome/skins => theme}/winaero/invite-style.css (100%)
 rename {chrome/skins => theme}/winaero/itemBodyEditor.css (100%)
 rename {chrome/skins => theme}/winaero/manageEWSAccounts.css (100%)
 rename {chrome/skins => theme}/winaero/oofSettings.css (100%)
 rename {chrome/skins => theme}/winaero/preferences.css (100%)
 rename {chrome/skins => theme}/winaero/priority-display.css (100%)
 rename {chrome/skins => theme}/winaero/progress_panel.css (100%)
 rename {chrome/skins => theme}/winaero/sharedCalendarParser.css (100%)

diff --git a/chrome/skins/common/addressingWidgetOverlay.css b/theme/common/addressingWidgetOverlay.css
similarity index 100%
rename from chrome/skins/common/addressingWidgetOverlay.css
rename to theme/common/addressingWidgetOverlay.css
diff --git a/chrome/skins/common/browseFolder.css b/theme/common/browseFolder.css
similarity index 100%
rename from chrome/skins/common/browseFolder.css
rename to theme/common/browseFolder.css
diff --git a/chrome/skins/common/calendar-calendars-list.css b/theme/common/calendar-calendars-list.css
similarity index 100%
rename from chrome/skins/common/calendar-calendars-list.css
rename to theme/common/calendar-calendars-list.css
diff --git a/chrome/skins/common/calendar-event-dialog-attendees.css b/theme/common/calendar-event-dialog-attendees.css
similarity index 100%
rename from chrome/skins/common/calendar-event-dialog-attendees.css
rename to theme/common/calendar-event-dialog-attendees.css
diff --git a/chrome/skins/common/calendar-summary-dialog.css b/theme/common/calendar-summary-dialog.css
similarity index 100%
rename from chrome/skins/common/calendar-summary-dialog.css
rename to theme/common/calendar-summary-dialog.css
diff --git a/chrome/skins/common/delegateCalendar.css b/theme/common/delegateCalendar.css
similarity index 100%
rename from chrome/skins/common/delegateCalendar.css
rename to theme/common/delegateCalendar.css
diff --git a/chrome/skins/common/exchWebServiceEditor.css b/theme/common/exchWebServiceEditor.css
similarity index 100%
rename from chrome/skins/common/exchWebServiceEditor.css
rename to theme/common/exchWebServiceEditor.css
diff --git a/chrome/skins/common/extras-preferences.css b/theme/common/extras-preferences.css
similarity index 100%
rename from chrome/skins/common/extras-preferences.css
rename to theme/common/extras-preferences.css
diff --git a/chrome/skins/common/images/Fugue Icons README.txt b/theme/common/images/Fugue Icons README.txt
similarity index 100%
rename from chrome/skins/common/images/Fugue Icons README.txt
rename to theme/common/images/Fugue Icons README.txt
diff --git a/chrome/skins/common/images/accepted.png b/theme/common/images/accepted.png
similarity index 100%
rename from chrome/skins/common/images/accepted.png
rename to theme/common/images/accepted.png
diff --git a/chrome/skins/common/images/address-book.png b/theme/common/images/address-book.png
similarity index 100%
rename from chrome/skins/common/images/address-book.png
rename to theme/common/images/address-book.png
diff --git a/chrome/skins/common/images/arrow-circle-135.png b/theme/common/images/arrow-circle-135.png
similarity index 100%
rename from chrome/skins/common/images/arrow-circle-135.png
rename to theme/common/images/arrow-circle-135.png
diff --git a/chrome/skins/common/images/arrow-circle-225.png b/theme/common/images/arrow-circle-225.png
similarity index 100%
rename from chrome/skins/common/images/arrow-circle-225.png
rename to theme/common/images/arrow-circle-225.png
diff --git a/chrome/skins/common/images/arrow-circle-315.png b/theme/common/images/arrow-circle-315.png
similarity index 100%
rename from chrome/skins/common/images/arrow-circle-315.png
rename to theme/common/images/arrow-circle-315.png
diff --git a/chrome/skins/common/images/arrow-circle.png b/theme/common/images/arrow-circle.png
similarity index 100%
rename from chrome/skins/common/images/arrow-circle.png
rename to theme/common/images/arrow-circle.png
diff --git a/chrome/skins/common/images/asterisk-small-yellow.png b/theme/common/images/asterisk-small-yellow.png
similarity index 100%
rename from chrome/skins/common/images/asterisk-small-yellow.png
rename to theme/common/images/asterisk-small-yellow.png
diff --git a/chrome/skins/common/images/blog.png b/theme/common/images/blog.png
similarity index 100%
rename from chrome/skins/common/images/blog.png
rename to theme/common/images/blog.png
diff --git a/chrome/skins/common/images/calendar-month.png b/theme/common/images/calendar-month.png
similarity index 100%
rename from chrome/skins/common/images/calendar-month.png
rename to theme/common/images/calendar-month.png
diff --git a/chrome/skins/common/images/cancelled.png b/theme/common/images/cancelled.png
similarity index 100%
rename from chrome/skins/common/images/cancelled.png
rename to theme/common/images/cancelled.png
diff --git a/chrome/skins/common/images/certificate.png b/theme/common/images/certificate.png
similarity index 100%
rename from chrome/skins/common/images/certificate.png
rename to theme/common/images/certificate.png
diff --git a/chrome/skins/common/images/chain--minus.png b/theme/common/images/chain--minus.png
similarity index 100%
rename from chrome/skins/common/images/chain--minus.png
rename to theme/common/images/chain--minus.png
diff --git a/chrome/skins/common/images/chain--pencil.png b/theme/common/images/chain--pencil.png
similarity index 100%
rename from chrome/skins/common/images/chain--pencil.png
rename to theme/common/images/chain--pencil.png
diff --git a/chrome/skins/common/images/chain--plus.png b/theme/common/images/chain--plus.png
similarity index 100%
rename from chrome/skins/common/images/chain--plus.png
rename to theme/common/images/chain--plus.png
diff --git a/chrome/skins/common/images/cross.png b/theme/common/images/cross.png
similarity index 100%
rename from chrome/skins/common/images/cross.png
rename to theme/common/images/cross.png
diff --git a/chrome/skins/common/images/declined.png b/theme/common/images/declined.png
similarity index 100%
rename from chrome/skins/common/images/declined.png
rename to theme/common/images/declined.png
diff --git a/chrome/skins/common/images/document--exclamation.png b/theme/common/images/document--exclamation.png
similarity index 100%
rename from chrome/skins/common/images/document--exclamation.png
rename to theme/common/images/document--exclamation.png
diff --git a/chrome/skins/common/images/document-binary.png b/theme/common/images/document-binary.png
similarity index 100%
rename from chrome/skins/common/images/document-binary.png
rename to theme/common/images/document-binary.png
diff --git a/chrome/skins/common/images/document-excel-csv.png b/theme/common/images/document-excel-csv.png
similarity index 100%
rename from chrome/skins/common/images/document-excel-csv.png
rename to theme/common/images/document-excel-csv.png
diff --git a/chrome/skins/common/images/document-excel.png b/theme/common/images/document-excel.png
similarity index 100%
rename from chrome/skins/common/images/document-excel.png
rename to theme/common/images/document-excel.png
diff --git a/chrome/skins/common/images/document-flash-movie.png b/theme/common/images/document-flash-movie.png
similarity index 100%
rename from chrome/skins/common/images/document-flash-movie.png
rename to theme/common/images/document-flash-movie.png
diff --git a/chrome/skins/common/images/document-image.png b/theme/common/images/document-image.png
similarity index 100%
rename from chrome/skins/common/images/document-image.png
rename to theme/common/images/document-image.png
diff --git a/chrome/skins/common/images/document-office.png b/theme/common/images/document-office.png
similarity index 100%
rename from chrome/skins/common/images/document-office.png
rename to theme/common/images/document-office.png
diff --git a/chrome/skins/common/images/document-pdf.png b/theme/common/images/document-pdf.png
similarity index 100%
rename from chrome/skins/common/images/document-pdf.png
rename to theme/common/images/document-pdf.png
diff --git a/chrome/skins/common/images/document-photoshop.png b/theme/common/images/document-photoshop.png
similarity index 100%
rename from chrome/skins/common/images/document-photoshop.png
rename to theme/common/images/document-photoshop.png
diff --git a/chrome/skins/common/images/document-php.png b/theme/common/images/document-php.png
similarity index 100%
rename from chrome/skins/common/images/document-php.png
rename to theme/common/images/document-php.png
diff --git a/chrome/skins/common/images/document-powerpoint.png b/theme/common/images/document-powerpoint.png
similarity index 100%
rename from chrome/skins/common/images/document-powerpoint.png
rename to theme/common/images/document-powerpoint.png
diff --git a/chrome/skins/common/images/document-tex.png b/theme/common/images/document-tex.png
similarity index 100%
rename from chrome/skins/common/images/document-tex.png
rename to theme/common/images/document-tex.png
diff --git a/chrome/skins/common/images/document-text.png b/theme/common/images/document-text.png
similarity index 100%
rename from chrome/skins/common/images/document-text.png
rename to theme/common/images/document-text.png
diff --git a/chrome/skins/common/images/document-word.png b/theme/common/images/document-word.png
similarity index 100%
rename from chrome/skins/common/images/document-word.png
rename to theme/common/images/document-word.png
diff --git a/chrome/skins/common/images/edit-alignment-center.png b/theme/common/images/edit-alignment-center.png
similarity index 100%
rename from chrome/skins/common/images/edit-alignment-center.png
rename to theme/common/images/edit-alignment-center.png
diff --git a/chrome/skins/common/images/edit-alignment-justify.png b/theme/common/images/edit-alignment-justify.png
similarity index 100%
rename from chrome/skins/common/images/edit-alignment-justify.png
rename to theme/common/images/edit-alignment-justify.png
diff --git a/chrome/skins/common/images/edit-alignment-right.png b/theme/common/images/edit-alignment-right.png
similarity index 100%
rename from chrome/skins/common/images/edit-alignment-right.png
rename to theme/common/images/edit-alignment-right.png
diff --git a/chrome/skins/common/images/edit-alignment.png b/theme/common/images/edit-alignment.png
similarity index 100%
rename from chrome/skins/common/images/edit-alignment.png
rename to theme/common/images/edit-alignment.png
diff --git a/chrome/skins/common/images/edit-bold.png b/theme/common/images/edit-bold.png
similarity index 100%
rename from chrome/skins/common/images/edit-bold.png
rename to theme/common/images/edit-bold.png
diff --git a/chrome/skins/common/images/edit-color.png b/theme/common/images/edit-color.png
similarity index 100%
rename from chrome/skins/common/images/edit-color.png
rename to theme/common/images/edit-color.png
diff --git a/chrome/skins/common/images/edit-indent.png b/theme/common/images/edit-indent.png
similarity index 100%
rename from chrome/skins/common/images/edit-indent.png
rename to theme/common/images/edit-indent.png
diff --git a/chrome/skins/common/images/edit-italic.png b/theme/common/images/edit-italic.png
similarity index 100%
rename from chrome/skins/common/images/edit-italic.png
rename to theme/common/images/edit-italic.png
diff --git a/chrome/skins/common/images/edit-list-order.png b/theme/common/images/edit-list-order.png
similarity index 100%
rename from chrome/skins/common/images/edit-list-order.png
rename to theme/common/images/edit-list-order.png
diff --git a/chrome/skins/common/images/edit-list.png b/theme/common/images/edit-list.png
similarity index 100%
rename from chrome/skins/common/images/edit-list.png
rename to theme/common/images/edit-list.png
diff --git a/chrome/skins/common/images/edit-outdent.png b/theme/common/images/edit-outdent.png
similarity index 100%
rename from chrome/skins/common/images/edit-outdent.png
rename to theme/common/images/edit-outdent.png
diff --git a/chrome/skins/common/images/edit-size-down.png b/theme/common/images/edit-size-down.png
similarity index 100%
rename from chrome/skins/common/images/edit-size-down.png
rename to theme/common/images/edit-size-down.png
diff --git a/chrome/skins/common/images/edit-size-up.png b/theme/common/images/edit-size-up.png
similarity index 100%
rename from chrome/skins/common/images/edit-size-up.png
rename to theme/common/images/edit-size-up.png
diff --git a/chrome/skins/common/images/edit-underline.png b/theme/common/images/edit-underline.png
similarity index 100%
rename from chrome/skins/common/images/edit-underline.png
rename to theme/common/images/edit-underline.png
diff --git a/chrome/skins/common/images/exchange-addrbook.png b/theme/common/images/exchange-addrbook.png
similarity index 100%
rename from chrome/skins/common/images/exchange-addrbook.png
rename to theme/common/images/exchange-addrbook.png
diff --git a/chrome/skins/common/images/extra-icon.png b/theme/common/images/extra-icon.png
similarity index 100%
rename from chrome/skins/common/images/extra-icon.png
rename to theme/common/images/extra-icon.png
diff --git a/chrome/skins/common/images/feed.png b/theme/common/images/feed.png
similarity index 100%
rename from chrome/skins/common/images/feed.png
rename to theme/common/images/feed.png
diff --git a/chrome/skins/common/images/folder-open.png b/theme/common/images/folder-open.png
similarity index 100%
rename from chrome/skins/common/images/folder-open.png
rename to theme/common/images/folder-open.png
diff --git a/chrome/skins/common/images/folder.png b/theme/common/images/folder.png
similarity index 100%
rename from chrome/skins/common/images/folder.png
rename to theme/common/images/folder.png
diff --git a/chrome/skins/common/images/high.gif b/theme/common/images/high.gif
similarity index 100%
rename from chrome/skins/common/images/high.gif
rename to theme/common/images/high.gif
diff --git a/chrome/skins/common/images/highest.gif b/theme/common/images/highest.gif
similarity index 100%
rename from chrome/skins/common/images/highest.gif
rename to theme/common/images/highest.gif
diff --git a/chrome/skins/common/images/invited.png b/theme/common/images/invited.png
similarity index 100%
rename from chrome/skins/common/images/invited.png
rename to theme/common/images/invited.png
diff --git a/chrome/skins/common/images/lightningexchangecalendar.png b/theme/common/images/lightningexchangecalendar.png
similarity index 100%
rename from chrome/skins/common/images/lightningexchangecalendar.png
rename to theme/common/images/lightningexchangecalendar.png
diff --git a/chrome/skins/common/images/low.gif b/theme/common/images/low.gif
similarity index 100%
rename from chrome/skins/common/images/low.gif
rename to theme/common/images/low.gif
diff --git a/chrome/skins/common/images/lowest.gif b/theme/common/images/lowest.gif
similarity index 100%
rename from chrome/skins/common/images/lowest.gif
rename to theme/common/images/lowest.gif
diff --git a/chrome/skins/common/images/mail.png b/theme/common/images/mail.png
similarity index 100%
rename from chrome/skins/common/images/mail.png
rename to theme/common/images/mail.png
diff --git a/chrome/skins/common/images/notify-icon.png b/theme/common/images/notify-icon.png
similarity index 100%
rename from chrome/skins/common/images/notify-icon.png
rename to theme/common/images/notify-icon.png
diff --git a/chrome/skins/common/images/plug-connect.png b/theme/common/images/plug-connect.png
similarity index 100%
rename from chrome/skins/common/images/plug-connect.png
rename to theme/common/images/plug-connect.png
diff --git a/chrome/skins/common/images/plug-disconnect-prohibition.png b/theme/common/images/plug-disconnect-prohibition.png
similarity index 100%
rename from chrome/skins/common/images/plug-disconnect-prohibition.png
rename to theme/common/images/plug-disconnect-prohibition.png
diff --git a/chrome/skins/common/images/scissors.png b/theme/common/images/scissors.png
similarity index 100%
rename from chrome/skins/common/images/scissors.png
rename to theme/common/images/scissors.png
diff --git a/chrome/skins/common/images/sticky-notes.png b/theme/common/images/sticky-notes.png
similarity index 100%
rename from chrome/skins/common/images/sticky-notes.png
rename to theme/common/images/sticky-notes.png
diff --git a/chrome/skins/common/images/task.png b/theme/common/images/task.png
similarity index 100%
rename from chrome/skins/common/images/task.png
rename to theme/common/images/task.png
diff --git a/chrome/skins/common/images/tentative.png b/theme/common/images/tentative.png
similarity index 100%
rename from chrome/skins/common/images/tentative.png
rename to theme/common/images/tentative.png
diff --git a/chrome/skins/common/images/threadCol-PriorityIcon.gif b/theme/common/images/threadCol-PriorityIcon.gif
similarity index 100%
rename from chrome/skins/common/images/threadCol-PriorityIcon.gif
rename to theme/common/images/threadCol-PriorityIcon.gif
diff --git a/chrome/skins/common/images/threadcol-invite.gif b/theme/common/images/threadcol-invite.gif
similarity index 100%
rename from chrome/skins/common/images/threadcol-invite.gif
rename to theme/common/images/threadcol-invite.gif
diff --git a/chrome/skins/common/images/tick.png b/theme/common/images/tick.png
similarity index 100%
rename from chrome/skins/common/images/tick.png
rename to theme/common/images/tick.png
diff --git a/chrome/skins/common/images/updated.png b/theme/common/images/updated.png
similarity index 100%
rename from chrome/skins/common/images/updated.png
rename to theme/common/images/updated.png
diff --git a/chrome/skins/common/images/view-refresh.png b/theme/common/images/view-refresh.png
similarity index 100%
rename from chrome/skins/common/images/view-refresh.png
rename to theme/common/images/view-refresh.png
diff --git a/chrome/skins/common/images/wrench-screwdriver.png b/theme/common/images/wrench-screwdriver.png
similarity index 100%
rename from chrome/skins/common/images/wrench-screwdriver.png
rename to theme/common/images/wrench-screwdriver.png
diff --git a/chrome/skins/common/invite-style.css b/theme/common/invite-style.css
similarity index 100%
rename from chrome/skins/common/invite-style.css
rename to theme/common/invite-style.css
diff --git a/chrome/skins/common/itemBodyEditor.css b/theme/common/itemBodyEditor.css
similarity index 100%
rename from chrome/skins/common/itemBodyEditor.css
rename to theme/common/itemBodyEditor.css
diff --git a/chrome/skins/common/manageEWSAccounts.css b/theme/common/manageEWSAccounts.css
similarity index 100%
rename from chrome/skins/common/manageEWSAccounts.css
rename to theme/common/manageEWSAccounts.css
diff --git a/chrome/skins/common/oofSettings.css b/theme/common/oofSettings.css
similarity index 100%
rename from chrome/skins/common/oofSettings.css
rename to theme/common/oofSettings.css
diff --git a/chrome/skins/common/preferences.css b/theme/common/preferences.css
similarity index 100%
rename from chrome/skins/common/preferences.css
rename to theme/common/preferences.css
diff --git a/chrome/skins/common/priority-display.css b/theme/common/priority-display.css
similarity index 100%
rename from chrome/skins/common/priority-display.css
rename to theme/common/priority-display.css
diff --git a/chrome/skins/common/progress_panel.css b/theme/common/progress_panel.css
similarity index 100%
rename from chrome/skins/common/progress_panel.css
rename to theme/common/progress_panel.css
diff --git a/chrome/skins/common/sharedCalendarParser.css b/theme/common/sharedCalendarParser.css
similarity index 100%
rename from chrome/skins/common/sharedCalendarParser.css
rename to theme/common/sharedCalendarParser.css
diff --git a/chrome/skins/mac/addressingWidgetOverlay.css b/theme/mac/addressingWidgetOverlay.css
similarity index 100%
rename from chrome/skins/mac/addressingWidgetOverlay.css
rename to theme/mac/addressingWidgetOverlay.css
diff --git a/chrome/skins/mac/attachments-view.css b/theme/mac/attachments-view.css
similarity index 100%
rename from chrome/skins/mac/attachments-view.css
rename to theme/mac/attachments-view.css
diff --git a/chrome/skins/mac/browseFolder.css b/theme/mac/browseFolder.css
similarity index 100%
rename from chrome/skins/mac/browseFolder.css
rename to theme/mac/browseFolder.css
diff --git a/chrome/skins/mac/calendar-calendars-list.css b/theme/mac/calendar-calendars-list.css
similarity index 100%
rename from chrome/skins/mac/calendar-calendars-list.css
rename to theme/mac/calendar-calendars-list.css
diff --git a/chrome/skins/mac/calendar-event-dialog-attendees.css b/theme/mac/calendar-event-dialog-attendees.css
similarity index 100%
rename from chrome/skins/mac/calendar-event-dialog-attendees.css
rename to theme/mac/calendar-event-dialog-attendees.css
diff --git a/chrome/skins/mac/calendar-summary-dialog.css b/theme/mac/calendar-summary-dialog.css
similarity index 100%
rename from chrome/skins/mac/calendar-summary-dialog.css
rename to theme/mac/calendar-summary-dialog.css
diff --git a/chrome/skins/mac/delegateCalendar.css b/theme/mac/delegateCalendar.css
similarity index 100%
rename from chrome/skins/mac/delegateCalendar.css
rename to theme/mac/delegateCalendar.css
diff --git a/chrome/skins/mac/exchWebServiceEditor.css b/theme/mac/exchWebServiceEditor.css
similarity index 100%
rename from chrome/skins/mac/exchWebServiceEditor.css
rename to theme/mac/exchWebServiceEditor.css
diff --git a/chrome/skins/mac/extras-preferences.css b/theme/mac/extras-preferences.css
similarity index 100%
rename from chrome/skins/mac/extras-preferences.css
rename to theme/mac/extras-preferences.css
diff --git a/chrome/skins/mac/invite-style.css b/theme/mac/invite-style.css
similarity index 100%
rename from chrome/skins/mac/invite-style.css
rename to theme/mac/invite-style.css
diff --git a/chrome/skins/mac/itemBodyEditor.css b/theme/mac/itemBodyEditor.css
similarity index 100%
rename from chrome/skins/mac/itemBodyEditor.css
rename to theme/mac/itemBodyEditor.css
diff --git a/chrome/skins/mac/manageEWSAccounts.css b/theme/mac/manageEWSAccounts.css
similarity index 100%
rename from chrome/skins/mac/manageEWSAccounts.css
rename to theme/mac/manageEWSAccounts.css
diff --git a/chrome/skins/mac/oofSettings.css b/theme/mac/oofSettings.css
similarity index 100%
rename from chrome/skins/mac/oofSettings.css
rename to theme/mac/oofSettings.css
diff --git a/chrome/skins/mac/preferences.css b/theme/mac/preferences.css
similarity index 100%
rename from chrome/skins/mac/preferences.css
rename to theme/mac/preferences.css
diff --git a/chrome/skins/mac/priority-display.css b/theme/mac/priority-display.css
similarity index 100%
rename from chrome/skins/mac/priority-display.css
rename to theme/mac/priority-display.css
diff --git a/chrome/skins/mac/progress_panel.css b/theme/mac/progress_panel.css
similarity index 100%
rename from chrome/skins/mac/progress_panel.css
rename to theme/mac/progress_panel.css
diff --git a/chrome/skins/mac/sharedCalendarParser.css b/theme/mac/sharedCalendarParser.css
similarity index 100%
rename from chrome/skins/mac/sharedCalendarParser.css
rename to theme/mac/sharedCalendarParser.css
diff --git a/chrome/skins/unix/addressingWidgetOverlay.css b/theme/unix/addressingWidgetOverlay.css
similarity index 100%
rename from chrome/skins/unix/addressingWidgetOverlay.css
rename to theme/unix/addressingWidgetOverlay.css
diff --git a/chrome/skins/unix/attachments-view.css b/theme/unix/attachments-view.css
similarity index 100%
rename from chrome/skins/unix/attachments-view.css
rename to theme/unix/attachments-view.css
diff --git a/chrome/skins/unix/browseFolder.css b/theme/unix/browseFolder.css
similarity index 100%
rename from chrome/skins/unix/browseFolder.css
rename to theme/unix/browseFolder.css
diff --git a/chrome/skins/unix/calendar-calendars-list.css b/theme/unix/calendar-calendars-list.css
similarity index 100%
rename from chrome/skins/unix/calendar-calendars-list.css
rename to theme/unix/calendar-calendars-list.css
diff --git a/chrome/skins/unix/calendar-event-dialog-attendees.css b/theme/unix/calendar-event-dialog-attendees.css
similarity index 100%
rename from chrome/skins/unix/calendar-event-dialog-attendees.css
rename to theme/unix/calendar-event-dialog-attendees.css
diff --git a/chrome/skins/unix/calendar-summary-dialog.css b/theme/unix/calendar-summary-dialog.css
similarity index 100%
rename from chrome/skins/unix/calendar-summary-dialog.css
rename to theme/unix/calendar-summary-dialog.css
diff --git a/chrome/skins/unix/delegateCalendar.css b/theme/unix/delegateCalendar.css
similarity index 100%
rename from chrome/skins/unix/delegateCalendar.css
rename to theme/unix/delegateCalendar.css
diff --git a/chrome/skins/unix/exchWebServiceEditor.css b/theme/unix/exchWebServiceEditor.css
similarity index 100%
rename from chrome/skins/unix/exchWebServiceEditor.css
rename to theme/unix/exchWebServiceEditor.css
diff --git a/chrome/skins/unix/extras-preferences.css b/theme/unix/extras-preferences.css
similarity index 100%
rename from chrome/skins/unix/extras-preferences.css
rename to theme/unix/extras-preferences.css
diff --git a/chrome/skins/unix/invite-style.css b/theme/unix/invite-style.css
similarity index 100%
rename from chrome/skins/unix/invite-style.css
rename to theme/unix/invite-style.css
diff --git a/chrome/skins/unix/itemBodyEditor.css b/theme/unix/itemBodyEditor.css
similarity index 100%
rename from chrome/skins/unix/itemBodyEditor.css
rename to theme/unix/itemBodyEditor.css
diff --git a/chrome/skins/unix/manageEWSAccounts.css b/theme/unix/manageEWSAccounts.css
similarity index 100%
rename from chrome/skins/unix/manageEWSAccounts.css
rename to theme/unix/manageEWSAccounts.css
diff --git a/chrome/skins/unix/oofSettings.css b/theme/unix/oofSettings.css
similarity index 100%
rename from chrome/skins/unix/oofSettings.css
rename to theme/unix/oofSettings.css
diff --git a/chrome/skins/unix/preferences.css b/theme/unix/preferences.css
similarity index 100%
rename from chrome/skins/unix/preferences.css
rename to theme/unix/preferences.css
diff --git a/chrome/skins/unix/priority-display.css b/theme/unix/priority-display.css
similarity index 100%
rename from chrome/skins/unix/priority-display.css
rename to theme/unix/priority-display.css
diff --git a/chrome/skins/unix/progress_panel.css b/theme/unix/progress_panel.css
similarity index 100%
rename from chrome/skins/unix/progress_panel.css
rename to theme/unix/progress_panel.css
diff --git a/chrome/skins/unix/sharedCalendarParser.css b/theme/unix/sharedCalendarParser.css
similarity index 100%
rename from chrome/skins/unix/sharedCalendarParser.css
rename to theme/unix/sharedCalendarParser.css
diff --git a/chrome/skins/win/addressingWidgetOverlay.css b/theme/win/addressingWidgetOverlay.css
similarity index 100%
rename from chrome/skins/win/addressingWidgetOverlay.css
rename to theme/win/addressingWidgetOverlay.css
diff --git a/chrome/skins/win/attachments-view.css b/theme/win/attachments-view.css
similarity index 100%
rename from chrome/skins/win/attachments-view.css
rename to theme/win/attachments-view.css
diff --git a/chrome/skins/win/browseFolder.css b/theme/win/browseFolder.css
similarity index 100%
rename from chrome/skins/win/browseFolder.css
rename to theme/win/browseFolder.css
diff --git a/chrome/skins/win/calendar-calendars-list.css b/theme/win/calendar-calendars-list.css
similarity index 100%
rename from chrome/skins/win/calendar-calendars-list.css
rename to theme/win/calendar-calendars-list.css
diff --git a/chrome/skins/win/calendar-event-dialog-attendees.css b/theme/win/calendar-event-dialog-attendees.css
similarity index 100%
rename from chrome/skins/win/calendar-event-dialog-attendees.css
rename to theme/win/calendar-event-dialog-attendees.css
diff --git a/chrome/skins/win/calendar-summary-dialog.css b/theme/win/calendar-summary-dialog.css
similarity index 100%
rename from chrome/skins/win/calendar-summary-dialog.css
rename to theme/win/calendar-summary-dialog.css
diff --git a/chrome/skins/win/delegateCalendar.css b/theme/win/delegateCalendar.css
similarity index 100%
rename from chrome/skins/win/delegateCalendar.css
rename to theme/win/delegateCalendar.css
diff --git a/chrome/skins/win/exchWebServiceEditor.css b/theme/win/exchWebServiceEditor.css
similarity index 100%
rename from chrome/skins/win/exchWebServiceEditor.css
rename to theme/win/exchWebServiceEditor.css
diff --git a/chrome/skins/win/extras-preferences.css b/theme/win/extras-preferences.css
similarity index 100%
rename from chrome/skins/win/extras-preferences.css
rename to theme/win/extras-preferences.css
diff --git a/chrome/skins/win/invite-style.css b/theme/win/invite-style.css
similarity index 100%
rename from chrome/skins/win/invite-style.css
rename to theme/win/invite-style.css
diff --git a/chrome/skins/win/itemBodyEditor.css b/theme/win/itemBodyEditor.css
similarity index 100%
rename from chrome/skins/win/itemBodyEditor.css
rename to theme/win/itemBodyEditor.css
diff --git a/chrome/skins/win/manageEWSAccounts.css b/theme/win/manageEWSAccounts.css
similarity index 100%
rename from chrome/skins/win/manageEWSAccounts.css
rename to theme/win/manageEWSAccounts.css
diff --git a/chrome/skins/win/oofSettings.css b/theme/win/oofSettings.css
similarity index 100%
rename from chrome/skins/win/oofSettings.css
rename to theme/win/oofSettings.css
diff --git a/chrome/skins/win/preferences.css b/theme/win/preferences.css
similarity index 100%
rename from chrome/skins/win/preferences.css
rename to theme/win/preferences.css
diff --git a/chrome/skins/win/priority-display.css b/theme/win/priority-display.css
similarity index 100%
rename from chrome/skins/win/priority-display.css
rename to theme/win/priority-display.css
diff --git a/chrome/skins/win/progress_panel.css b/theme/win/progress_panel.css
similarity index 100%
rename from chrome/skins/win/progress_panel.css
rename to theme/win/progress_panel.css
diff --git a/chrome/skins/win/sharedCalendarParser.css b/theme/win/sharedCalendarParser.css
similarity index 100%
rename from chrome/skins/win/sharedCalendarParser.css
rename to theme/win/sharedCalendarParser.css
diff --git a/chrome/skins/winaero/addressingWidgetOverlay.css b/theme/winaero/addressingWidgetOverlay.css
similarity index 100%
rename from chrome/skins/winaero/addressingWidgetOverlay.css
rename to theme/winaero/addressingWidgetOverlay.css
diff --git a/chrome/skins/winaero/attachments-view.css b/theme/winaero/attachments-view.css
similarity index 100%
rename from chrome/skins/winaero/attachments-view.css
rename to theme/winaero/attachments-view.css
diff --git a/chrome/skins/winaero/browseFolder.css b/theme/winaero/browseFolder.css
similarity index 100%
rename from chrome/skins/winaero/browseFolder.css
rename to theme/winaero/browseFolder.css
diff --git a/chrome/skins/winaero/calendar-calendars-list.css b/theme/winaero/calendar-calendars-list.css
similarity index 100%
rename from chrome/skins/winaero/calendar-calendars-list.css
rename to theme/winaero/calendar-calendars-list.css
diff --git a/chrome/skins/winaero/calendar-event-dialog-attendees.css b/theme/winaero/calendar-event-dialog-attendees.css
similarity index 100%
rename from chrome/skins/winaero/calendar-event-dialog-attendees.css
rename to theme/winaero/calendar-event-dialog-attendees.css
diff --git a/chrome/skins/winaero/calendar-summary-dialog.css b/theme/winaero/calendar-summary-dialog.css
similarity index 100%
rename from chrome/skins/winaero/calendar-summary-dialog.css
rename to theme/winaero/calendar-summary-dialog.css
diff --git a/chrome/skins/winaero/delegateCalendar.css b/theme/winaero/delegateCalendar.css
similarity index 100%
rename from chrome/skins/winaero/delegateCalendar.css
rename to theme/winaero/delegateCalendar.css
diff --git a/chrome/skins/winaero/exchWebServiceEditor.css b/theme/winaero/exchWebServiceEditor.css
similarity index 100%
rename from chrome/skins/winaero/exchWebServiceEditor.css
rename to theme/winaero/exchWebServiceEditor.css
diff --git a/chrome/skins/winaero/extras-preferences.css b/theme/winaero/extras-preferences.css
similarity index 100%
rename from chrome/skins/winaero/extras-preferences.css
rename to theme/winaero/extras-preferences.css
diff --git a/chrome/skins/winaero/invite-style.css b/theme/winaero/invite-style.css
similarity index 100%
rename from chrome/skins/winaero/invite-style.css
rename to theme/winaero/invite-style.css
diff --git a/chrome/skins/winaero/itemBodyEditor.css b/theme/winaero/itemBodyEditor.css
similarity index 100%
rename from chrome/skins/winaero/itemBodyEditor.css
rename to theme/winaero/itemBodyEditor.css
diff --git a/chrome/skins/winaero/manageEWSAccounts.css b/theme/winaero/manageEWSAccounts.css
similarity index 100%
rename from chrome/skins/winaero/manageEWSAccounts.css
rename to theme/winaero/manageEWSAccounts.css
diff --git a/chrome/skins/winaero/oofSettings.css b/theme/winaero/oofSettings.css
similarity index 100%
rename from chrome/skins/winaero/oofSettings.css
rename to theme/winaero/oofSettings.css
diff --git a/chrome/skins/winaero/preferences.css b/theme/winaero/preferences.css
similarity index 100%
rename from chrome/skins/winaero/preferences.css
rename to theme/winaero/preferences.css
diff --git a/chrome/skins/winaero/priority-display.css b/theme/winaero/priority-display.css
similarity index 100%
rename from chrome/skins/winaero/priority-display.css
rename to theme/winaero/priority-display.css
diff --git a/chrome/skins/winaero/progress_panel.css b/theme/winaero/progress_panel.css
similarity index 100%
rename from chrome/skins/winaero/progress_panel.css
rename to theme/winaero/progress_panel.css
diff --git a/chrome/skins/winaero/sharedCalendarParser.css b/theme/winaero/sharedCalendarParser.css
similarity index 100%
rename from chrome/skins/winaero/sharedCalendarParser.css
rename to theme/winaero/sharedCalendarParser.css

From 41688d62c6d74758c695f8d01312fe0e3874defe Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 21:21:31 +0100
Subject: [PATCH 154/222] update main chrome manifest to look for skins inside
 the theme directory

---
 chrome.manifest | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 91434d6c..ffc44a53 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,9 +1,11 @@
 content exchangecalendar chrome/content/
-skin exchangecalendar fugue chrome/skins/unix/
-skin exchangecalendar fugue chrome/skins/win/ os=WINNT
-skin exchangecalendar fugue chrome/skins/winaero/ os=WINNT osversion>=6
-skin exchangecalendar fugue chrome/skins/mac/ os=Darwin
-skin exchangecalendar-common fugue chrome/skins/common/
+
+skin exchangecalendar fugue theme/unix/
+skin exchangecalendar fugue theme/win/ os=WINNT
+skin exchangecalendar fugue theme/winaero/ os=WINNT osversion>=6
+skin exchangecalendar fugue theme/mac/ os=Darwin
+skin exchangecalendar-common fugue theme/common/
+
 resource exchangecalendar components/
 resource interfaces interfaces/
 

From ad45e43ed685bd2795188885314065f46ea2bac5 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 22:28:20 +0100
Subject: [PATCH 155/222] email: remove the 'exchangemail' which appeared to be
 a skeleton to create a mail service using Exchange directories.

We don't have man power to build a full Exchange mail support and this skeleton was empty (there was only dumps to display the name of the function).
Furthermore, this directory don't appear in the main chrome.manifest file so it has never been used
---
 email/chrome.manifest                         |    9 -
 .../content/am-exchangeWebServiceMail.xul     |  132 ---
 .../mivExchangeMsgAccountManagerExtension.idl |   28 -
 .../mivExchangeMsgAccountManagerExtension.js  |  100 --
 ...xchangeMsgAccountManagerExtension.manifest |    5 -
 .../mivExchangeMsgAccountManagerExtension.xpt |  Bin 164 -> 0 bytes
 .../mivExchangeMsgIncomingServer.idl          |   28 -
 .../mivExchangeMsgIncomingServer.js           | 1000 -----------------
 .../mivExchangeMsgIncomingServer.manifest     |    5 -
 .../mivExchangeMsgProtocolInfo.idl            |   28 -
 .../mivExchangeMsgProtocolInfo.js             |  204 ----
 .../mivExchangeMsgProtocolInfo.manifest       |    5 -
 .../mivExchangeMsgProtocolInfo.xpt            |  Bin 142 -> 0 bytes
 13 files changed, 1544 deletions(-)
 delete mode 100644 email/chrome.manifest
 delete mode 100644 email/chrome/content/am-exchangeWebServiceMail.xul
 delete mode 100644 email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.idl
 delete mode 100644 email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js
 delete mode 100644 email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.manifest
 delete mode 100644 email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.xpt
 delete mode 100644 email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.idl
 delete mode 100644 email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js
 delete mode 100644 email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.manifest
 delete mode 100644 email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.idl
 delete mode 100644 email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js
 delete mode 100644 email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.manifest
 delete mode 100644 email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.xpt

diff --git a/email/chrome.manifest b/email/chrome.manifest
deleted file mode 100644
index c8488d36..00000000
--- a/email/chrome.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-content exchangemail chrome/content/
-skin exchangemail fugue chrome/skins/fugue/
-resource exchangemail components/
-resource exchangemail interfaces/
-
-manifest interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.manifest
-manifest interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.manifest
-manifest interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.manifest
-
diff --git a/email/chrome/content/am-exchangeWebServiceMail.xul b/email/chrome/content/am-exchangeWebServiceMail.xul
deleted file mode 100644
index 1b9704b3..00000000
--- a/email/chrome/content/am-exchangeWebServiceMail.xul
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<!--
-<!DOCTYPE page [
-<!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd" >
-%newsblogDTD;
-<!ENTITY % accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >
-%accountNoIdentDTD;
-<!ENTITY % accountServerTopDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">%accountServerTopDTD;
-]>
--->
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      class="color-dialog"
-      title="&accountTitle.label;"
-      onload="">
-    <!--      onload="parent.onPanelLoaded('am-newsblog.xul');"> -->
-    <!--  <script type="application/javascript"
-          src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger-newsblog/content/am-newsblog.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-prefs.js"/>
--->
-    <dialogheader id="am-exchangeWebServiceMail-title"
-                  defaultTitle="exchangeWebServiceMail defaulttitle" />
-    <description class="secDesc">exchangeWebServiceMail
-    description</description>
-    <!--    <hbox align="center">
-      <label value="&accountName.label;"
-             accesskey="&accountName.accesskey;"
-             control="server.prettyName"/>
-      <textbox id="server.prettyName"
-               wsm_persist="true"
-               size="30"
-               prefstring="mail.server.%serverkey%.name"/>
-    </hbox>
-
-    <separator/>
-
-    <groupbox>
-      <caption label="&serverSettings.label;"/>
-
-      <checkbox id="server.loginAtStartUp"
-                wsm_persist="true"
-                label="&loginAtStartup.label;"
-                accesskey="&loginAtStartup.accesskey;"
-                prefattribute="value"
-                prefstring="mail.server.%serverkey%.login_at_startup"/>
-
-      <hbox align="center">
-        <checkbox id="server.doBiff"
-                  wsm_persist="true"
-                  label="&biffStart.label;"
-                  accesskey="&biffStart.accesskey;"
-                  oncommand="onCheckItem('server.biffMinutes', [this.id]);"
-                  prefattribute="value"
-                  prefstring="mail.server.%serverkey%.check_new_mail"/>
-        <textbox id="server.biffMinutes"
-                 wsm_persist="true"
-                 type="number"
-                 size="3"
-                 min="1"
-                 increment="1"
-                 preftype="int"
-                 prefstring="mail.server.%serverkey%.check_time"
-                 aria-labelledby="server.doBiff server.biffMinutes biffEnd"/>
-        <label id="biffEnd"
-             value="&biffEnd.label;"
-             control="server.biffMinutes"/>
-      </hbox>
-
-      <checkbox id="server.quickMode"
-                wsm_persist="true"
-                genericattr="true"
-                label="&useQuickMode.label;"
-                accesskey="&useQuickMode.accesskey;"
-                preftype="bool"
-                prefattribute="value"
-                prefstring="mail.server.%serverkey%.quickMode"/>
-    </groupbox>
-
-    <separator class="thin"/>
-
-    <groupbox>
-      <caption label="&messageStorage.label;"/>
-
-      <checkbox id="server.emptyTrashOnExit"
-                wsm_persist="true"
-                label="&emptyTrashOnExit.label;"
-                accesskey="&emptyTrashOnExit.accesskey;"
-                prefattribute="value"
-                prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
-
-      <separator class="thin"/>
-
-      <vbox>
-        <label value="&localPath.label;" control="server.localPath"/>
-        <hbox align="center">
-          <textbox readonly="true"
-                   wsm_persist="true"
-                   flex="1"
-                   id="server.localPath"
-                   datatype="nsILocalFile"
-                   prefstring="mail.server.%serverkey%.directory"
-                   class="uri-element"/>
-          <button id="browseForLocalFolder"
-                  label="&browseFolder.label;"
-                  filepickertitle="&localFolderPicker.label;"
-                  accesskey="&browseFolder.accesskey;"
-                  oncommand="BrowseForLocalFolders();"/>
-        </hbox>
-      </vbox>
-
-    </groupbox>
-
-    <separator class="thin"/>
-
-    <hbox align="center">
-      <spacer flex="1"/>
-      <button label="&manageSubscriptions.label;"
-              accesskey="&manageSubscriptions.accesskey;"
-              oncommand="openSubscriptionsDialog(gServer.rootFolder);"/>
-    </hbox>
--->
-</page>
diff --git a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.idl b/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.idl
deleted file mode 100644
index 71b27e7a..00000000
--- a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/
- * email: info@1st-setup.nl
- *
- * This interface can be used to for updates
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-#include "nsIMsgAccountManager.idl"
-
-[scriptable, uuid(9b353ed2-b8c9-42aa-8aad-e2ee853d33b6)]
-interface mivExchangeMsgAccountManagerExtension : nsIMsgAccountManagerExtension
-{
-
-};
diff --git a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js b/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js
deleted file mode 100644
index 8f392d44..00000000
--- a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/
- *
- * This interface/service is used for loadBalancing Request to Exchange
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-var components = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function mivExchangeMsgAccountManagerExtension() {
-
-    //this.logInfo("mivExchangeMsgAccountManagerExtension: init");
-
-}
-
-var mivExchangeMsgAccountManagerExtensionGUID = "9b353ed2-b8c9-42aa-8aad-e2ee853d33b6";
-
-mivExchangeMsgAccountManagerExtension.prototype = {
-
-    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeMsgAccountManagerExtension,
-        Ci.nsIMsgAccountManagerExtension,
-        Ci.nsIClassInfo,
-        Ci.nsISupports
-    ]),
-
-    _className: "mivExchangeMsgAccountManagerExtension",
-
-    classDescription: "Exchange EWS Msg Account Manager Extension",
-
-    classID: components.ID("{" + mivExchangeMsgAccountManagerExtensionGUID + "}"),
-    contractID: "@mozilla.org/accountmanager/extension;1?name=exchangeWebServiceMail",
-    flags: Ci.nsIClassInfo.THREADSAFE,
-    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-    getInterfaces: function _getInterfaces(count) {
-        var ifaces = [Ci.mivExchangeMsgAccountManagerExtension,
-            Ci.nsIMsgAccountManagerExtension,
-            Ci.nsIClassInfo,
-            Ci.nsISupports
-        ];
-        count.value = ifaces.length;
-        return ifaces;
-    },
-
-    //  readonly attribute ACString name;   // examples:  mdn
-    get name() {
-        dump("mivExchangeMsgAccountManagerExtension.name:\n");
-        return "exchangeWebServiceMail";
-    },
-
-    //  boolean showPanel(in nsIMsgIncomingServer server);
-    showPanel: function _showPanel(aServer) {
-        dump("mivExchangeMsgAccountManagerExtension.showPanel: aServer.type:" + aServer.type + "\n");
-    },
-
-    //  readonly attribute ACString chromePackageName;  // example:  messenger, chrome://messenger/content/am-mdn.xul and chrome://messenger/locale/am-mdn.properties
-    get chromePackageName() {
-        dump("mivExchangeMsgAccountManagerExtension.chromePackageName:\n");
-        return "exchangemail"
-    },
-
-};
-
-function NSGetFactory(cid) {
-
-    try {
-        if (!NSGetFactory.mivExchangeMsgAccountManagerExtension) {
-            NSGetFactory.mivExchangeMsgAccountManagerExtension = XPCOMUtils.generateNSGetFactory([mivExchangeMsgAccountManagerExtension]);
-
-        }
-
-    }
-    catch (e) {
-        Components.utils.reportError(e);
-        dump(e);
-        throw e;
-    }
-
-    return NSGetFactory.mivExchangeMsgAccountManagerExtension(cid);
-}
diff --git a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.manifest b/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.manifest
deleted file mode 100644
index 1f34783f..00000000
--- a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-interfaces mivExchangeMsgAccountManagerExtension.xpt
-component {9b353ed2-b8c9-42aa-8aad-e2ee853d33b6} mivExchangeMsgAccountManagerExtension.js
-contract @mozilla.org/accountmanager/extension;1?name=exchangeWebServiceMail {9b353ed2-b8c9-42aa-8aad-e2ee853d33b6}
-
-
diff --git a/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.xpt b/email/interfaces/exchangeMsgAccountManagerExtension/mivExchangeMsgAccountManagerExtension.xpt
deleted file mode 100644
index f28f180220b88d5d8abf982a092c54b449d6fe64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmazDaQ64*3aKne^~p@)<&t7#VqjumU|0ggN<bXhP{6GF;B2JhuI9Oaq*Kl6o&yCL
zffx*Co7!F4anfm3*V;$#T5XND0R`ouQm%Q$p1#HDj>*aSrFkX3iFt|XsYR|8C8>GE
ZnfZAPxtV3I70DTidFiQmR6%TN001oNGEM*h

diff --git a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.idl b/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.idl
deleted file mode 100644
index ac19ad16..00000000
--- a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/
- * email: info@1st-setup.nl
- *
- * This interface can be used to for updates
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-#include "nsIMsgIncomingServer.idl"
-
-[scriptable, uuid(79d87edc-020e-48d4-8c04-b894edab4bd2)]
-interface mivExchangeMsgIncomingServer : nsIMsgIncomingServer
-{
-
-};
diff --git a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js b/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js
deleted file mode 100644
index dcb17617..00000000
--- a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.js
+++ /dev/null
@@ -1,1000 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/
- *
- * This interface/service is used for loadBalancing Request to Exchange
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-var components = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function mivExchangeMsgIncomingServer() {
-
-    //this.logInfo("mivExchangeMsgIncomingServer: init");
-
-}
-
-var mivExchangeMsgIncomingServerGUID = "79d87edc-020e-48d4-8c04-b894edab4bd2";
-
-mivExchangeMsgIncomingServer.prototype = {
-
-    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeMsgIncomingServer,
-        Ci.nsIMsgIncomingServer,
-        Ci.nsIClassInfo,
-        Ci.nsISupports
-    ]),
-
-    _className: "mivExchangeMsgIncomingServer",
-
-    classDescription: "Exchange EWS Msg Incoming server",
-
-    classID: components.ID("{" + mivExchangeMsgIncomingServerGUID + "}"),
-    contractID: "@mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail",
-    flags: Ci.nsIClassInfo.THREADSAFE,
-    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-    getInterfaces: function _getInterfaces(count) {
-        var ifaces = [Ci.mivExchangeMsgIncomingServer,
-            Ci.nsIMsgIncomingServer,
-            Ci.nsIClassInfo,
-            Ci.nsISupports
-        ];
-        count.value = ifaces.length;
-        return ifaces;
-    },
-
-    /**
-     * internal pref key - guaranteed to be unique across all servers
-     */
-    //  attribute ACString key;
-    get key() {
-        dump("get key\n");
-    },
-
-    set key(aValue) {
-        dump("set key aValue:" + aValue + "\n");
-    },
-
-    /**
-     * pretty name - should be "userid on hostname"
-     * if the pref is not set
-     */
-    //  attribute AString prettyName;
-    get prettyName() {
-        dump("get prettyName\n");
-    },
-
-    set prettyName(aValue) {
-        dump("set prettyName aValue:" + aValue + "\n");
-    },
-
-    /**
-     * helper function to construct the pretty name in a server type
-     * specific way - e.g., mail for foo@test.com, news on news.mozilla.org
-     */
-    //  readonly attribute AString constructedPrettyName;
-    get constructedPrettyName() {
-        dump("get constructedPrettyName\n");
-    },
-
-    /**
-     * hostname of the server
-     */
-    //  attribute ACString hostName;
-    get hostName() {
-        dump("get hostName\n");
-    },
-
-    set hostName(aValue) {
-        dump("set hostName aValue:" + aValue + "\n");
-    },
-
-    /**
-     * real hostname of the server (if server name is changed it's stored here)
-     */
-    //  attribute ACString realHostName;
-    get realHostName() {
-        dump("get realHostName\n");
-    },
-
-    set realHostName(aValue) {
-        dump("set realHostName aValue:" + aValue + "\n");
-    },
-
-    /* port of the server */
-    //  attribute long port;
-    get port() {
-        dump("get port\n");
-    },
-
-    set port(aValue) {
-        dump("set port aValue:" + aValue + "\n");
-    },
-
-    /**
-     * userid to log into the server
-     */
-    //  attribute ACString username;
-    get username() {
-        dump("get username\n");
-    },
-
-    set username(aValue) {
-        dump("set username aValue:" + aValue + "\n");
-    },
-
-    /**
-     * real username of the server (if username is changed it's stored here)
-     */
-    //  attribute ACString realUsername;
-    get realUsername() {
-        dump("get realUsername\n");
-    },
-
-    set realUsername(aValue) {
-        dump("set realUsername aValue:" + aValue + "\n");
-    },
-
-    /**
-     * protocol type, i.e. "pop3", "imap", "nntp", "none", etc
-     * used to construct URLs
-     */
-    //  attribute ACString type;
-    get type() {
-        dump("get type\n");
-    },
-
-    set type(aValue) {
-        dump("set type aValue:" + aValue + "\n");
-    },
-
-    //  readonly attribute AString accountManagerChrome;
-    get accountManagerChrome() {
-        dump("get accountManagerChrome\n");
-    },
-
-    /**
-     * the schema for the local mail store, such
-     * as "mailbox", "imap", or "news"
-     * used to construct URIs
-     */
-    //  readonly attribute ACString localStoreType;
-    get localStoreType() {
-        dump("get localStoreType\n");
-    },
-
-    // Perform specific tasks (reset flags, remove files, etc) for account user/server name changes.
-    //  void onUserOrHostNameChanged(in ACString oldName, in ACString newName,
-    //                               in bool hostnameChanged);
-    onUserOrHostNameChanged: function _onUserOrHostNameChanged(oldName, newName, hostnameChanged) {
-        dump("function onUserOrHostNameChanged\n");
-    },
-
-    /* cleartext version of the password */
-    //  attribute ACString password;
-    get password() {
-        dump("get password\n");
-    },
-
-    set password(aValue) {
-        dump("set password aValue:" + aValue + "\n");
-    },
-
-    /**
-     * Attempts to get the password first from the password manager, if that
-     * fails it will attempt to get it from the user if aMsgWindow is supplied.
-     *
-     * @param aPromptString  The text of the prompt if the user is prompted for
-     *                       password.
-     * @param aPromptTitle   The title of the prompt if the user is prompted.
-     * @param aMsgWindow     A message window to associate the prompt with.
-     * @return               The obtained password. Could be an empty password.
-     *
-     * @exception NS_ERROR_FAILURE  The password could not be obtained.
-     *
-     * @note NS_MSG_PASSWORD_PROMPT_CANCELLED is a success code that is returned
-     *       if the prompt was presented to the user but the user cancelled the
-     *       prompt.
-     */
-    //  ACString getPasswordWithUI(in AString aPromptString, in AString aPromptTitle,
-    //                             in nsIMsgWindow aMsgWindow);
-    getPasswordWithUI: function _getPasswordWithUI(aPromptString, aPromptTitle, aMsgWindow) {
-        dump("function getPasswordWithUI\n");
-    },
-
-    /* forget the password in memory and in single signon database */
-    //  void forgetPassword();
-    forgetPassword: function _forgetPassword() {
-        dump("function forgetPassword\n");
-    },
-
-    /* forget the password in memory which is cached for the session */
-    //  void forgetSessionPassword();
-    forgetSessionPassword: function _forgetSessionPassword() {
-        dump("function forgetSessionPassword\n");
-    },
-
-    /* should we download whole messages when biff goes off? */
-    //  attribute boolean downloadOnBiff;
-    get downloadOnBiff() {
-        dump("get downloadOnBiff\n");
-    },
-
-    set downloadOnBiff(aValue) {
-        dump("set downloadOnBiff aValue:" + aValue + "\n");
-    },
-
-    /* should we biff the server? */
-    //  attribute boolean doBiff;
-    get doBiff() {
-        dump("get doBiff\n");
-    },
-
-    set doBiff(aValue) {
-        dump("set doBiff aValue:" + aValue + "\n");
-    },
-
-    /* how often to biff */
-    //  attribute long biffMinutes;
-    get biffMinutes() {
-        dump("get biffMinutes\n");
-    },
-
-    set biffMinutes(aValue) {
-        dump("set biffMinutes aValue:" + aValue + "\n");
-    },
-
-    /* current biff state */
-    //  attribute unsigned long biffState;
-    get biffState() {
-        dump("get biffState\n");
-    },
-
-    set biffState(aValue) {
-        dump("set biffState aValue:" + aValue + "\n");
-    },
-
-    /* are we running a url as a result of biff going off? (different from user clicking get msg) */
-    //  attribute boolean performingBiff; 
-    get performingBiff() {
-        dump("get performingBiff\n");
-    },
-
-    set performingBiff(aValue) {
-        dump("set performingBiff aValue:" + aValue + "\n");
-    },
-
-    /* the on-disk path to message storage for this server */
-    //  attribute nsIFile localPath;
-    get localPath() {
-        dump("get localPath\n");
-    },
-
-    set localPath(aValue) {
-        dump("set localPath aValue:" + aValue + "\n");
-    },
-
-    /// message store to use for the folders under this server.
-    //  readonly attribute nsIMsgPluggableStore msgStore;
-    get msgStore() {
-        dump("get msgStore\n");
-    },
-
-    /* the RDF URI for the root mail folder */
-    //  readonly attribute ACString serverURI;
-    get serverURI() {
-        dump("get serverURI\n");
-    },
-
-    /* the root folder for this server, even if server is deferred */
-    //  attribute nsIMsgFolder rootFolder;
-    get rootFolder() {
-        dump("get rootFolder\n");
-    },
-
-    set rootFolder(aValue) {
-        dump("set rootFolder aValue:" + aValue + "\n");
-    },
-
-    /* root folder for this account 
-       - if account is deferred, root folder of deferred-to account */
-    //  readonly attribute nsIMsgFolder rootMsgFolder;
-    get rootMsgFolder() {
-        dump("get rootMsgFolder\n");
-    },
-
-    /* are we already getting new Messages on the current server..
-       This is used to help us prevent multiple get new msg commands from
-       going off at the same time. */
-    //  attribute boolean serverBusy;
-    get serverBusy() {
-        dump("get serverBusy\n");
-    },
-
-    set serverBusy(aValue) {
-        dump("set serverBusy aValue:" + aValue + "\n");
-    },
-
-    /**
-     * Is the server using a secure channel (SSL or STARTTLS).
-     */
-    //  readonly attribute boolean isSecure;
-    get isSecure() {
-        dump("get isSecure\n");
-    },
-
-    /**
-     * Authentication mechanism.
-     *
-     * @see nsMsgAuthMethod (in MailNewsTypes2.idl)
-     * Same as "mail.server...authMethod" pref
-     */
-    //  attribute nsMsgAuthMethodValue authMethod;
-    get authMethod() {
-        dump("get authMethod\n");
-    },
-
-    set authMethod(aValue) {
-        dump("set authMethod aValue:" + aValue + "\n");
-    },
-
-    /**
-     * Whether to SSL or STARTTLS or not
-     *
-     * @see nsMsgSocketType (in MailNewsTypes2.idl)
-     * Same as "mail.server...socketType" pref
-     */
-    //  attribute nsMsgSocketTypeValue socketType;
-    get socketType() {
-        dump("get socketType\n");
-    },
-
-    set socketType(aValue) {
-        dump("set socketType aValue:" + aValue + "\n");
-    },
-
-    /* empty trash on exit */
-    //  attribute boolean emptyTrashOnExit;
-    get emptyTrashOnExit() {
-        dump("get emptyTrashOnExit\n");
-    },
-
-    set emptyTrashOnExit(aValue) {
-        dump("set emptyTrashOnExit aValue:" + aValue + "\n");
-    },
-
-    /**
-     * Get the server's list of filters.
-     *
-     * This SHOULD be the same filter list as the root folder's, if the server
-     * supports per-folder filters. Furthermore, this list SHOULD be used for all
-     * incoming messages.
-     *
-     * Since the returned nsIMsgFilterList is mutable, it is not necessary to call
-     * setFilterList after the filters have been changed.
-     *
-     * @param aMsgWindow  @ref msgwindow "The standard message window"
-     * @return            The list of filters.
-     */
-    //  nsIMsgFilterList getFilterList(in nsIMsgWindow aMsgWindow);
-    getFilterList: function _getFilterList(aMsgWindow) {
-        dump("function getFilterList\n");
-    },
-
-    /**
-     * Set the server's list of filters.
-     *
-     * Note that this does not persist the filter list. To change the contents
-     * of the existing filters, use getFilterList and mutate the values as
-     * appopriate.
-     *
-     * @param aFilterList The new list of filters.
-     */
-    //  void setFilterList(in nsIMsgFilterList aFilterList);
-    setFilterList: function _setFilterList(aFilterList) {
-        dump("function setFilterList\n");
-    },
-
-    /**
-     * Get user editable filter list. This does not have to be the same as
-     * the filterlist above, typically depending on the users preferences.
-     * The filters in this list are not processed, but only to be edited by
-     * the user.
-     * @see getFilterList
-     *
-     * @param aMsgWindow  @ref msgwindow "The standard message window"
-     * @return            The list of filters.
-     */
-    //  nsIMsgFilterList getEditableFilterList(in nsIMsgWindow aMsgWindow);
-    getEditableFilterList: function _getEditableFilterList(aMsgWindow) {
-        dump("function getEditableFilterList\n");
-    },
-
-    /**
-     * Set user editable filter list.
-     * This does not persist the filterlist, @see setFilterList
-     * @see getEditableFilterList
-     * @see setFilterList
-     *
-     * @param aFilterList The new list of filters.
-     */
-    //  void setEditableFilterList(in nsIMsgFilterList aFilterList);
-    setEditableFilterList: function _setEditableFilterList(aFilterList) {
-        dump("function setEditableFilterList\n");
-    },
-
-    /* we use this to set the default local path.  we use this when migrating prefs */
-    //  void setDefaultLocalPath(in nsIFile aDefaultLocalPath);
-    setDefaultLocalPath: function _setDefaultLocalPath(aDefaultLocalPath) {
-        dump("function setDefaultLocalPath\n");
-    },
-
-    /**
-     * Verify that we can logon
-     * 
-     * @param  aUrlListener - gets called back with success or failure.
-     * @param aMsgWindow         nsIMsgWindow to use for notification callbacks.
-     * @return - the url that we run.
-     */
-    //  nsIURI verifyLogon(in nsIUrlListener aUrlListener, in nsIMsgWindow aMsgWindow);
-    verifyLogon: function _verifyLogon(aUrlListener, aMsgWindow) {
-        dump("function verifyLogon\n");
-    },
-
-    /* do a biff */
-    //  void performBiff(in nsIMsgWindow aMsgWindow);
-    performBiff: function _performBiff(aMsgWindow) {
-        dump("function performBiff\n");
-    },
-
-    /* get new messages */
-    //  void getNewMessages(in nsIMsgFolder aFolder, in nsIMsgWindow aMsgWindow, 
-    //                      in nsIUrlListener aUrlListener);
-    getNewMessages: function _getNewMessages(aFolder, aMsgWindow, aUrlListener) {
-        dump("function getNewMessages\n");
-    },
-
-    /* this checks if a server needs a password to do biff */
-    //  readonly attribute boolean serverRequiresPasswordForBiff;
-    get serverRequiresPasswordForBiff() {
-        dump("get serverRequiresPasswordForBiff\n");
-    },
-
-    /* this gets called when the server is expanded in the folder pane */
-    //  void performExpand(in nsIMsgWindow aMsgWindow);
-    performExpand: function _performExpand(aMsgWindow) {
-        dump("function performExpand\n");
-    },
-
-    /* Write out all known folder data to panacea.dat */
-    //  void writeToFolderCache(in nsIMsgFolderCache folderCache);
-    writeToFolderCache: function _writeToFolderCache(folderCache) {
-        dump("function writeToFolderCache\n");
-    },
-
-    /* close any server connections */
-    //  void closeCachedConnections();
-    closeCachedConnections: function _closeCachedConnections() {
-        dump("function closeCachedConnections\n");
-    },
-
-    /* ... */
-    //  void shutdown();
-    shutdown: function _shutdown() {
-        dump("function shutdown\n");
-    },
-
-    /**
-     * Get or set the value as determined by the preference tree.
-     *
-     * These methods MUST NOT fail if the preference is not set, and therefore
-     * they MUST have a default value. This default value is provided in practice
-     * by use of a default preference tree. The standard format for the pref
-     * branches are <tt>mail.server.<i>key</i>.</tt> for per-server preferences,
-     * such that the preference is <tt>mail.server.<i>key</i>.<i>attr</i></tt>.
-     *
-     * The attributes are passed in as strings for ease of access by the C++
-     * consumers of this method.
-     *
-     * @param attr  The value for which the preference should be accessed.
-     * @param value The value of the preference to set.
-     * @return      The value of the preference.
-     * @{
-     */
-    //  boolean getBoolValue(in string attr);
-    getBoolValue: function _getBoolValue(attr) {
-        dump("function getBoolValue\n");
-    },
-
-    //  void setBoolValue(in string attr, in boolean value);
-    setBoolValue: function _setBoolValue(attr, value) {
-        dump("function setBoolValue\n");
-    },
-
-    //  ACString getCharValue(in string attr);
-    getCharValue: function _getCharValue(attr) {
-        dump("function getCharValue\n");
-    },
-
-    //  void setCharValue(in string attr, in ACString value);
-    setCharValue: function _setCharValue(attr, value) {
-        dump("function setCharValue\n");
-    },
-
-    //  AString getUnicharValue(in string attr);
-    getUnicharValue: function _getUnicharValue(attr) {
-        dump("function getUnicharValue\n");
-    },
-
-    //  void setUnicharValue(in string attr, in AString value);
-    setUnicharValue: function _setUnicharValue(attr, value) {
-        dump("function setUnicharValue\n");
-    },
-
-    //  long getIntValue(in string attr);
-    getIntValue: function _getIntValue(attr) {
-        dump("function getIntValue\n");
-    },
-
-    //  void setIntValue(in string attr, in long value);
-    setIntValue: function _setIntValue(attr, value) {
-        dump("function setIntValue\n");
-    },
-
-    /** @} */
-
-    /**
-     * Get or set the value as determined by the preference tree.
-     *
-     * These methods MUST NOT fail if the preference is not set, and therefore
-     * they MUST have a default value. This default value is provided in practice
-     * by use of a default preference tree. The standard format for the pref
-     * branches are <tt>mail.server.<i>key</i>.</tt> for per-server preferences,
-     * such that the preference is <tt>mail.server.<i>key</i>.<i>attr</i></tt>.
-     *
-     * The attributes are passed in as strings for ease of access by the C++
-     * consumers of this method.
-     *
-     * There are two preference names on here for legacy reasons, where the first
-     * is the name which will be using a (preferred) relative preference and the
-     * second a deprecated absolute preference. Implementations that do not have
-     * to worry about supporting legacy preferences can safely ignore this second
-     * parameter. Callers must still provide a valid value, though.
-     *
-     * @param relpref The name of the relative file preference.
-     * @param absref  The name of the absolute file preference.
-     * @param aValue  The value of the preference to set.
-     * @return        The value of the preference.
-     * @{
-     */
-    //  nsIFile getFileValue(in string relpref, in string abspref);
-    getFileValue: function _getFileValue(relpref, abspref) {
-        dump("function getFileValue\n");
-    },
-
-    //  void setFileValue(in string relpref, in string abspref, in nsIFile aValue);
-    setFileValue: function _setFileValue(relpref, abspref, aValue) {
-        dump("function setFileValue\n");
-    },
-
-    /** @} */
-
-    /**
-     * this is really dangerous. this destroys all pref values
-     * do not call this unless you know what you're doing!
-     */
-    //  void clearAllValues();
-    clearAllValues: function _clearAllValues() {
-        dump("function clearAllValues\n");
-    },
-
-    /** 
-     * this is also very dangerous.  this will remove the files
-     * associated with this server on disk.
-     */
-    //  void removeFiles();
-    removeFiles: function _removeFiles() {
-        dump("function removeFiles\n");
-    },
-
-    //  attribute boolean valid;
-    get valid() {
-        dump("get valid\n");
-    },
-
-    set valid(aValue) {
-        dump("set valid aValue:" + aValue + "\n");
-    },
-
-    //  AString toString();
-    toString: function _toString() {
-        dump("function toString\n");
-    },
-
-    //  void displayOfflineMsg(in nsIMsgWindow aWindow);
-    displayOfflineMsg: function _displayOfflineMsg(aWindow) {
-        dump("function displayOfflineMsg\n");
-    },
-
-    /* used for comparing nsIMsgIncomingServers */
-    //  boolean equals(in nsIMsgIncomingServer server);
-    equals: function _equals(server) {
-        dump("function equals\n");
-    },
-
-    /* Get Messages at startup */
-    //  readonly attribute boolean downloadMessagesAtStartup; 
-    get downloadMessagesAtStartup() {
-        dump("get downloadMessagesAtStartup\n");
-    },
-
-    /* check to this if the server supports filters */
-    //  attribute boolean canHaveFilters;
-    get canHaveFilters() {
-        dump("get canHaveFilters\n");
-    },
-
-    set canHaveFilters(aValue) {
-        dump("set canHaveFilters aValue:" + aValue + "\n");
-    },
-
-    /**
-     * can this server be removed from the account manager?  for
-     * instance, local mail is not removable, but an imported folder is 
-     */
-    //  attribute boolean canDelete;
-    get canDelete() {
-        dump("get canDelete\n");
-    },
-
-    set canDelete(aValue) {
-        dump("set canDelete aValue:" + aValue + "\n");
-    },
-
-    //  attribute boolean loginAtStartUp;
-    get loginAtStartUp() {
-        dump("get loginAtStartUp\n");
-    },
-
-    set loginAtStartUp(aValue) {
-        dump("set loginAtStartUp aValue:" + aValue + "\n");
-    },
-
-    //  attribute boolean limitOfflineMessageSize;
-    get limitOfflineMessageSize() {
-        dump("get limitOfflineMessageSize\n");
-    },
-
-    set limitOfflineMessageSize(aValue) {
-        dump("set limitOfflineMessageSize aValue:" + aValue + "\n");
-    },
-    //  attribute long maxMessageSize;
-    get maxMessageSize() {
-        dump("get maxMessageSize\n");
-    },
-
-    set maxMessageSize(aValue) {
-        dump("set maxMessageSize aValue:" + aValue + "\n");
-    },
-
-    //  attribute nsIMsgRetentionSettings retentionSettings;
-    get retentionSettings() {
-        dump("get retentionSettings\n");
-    },
-
-    set retentionSettings(aValue) {
-        dump("set retentionSettings aValue:" + aValue + "\n");
-    },
-
-    /* check if this server can be a default server */
-    //  readonly attribute boolean canBeDefaultServer;
-    get canBeDefaultServer() {
-        dump("get canBeDefaultServer\n");
-    },
-
-    /* check if this server allows search operations */
-    //  readonly attribute boolean canSearchMessages;
-    get canSearchMessages() {
-        dump("get canSearchMessages\n");
-    },
-
-    /* check if this server allows canEmptyTrashOnExit operations */
-    //  readonly attribute boolean canEmptyTrashOnExit;
-    get canEmptyTrashOnExit() {
-        dump("get canEmptyTrashOnExit\n");
-    },
-
-    /* display startup page once per account per session */
-    //  attribute boolean displayStartupPage;
-    get displayStartupPage() {
-        dump("get displayStartupPage\n");
-    },
-
-    set displayStartupPage(aValue) {
-        dump("set displayStartupPage aValue:" + aValue + "\n");
-    },
-    //  attribute nsIMsgDownloadSettings downloadSettings;
-    get downloadSettings() {
-        dump("get downloadSettings\n");
-    },
-
-    set downloadSettings(aValue) {
-        dump("set downloadSettings aValue:" + aValue + "\n");
-    },
-
-    /*
-     * Offline support level. Support level can vary based on abilities 
-     * and features each server can offer wrt to offline service.
-     * Here is the legend to determine the each support level details
-     *
-     * supportLevel == 0  --> no offline support (default) 
-     * supportLevel == 10 --> regular offline feature support
-     * supportLevel == 20 --> extended offline feature support 
-     *
-     * Each server can initialize itself to the support level if needed
-     * to override the default choice i.e., no offline support.
-     *
-     * POP3, None and Movemail will default to 0. 
-     * IMAP level 10 and NEWS with level 20. 
-     * 
-     */
-    //  attribute long offlineSupportLevel;
-    get offlineSupportLevel() {
-        dump("get offlineSupportLevel\n");
-    },
-
-    set offlineSupportLevel(aValue) {
-        dump("set offlineSupportLevel aValue:" + aValue + "\n");
-    },
-
-    /* create pretty name for migrated accounts */
-    //  AString generatePrettyNameForMigration(); 
-    generatePrettyNameForMigration: function _generatePrettyNameForMigration() {
-        dump("function generatePrettyNameForMigration\n");
-    },
-
-    /* does this server have disk space settings? */
-    //  readonly attribute boolean supportsDiskSpace;
-    get supportsDiskSpace() {
-        dump("get supportsDiskSpace\n");
-    },
-
-    /**
-     * Hide this server/account from the UI - used for smart mailboxes.
-     * The server can be retrieved from the account manager by name using the
-     * various Find methods, but nsIMsgAccountManager's GetAccounts and 
-     * GetAllServers methods won't return the server/account.
-     */
-    //  attribute boolean hidden;
-    get hidden() {
-        dump("get hidden\n");
-    },
-
-    set hidden(aValue) {
-        dump("set hidden aValue:" + aValue + "\n");
-    },
-
-    /**
-     * If the server supports Fcc/Sent/etc, default prefs can point to 
-     * the server. Otherwise, copies and folders prefs should point to
-     * Local Folders.
-     *
-     * By default this value is set to true via global pref 'allows_specialfolders_usage'
-     * (mailnews.js). For Nntp, the value is overridden to be false.
-     * If ISPs want to modify this value, they should do that in their rdf file
-     * by using this attribute. Please look at mozilla/mailnews/base/ispdata/aol.rdf for
-     * usage example.
-     */
-    //  attribute boolean defaultCopiesAndFoldersPrefsToServer;
-    get defaultCopiesAndFoldersPrefsToServer() {
-        dump("get defaultCopiesAndFoldersPrefsToServer\n");
-    },
-
-    set defaultCopiesAndFoldersPrefsToServer(aValue) {
-        dump("set defaultCopiesAndFoldersPrefsToServer aValue:" + aValue + "\n");
-    },
-
-    /* can this server allows sub folder creation */
-    //  attribute boolean canCreateFoldersOnServer;
-    get canCreateFoldersOnServer() {
-        dump("get canCreateFoldersOnServer\n");
-    },
-
-    set canCreateFoldersOnServer(aValue) {
-        dump("set canCreateFoldersOnServer aValue:" + aValue + "\n");
-    },
-
-    /* can this server allows message filing ? */
-    //  attribute boolean canFileMessagesOnServer;
-    get canFileMessagesOnServer() {
-        dump("get canFileMessagesOnServer\n");
-    },
-
-    set canFileMessagesOnServer(aValue) {
-        dump("set canFileMessagesOnServer aValue:" + aValue + "\n");
-    },
-
-    /* can this server allow compacting folders ? */
-    //  readonly attribute boolean canCompactFoldersOnServer;
-    get canCompactFoldersOnServer() {
-        dump("get canCompactFoldersOnServer\n");
-    },
-
-    /* can this server allow undo delete ? */
-    //  readonly attribute boolean canUndoDeleteOnServer;
-    get canUndoDeleteOnServer() {
-        dump("get canUndoDeleteOnServer\n");
-    },
-
-    /* used for setting up the filter UI */
-    //  readonly attribute nsMsgSearchScopeValue filterScope;
-    get filterScope() {
-        dump("get filterScope\n");
-    },
-
-    /* used for setting up the search UI */
-    //  readonly attribute nsMsgSearchScopeValue searchScope;
-    get searchScope() {
-        dump("get searchScope\n");
-    },
-
-    /** 
-     * If the password for the server is available either via authentication 
-     * in the current session or from password manager stored entries, return
-     * false. Otherwise, return true. If password is obtained from password 
-     * manager, set the password member variable.
-     */
-    //  readonly attribute boolean passwordPromptRequired;
-    get passwordPromptRequired() {
-        dump("get passwordPromptRequired\n");
-    },
-
-    /**
-     * for mail, this configures both the MDN filter, and the server-side
-     * spam filter filters, if needed.
-     *
-     * If we have set up to filter return receipts into
-     * our Sent folder, this utility method creates
-     * a filter to do that, and adds it to our filterList
-     * if it doesn't exist.  If it does, it will enable it.
-     *
-     * this is not used by news filters (yet).
-     */
-    //  void configureTemporaryFilters(in nsIMsgFilterList filterList);
-    configureTemporaryFilters: function _configureTemporaryFilters(filterList) {
-        dump("function configureTemporaryFilters\n");
-    },
-
-    /**
-     * If Sent folder pref is changed we need to clear the temporary 
-     * return receipt filter so that the new return receipt filter can
-     * be recreated (by ConfigureTemporaryReturnReceiptsFilter()).
-     */
-    //  void clearTemporaryReturnReceiptsFilter();
-    clearTemporaryReturnReceiptsFilter: function _clearTemporaryReturnReceiptsFilter() {
-        dump("function clearTemporaryReturnReceiptsFilter\n");
-    },
-
-    /**
-     * spam settings
-     */
-    //  readonly attribute nsISpamSettings spamSettings;
-    get spamSettings() {
-        dump("get spamSettings\n");
-    },
-
-    //  readonly attribute nsIMsgFilterPlugin spamFilterPlugin;
-    get spamFilterPlugin() {
-        dump("get spamFilterPlugin\n");
-    },
-
-    //  nsIMsgFolder getMsgFolderFromURI(in nsIMsgFolder aFolderResource, in ACString aURI);
-    getMsgFolderFromURI: function _getMsgFolderFromURI(aFolderResource, aURI) {
-        dump("function getMsgFolderFromURI\n");
-    },
-
-    //  readonly attribute boolean isDeferredTo;
-    get isDeferredTo() {
-        dump("get isDeferredTo\n");
-    },
-
-    //  const long keepDups = 0;
-    //  const long deleteDups = 1;
-    //  const long moveDupsToTrash = 2;
-    //  const long markDupsRead = 3;
-
-    //  attribute long incomingDuplicateAction;
-    get incomingDuplicateAction() {
-        dump("get incomingDuplicateAction\n");
-    },
-
-    set incomingDuplicateAction(aValue) {
-        dump("set incomingDuplicateAction aValue:" + aValue + "\n");
-    },
-
-    // check if new hdr is a duplicate of a recently arrived header
-    //  boolean isNewHdrDuplicate(in nsIMsgDBHdr aNewHdr);
-    isNewHdrDuplicate: function _isNewHdrDuplicate(aNewHdr) {
-        dump("function isNewHdrDuplicate\n");
-    },
-
-    /**
-     * Set a boolean to force an inherited propertyName to return empty instead
-     * of inheriting from a parent folder, server, or the global
-     *
-     * @param propertyName         The name of the property
-     * @param aForcePropertyEmpty  true if an empty inherited property should be returned
-     */
-    //  void setForcePropertyEmpty(in string propertyName, in boolean aForcePropertyEmpty);
-    setForcePropertyEmpty: function _setForcePropertyEmpty(propertyName, aForcePropertyEmpty) {
-        dump("function setForcePropertyEmpty\n");
-    },
-
-    /**
-     * Get a boolean to force an inherited propertyName to return empty instead
-     * of inheriting from a parent folder, server, or the global
-     *
-     * @param propertyName      The name of the property
-     *
-     * @return                  true if an empty inherited property should be returned
-     */
-    //  boolean getForcePropertyEmpty(in string propertyName);
-    getForcePropertyEmpty: function _getForcePropertyEmpty(propertyName) {
-        dump("function getForcePropertyEmpty\n");
-    },
-
-    /**
-     * Return the order in which this server type should appear in the folder pane.
-     * This sort order is a number between 100000000 and 900000000 so that RDF can
-     * use it as a string.
-     * The current return values are these:
-     * 0 = default account,       100000000 = mail accounts (POP3/IMAP4),
-     * 200000000 = Local Folders, 300000000 = IM accounts,
-     * 400000000 = RSS,           500000000 = News
-     * If a new server type is created a TB UI reviewer must decide its sort order.
-     */
-    //  readonly attribute long sortOrder;
-    get sortOrder() {
-        dump("get sortOrder\n");
-        return 100000000;
-    },
-
-
-};
-
-function NSGetFactory(cid) {
-
-    try {
-        if (!NSGetFactory.mivExchangeMsgIncomingServer) {
-            NSGetFactory.mivExchangeMsgIncomingServer = XPCOMUtils.generateNSGetFactory([mivExchangeMsgIncomingServer]);
-
-        }
-
-    }
-    catch (e) {
-        Components.utils.reportError(e);
-        dump(e);
-        throw e;
-    }
-
-    return NSGetFactory.mivExchangeMsgIncomingServer(cid);
-}
diff --git a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.manifest b/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.manifest
deleted file mode 100644
index 1d3e5929..00000000
--- a/email/interfaces/exchangeMsgIncomingServer/mivExchangeMsgIncomingServer.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-interfaces mivExchangeMsgIncomingServer.xpt
-component {79d87edc-020e-48d4-8c04-b894edab4bd2} mivExchangeMsgIncomingServer.js
-contract @mozilla.org/messenger/server;1?type=exchangeWebServiceMail {79d87edc-020e-48d4-8c04-b894edab4bd2}
-
-
diff --git a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.idl b/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.idl
deleted file mode 100644
index f8c58a5e..00000000
--- a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/
- * email: info@1st-setup.nl
- *
- * This interface can be used to for updates
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-#include "nsIMsgProtocolInfo.idl"
-
-[scriptable, uuid(ea4d2e73-b0bc-4b70-9f7d-95dbcb648930)]
-interface mivExchangeMsgProtocolInfo : nsIMsgProtocolInfo
-{
-
-};
diff --git a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js b/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js
deleted file mode 100644
index 8908c7f7..00000000
--- a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.js
+++ /dev/null
@@ -1,204 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/
- *
- * This interface/service is used for loadBalancing Request to Exchange
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-var components = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function mivExchangeMsgProtocolInfo() {
-
-    //this.logInfo("mivExchangeMsgProtocolInfo: init");
-
-}
-
-var mivExchangeMsgProtocolInfoGUID = "ea4d2e73-b0bc-4b70-9f7d-95dbcb648930";
-
-mivExchangeMsgProtocolInfo.prototype = {
-
-    QueryInterface: XPCOMUtils.generateQI([Ci.mivExchangeMsgProtocolInfo,
-        Ci.nsIMsgProtocolInfo,
-        Ci.nsIClassInfo,
-        Ci.nsISupports
-    ]),
-
-    _className: "mivExchangeMsgProtocolInfo",
-
-    classDescription: "Exchange EWS Msg Protocol Info",
-
-    classID: components.ID("{" + mivExchangeMsgProtocolInfoGUID + "}"),
-    contractID: "@mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail",
-    flags: Ci.nsIClassInfo.THREADSAFE,
-    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-    getInterfaces: function _getInterfaces(count) {
-        var ifaces = [Ci.mivExchangeMsgProtocolInfo,
-            Ci.nsIMsgProtocolInfo,
-            Ci.nsIClassInfo,
-            Ci.nsISupports
-        ];
-        count.value = ifaces.length;
-        return ifaces;
-    },
-
-    /**
-     * the default path to store local data for this type of
-     * server. Each server is usually in a subdirectory below this
-     */
-    //    attribute nsIFile defaultLocalPath;
-    get defaultLocalPath() {
-        var file = Cc["@mozilla.org/file/directory_service;1"].
-        getService(Ci.nsIProperties).
-        get("ProfD", Ci.nsIFile);
-        if (!file) return Cr.NS_ERROR_FAILURE;
-
-        if (!file.exists()) {
-            file.create(file.DIRECTORY_TYPE, 0775);
-        }
-    },
-
-    set defaultLocalPath(aValue) {
-        return Cr.NS_ERROR_NOT_IMPLEMENTED;
-    },
-    /**
-     * the IID of the protocol-specific interface for this server
-     * usually used from JS to dynamically get server-specific attributes
-     */
-    //    readonly attribute nsIIDPtr serverIID;
-    get serverIID() {
-        return Cr.NS_ERROR_NOT_IMPLEMENTED;
-    },
-
-    /**
-     * does this server type require a username?
-     * for instance, news does not but IMAP/POP do
-     */
-    //    readonly attribute boolean requiresUsername;
-    get requiresUsername() {
-        return true;
-    },
-
-    /**
-     * if the pretty name of the server should
-     * just be the e-mail address. Otherwise it usually
-     * ends up being something like "news on hostname"
-     */
-    //    readonly attribute boolean preflightPrettyNameWithEmailAddress;
-    get preflightPrettyNameWithEmailAddress() {
-        return Cr.NS_ERROR_NOT_IMPLEMENTED;
-    },
-
-    /**
-     * can this type of server be removed from the account manager?
-     * for instance, local mail is not removable
-     */
-    //    readonly attribute boolean canDelete;
-    get canDelete() {
-        return true;
-    },
-
-    /**
-     * can this type of server log in at startup?
-     */
-    //    readonly attribute boolean canLoginAtStartUp;
-    get canLoginAtStartUp() {
-        return true;
-    },
-
-    /**
-     * can you duplicate this server?
-     * for instance, local mail is unique and should not be duplicated.
-     */
-    //    readonly attribute boolean canDuplicate;
-    get canDuplicate() {
-        return true;
-    },
-
-    /* the default port
-       This is similar to nsIProtocolHanderl.defaultPort,
-       but for architectural reasons, there is a mail-specific interface to this.
-       When the input param isSecure is set to true, for all supported protocols, 
-       the secure port value is returned. If isSecure is set to false the default
-       port value is returned  */
-    //    long getDefaultServerPort(in boolean isSecure);
-    getDefaultServerPort: function _getDefaultServerPort(isSecure) {
-        return 443;
-    },
-
-    /**
-     * An attribute that tell us whether on not we can 
-     * get messages for the given server type 
-     * this is poorly named right now.
-     * it's really is there an inbox for this type?
-     * XXX todo, rename this.
-     */
-    //    readonly attribute boolean canGetMessages;
-    get canGetMessages() {
-        return true;
-    },
-
-    /** 
-     * do messages arrive for this server
-     * if they do, we can use our junk controls on it.
-     */
-    //    readonly attribute boolean canGetIncomingMessages;
-    get canGetIncomingMessages() {
-        return true;
-    },
-
-    /**
-     * do biff by default?
-     */
-    //    readonly attribute boolean defaultDoBiff;
-    get defaultDoBiff() {
-        return true;
-    },
-
-    /**
-     * do we need to show compose message link in the AccountCentral page ? 
-     */
-    //    readonly attribute boolean showComposeMsgLink;
-    get showComposeMsgLink() {
-        return true;
-    },
-
-};
-
-function NSGetFactory(cid) {
-
-    try {
-        if (!NSGetFactory.mivExchangeMsgProtocolInfo) {
-            NSGetFactory.mivExchangeMsgProtocolInfo = XPCOMUtils.generateNSGetFactory([mivExchangeMsgProtocolInfo]);
-
-        }
-
-    }
-    catch (e) {
-        Components.utils.reportError(e);
-        dump(e);
-        throw e;
-    }
-
-    return NSGetFactory.mivExchangeMsgProtocolInfo(cid);
-}
diff --git a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.manifest b/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.manifest
deleted file mode 100644
index 9f484b3c..00000000
--- a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-interfaces mivExchangeMsgProtocolInfo.xpt
-component {ea4d2e73-b0bc-4b70-9f7d-95dbcb648930} mivExchangeMsgProtocolInfo.js
-contract @mozilla.org/messenger/protocol/info;1?type=exchangeWebServiceMail {ea4d2e73-b0bc-4b70-9f7d-95dbcb648930}
-
-
diff --git a/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.xpt b/email/interfaces/exchangeMsgProtocolInfo/mivExchangeMsgProtocolInfo.xpt
deleted file mode 100644
index c0d2cecf3e8b4952034b1085ef3c0c91694c9562..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmazDaQ64*3aKne^~p@)<&t7#VqjumVCVy4B_NJ$n4+=uYqyZ6&8kNdnmHQf8-Rk0
zKnw=2eD#Vq?C~y`Upw{o>6A_bpr8m;N<XjI)3-Q1peVm2KRG|gGcPTlAvd$kwIVqq
NF)uw8T?%4m0|0!+C-ndT


From 5450f7002288e23ca0e8358000d1f8e28259a836 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 23:44:31 +0100
Subject: [PATCH 156/222] emailtag: move old rtews (remote tag EWS) to emailtag
 directory structure

---
 defaults/preferences/{rtews.prefs.js => emailtag.prefs.js}        | 0
 .../rtews-overlay.xul => emailtag/content/emailtag-overlay.js     | 0
 chrome/content/rtews.js => emailtag/content/emailtag.js           | 0
 .../cs_CZ/rtews.dtd => emailtag/locale/cs_CZ/emailtag.dtd         | 0
 .../rtews.properties => emailtag/locale/cs_CZ/emailtag.properties | 0
 .../de/rtews.dtd => emailtag/locale/de/emailtag.dtd               | 0
 .../en/rtews.dtd => emailtag/locale/en/emailtag.dtd               | 0
 .../en/rtews.properties => emailtag/locale/en/emailtag.properties | 0
 .../en_US/rtews.dtd => emailtag/locale/en_US/emailtag.dtd         | 0
 .../rtews.properties => emailtag/locale/en_US/emailtag.properties | 0
 .../fr_FR/rtews.dtd => emailtag/locale/fr_FR/emailtag.dtd         | 0
 .../rtews.properties => emailtag/locale/fr_FR/emailtag.properties | 0
 .../it_IT/rtews.dtd => emailtag/locale/it_IT/emailtag.dtd         | 0
 .../rtews.properties => emailtag/locale/it_IT/emailtag.properties | 0
 .../ja_JP/rtews.dtd => emailtag/locale/ja_JP/emailtag.dtd         | 0
 .../nl/rtews.dtd => emailtag/locale/nl/emailtag.dtd               | 0
 .../ru/rtews.dtd => emailtag/locale/ru/emailtag.dtd               | 0
 .../sv/rtews.dtd => emailtag/locale/sv/emailtag.dtd               | 0
 .../tr/rtews.dtd => emailtag/locale/tr/emailtag.dtd               | 0
 .../tr/rtews.properties => emailtag/locale/tr/emailtag.properties | 0
 20 files changed, 0 insertions(+), 0 deletions(-)
 rename defaults/preferences/{rtews.prefs.js => emailtag.prefs.js} (100%)
 rename chrome/content/rtews-overlay.xul => emailtag/content/emailtag-overlay.js (100%)
 rename chrome/content/rtews.js => emailtag/content/emailtag.js (100%)
 rename locale/exchangecalendar/cs_CZ/rtews.dtd => emailtag/locale/cs_CZ/emailtag.dtd (100%)
 rename locale/exchangecalendar/cs_CZ/rtews.properties => emailtag/locale/cs_CZ/emailtag.properties (100%)
 rename locale/exchangecalendar/de/rtews.dtd => emailtag/locale/de/emailtag.dtd (100%)
 rename locale/exchangecalendar/en/rtews.dtd => emailtag/locale/en/emailtag.dtd (100%)
 rename locale/exchangecalendar/en/rtews.properties => emailtag/locale/en/emailtag.properties (100%)
 rename locale/exchangecalendar/en_US/rtews.dtd => emailtag/locale/en_US/emailtag.dtd (100%)
 rename locale/exchangecalendar/en_US/rtews.properties => emailtag/locale/en_US/emailtag.properties (100%)
 rename locale/exchangecalendar/fr_FR/rtews.dtd => emailtag/locale/fr_FR/emailtag.dtd (100%)
 rename locale/exchangecalendar/fr_FR/rtews.properties => emailtag/locale/fr_FR/emailtag.properties (100%)
 rename locale/exchangecalendar/it_IT/rtews.dtd => emailtag/locale/it_IT/emailtag.dtd (100%)
 rename locale/exchangecalendar/it_IT/rtews.properties => emailtag/locale/it_IT/emailtag.properties (100%)
 rename locale/exchangecalendar/ja_JP/rtews.dtd => emailtag/locale/ja_JP/emailtag.dtd (100%)
 rename locale/exchangecalendar/nl/rtews.dtd => emailtag/locale/nl/emailtag.dtd (100%)
 rename locale/exchangecalendar/ru/rtews.dtd => emailtag/locale/ru/emailtag.dtd (100%)
 rename locale/exchangecalendar/sv/rtews.dtd => emailtag/locale/sv/emailtag.dtd (100%)
 rename locale/exchangecalendar/tr/rtews.dtd => emailtag/locale/tr/emailtag.dtd (100%)
 rename locale/exchangecalendar/tr/rtews.properties => emailtag/locale/tr/emailtag.properties (100%)

diff --git a/defaults/preferences/rtews.prefs.js b/defaults/preferences/emailtag.prefs.js
similarity index 100%
rename from defaults/preferences/rtews.prefs.js
rename to defaults/preferences/emailtag.prefs.js
diff --git a/chrome/content/rtews-overlay.xul b/emailtag/content/emailtag-overlay.js
similarity index 100%
rename from chrome/content/rtews-overlay.xul
rename to emailtag/content/emailtag-overlay.js
diff --git a/chrome/content/rtews.js b/emailtag/content/emailtag.js
similarity index 100%
rename from chrome/content/rtews.js
rename to emailtag/content/emailtag.js
diff --git a/locale/exchangecalendar/cs_CZ/rtews.dtd b/emailtag/locale/cs_CZ/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/rtews.dtd
rename to emailtag/locale/cs_CZ/emailtag.dtd
diff --git a/locale/exchangecalendar/cs_CZ/rtews.properties b/emailtag/locale/cs_CZ/emailtag.properties
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/rtews.properties
rename to emailtag/locale/cs_CZ/emailtag.properties
diff --git a/locale/exchangecalendar/de/rtews.dtd b/emailtag/locale/de/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/de/rtews.dtd
rename to emailtag/locale/de/emailtag.dtd
diff --git a/locale/exchangecalendar/en/rtews.dtd b/emailtag/locale/en/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/en/rtews.dtd
rename to emailtag/locale/en/emailtag.dtd
diff --git a/locale/exchangecalendar/en/rtews.properties b/emailtag/locale/en/emailtag.properties
similarity index 100%
rename from locale/exchangecalendar/en/rtews.properties
rename to emailtag/locale/en/emailtag.properties
diff --git a/locale/exchangecalendar/en_US/rtews.dtd b/emailtag/locale/en_US/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/rtews.dtd
rename to emailtag/locale/en_US/emailtag.dtd
diff --git a/locale/exchangecalendar/en_US/rtews.properties b/emailtag/locale/en_US/emailtag.properties
similarity index 100%
rename from locale/exchangecalendar/en_US/rtews.properties
rename to emailtag/locale/en_US/emailtag.properties
diff --git a/locale/exchangecalendar/fr_FR/rtews.dtd b/emailtag/locale/fr_FR/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/rtews.dtd
rename to emailtag/locale/fr_FR/emailtag.dtd
diff --git a/locale/exchangecalendar/fr_FR/rtews.properties b/emailtag/locale/fr_FR/emailtag.properties
similarity index 100%
rename from locale/exchangecalendar/fr_FR/rtews.properties
rename to emailtag/locale/fr_FR/emailtag.properties
diff --git a/locale/exchangecalendar/it_IT/rtews.dtd b/emailtag/locale/it_IT/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/rtews.dtd
rename to emailtag/locale/it_IT/emailtag.dtd
diff --git a/locale/exchangecalendar/it_IT/rtews.properties b/emailtag/locale/it_IT/emailtag.properties
similarity index 100%
rename from locale/exchangecalendar/it_IT/rtews.properties
rename to emailtag/locale/it_IT/emailtag.properties
diff --git a/locale/exchangecalendar/ja_JP/rtews.dtd b/emailtag/locale/ja_JP/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/rtews.dtd
rename to emailtag/locale/ja_JP/emailtag.dtd
diff --git a/locale/exchangecalendar/nl/rtews.dtd b/emailtag/locale/nl/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/rtews.dtd
rename to emailtag/locale/nl/emailtag.dtd
diff --git a/locale/exchangecalendar/ru/rtews.dtd b/emailtag/locale/ru/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/rtews.dtd
rename to emailtag/locale/ru/emailtag.dtd
diff --git a/locale/exchangecalendar/sv/rtews.dtd b/emailtag/locale/sv/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/rtews.dtd
rename to emailtag/locale/sv/emailtag.dtd
diff --git a/locale/exchangecalendar/tr/rtews.dtd b/emailtag/locale/tr/emailtag.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/rtews.dtd
rename to emailtag/locale/tr/emailtag.dtd
diff --git a/locale/exchangecalendar/tr/rtews.properties b/emailtag/locale/tr/emailtag.properties
similarity index 100%
rename from locale/exchangecalendar/tr/rtews.properties
rename to emailtag/locale/tr/emailtag.properties

From a30a8e3bff9f7354e7d32d6ab647ae759cdb2288 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 23:54:02 +0100
Subject: [PATCH 157/222] emailtag: move emailtag declarations into itself
 manifest

---
 chrome.manifest                    |  3 +--
 emailtag/exchangeEmailTag.manifest | 13 +++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 emailtag/exchangeEmailTag.manifest

diff --git a/chrome.manifest b/chrome.manifest
index 91434d6c..32ae58cd 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -41,8 +41,6 @@ overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchange
 overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/priority-display.xul 
 overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/invite-style.xul
 overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/content/folderPropsOverlay.xul
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/rtews-overlay.xul
-
 
 locale exchangecalendar en locale/exchangecalendar/en/
 
@@ -85,3 +83,4 @@ manifest interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manif
 manifest interfaces/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
 manifest interfaces/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
 
+manifest emailtag/exchangeEmailTag.manifest
diff --git a/emailtag/exchangeEmailTag.manifest b/emailtag/exchangeEmailTag.manifest
new file mode 100644
index 00000000..7fc1093c
--- /dev/null
+++ b/emailtag/exchangeEmailTag.manifest
@@ -0,0 +1,13 @@
+content exchangeemailtag content/
+
+overlay chrome://messenger/content/messenger.xul chrome://exchangeemailtag/content/emailtag-overlay.xul
+
+locale exchangeemailtag en    locale/en/
+
+locale exchangeemailtag de    locale/de/
+locale exchangeemailtag en-US locale/en_US/
+locale exchangeemailtag fr-FR locale/fr_FR/
+locale exchangeemailtag ja-JP locale/ja_JP/
+locale exchangeemailtag nl    locale/nl/
+locale exchangeemailtag ru    locale/ru/
+locale exchangeemailtag sv    locale/sv/

From 9de9063451ee54f5d54dcc70d3172e2787a04161 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 11 Nov 2017 23:54:53 +0100
Subject: [PATCH 158/222] emailtag: complete rename for emailtag file inside
 the overlay

---
 emailtag/content/emailtag-overlay.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emailtag/content/emailtag-overlay.js b/emailtag/content/emailtag-overlay.js
index 03e23941..76187384 100644
--- a/emailtag/content/emailtag-overlay.js
+++ b/emailtag/content/emailtag-overlay.js
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecalendar/locale/rtews.dtd">
-<overlay id="rtews-overlay"
+overlay SYSTEM "chrome://exchangeemailtag/locale/emailtag.dtd">
+<overlay id="emailtag-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/rtews.js" />
+            src="chrome://exchangeemailtag/content/emailtag.js" />
     <stringbundleset id="stringbundleset">
         <stringbundle id="string-bundle"
-                      src="chrome://exchangecalendar/locale/rtews.properties" />
+                      src="chrome://exchangeemailtag/locale/emailtag.properties" />
     </stringbundleset>
 </overlay>

From a9ba1f179fdf4fee94cb74477c96f070f771bfd9 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 12 Nov 2017 00:06:10 +0100
Subject: [PATCH 159/222] emailtag: update Transifex references

---
 .tx/config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.tx/config b/.tx/config
index 7f48efbf..6f03ff0c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -146,14 +146,14 @@ source_lang = en
 type = DTD
 
 [exchangecalendar.rtews]
-file_filter = locale/exchangecalendar/<lang>/rtews.dtd
-source_file = locale/exchangecalendar/en/rtews.dtd
+file_filter = emailtag/locale/<lang>/emailtag.dtd
+source_file = emailtag/locale/en/emailtag.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.rtews-properties]
-file_filter = locale/exchangecalendar/<lang>/rtews.properties
-source_file = locale/exchangecalendar/en/rtews.properties
+file_filter = emailtag/locale/<lang>/emailtag.properties
+source_file = emailtag/locale/en/emailtag.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 

From d6b305eee1ee1a33359d7527b34a4199bced03ac Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 12 Nov 2017 07:24:22 +0100
Subject: [PATCH 160/222] emailtag: rename the XUL overlay to emailtag.xul

---
 emailtag/content/{emailtag-overlay.js => emailtag.xul} | 0
 emailtag/exchangeEmailTag.manifest                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename emailtag/content/{emailtag-overlay.js => emailtag.xul} (100%)

diff --git a/emailtag/content/emailtag-overlay.js b/emailtag/content/emailtag.xul
similarity index 100%
rename from emailtag/content/emailtag-overlay.js
rename to emailtag/content/emailtag.xul
diff --git a/emailtag/exchangeEmailTag.manifest b/emailtag/exchangeEmailTag.manifest
index 7fc1093c..ecd08876 100644
--- a/emailtag/exchangeEmailTag.manifest
+++ b/emailtag/exchangeEmailTag.manifest
@@ -1,6 +1,6 @@
 content exchangeemailtag content/
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangeemailtag/content/emailtag-overlay.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangeemailtag/content/emailtag.xul
 
 locale exchangeemailtag en    locale/en/
 

From f3b55c5388c896c60415ef6ca4cdeeb2f8b4b5ee Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 12 Nov 2017 07:25:01 +0100
Subject: [PATCH 161/222] emailtag: fix XUL header

---
 emailtag/content/emailtag.xul | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/emailtag/content/emailtag.xul b/emailtag/content/emailtag.xul
index 76187384..784aacff 100644
--- a/emailtag/content/emailtag.xul
+++ b/emailtag/content/emailtag.xul
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE 
-overlay SYSTEM "chrome://exchangeemailtag/locale/emailtag.dtd">
+<!DOCTYPE overlay
+[
+    <!ENTITY % emailtag SYSTEM "chrome://exchangeemailtag/locale/emailtag.dtd">
+    %emailtag;
+]>
 <overlay id="emailtag-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 

From fd1f163d20213fa3f2eeaac950db30828a4313d4 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 12 Nov 2017 00:16:23 +0100
Subject: [PATCH 162/222] default preferences: disable debug settings

---
 defaults/preferences/debug.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/preferences/debug.js b/defaults/preferences/debug.js
index 9017b4f5..fd618fb9 100644
--- a/defaults/preferences/debug.js
+++ b/defaults/preferences/debug.js
@@ -1,4 +1,5 @@
 /* debugging prefs */
+/*
 pref("browser.dom.window.dump.enabled", true);
 pref("javascript.options.showInConsole", true);
 pref("javascript.options.strict", true);
@@ -16,3 +17,4 @@ pref("extensions.extras.ShadeLow", false);
 pref("calendar.timezone.local.auto", true);
 pref("extensions.1st-setup.others.warnAboutPrereleaseVersion", true);
 user_pref("mailnews.database.global.indexer.enabled", true);
+*/

From 70f06586196495b847bb3cf4fe1f47b49fe4fd26 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 23 Nov 2017 23:17:33 +0100
Subject: [PATCH 163/222] preferences: show in other preferences that
 enabling/disabling Thunderbird globasl search index will affect features

---
 chrome/content/otherPreferences.xul           | 12 ++++++++++++
 locale/exchangecalendar/en/preferences.dtd    |  4 ++++
 locale/exchangecalendar/en_US/preferences.dtd |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/chrome/content/otherPreferences.xul b/chrome/content/otherPreferences.xul
index f163216f..bcd01966 100644
--- a/chrome/content/otherPreferences.xul
+++ b/chrome/content/otherPreferences.xul
@@ -77,6 +77,9 @@
             <preference id="extensions.1st-setup.others.userAgent"
                         name="extensions.1st-setup.others.userAgent"
                         type="unichar" />
+            <preference id="extensions.1st-setup.others.globalsearch"
+                        name="mailnews.database.global.indexer.enabled"
+                        type="bool" />
             <preference id="extensions.1st-setup.others.ntlmv1"
                         name="network.auth.force-generic-ntlm-v1"
                         type="bool" />
@@ -159,6 +162,15 @@
                 </hbox>
             </vbox>
         </groupbox>
+        <groupbox id="exchangeWebService_others_prefs_groupbox5">
+            <caption label="&exchangeWebService.preference.globalsearch.caption;" />
+            <vbox>
+                <checkbox id="globalsearch"
+                          preference="extensions.1st-setup.others.globalsearch"
+                          label="&exchangeWebService.preference.globalsearch.label;" />
+                <label>&exchangeWebService.preference.globalsearch.explain;</label>
+            </vbox>
+        </groupbox>
         <groupbox id="exchangeWebService_others_prefs_groupbox4">
             <caption label="&exchangeWebService.preference.ntlmv1.label;" />
             <vbox>
diff --git a/locale/exchangecalendar/en/preferences.dtd b/locale/exchangecalendar/en/preferences.dtd
index b5922ad7..6f99a599 100644
--- a/locale/exchangecalendar/en/preferences.dtd
+++ b/locale/exchangecalendar/en/preferences.dtd
@@ -43,6 +43,10 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/locale/exchangecalendar/en_US/preferences.dtd b/locale/exchangecalendar/en_US/preferences.dtd
index b5922ad7..6f99a599 100644
--- a/locale/exchangecalendar/en_US/preferences.dtd
+++ b/locale/exchangecalendar/en_US/preferences.dtd
@@ -43,6 +43,10 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">

From 70ecaa6094ca60c227c55f4a182b7d3beab0df3c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 25 Dec 2017 15:44:46 +0100
Subject: [PATCH 164/222] exchangeTimeZones: revert changes from the beautifier
 as this XML code relies on spaces inside XML inner values (checkout file from
 commit 5fe104)

---
 .../ewsTimesZoneDefinitions_2007.xml          | 17821 ++++++----------
 1 file changed, 6625 insertions(+), 11196 deletions(-)

diff --git a/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml b/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
index 8a6a21a2..2cb24b93 100644
--- a/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
+++ b/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
@@ -1,11198 +1,6627 @@
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
-    <s:Header>
-        <h:ServerVersionInfo MajorVersion="14"
-                             MinorVersion="1"
-                             MajorBuildNumber="289"
-                             MinorBuildNumber="6"
-                             Version="Exchange2010_SP1"
-                             xmlns:h="http://schemas.microsoft.com/exchange/services/2006/types"
-                             xmlns="http://schemas.microsoft.com/exchange/services/2006/types"
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                             xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
-    </s:Header>
-    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-        <m:GetServerTimeZonesResponse xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages"
-                                      xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types">
-
-            <m:ResponseMessages>
-                <m:GetServerTimeZonesResponseMessage ResponseClass="Success">
-
-                    <m:ResponseCode>NoError</m:ResponseCode>
-                    <m:TimeZoneDefinitions>
-                        <t:TimeZoneDefinition Name="(UTC-12:00) International Date Line West"
-                                              Id="Dateline Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Dateline Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Dateline
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-11:00) Coordinated Universal Time-11"
-                                              Id="UTC-11">
-                            <t:Periods>
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/UTC-11/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/UTC-11/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-11:00) Midway Island, Samoa"
-                                              Id="Samoa Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2009-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Standard" />
-                                <t:Period Bias="PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Daylight" />
-                                <t:Period Bias="PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Samoa
-                                        Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-10:00) Hawaii"
-                                              Id="Hawaiian Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Hawaiian Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Hawaiian
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-09:00) Alaska"
-                                              Id="Alaskan Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT9H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Standard" />
-                                <t:Period Bias="PT8H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT9H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Standard" />
-                                <t:Period Bias="PT8H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Alaskan
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Alaskan
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Alaskan
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Alaskan
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-08:00) Pacific Time (US &amp; Canada)"
-                                              Id="Pacific Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Standard" />
-                                <t:Period Bias="PT7H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Standard" />
-                                <t:Period Bias="PT7H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-08:00) Tijuana, Baja California"
-                                              Id="Pacific Standard Time (Mexico)">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Standard" />
-                                <t:Period Bias="PT7H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        Standard Time
-                                        (Mexico)/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        Standard Time
-                                        (Mexico)/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-07:00) Arizona"
-                                              Id="US Mountain Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT7H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/US Mountain Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/US
-                                        Mountain Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-07:00) Chihuahua, La Paz, Mazatlan"
-                                              Id="Mountain Standard Time (Mexico)">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT7H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Standard" />
-                                <t:Period Bias="PT6H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mountain
-                                        Standard Time
-                                        (Mexico)/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mountain
-                                        Standard Time
-                                        (Mexico)/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-07:00) Mountain Time (US &amp; Canada)"
-                                              Id="Mountain Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT7H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Standard" />
-                                <t:Period Bias="PT6H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT7H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Standard" />
-                                <t:Period Bias="PT6H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mountain
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mountain
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mountain
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mountain
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-06:00) Central America"
-                                              Id="Central America Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central America Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        America Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-06:00) Central Time (US &amp; Canada)"
-                                              Id="Central Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Standard Time/2006-Standard" />
-                                <t:Period Bias="PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Standard Time/2007-Standard" />
-                                <t:Period Bias="PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-06:00) Guadalajara, Mexico City, Monterrey"
-                                              Id="Central Standard Time (Mexico)">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Standard" />
-                                <t:Period Bias="PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Standard Time
-                                        (Mexico)/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Standard Time
-                                        (Mexico)/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-06:00) Saskatchewan"
-                                              Id="Canada Central Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Canada Central Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Canada
-                                        Central Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-05:00) Bogota, Lima, Quito"
-                                              Id="SA Pacific Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/SA Pacific Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/SA
-                                        Pacific Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-05:00) Eastern Time (US &amp; Canada)"
-                                              Id="Eastern Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Standard" />
-                                <t:Period Bias="PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Standard" />
-                                <t:Period Bias="PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Eastern
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Eastern
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Eastern
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Eastern
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-05:00) Indiana (East)"
-                                              Id="US Eastern Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2005-Standard" />
-                                <t:Period Bias="PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Standard" />
-                                <t:Period Bias="PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Standard" />
-                                <t:Period Bias="PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/US
-                                        Eastern Standard
-                                        Time/2005-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/US
-                                        Eastern Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/US
-                                        Eastern Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/US
-                                        Eastern Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/US
-                                        Eastern Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2006-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-04:30) Caracas"
-                                              Id="Venezuela Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Venezuela Standard Time/2006-Standard" />
-                                <t:Period Bias="PT4H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Venezuela Standard Time/2007-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Venezuela
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Venezuela
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-04:00) Asuncion"
-                                              Id="Paraguay Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="12">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="13">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2021-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Paraguay
-                                        Standard
-                                        Time/2021-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">12</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">13</t:To>
-                                    <t:DateTime>
-                                    2021-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-04:00) Atlantic Time (Canada)"
-                                              Id="Atlantic Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Atlantic
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Atlantic
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Atlantic
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Atlantic
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-04:00) Georgetown, La Paz, San Juan"
-                                              Id="SA Western Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/SA Western Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/SA
-                                        Western Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-04:00) Manaus"
-                                              Id="Central Brazilian Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="12">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="13">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="14">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="15">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2021-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2021-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="16">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2022-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2022-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="17">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2023-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2023-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="18">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2024-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2024-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="19">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2025-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2025-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="20">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2026-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2026-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="21">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2027-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2027-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="22">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2028-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2028-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="23">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2029-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2029-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="24">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2030-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2030-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="25">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2031-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2031-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="26">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2032-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2032-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="27">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2033-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2033-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="28">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2034-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2034-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="29">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2035-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2035-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="30">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2036-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2036-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="31">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2037-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2037-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="32">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2038-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2038-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="33">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2039-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2039-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="34">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2040-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Brazilian Standard
-                                        Time/2040-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">12</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">13</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">14</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">15</t:To>
-                                    <t:DateTime>
-                                    2021-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">16</t:To>
-                                    <t:DateTime>
-                                    2022-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">17</t:To>
-                                    <t:DateTime>
-                                    2023-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">18</t:To>
-                                    <t:DateTime>
-                                    2024-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">19</t:To>
-                                    <t:DateTime>
-                                    2025-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">20</t:To>
-                                    <t:DateTime>
-                                    2026-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">21</t:To>
-                                    <t:DateTime>
-                                    2027-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">22</t:To>
-                                    <t:DateTime>
-                                    2028-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">23</t:To>
-                                    <t:DateTime>
-                                    2029-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">24</t:To>
-                                    <t:DateTime>
-                                    2030-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">25</t:To>
-                                    <t:DateTime>
-                                    2031-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">26</t:To>
-                                    <t:DateTime>
-                                    2032-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">27</t:To>
-                                    <t:DateTime>
-                                    2033-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">28</t:To>
-                                    <t:DateTime>
-                                    2034-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">29</t:To>
-                                    <t:DateTime>
-                                    2035-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">30</t:To>
-                                    <t:DateTime>
-                                    2036-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">31</t:To>
-                                    <t:DateTime>
-                                    2037-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">32</t:To>
-                                    <t:DateTime>
-                                    2038-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">33</t:To>
-                                    <t:DateTime>
-                                    2039-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">34</t:To>
-                                    <t:DateTime>
-                                    2040-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-04:00) Santiago"
-                                              Id="Pacific SA Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Daylight" />
-                                <t:Period Bias="PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pacific
-                                        SA Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-03:30) Newfoundland"
-                                              Id="Newfoundland Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Standard" />
-                                <t:Period Bias="PT2H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Standard" />
-                                <t:Period Bias="PT2H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Newfoundland
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT1M</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Newfoundland
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT1M</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Newfoundland
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT1M</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Newfoundland
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT1M</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-03:00) Brasilia"
-                                              Id="E. South America Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="12">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="13">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="14">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="15">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2021-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2021-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="16">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2022-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2022-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="17">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2023-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2023-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="18">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2024-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2024-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="19">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2025-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2025-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="20">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2026-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2026-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="21">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2027-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2027-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="22">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2028-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2028-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="23">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2029-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2029-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="24">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2030-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2030-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="25">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2031-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2031-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="26">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2032-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2032-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="27">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2033-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2033-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="28">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2034-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2034-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="29">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2035-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2035-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="30">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2036-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2036-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="31">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2037-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2037-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="32">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2038-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2038-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="33">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2039-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2039-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="34">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2040-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>2</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        South America Standard
-                                        Time/2040-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">12</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">13</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">14</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">15</t:To>
-                                    <t:DateTime>
-                                    2021-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">16</t:To>
-                                    <t:DateTime>
-                                    2022-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">17</t:To>
-                                    <t:DateTime>
-                                    2023-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">18</t:To>
-                                    <t:DateTime>
-                                    2024-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">19</t:To>
-                                    <t:DateTime>
-                                    2025-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">20</t:To>
-                                    <t:DateTime>
-                                    2026-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">21</t:To>
-                                    <t:DateTime>
-                                    2027-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">22</t:To>
-                                    <t:DateTime>
-                                    2028-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">23</t:To>
-                                    <t:DateTime>
-                                    2029-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">24</t:To>
-                                    <t:DateTime>
-                                    2030-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">25</t:To>
-                                    <t:DateTime>
-                                    2031-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">26</t:To>
-                                    <t:DateTime>
-                                    2032-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">27</t:To>
-                                    <t:DateTime>
-                                    2033-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">28</t:To>
-                                    <t:DateTime>
-                                    2034-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">29</t:To>
-                                    <t:DateTime>
-                                    2035-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">30</t:To>
-                                    <t:DateTime>
-                                    2036-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">31</t:To>
-                                    <t:DateTime>
-                                    2037-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">32</t:To>
-                                    <t:DateTime>
-                                    2038-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">33</t:To>
-                                    <t:DateTime>
-                                    2039-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">34</t:To>
-                                    <t:DateTime>
-                                    2040-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-03:00) Buenos Aires"
-                                              Id="Argentina Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2006-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Standard" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Argentina Standard Time/2010-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Monday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>12</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Argentina
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-03:00) Cayenne"
-                                              Id="SA Eastern Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/SA Eastern Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/SA
-                                        Eastern Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-03:00) Greenland"
-                                              Id="Greenland Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="12">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="13">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2021-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT22H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenland
-                                        Standard
-                                        Time/2021-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">12</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">13</t:To>
-                                    <t:DateTime>
-                                    2021-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-03:00) Montevideo"
-                                              Id="Montevideo Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Standard" />
-                                <t:Period Bias="PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Daylight" />
-                                <t:Period Bias="PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Montevideo
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Montevideo
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Montevideo
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Montevideo
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-02:00) Coordinated Universal Time-02"
-                                              Id="UTC-02">
-                            <t:Periods>
-                                <t:Period Bias="PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/UTC-02/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/UTC-02/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-02:00) Mid-Atlantic"
-                                              Id="Mid-Atlantic Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Standard" />
-                                <t:Period Bias="PT1H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mid-Atlantic
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mid-Atlantic
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-01:00) Azores"
-                                              Id="Azores Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Azores Standard Time/1-Standard" />
-                                <t:Period Bias="PT0H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Azores Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Azores
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Azores
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC-01:00) Cape Verde Is."
-                                              Id="Cape Verde Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Cape Verde Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Cape
-                                        Verde Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC) Casablanca"
-                                              Id="Morocco Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2007-Standard" />
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT1H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Daylight" />
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT1H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Daylight" />
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Standard" />
-                                <t:Period Bias="-PT1H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Daylight" />
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Morocco Standard Time/2011-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>5</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>8</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>5</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>8</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>5</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>8</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Morocco
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC) Coordinated Universal Time"
-                                              Id="UTC">
-                            <t:Periods>
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/UTC/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/UTC/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London"
-                                              Id="GMT Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/GMT Standard Time/1-Standard" />
-                                <t:Period Bias="-PT1H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/GMT Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/GMT
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT1H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/GMT
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC) Monrovia, Reykjavik"
-                                              Id="Greenwich Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="PT0H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Greenwich Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Greenwich
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"
-                                              Id="W. Europe Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Standard" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Europe Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Europe Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"
-                                              Id="Central Europe Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Standard" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Europe Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Europe Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+01:00) Brussels, Copenhagen, Madrid, Paris"
-                                              Id="Romance Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Romance Standard Time/1-Standard" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Romance Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Romance
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Romance
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb"
-                                              Id="Central European Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central European Standard Time/1-Standard" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Central European Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        European Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        European Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+01:00) West Central Africa"
-                                              Id="W. Central Africa Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Central Africa Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Central Africa Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Windhoek"
-                                              Id="Namibia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Standard" />
-                                <t:Period Bias="-PT1H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Daylight" />
-                                <t:Period Bias="-PT1H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Namibia
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Namibia
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Namibia
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Namibia
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Amman"
-                                              Id="Jordan Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Jordan
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Jordan
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT1H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Jordan
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Jordan
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT1H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Athens, Bucharest, Istanbul"
-                                              Id="GTB Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/GTB Standard Time/1-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/GTB Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/GTB
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/GTB
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT4H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Beirut"
-                                              Id="Middle East Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="12">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2021-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Middle
-                                        East Standard
-                                        Time/2021-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">12</t:To>
-                                    <t:DateTime>
-                                    2021-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Cairo"
-                                              Id="Egypt Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2005-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2005-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>8</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>8</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Egypt
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2006-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Damascus"
-                                              Id="Syria Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2010-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2010-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2011-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2011-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2012-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2012-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2013-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2013-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2014-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2014-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2015-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2015-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2016-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2016-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2017-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Syria Standard Time/2017-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Wednesday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Syria
-                                        Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Harare, Pretoria"
-                                              Id="South Africa Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/South Africa Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/South
-                                        Africa Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius"
-                                              Id="FLE Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/FLE Standard Time/1-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/FLE Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/FLE
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/FLE
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT4H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Jerusalem"
-                                              Id="Israel Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2004-Standard" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2005-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2005-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2010-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2010-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2011-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2011-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2012-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2012-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2013-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2013-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2014-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2014-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2015-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2015-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2016-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2016-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2017-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2017-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2018-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2018-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2019-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2019-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2020-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2020-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2021-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2021-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2022-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2022-Daylight" />
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2023-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Israel Standard Time/2023-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2004-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2005-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2005-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="6">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="7">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2011-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2011-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="8">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2012-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2012-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="9">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2013-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2013-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="10">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2014-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2014-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="11">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2015-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2015-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="12">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2016-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2016-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="13">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2017-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2017-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="14">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2018-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2018-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="15">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2019-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2019-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="16">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2020-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2020-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="17">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2021-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2021-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="18">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2022-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2022-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="19">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2023-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Israel
-                                        Standard
-                                        Time/2023-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2005-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2006-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">6</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">7</t:To>
-                                    <t:DateTime>
-                                    2011-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">8</t:To>
-                                    <t:DateTime>
-                                    2012-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">9</t:To>
-                                    <t:DateTime>
-                                    2013-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">10</t:To>
-                                    <t:DateTime>
-                                    2014-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">11</t:To>
-                                    <t:DateTime>
-                                    2015-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">12</t:To>
-                                    <t:DateTime>
-                                    2016-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">13</t:To>
-                                    <t:DateTime>
-                                    2017-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">14</t:To>
-                                    <t:DateTime>
-                                    2018-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">15</t:To>
-                                    <t:DateTime>
-                                    2019-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">16</t:To>
-                                    <t:DateTime>
-                                    2020-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">17</t:To>
-                                    <t:DateTime>
-                                    2021-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">18</t:To>
-                                    <t:DateTime>
-                                    2022-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">19</t:To>
-                                    <t:DateTime>
-                                    2023-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+02:00) Minsk"
-                                              Id="E. Europe Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT2H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Standard" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        Europe Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        Europe Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+03:00) Baghdad"
-                                              Id="Arabic Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Arabic Standard Time/2008-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arabic
-                                        Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arabic
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT4H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arabic
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arabic
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT4H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Monday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arabic
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+03:00) Kuwait, Riyadh"
-                                              Id="Arab Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Arab Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arab
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+03:00) Moscow, St. Petersburg, Volgograd"
-                                              Id="Russian Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Russian Standard Time/1-Standard" />
-                                <t:Period Bias="-PT4H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Russian Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Russian
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Russian
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+03:00) Nairobi"
-                                              Id="E. Africa Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT3H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. Africa Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        Africa Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+03:30) Tehran"
-                                              Id="Iran Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2005-Standard" />
-                                <t:Period Bias="-PT4H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2005-Daylight" />
-                                <t:Period Bias="-PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT4H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT3H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT4H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Iran Standard Time/2009-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2005-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2005-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Tuesday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2006-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Iran
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Monday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2006-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+03:00) Tbilisi"
-                                              Id="Georgian Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Georgian Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Georgian
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+04:00) Abu Dhabi, Muscat"
-                                              Id="Arabian Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Arabian Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Arabian
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+04:00) Baku"
-                                              Id="Azerbaijan Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Standard" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Azerbaijan
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT4H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Azerbaijan
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT5H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+04:00) Port Louis"
-                                              Id="Mauritius Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Mauritius Standard Time/2010-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mauritius
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mauritius
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Tuesday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mauritius
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mauritius
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mauritius
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Mauritius
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+04:00) Yerevan"
-                                              Id="Caucasus Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT4H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Standard" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Caucasus
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Caucasus
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+04:30) Kabul"
-                                              Id="Afghanistan Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT4H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Afghanistan Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Afghanistan
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+05:00) Ekaterinburg"
-                                              Id="Ekaterinburg Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Standard" />
-                                <t:Period Bias="-PT6H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Ekaterinburg
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Ekaterinburg
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+05:00) Islamabad, Karachi"
-                                              Id="Pakistan Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT6H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT6H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Pakistan Standard Time/2010-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pakistan
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pakistan
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>5</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pakistan
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pakistan
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Tuesday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        2</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pakistan
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M59.999S</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Saturday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Pakistan
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+05:00) Tashkent"
-                                              Id="West Asia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT5H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/West Asia Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/West
-                                        Asia Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi"
-                                              Id="India Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT5H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/India Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/India
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+05:30) Sri Jayawardenepura"
-                                              Id="Sri Lanka Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT5H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Sri Lanka Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Sri
-                                        Lanka Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+05:45) Kathmandu"
-                                              Id="Nepal Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT5H45M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Nepal Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Nepal
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+06:00) Almaty, Novosibirsk"
-                                              Id="N. Central Asia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Standard" />
-                                <t:Period Bias="-PT7H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/N.
-                                        Central Asia Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/N.
-                                        Central Asia Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+06:00) Astana"
-                                              Id="Central Asia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Asia Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Asia Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+06:00) Dhaka"
-                                              Id="Bangladesh Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT7H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT6H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Bangladesh Standard Time/2010-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Bangladesh
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Bangladesh
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT23H</t:TimeOffset>
-                                        <t:Month>6</t:Month>
-                                        <t:DayOfWeek>
-                                        Friday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Bangladesh
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT23H59M</t:TimeOffset>
-                                        <t:Month>12</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Bangladesh
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+06:30) Yangon (Rangoon)"
-                                              Id="Myanmar Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT6H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Myanmar Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Myanmar
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+07:00) Bangkok, Hanoi, Jakarta"
-                                              Id="SE Asia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT7H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/SE Asia Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/SE
-                                        Asia Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+07:00) Krasnoyarsk"
-                                              Id="North Asia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT7H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/North Asia Standard Time/1-Standard" />
-                                <t:Period Bias="-PT8H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/North Asia Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/North
-                                        Asia Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/North
-                                        Asia Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi"
-                                              Id="China Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/China Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/China
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+08:00) Irkutsk, Ulaan Bataar"
-                                              Id="North Asia East Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Standard" />
-                                <t:Period Bias="-PT9H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/North
-                                        Asia East Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/North
-                                        Asia East Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+08:00) Kuala Lumpur, Singapore"
-                                              Id="Singapore Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Singapore Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Singapore
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+08:00) Perth"
-                                              Id="W. Australia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2005-Standard" />
-                                <t:Period Bias="-PT9H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT9H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT9H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT9H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/W. Australia Standard Time/2010-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2005-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>12</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="3">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="4">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="5">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/W.
-                                        Australia Standard
-                                        Time/2010-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2006-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">3</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">4</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">5</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+08:00) Taipei"
-                                              Id="Taipei Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Taipei Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Taipei
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+08:00) Ulaanbaatar"
-                                              Id="Ulaanbaatar Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT8H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Ulaanbaatar Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Ulaanbaatar
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+09:00) Osaka, Sapporo, Tokyo"
-                                              Id="Tokyo Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT9H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Tokyo Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Tokyo
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+09:00) Seoul"
-                                              Id="Korea Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT9H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Korea Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Korea
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+09:00) Yakutsk"
-                                              Id="Yakutsk Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT9H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Standard" />
-                                <t:Period Bias="-PT10H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Yakutsk
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Yakutsk
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+09:30) Adelaide"
-                                              Id="Cen. Australia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT10H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT9H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT10H30M"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT9H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Cen.
-                                        Australia Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Cen.
-                                        Australia Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Cen.
-                                        Australia Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Cen.
-                                        Australia Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+09:30) Darwin"
-                                              Id="AUS Central Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT9H30M"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/AUS Central Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/AUS
-                                        Central Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+10:00) Brisbane"
-                                              Id="E. Australia Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/E. Australia Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/E.
-                                        Australia Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+10:00) Canberra, Melbourne, Sydney"
-                                              Id="AUS Eastern Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT11H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT11H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/AUS
-                                        Eastern Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/AUS
-                                        Eastern Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/AUS
-                                        Eastern Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/AUS
-                                        Eastern Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+10:00) Guam, Port Moresby"
-                                              Id="West Pacific Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/West Pacific Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/West
-                                        Pacific Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+10:00) Hobart"
-                                              Id="Tasmania Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT11H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT11H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Tasmania
-                                        Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Tasmania
-                                        Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Tasmania
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Tasmania
-                                        Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+10:00) Vladivostok"
-                                              Id="Vladivostok Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT10H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Standard" />
-                                <t:Period Bias="-PT11H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Vladivostok
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Vladivostok
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+11:00) Magadan"
-                                              Id="Magadan Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Magadan Standard Time/1-Standard" />
-                                <t:Period Bias="-PT12H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Magadan Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Magadan
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Magadan
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+11:00) Magadan, Solomon Is., New Caledonia"
-                                              Id="Central Pacific Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT11H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Central Pacific Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Central
-                                        Pacific Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+12:00) Auckland, Wellington"
-                                              Id="New Zealand Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT13H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Daylight" />
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Standard" />
-                                <t:Period Bias="-PT13H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Daylight" />
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Standard" />
-                                <t:Period Bias="-PT13H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Daylight" />
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/New
-                                        Zealand Standard
-                                        Time/2006-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/New
-                                        Zealand Standard
-                                        Time/2006-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/New
-                                        Zealand Standard
-                                        Time/2007-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        3</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/New
-                                        Zealand Standard
-                                        Time/2007-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/New
-                                        Zealand Standard
-                                        Time/2008-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>4</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/New
-                                        Zealand Standard
-                                        Time/2008-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>9</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2007-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2008-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+12:00) Coordinated Universal Time+12"
-                                              Id="UTC+12">
-                            <t:Periods>
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/UTC+12/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/UTC+12/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+12:00) Fiji, Marshall Is."
-                                              Id="Fiji Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2008-Standard" />
-                                <t:Period Bias="-PT13H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Daylight" />
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Standard" />
-                                <t:Period Bias="-PT13H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Daylight" />
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Fiji
-                                        Standard
-                                        Time/2008-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="1">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Fiji
-                                        Standard
-                                        Time/2009-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT0H</t:TimeOffset>
-                                        <t:Month>1</t:Month>
-                                        <t:DayOfWeek>
-                                        Thursday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Fiji
-                                        Standard
-                                        Time/2009-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>11</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                                <t:TransitionsGroup Id="2">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Fiji
-                                        Standard
-                                        Time/2010-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Fiji
-                                        Standard
-                                        Time/2010-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        4</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">1</t:To>
-                                    <t:DateTime>
-                                    2009-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                                <t:AbsoluteDateTransition>
-                                    <t:To Kind="Group">2</t:To>
-                                    <t:DateTime>
-                                    2010-01-01T00:00:00</t:DateTime>
-                                </t:AbsoluteDateTransition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+12:00) Petropavlovsk-Kamchatsky"
-                                              Id="Kamchatka Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT12H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Standard" />
-                                <t:Period Bias="-PT13H"
-                                          Name="Daylight"
-                                          Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Daylight" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Kamchatka
-                                        Standard
-                                        Time/1-Daylight</t:To>
-                                        <t:TimeOffset>
-                                        PT2H</t:TimeOffset>
-                                        <t:Month>3</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                    <t:RecurringDayTransition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Kamchatka
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                        <t:TimeOffset>
-                                        PT3H</t:TimeOffset>
-                                        <t:Month>10</t:Month>
-                                        <t:DayOfWeek>
-                                        Sunday</t:DayOfWeek>
-                                        <t:Occurrence>
-                                        -1</t:Occurrence>
-                                    </t:RecurringDayTransition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                        <t:TimeZoneDefinition Name="(UTC+13:00) Nuku'alofa"
-                                              Id="Tonga Standard Time">
-                                              
-                            <t:Periods>
-                                <t:Period Bias="-PT13H"
-                                          Name="Standard"
-                                          Id="trule:Microsoft/Registry/Tonga Standard Time/1-Standard" />
-                            </t:Periods>
-                            <t:TransitionsGroups>
-                                <t:TransitionsGroup Id="0">
-                                    <t:Transition>
-                                        <t:To Kind="Period">
-                                        trule:Microsoft/Registry/Tonga
-                                        Standard
-                                        Time/1-Standard</t:To>
-                                    </t:Transition>
-                                </t:TransitionsGroup>
-                            </t:TransitionsGroups>
-                            <t:Transitions>
-                                <t:Transition>
-                                    <t:To Kind="Group">0</t:To>
-                                </t:Transition>
-                            </t:Transitions>
-                        </t:TimeZoneDefinition>
-                    </m:TimeZoneDefinitions>
-                </m:GetServerTimeZonesResponseMessage>
-            </m:ResponseMessages>
-        </m:GetServerTimeZonesResponse>
-    </s:Body>
+  <s:Header>
+    <h:ServerVersionInfo MajorVersion="14" MinorVersion="1" MajorBuildNumber="289" MinorBuildNumber="6" Version="Exchange2010_SP1" xmlns:h="http://schemas.microsoft.com/exchange/services/2006/types" xmlns="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
+  </s:Header>
+  <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <m:GetServerTimeZonesResponse xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types">
+      <m:ResponseMessages>
+        <m:GetServerTimeZonesResponseMessage ResponseClass="Success">
+          <m:ResponseCode>NoError</m:ResponseCode>
+          <m:TimeZoneDefinitions>
+            <t:TimeZoneDefinition Name="(UTC-12:00) International Date Line West" Id="Dateline Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT12H" Name="Standard" Id="trule:Microsoft/Registry/Dateline Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Dateline Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-11:00) Coordinated Universal Time-11" Id="UTC-11">
+              <t:Periods>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/UTC-11/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/UTC-11/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-11:00) Midway Island, Samoa" Id="Samoa Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2009-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2010-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2011-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2012-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2013-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2014-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2015-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2016-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2017-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2018-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2019-Standard"/>
+                <t:Period Bias="PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Daylight"/>
+                <t:Period Bias="PT11H" Name="Standard" Id="trule:Microsoft/Registry/Samoa Standard Time/2020-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2009-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2018-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2018-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2019-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2019-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2020-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Samoa Standard Time/2020-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-10:00) Hawaii" Id="Hawaiian Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT10H" Name="Standard" Id="trule:Microsoft/Registry/Hawaiian Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Hawaiian Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-09:00) Alaska" Id="Alaskan Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT9H" Name="Standard" Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Standard"/>
+                <t:Period Bias="PT8H" Name="Daylight" Id="trule:Microsoft/Registry/Alaskan Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT9H" Name="Standard" Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Standard"/>
+                <t:Period Bias="PT8H" Name="Daylight" Id="trule:Microsoft/Registry/Alaskan Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Alaskan Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-08:00) Pacific Time (US &amp; Canada)" Id="Pacific Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT8H" Name="Standard" Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Standard"/>
+                <t:Period Bias="PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT8H" Name="Standard" Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Standard"/>
+                <t:Period Bias="PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-08:00) Tijuana, Baja California" Id="Pacific Standard Time (Mexico)">
+              <t:Periods>
+                <t:Period Bias="PT8H" Name="Standard" Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Standard"/>
+                <t:Period Bias="PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific Standard Time (Mexico)/1-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-07:00) Arizona" Id="US Mountain Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/US Mountain Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/US Mountain Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-07:00) Chihuahua, La Paz, Mazatlan" Id="Mountain Standard Time (Mexico)">
+              <t:Periods>
+                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Standard"/>
+                <t:Period Bias="PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time (Mexico)/1-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-07:00) Mountain Time (US &amp; Canada)" Id="Mountain Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Standard"/>
+                <t:Period Bias="PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Mountain Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT7H" Name="Standard" Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Standard"/>
+                <t:Period Bias="PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Mountain Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mountain Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-06:00) Central America" Id="Central America Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central America Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central America Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-06:00) Central Time (US &amp; Canada)" Id="Central Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Standard Time/2006-Standard"/>
+                <t:Period Bias="PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Central Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Standard Time/2007-Standard"/>
+                <t:Period Bias="PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Central Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-06:00) Guadalajara, Mexico City, Monterrey" Id="Central Standard Time (Mexico)">
+              <t:Periods>
+                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Standard"/>
+                <t:Period Bias="PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Standard Time (Mexico)/1-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-06:00) Saskatchewan" Id="Canada Central Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT6H" Name="Standard" Id="trule:Microsoft/Registry/Canada Central Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Canada Central Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-05:00) Bogota, Lima, Quito" Id="SA Pacific Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/SA Pacific Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/SA Pacific Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-05:00) Eastern Time (US &amp; Canada)" Id="Eastern Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Standard"/>
+                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Eastern Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Standard"/>
+                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Eastern Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Eastern Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-05:00) Indiana (East)" Id="US Eastern Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/US Eastern Standard Time/2005-Standard"/>
+                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Standard"/>
+                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/US Eastern Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT5H" Name="Standard" Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Standard"/>
+                <t:Period Bias="PT4H" Name="Daylight" Id="trule:Microsoft/Registry/US Eastern Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2005-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/US Eastern Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-04:30) Caracas" Id="Venezuela Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Venezuela Standard Time/2006-Standard"/>
+                <t:Period Bias="PT4H30M" Name="Standard" Id="trule:Microsoft/Registry/Venezuela Standard Time/2007-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Venezuela Standard Time/2006-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Venezuela Standard Time/2007-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-04:00) Asuncion" Id="Paraguay Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2008-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2009-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2010-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2011-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2012-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2013-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2014-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2015-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2016-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2017-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2018-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2019-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2020-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Paraguay Standard Time/2021-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2018-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2018-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2019-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2019-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="12">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2020-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2020-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="13">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2021-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Paraguay Standard Time/2021-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">12</t:To>
+                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">13</t:To>
+                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-04:00) Atlantic Time (Canada)" Id="Atlantic Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Atlantic Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Atlantic Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Atlantic Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-04:00) Georgetown, La Paz, San Juan" Id="SA Western Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/SA Western Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/SA Western Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-04:00) Manaus" Id="Central Brazilian Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="12">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2018-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="13">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2019-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="14">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2020-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="15">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2021-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="16">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2022-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="17">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2023-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="18">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2024-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="19">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2025-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="20">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2026-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="21">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2027-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="22">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2028-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="23">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2029-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="24">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2030-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="25">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2031-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="26">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2032-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="27">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2033-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="28">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2034-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="29">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2035-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="30">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2036-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="31">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2037-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="32">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2038-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="33">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2039-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="34">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Brazilian Standard Time/2040-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">12</t:To>
+                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">13</t:To>
+                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">14</t:To>
+                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">15</t:To>
+                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">16</t:To>
+                  <t:DateTime>2022-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">17</t:To>
+                  <t:DateTime>2023-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">18</t:To>
+                  <t:DateTime>2024-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">19</t:To>
+                  <t:DateTime>2025-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">20</t:To>
+                  <t:DateTime>2026-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">21</t:To>
+                  <t:DateTime>2027-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">22</t:To>
+                  <t:DateTime>2028-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">23</t:To>
+                  <t:DateTime>2029-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">24</t:To>
+                  <t:DateTime>2030-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">25</t:To>
+                  <t:DateTime>2031-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">26</t:To>
+                  <t:DateTime>2032-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">27</t:To>
+                  <t:DateTime>2033-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">28</t:To>
+                  <t:DateTime>2034-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">29</t:To>
+                  <t:DateTime>2035-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">30</t:To>
+                  <t:DateTime>2036-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">31</t:To>
+                  <t:DateTime>2037-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">32</t:To>
+                  <t:DateTime>2038-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">33</t:To>
+                  <t:DateTime>2039-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">34</t:To>
+                  <t:DateTime>2040-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-04:00) Santiago" Id="Pacific SA Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2007-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2008-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2009-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2010-Standard"/>
+                <t:Period Bias="PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Daylight"/>
+                <t:Period Bias="PT4H" Name="Standard" Id="trule:Microsoft/Registry/Pacific SA Standard Time/2011-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pacific SA Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-03:30) Newfoundland" Id="Newfoundland Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Standard"/>
+                <t:Period Bias="PT2H30M" Name="Daylight" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Standard"/>
+                <t:Period Bias="PT2H30M" Name="Daylight" Id="trule:Microsoft/Registry/Newfoundland Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT1M</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT1M</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT1M</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Newfoundland Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT1M</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-03:00) Brasilia" Id="E. South America Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2006-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2007-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2008-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2009-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2010-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2011-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2012-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2013-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2014-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2015-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2016-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2017-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2018-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2019-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2020-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2021-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2022-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2023-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2024-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2025-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2026-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2027-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2028-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2029-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2030-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2031-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2032-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2033-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2034-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2035-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2036-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2037-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2038-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2039-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. South America Standard Time/2040-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="12">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2018-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2018-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="13">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2019-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2019-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="14">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2020-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2020-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="15">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2021-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2021-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="16">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2022-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2022-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="17">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2023-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2023-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="18">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2024-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2024-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="19">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2025-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2025-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="20">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2026-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2026-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="21">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2027-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2027-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="22">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2028-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2028-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="23">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2029-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2029-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="24">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2030-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2030-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="25">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2031-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2031-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="26">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2032-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2032-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="27">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2033-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2033-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="28">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2034-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2034-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="29">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2035-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2035-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="30">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2036-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2036-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="31">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2037-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2037-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="32">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2038-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2038-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="33">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2039-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2039-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="34">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2040-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>2</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. South America Standard Time/2040-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">12</t:To>
+                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">13</t:To>
+                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">14</t:To>
+                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">15</t:To>
+                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">16</t:To>
+                  <t:DateTime>2022-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">17</t:To>
+                  <t:DateTime>2023-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">18</t:To>
+                  <t:DateTime>2024-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">19</t:To>
+                  <t:DateTime>2025-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">20</t:To>
+                  <t:DateTime>2026-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">21</t:To>
+                  <t:DateTime>2027-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">22</t:To>
+                  <t:DateTime>2028-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">23</t:To>
+                  <t:DateTime>2029-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">24</t:To>
+                  <t:DateTime>2030-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">25</t:To>
+                  <t:DateTime>2031-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">26</t:To>
+                  <t:DateTime>2032-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">27</t:To>
+                  <t:DateTime>2033-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">28</t:To>
+                  <t:DateTime>2034-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">29</t:To>
+                  <t:DateTime>2035-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">30</t:To>
+                  <t:DateTime>2036-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">31</t:To>
+                  <t:DateTime>2037-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">32</t:To>
+                  <t:DateTime>2038-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">33</t:To>
+                  <t:DateTime>2039-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">34</t:To>
+                  <t:DateTime>2040-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-03:00) Buenos Aires" Id="Argentina Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2006-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2007-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2008-Standard"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Argentina Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Argentina Standard Time/2010-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2006-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Monday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>12</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Argentina Standard Time/2010-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-03:00) Cayenne" Id="SA Eastern Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/SA Eastern Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/SA Eastern Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-03:00) Greenland" Id="Greenland Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2011-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2012-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2013-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2014-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2015-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2016-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2017-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2018-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2019-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2020-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Greenland Standard Time/2021-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2018-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2018-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2019-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2019-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="12">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2020-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2020-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="13">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2021-Daylight</t:To>
+                    <t:TimeOffset>PT22H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenland Standard Time/2021-Standard</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">12</t:To>
+                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">13</t:To>
+                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-03:00) Montevideo" Id="Montevideo Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Montevideo Standard Time/2006-Standard"/>
+                <t:Period Bias="PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Daylight"/>
+                <t:Period Bias="PT3H" Name="Standard" Id="trule:Microsoft/Registry/Montevideo Standard Time/2007-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Montevideo Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-02:00) Coordinated Universal Time-02" Id="UTC-02">
+              <t:Periods>
+                <t:Period Bias="PT2H" Name="Standard" Id="trule:Microsoft/Registry/UTC-02/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/UTC-02/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-02:00) Mid-Atlantic" Id="Mid-Atlantic Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT2H" Name="Standard" Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Standard"/>
+                <t:Period Bias="PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mid-Atlantic Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-01:00) Azores" Id="Azores Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT1H" Name="Standard" Id="trule:Microsoft/Registry/Azores Standard Time/1-Standard"/>
+                <t:Period Bias="PT0H" Name="Daylight" Id="trule:Microsoft/Registry/Azores Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Azores Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Azores Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC-01:00) Cape Verde Is." Id="Cape Verde Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT1H" Name="Standard" Id="trule:Microsoft/Registry/Cape Verde Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Cape Verde Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC) Casablanca" Id="Morocco Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2007-Standard"/>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Morocco Standard Time/2008-Daylight"/>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Morocco Standard Time/2009-Daylight"/>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Standard"/>
+                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Morocco Standard Time/2010-Daylight"/>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Morocco Standard Time/2011-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2007-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>5</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>8</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>5</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>8</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>5</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>8</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Morocco Standard Time/2011-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC) Coordinated Universal Time" Id="UTC">
+              <t:Periods>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/UTC/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/UTC/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London" Id="GMT Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/GMT Standard Time/1-Standard"/>
+                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/GMT Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/GMT Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT1H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/GMT Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC) Monrovia, Reykjavik" Id="Greenwich Standard Time">
+              <t:Periods>
+                <t:Period Bias="PT0H" Name="Standard" Id="trule:Microsoft/Registry/Greenwich Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Greenwich Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" Id="W. Europe Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Standard"/>
+                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/W. Europe Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Europe Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Europe Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" Id="Central Europe Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Standard"/>
+                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Central Europe Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Europe Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Europe Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" Id="Romance Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Romance Standard Time/1-Standard"/>
+                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Romance Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Romance Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Romance Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" Id="Central European Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Central European Standard Time/1-Standard"/>
+                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Central European Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central European Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central European Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+01:00) West Central Africa" Id="W. Central Africa Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/W. Central Africa Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Central Africa Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Windhoek" Id="Namibia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Standard"/>
+                <t:Period Bias="-PT1H" Name="Daylight" Id="trule:Microsoft/Registry/Namibia Standard Time/2010-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Daylight" Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Daylight"/>
+                <t:Period Bias="-PT1H" Name="Standard" Id="trule:Microsoft/Registry/Namibia Standard Time/2011-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Namibia Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Amman" Id="Jordan Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Jordan Standard Time/2006-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Jordan Standard Time/2007-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT1H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Jordan Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT1H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Athens, Bucharest, Istanbul" Id="GTB Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/GTB Standard Time/1-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/GTB Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/GTB Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/GTB Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT4H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Beirut" Id="Middle East Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2010-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2011-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2012-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2013-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2014-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2015-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2016-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2017-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2018-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2019-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2020-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Middle East Standard Time/2021-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2018-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2018-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2019-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2019-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2020-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2020-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="12">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2021-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Middle East Standard Time/2021-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">12</t:To>
+                  <t:DateTime>2021-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Cairo" Id="Egypt Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2005-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2006-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2010-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Egypt Standard Time/2011-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2005-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2005-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>8</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>8</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Egypt Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Damascus" Id="Syria Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2006-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2010-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2010-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2011-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2011-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2012-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2012-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2013-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2013-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2014-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2014-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2015-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2015-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2016-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2016-Daylight"/>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Syria Standard Time/2017-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Syria Standard Time/2017-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Wednesday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2011-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2011-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="6">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2012-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2012-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="7">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2013-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2013-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="8">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2014-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2014-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="9">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2015-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2015-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="10">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2016-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2016-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="11">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2017-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Syria Standard Time/2017-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">6</t:To>
+                  <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">7</t:To>
+                  <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">8</t:To>
+                  <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">9</t:To>
+                  <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">10</t:To>
+                  <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">11</t:To>
+                  <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Harare, Pretoria" Id="South Africa Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/South Africa Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/South Africa Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" Id="FLE Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/FLE Standard Time/1-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/FLE Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/FLE Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/FLE Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT4H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Jerusalem" Id="Israel Standard Time">
+               <t:Periods>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2004-Standard"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2005-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2005-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2006-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2006-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2007-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2007-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2008-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2008-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2009-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2009-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2010-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2010-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2011-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2011-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2012-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2012-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2013-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2013-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2014-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2014-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2015-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2015-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2016-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2016-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2017-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2017-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2018-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2018-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2019-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2019-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2020-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2020-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2021-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2021-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2022-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2022-Daylight"/>
+                  <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/Israel Standard Time/2023-Standard"/>
+                  <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/Israel Standard Time/2023-Daylight"/>
+               </t:Periods>
+               <t:TransitionsGroups>
+                  <t:TransitionsGroup Id="0">
+                     <t:Transition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2004-Standard</t:To>
+                     </t:Transition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="1">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2005-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>4</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2005-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>2</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="2">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2006-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2006-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="3">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2007-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2007-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>9</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>3</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="4">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2008-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2008-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="5">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2009-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2009-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>9</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="6">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2010-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2010-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>9</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>2</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="7">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2011-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>4</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2011-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="8">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2012-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2012-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>9</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>4</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="9">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2013-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2013-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="10">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2014-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2014-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="11">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2015-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2015-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="12">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2016-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2016-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="13">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2017-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>4</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2017-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="14">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2018-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>4</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2018-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="15">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2019-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2019-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="16">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2020-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2020-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="17">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2021-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2021-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="18">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2022-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2022-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+                  <t:TransitionsGroup Id="19">
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2023-Daylight</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>3</t:Month>
+                        <t:DayOfWeek>Friday</t:DayOfWeek>
+                        <t:Occurrence>4</t:Occurrence>
+                     </t:RecurringDayTransition>
+                     <t:RecurringDayTransition>
+                        <t:To Kind="Period">trule:Microsoft/Registry/Israel Standard Time/2023-Standard</t:To>
+                        <t:TimeOffset>PT2H</t:TimeOffset>
+                        <t:Month>10</t:Month>
+                        <t:DayOfWeek>Sunday</t:DayOfWeek>
+                        <t:Occurrence>-1</t:Occurrence>
+                     </t:RecurringDayTransition>
+                  </t:TransitionsGroup>
+               </t:TransitionsGroups>
+               <t:Transitions>
+                  <t:Transition>
+                     <t:To Kind="Group">0</t:To>
+                  </t:Transition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">1</t:To>
+                     <t:DateTime>2005-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">2</t:To>
+                     <t:DateTime>2006-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">3</t:To>
+                     <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">4</t:To>
+                     <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">5</t:To>
+                     <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">6</t:To>
+                     <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">7</t:To>
+                     <t:DateTime>2011-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">8</t:To>
+                     <t:DateTime>2012-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">9</t:To>
+                     <t:DateTime>2013-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">10</t:To>
+                     <t:DateTime>2014-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">11</t:To>
+                     <t:DateTime>2015-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">12</t:To>
+                     <t:DateTime>2016-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">13</t:To>
+                     <t:DateTime>2017-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">14</t:To>
+                     <t:DateTime>2018-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">15</t:To>
+                     <t:DateTime>2019-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">16</t:To>
+                     <t:DateTime>2020-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">17</t:To>
+                     <t:DateTime>2021-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">18</t:To>
+                     <t:DateTime>2022-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+                  <t:AbsoluteDateTransition>
+                     <t:To Kind="Group">19</t:To>
+                     <t:DateTime>2023-01-01T00:00:00</t:DateTime>
+                  </t:AbsoluteDateTransition>
+               </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+02:00) Minsk" Id="E. Europe Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT2H" Name="Standard" Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Standard"/>
+                <t:Period Bias="-PT3H" Name="Daylight" Id="trule:Microsoft/Registry/E. Europe Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. Europe Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. Europe Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+03:00) Baghdad" Id="Arabic Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Arabic Standard Time/2006-Daylight"/>
+                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Arabic Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arabic Standard Time/2008-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT4H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT4H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Monday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arabic Standard Time/2008-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+03:00) Kuwait, Riyadh" Id="Arab Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Arab Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arab Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+03:00) Moscow, St. Petersburg, Volgograd" Id="Russian Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/Russian Standard Time/1-Standard"/>
+                <t:Period Bias="-PT4H" Name="Daylight" Id="trule:Microsoft/Registry/Russian Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Russian Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Russian Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+03:00) Nairobi" Id="E. Africa Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT3H" Name="Standard" Id="trule:Microsoft/Registry/E. Africa Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. Africa Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+03:30) Tehran" Id="Iran Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2005-Standard"/>
+                <t:Period Bias="-PT4H30M" Name="Daylight" Id="trule:Microsoft/Registry/Iran Standard Time/2005-Daylight"/>
+                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT4H30M" Name="Daylight" Id="trule:Microsoft/Registry/Iran Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT3H30M" Name="Standard" Id="trule:Microsoft/Registry/Iran Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT4H30M" Name="Daylight" Id="trule:Microsoft/Registry/Iran Standard Time/2009-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2005-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2005-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Tuesday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2006-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2007-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Iran Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Monday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+03:00) Tbilisi" Id="Georgian Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Georgian Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Georgian Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+04:00) Abu Dhabi, Muscat" Id="Arabian Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Arabian Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Arabian Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+04:00) Baku" Id="Azerbaijan Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Standard"/>
+                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Azerbaijan Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Azerbaijan Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT4H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Azerbaijan Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT5H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+04:00) Port Louis" Id="Mauritius Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Mauritius Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Mauritius Standard Time/2010-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2007-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Tuesday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Mauritius Standard Time/2010-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+04:00) Yerevan" Id="Caucasus Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT4H" Name="Standard" Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Standard"/>
+                <t:Period Bias="-PT5H" Name="Daylight" Id="trule:Microsoft/Registry/Caucasus Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Caucasus Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Caucasus Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+04:30) Kabul" Id="Afghanistan Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT4H30M" Name="Standard" Id="trule:Microsoft/Registry/Afghanistan Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Afghanistan Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+05:00) Ekaterinburg" Id="Ekaterinburg Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Standard"/>
+                <t:Period Bias="-PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Ekaterinburg Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+05:00) Islamabad, Karachi" Id="Pakistan Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Pakistan Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT6H" Name="Daylight" Id="trule:Microsoft/Registry/Pakistan Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/Pakistan Standard Time/2010-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2007-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>5</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Tuesday</t:DayOfWeek>
+                    <t:Occurrence>2</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M59.999S</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Saturday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Pakistan Standard Time/2010-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+05:00) Tashkent" Id="West Asia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT5H" Name="Standard" Id="trule:Microsoft/Registry/West Asia Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/West Asia Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" Id="India Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT5H30M" Name="Standard" Id="trule:Microsoft/Registry/India Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/India Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+05:30) Sri Jayawardenepura" Id="Sri Lanka Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT5H30M" Name="Standard" Id="trule:Microsoft/Registry/Sri Lanka Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Sri Lanka Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+05:45) Kathmandu" Id="Nepal Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT5H45M" Name="Standard" Id="trule:Microsoft/Registry/Nepal Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Nepal Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+06:00) Almaty, Novosibirsk" Id="N. Central Asia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Standard"/>
+                <t:Period Bias="-PT7H" Name="Daylight" Id="trule:Microsoft/Registry/N. Central Asia Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/N. Central Asia Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/N. Central Asia Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+06:00) Astana" Id="Central Asia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Central Asia Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Asia Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+06:00) Dhaka" Id="Bangladesh Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT7H" Name="Daylight" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT6H" Name="Standard" Id="trule:Microsoft/Registry/Bangladesh Standard Time/2010-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2008-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT23H</t:TimeOffset>
+                    <t:Month>6</t:Month>
+                    <t:DayOfWeek>Friday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT23H59M</t:TimeOffset>
+                    <t:Month>12</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Bangladesh Standard Time/2010-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+06:30) Yangon (Rangoon)" Id="Myanmar Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT6H30M" Name="Standard" Id="trule:Microsoft/Registry/Myanmar Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Myanmar Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+07:00) Bangkok, Hanoi, Jakarta" Id="SE Asia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT7H" Name="Standard" Id="trule:Microsoft/Registry/SE Asia Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/SE Asia Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+07:00) Krasnoyarsk" Id="North Asia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT7H" Name="Standard" Id="trule:Microsoft/Registry/North Asia Standard Time/1-Standard"/>
+                <t:Period Bias="-PT8H" Name="Daylight" Id="trule:Microsoft/Registry/North Asia Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" Id="China Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/China Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/China Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+08:00) Irkutsk, Ulaan Bataar" Id="North Asia East Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Standard"/>
+                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/North Asia East Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia East Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/North Asia East Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+08:00) Kuala Lumpur, Singapore" Id="Singapore Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/Singapore Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Singapore Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+08:00) Perth" Id="W. Australia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2005-Standard"/>
+                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Daylight"/>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT9H" Name="Daylight" Id="trule:Microsoft/Registry/W. Australia Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/W. Australia Standard Time/2010-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2005-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>12</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="3">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="4">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="5">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/W. Australia Standard Time/2010-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2006-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">3</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">4</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">5</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+08:00) Taipei" Id="Taipei Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/Taipei Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Taipei Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+08:00) Ulaanbaatar" Id="Ulaanbaatar Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT8H" Name="Standard" Id="trule:Microsoft/Registry/Ulaanbaatar Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Ulaanbaatar Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+09:00) Osaka, Sapporo, Tokyo" Id="Tokyo Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT9H" Name="Standard" Id="trule:Microsoft/Registry/Tokyo Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Tokyo Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+09:00) Seoul" Id="Korea Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT9H" Name="Standard" Id="trule:Microsoft/Registry/Korea Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Korea Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+09:00) Yakutsk" Id="Yakutsk Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT9H" Name="Standard" Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Standard"/>
+                <t:Period Bias="-PT10H" Name="Daylight" Id="trule:Microsoft/Registry/Yakutsk Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Yakutsk Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Yakutsk Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+09:30) Adelaide" Id="Cen. Australia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT10H30M" Name="Daylight" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT9H30M" Name="Standard" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT10H30M" Name="Daylight" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT9H30M" Name="Standard" Id="trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Cen. Australia Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+09:30) Darwin" Id="AUS Central Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT9H30M" Name="Standard" Id="trule:Microsoft/Registry/AUS Central Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Central Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+10:00) Brisbane" Id="E. Australia Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/E. Australia Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/E. Australia Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+10:00) Canberra, Melbourne, Sydney" Id="AUS Eastern Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/AUS Eastern Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+10:00) Guam, Port Moresby" Id="West Pacific Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/West Pacific Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/West Pacific Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+10:00) Hobart" Id="Tasmania Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/Tasmania Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/Tasmania Standard Time/2008-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Tasmania Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+10:00) Vladivostok" Id="Vladivostok Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT10H" Name="Standard" Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Standard"/>
+                <t:Period Bias="-PT11H" Name="Daylight" Id="trule:Microsoft/Registry/Vladivostok Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Vladivostok Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Vladivostok Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+11:00) Magadan" Id="Magadan Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT11H" Name="Standard" Id="trule:Microsoft/Registry/Magadan Standard Time/1-Standard"/>
+                <t:Period Bias="-PT12H" Name="Daylight" Id="trule:Microsoft/Registry/Magadan Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Magadan Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Magadan Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+11:00) Magadan, Solomon Is., New Caledonia" Id="Central Pacific Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT11H" Name="Standard" Id="trule:Microsoft/Registry/Central Pacific Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Central Pacific Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+12:00) Auckland, Wellington" Id="New Zealand Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Daylight"/>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/New Zealand Standard Time/2006-Standard"/>
+                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Daylight"/>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/New Zealand Standard Time/2007-Standard"/>
+                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Daylight"/>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/New Zealand Standard Time/2008-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2006-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2006-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2007-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>3</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2007-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2008-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>4</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/New Zealand Standard Time/2008-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>9</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2007-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2008-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+12:00) Coordinated Universal Time+12" Id="UTC+12">
+              <t:Periods>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/UTC+12/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/UTC+12/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+12:00) Fiji, Marshall Is." Id="Fiji Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Fiji Standard Time/2008-Standard"/>
+                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Daylight"/>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Fiji Standard Time/2009-Standard"/>
+                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Daylight"/>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Fiji Standard Time/2010-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2008-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="1">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2009-Standard</t:To>
+                    <t:TimeOffset>PT0H</t:TimeOffset>
+                    <t:Month>1</t:Month>
+                    <t:DayOfWeek>Thursday</t:DayOfWeek>
+                    <t:Occurrence>1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2009-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>11</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+                <t:TransitionsGroup Id="2">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2010-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Fiji Standard Time/2010-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>4</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">1</t:To>
+                  <t:DateTime>2009-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+                <t:AbsoluteDateTransition>
+                  <t:To Kind="Group">2</t:To>
+                  <t:DateTime>2010-01-01T00:00:00</t:DateTime>
+                </t:AbsoluteDateTransition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+12:00) Petropavlovsk-Kamchatsky" Id="Kamchatka Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT12H" Name="Standard" Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Standard"/>
+                <t:Period Bias="-PT13H" Name="Daylight" Id="trule:Microsoft/Registry/Kamchatka Standard Time/1-Daylight"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Kamchatka Standard Time/1-Daylight</t:To>
+                    <t:TimeOffset>PT2H</t:TimeOffset>
+                    <t:Month>3</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                  <t:RecurringDayTransition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Kamchatka Standard Time/1-Standard</t:To>
+                    <t:TimeOffset>PT3H</t:TimeOffset>
+                    <t:Month>10</t:Month>
+                    <t:DayOfWeek>Sunday</t:DayOfWeek>
+                    <t:Occurrence>-1</t:Occurrence>
+                  </t:RecurringDayTransition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+            <t:TimeZoneDefinition Name="(UTC+13:00) Nuku'alofa" Id="Tonga Standard Time">
+              <t:Periods>
+                <t:Period Bias="-PT13H" Name="Standard" Id="trule:Microsoft/Registry/Tonga Standard Time/1-Standard"/>
+              </t:Periods>
+              <t:TransitionsGroups>
+                <t:TransitionsGroup Id="0">
+                  <t:Transition>
+                    <t:To Kind="Period">trule:Microsoft/Registry/Tonga Standard Time/1-Standard</t:To>
+                  </t:Transition>
+                </t:TransitionsGroup>
+              </t:TransitionsGroups>
+              <t:Transitions>
+                <t:Transition>
+                  <t:To Kind="Group">0</t:To>
+                </t:Transition>
+              </t:Transitions>
+            </t:TimeZoneDefinition>
+          </m:TimeZoneDefinitions>
+        </m:GetServerTimeZonesResponseMessage>
+      </m:ResponseMessages>
+    </m:GetServerTimeZonesResponse>
+  </s:Body>
 </s:Envelope>
+

From 7eb6e4078663fad7b8e6b5adb8ff68e758c99cb6 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 25 Dec 2017 15:57:44 +0100
Subject: [PATCH 165/222] Makefile: exclude timezone definition file from
 beautify-xml target

Fix #134
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 94c2b398..f2d06326 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,9 @@ dev: beautify build
 beautify: beautify-xml beautify-js
 
 beautify-xml:
-	find \( -name "*.xml" -o -name "*.xul" \) -exec \
+	find \( -name "*.xml" -o -name "*.xul" \) \
+		-a \( \! -wholename "./interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml" \) \
+		-exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes \

From 7490574165097c464d96f8d7840ef76ed5993d41 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 20 Jan 2018 22:50:24 +0100
Subject: [PATCH 166/222] calendar: moving content/overlays

---
 {chrome => calendar}/content/calendar-calendars-list.js          | 0
 {chrome => calendar}/content/calendar-calendars-list.xul         | 0
 {chrome => calendar}/content/calendar-common-sets.js             | 0
 {chrome => calendar}/content/calendar-common-sets.xul            | 0
 {chrome => calendar}/content/calendar-event-dialog-attendees.xml | 0
 {chrome => calendar}/content/calendar-event-dialog-attendees.xul | 0
 {chrome => calendar}/content/calendar-event-dialog-reminder.js   | 0
 {chrome => calendar}/content/calendar-event-dialog-reminder.xul  | 0
 {chrome => calendar}/content/calendar-event-dialog.js            | 0
 {chrome => calendar}/content/calendar-event-dialog.xul           | 0
 {chrome => calendar}/content/calendar-properties-dialog.js       | 0
 {chrome => calendar}/content/calendar-properties-dialog.xul      | 0
 {chrome => calendar}/content/calendar-summary-dialog.js          | 0
 {chrome => calendar}/content/calendar-summary-dialog.xul         | 0
 {chrome => calendar}/content/calendar-task-view.js               | 0
 {chrome => calendar}/content/calendar-task-view.xul              | 0
 {chrome => calendar}/content/ecCalendarCreation.js               | 0
 {chrome => calendar}/content/ecCalendarCreation.xul              | 0
 {chrome => calendar}/content/lightning-item-iframe.js            | 0
 {chrome => calendar}/content/lightning-item-iframe.xul           | 0
 {chrome => calendar}/content/messenger_task_delegation.js        | 0
 {chrome => calendar}/content/messenger_task_delegation.xul       | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 rename {chrome => calendar}/content/calendar-calendars-list.js (100%)
 rename {chrome => calendar}/content/calendar-calendars-list.xul (100%)
 rename {chrome => calendar}/content/calendar-common-sets.js (100%)
 rename {chrome => calendar}/content/calendar-common-sets.xul (100%)
 rename {chrome => calendar}/content/calendar-event-dialog-attendees.xml (100%)
 rename {chrome => calendar}/content/calendar-event-dialog-attendees.xul (100%)
 rename {chrome => calendar}/content/calendar-event-dialog-reminder.js (100%)
 rename {chrome => calendar}/content/calendar-event-dialog-reminder.xul (100%)
 rename {chrome => calendar}/content/calendar-event-dialog.js (100%)
 rename {chrome => calendar}/content/calendar-event-dialog.xul (100%)
 rename {chrome => calendar}/content/calendar-properties-dialog.js (100%)
 rename {chrome => calendar}/content/calendar-properties-dialog.xul (100%)
 rename {chrome => calendar}/content/calendar-summary-dialog.js (100%)
 rename {chrome => calendar}/content/calendar-summary-dialog.xul (100%)
 rename {chrome => calendar}/content/calendar-task-view.js (100%)
 rename {chrome => calendar}/content/calendar-task-view.xul (100%)
 rename {chrome => calendar}/content/ecCalendarCreation.js (100%)
 rename {chrome => calendar}/content/ecCalendarCreation.xul (100%)
 rename {chrome => calendar}/content/lightning-item-iframe.js (100%)
 rename {chrome => calendar}/content/lightning-item-iframe.xul (100%)
 rename {chrome => calendar}/content/messenger_task_delegation.js (100%)
 rename {chrome => calendar}/content/messenger_task_delegation.xul (100%)

diff --git a/chrome/content/calendar-calendars-list.js b/calendar/content/calendar-calendars-list.js
similarity index 100%
rename from chrome/content/calendar-calendars-list.js
rename to calendar/content/calendar-calendars-list.js
diff --git a/chrome/content/calendar-calendars-list.xul b/calendar/content/calendar-calendars-list.xul
similarity index 100%
rename from chrome/content/calendar-calendars-list.xul
rename to calendar/content/calendar-calendars-list.xul
diff --git a/chrome/content/calendar-common-sets.js b/calendar/content/calendar-common-sets.js
similarity index 100%
rename from chrome/content/calendar-common-sets.js
rename to calendar/content/calendar-common-sets.js
diff --git a/chrome/content/calendar-common-sets.xul b/calendar/content/calendar-common-sets.xul
similarity index 100%
rename from chrome/content/calendar-common-sets.xul
rename to calendar/content/calendar-common-sets.xul
diff --git a/chrome/content/calendar-event-dialog-attendees.xml b/calendar/content/calendar-event-dialog-attendees.xml
similarity index 100%
rename from chrome/content/calendar-event-dialog-attendees.xml
rename to calendar/content/calendar-event-dialog-attendees.xml
diff --git a/chrome/content/calendar-event-dialog-attendees.xul b/calendar/content/calendar-event-dialog-attendees.xul
similarity index 100%
rename from chrome/content/calendar-event-dialog-attendees.xul
rename to calendar/content/calendar-event-dialog-attendees.xul
diff --git a/chrome/content/calendar-event-dialog-reminder.js b/calendar/content/calendar-event-dialog-reminder.js
similarity index 100%
rename from chrome/content/calendar-event-dialog-reminder.js
rename to calendar/content/calendar-event-dialog-reminder.js
diff --git a/chrome/content/calendar-event-dialog-reminder.xul b/calendar/content/calendar-event-dialog-reminder.xul
similarity index 100%
rename from chrome/content/calendar-event-dialog-reminder.xul
rename to calendar/content/calendar-event-dialog-reminder.xul
diff --git a/chrome/content/calendar-event-dialog.js b/calendar/content/calendar-event-dialog.js
similarity index 100%
rename from chrome/content/calendar-event-dialog.js
rename to calendar/content/calendar-event-dialog.js
diff --git a/chrome/content/calendar-event-dialog.xul b/calendar/content/calendar-event-dialog.xul
similarity index 100%
rename from chrome/content/calendar-event-dialog.xul
rename to calendar/content/calendar-event-dialog.xul
diff --git a/chrome/content/calendar-properties-dialog.js b/calendar/content/calendar-properties-dialog.js
similarity index 100%
rename from chrome/content/calendar-properties-dialog.js
rename to calendar/content/calendar-properties-dialog.js
diff --git a/chrome/content/calendar-properties-dialog.xul b/calendar/content/calendar-properties-dialog.xul
similarity index 100%
rename from chrome/content/calendar-properties-dialog.xul
rename to calendar/content/calendar-properties-dialog.xul
diff --git a/chrome/content/calendar-summary-dialog.js b/calendar/content/calendar-summary-dialog.js
similarity index 100%
rename from chrome/content/calendar-summary-dialog.js
rename to calendar/content/calendar-summary-dialog.js
diff --git a/chrome/content/calendar-summary-dialog.xul b/calendar/content/calendar-summary-dialog.xul
similarity index 100%
rename from chrome/content/calendar-summary-dialog.xul
rename to calendar/content/calendar-summary-dialog.xul
diff --git a/chrome/content/calendar-task-view.js b/calendar/content/calendar-task-view.js
similarity index 100%
rename from chrome/content/calendar-task-view.js
rename to calendar/content/calendar-task-view.js
diff --git a/chrome/content/calendar-task-view.xul b/calendar/content/calendar-task-view.xul
similarity index 100%
rename from chrome/content/calendar-task-view.xul
rename to calendar/content/calendar-task-view.xul
diff --git a/chrome/content/ecCalendarCreation.js b/calendar/content/ecCalendarCreation.js
similarity index 100%
rename from chrome/content/ecCalendarCreation.js
rename to calendar/content/ecCalendarCreation.js
diff --git a/chrome/content/ecCalendarCreation.xul b/calendar/content/ecCalendarCreation.xul
similarity index 100%
rename from chrome/content/ecCalendarCreation.xul
rename to calendar/content/ecCalendarCreation.xul
diff --git a/chrome/content/lightning-item-iframe.js b/calendar/content/lightning-item-iframe.js
similarity index 100%
rename from chrome/content/lightning-item-iframe.js
rename to calendar/content/lightning-item-iframe.js
diff --git a/chrome/content/lightning-item-iframe.xul b/calendar/content/lightning-item-iframe.xul
similarity index 100%
rename from chrome/content/lightning-item-iframe.xul
rename to calendar/content/lightning-item-iframe.xul
diff --git a/chrome/content/messenger_task_delegation.js b/calendar/content/messenger_task_delegation.js
similarity index 100%
rename from chrome/content/messenger_task_delegation.js
rename to calendar/content/messenger_task_delegation.js
diff --git a/chrome/content/messenger_task_delegation.xul b/calendar/content/messenger_task_delegation.xul
similarity index 100%
rename from chrome/content/messenger_task_delegation.xul
rename to calendar/content/messenger_task_delegation.xul

From d4a47ec032d66172eac7953c6166ada139e38f7c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 20 Jan 2018 23:22:02 +0100
Subject: [PATCH 167/222] calendar: move interfaces

---
 calendar/exchangeCalendar.manifest            |  42 ++++++++
 .../mivExchangeRecurrenceInfo.idl             |   0
 .../mivExchangeRecurrenceInfo.js              |   0
 .../mivExchangeRecurrenceInfo.manifest        |   0
 .../mivExchangeRecurrenceInfo.xpt             | Bin
 .../exchangeAttendee/mivExchangeAttendee.idl  |   0
 .../exchangeAttendee/mivExchangeAttendee.js   |   0
 .../mivExchangeAttendee.manifest              |   0
 .../exchangeAttendee/mivExchangeAttendee.xpt  | Bin
 .../exchangeCalendar/mivExchangeCalendar.idl  |   0
 .../exchangeCalendar/mivExchangeCalendar.js   |   0
 .../mivExchangeCalendar.manifest              |   0
 .../exchangeCalendar/mivExchangeCalendar.xpt  | Bin
 .../exchangeEvent/mivExchangeEvent.idl        |   0
 .../exchangeEvent/mivExchangeEvent.js         |   0
 .../exchangeEvent/mivExchangeEvent.manifest   |   0
 .../exchangeEvent/mivExchangeEvent.xpt        | Bin
 .../ewsTimesZoneDefinitions_2007.xml          |   0
 .../exchangeTimeZones/mivExchangeTimeZone.idl |   0
 .../exchangeTimeZones/mivExchangeTimeZone.js  |   0
 .../exchangeTimeZones/mivExchangeTimeZone.xpt | Bin
 .../mivExchangeTimeZones.idl                  |   0
 .../exchangeTimeZones/mivExchangeTimeZones.js |   0
 .../mivExchangeTimeZones.manifest             |   0
 .../mivExchangeTimeZones.xpt                  | Bin
 .../exchangeTodo/mivExchangeTodo.idl          |   0
 .../exchangeTodo/mivExchangeTodo.js           |   0
 .../exchangeTodo/mivExchangeTodo.manifest     |   0
 .../exchangeTodo/mivExchangeTodo.xpt          | Bin
 chrome.manifest                               |  93 ++++++++----------
 30 files changed, 81 insertions(+), 54 deletions(-)
 create mode 100644 calendar/exchangeCalendar.manifest
 rename {interfaces => calendar/exchangeapi}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl (100%)
 rename {interfaces => calendar/exchangeapi}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js (100%)
 rename {interfaces => calendar/exchangeapi}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest (100%)
 rename {interfaces => calendar/exchangeapi}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt (100%)
 rename {interfaces => calendar/interface}/exchangeAttendee/mivExchangeAttendee.idl (100%)
 rename {interfaces => calendar/interface}/exchangeAttendee/mivExchangeAttendee.js (100%)
 rename {interfaces => calendar/interface}/exchangeAttendee/mivExchangeAttendee.manifest (100%)
 rename {interfaces => calendar/interface}/exchangeAttendee/mivExchangeAttendee.xpt (100%)
 rename {interfaces => calendar/interface}/exchangeCalendar/mivExchangeCalendar.idl (100%)
 rename {interfaces => calendar/interface}/exchangeCalendar/mivExchangeCalendar.js (100%)
 rename {interfaces => calendar/interface}/exchangeCalendar/mivExchangeCalendar.manifest (100%)
 rename {interfaces => calendar/interface}/exchangeCalendar/mivExchangeCalendar.xpt (100%)
 rename {interfaces => calendar/interface}/exchangeEvent/mivExchangeEvent.idl (100%)
 rename {interfaces => calendar/interface}/exchangeEvent/mivExchangeEvent.js (100%)
 rename {interfaces => calendar/interface}/exchangeEvent/mivExchangeEvent.manifest (100%)
 rename {interfaces => calendar/interface}/exchangeEvent/mivExchangeEvent.xpt (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZone.idl (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZone.js (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZone.xpt (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZones.idl (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZones.js (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZones.manifest (100%)
 rename {interfaces => calendar/interface}/exchangeTimeZones/mivExchangeTimeZones.xpt (100%)
 rename {interfaces => calendar/interface}/exchangeTodo/mivExchangeTodo.idl (100%)
 rename {interfaces => calendar/interface}/exchangeTodo/mivExchangeTodo.js (100%)
 rename {interfaces => calendar/interface}/exchangeTodo/mivExchangeTodo.manifest (100%)
 rename {interfaces => calendar/interface}/exchangeTodo/mivExchangeTodo.xpt (100%)

diff --git a/calendar/exchangeCalendar.manifest b/calendar/exchangeCalendar.manifest
new file mode 100644
index 00000000..aaafa511
--- /dev/null
+++ b/calendar/exchangeCalendar.manifest
@@ -0,0 +1,42 @@
+content exchangecalendar content/
+
+resource exchangecalendar exchangeapi/
+
+overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendar/content/ecCalendarCreation.xul
+overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendar/content/calendar-properties-dialog.xul
+
+overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangecalendar/content/calendar-calendars-list.xul
+
+overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
+overlay chrome://calendar/content/calendar-task-view.xul  chrome://exchangecalendar/content/calendar-task-view.xul
+
+overlay chrome://calendar/content/calendar-common-sets.xul chrome://exchangecalendar/content/calendar-common-sets.xul
+
+overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
+overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
+overlay chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://exchangecalendar/content/calendar-event-dialog-attendees.xul
+
+overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendar/content/calendar-summary-dialog.xul
+
+overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
+
+manifest exchangeapi/exchangeCalendar/mivExchangeCalendar.manifest
+manifest exchangeapi/exchangeTimeZones/mivExchangeTimeZones.manifest
+manifest exchangeapi/exchangeAttendee/mivExchangeAttendee.manifest
+manifest exchangeapi/exchangeEvent/mivExchangeEvent.manifest
+manifest exchangeapi/exchangeTodo/mivExchangeTodo.manifest
+manifest exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
+
+locale exchangecalendar en locale/exchangecalendar/en/
+
+locale exchangecalendar cs-CZ locale/cs_CZ/
+locale exchangecalendar de locale/de/
+locale exchangecalendar en-US locale/en_US/
+locale exchangecalendar fr-FR locale/fr_FR/
+locale exchangecalendar it-IT locale/it_IT/
+locale exchangecalendar ja-JP locale/ja_JP/
+locale exchangecalendar nl locale/nl/
+locale exchangecalendar ru locale/ru/
+locale exchangecalendar sv locale/sv/
+locale exchangecalendar tr locale/tr/
+
diff --git a/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl b/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl
similarity index 100%
rename from interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl
rename to calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl
diff --git a/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js b/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
similarity index 100%
rename from interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
rename to calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
diff --git a/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest b/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
similarity index 100%
rename from interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
rename to calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
diff --git a/interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt b/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt
similarity index 100%
rename from interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt
rename to calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt
diff --git a/interfaces/exchangeAttendee/mivExchangeAttendee.idl b/calendar/interface/exchangeAttendee/mivExchangeAttendee.idl
similarity index 100%
rename from interfaces/exchangeAttendee/mivExchangeAttendee.idl
rename to calendar/interface/exchangeAttendee/mivExchangeAttendee.idl
diff --git a/interfaces/exchangeAttendee/mivExchangeAttendee.js b/calendar/interface/exchangeAttendee/mivExchangeAttendee.js
similarity index 100%
rename from interfaces/exchangeAttendee/mivExchangeAttendee.js
rename to calendar/interface/exchangeAttendee/mivExchangeAttendee.js
diff --git a/interfaces/exchangeAttendee/mivExchangeAttendee.manifest b/calendar/interface/exchangeAttendee/mivExchangeAttendee.manifest
similarity index 100%
rename from interfaces/exchangeAttendee/mivExchangeAttendee.manifest
rename to calendar/interface/exchangeAttendee/mivExchangeAttendee.manifest
diff --git a/interfaces/exchangeAttendee/mivExchangeAttendee.xpt b/calendar/interface/exchangeAttendee/mivExchangeAttendee.xpt
similarity index 100%
rename from interfaces/exchangeAttendee/mivExchangeAttendee.xpt
rename to calendar/interface/exchangeAttendee/mivExchangeAttendee.xpt
diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.idl b/calendar/interface/exchangeCalendar/mivExchangeCalendar.idl
similarity index 100%
rename from interfaces/exchangeCalendar/mivExchangeCalendar.idl
rename to calendar/interface/exchangeCalendar/mivExchangeCalendar.idl
diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
similarity index 100%
rename from interfaces/exchangeCalendar/mivExchangeCalendar.js
rename to calendar/interface/exchangeCalendar/mivExchangeCalendar.js
diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.manifest b/calendar/interface/exchangeCalendar/mivExchangeCalendar.manifest
similarity index 100%
rename from interfaces/exchangeCalendar/mivExchangeCalendar.manifest
rename to calendar/interface/exchangeCalendar/mivExchangeCalendar.manifest
diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.xpt b/calendar/interface/exchangeCalendar/mivExchangeCalendar.xpt
similarity index 100%
rename from interfaces/exchangeCalendar/mivExchangeCalendar.xpt
rename to calendar/interface/exchangeCalendar/mivExchangeCalendar.xpt
diff --git a/interfaces/exchangeEvent/mivExchangeEvent.idl b/calendar/interface/exchangeEvent/mivExchangeEvent.idl
similarity index 100%
rename from interfaces/exchangeEvent/mivExchangeEvent.idl
rename to calendar/interface/exchangeEvent/mivExchangeEvent.idl
diff --git a/interfaces/exchangeEvent/mivExchangeEvent.js b/calendar/interface/exchangeEvent/mivExchangeEvent.js
similarity index 100%
rename from interfaces/exchangeEvent/mivExchangeEvent.js
rename to calendar/interface/exchangeEvent/mivExchangeEvent.js
diff --git a/interfaces/exchangeEvent/mivExchangeEvent.manifest b/calendar/interface/exchangeEvent/mivExchangeEvent.manifest
similarity index 100%
rename from interfaces/exchangeEvent/mivExchangeEvent.manifest
rename to calendar/interface/exchangeEvent/mivExchangeEvent.manifest
diff --git a/interfaces/exchangeEvent/mivExchangeEvent.xpt b/calendar/interface/exchangeEvent/mivExchangeEvent.xpt
similarity index 100%
rename from interfaces/exchangeEvent/mivExchangeEvent.xpt
rename to calendar/interface/exchangeEvent/mivExchangeEvent.xpt
diff --git a/interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml b/calendar/interface/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
similarity index 100%
rename from interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
rename to calendar/interface/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZone.idl b/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.idl
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZone.idl
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZone.idl
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZone.js b/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZone.js
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZone.xpt b/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.xpt
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZone.xpt
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZone.xpt
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZones.idl b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.idl
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZones.idl
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZones.idl
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZones.js b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZones.js
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZones.manifest b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.manifest
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZones.manifest
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZones.manifest
diff --git a/interfaces/exchangeTimeZones/mivExchangeTimeZones.xpt b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.xpt
similarity index 100%
rename from interfaces/exchangeTimeZones/mivExchangeTimeZones.xpt
rename to calendar/interface/exchangeTimeZones/mivExchangeTimeZones.xpt
diff --git a/interfaces/exchangeTodo/mivExchangeTodo.idl b/calendar/interface/exchangeTodo/mivExchangeTodo.idl
similarity index 100%
rename from interfaces/exchangeTodo/mivExchangeTodo.idl
rename to calendar/interface/exchangeTodo/mivExchangeTodo.idl
diff --git a/interfaces/exchangeTodo/mivExchangeTodo.js b/calendar/interface/exchangeTodo/mivExchangeTodo.js
similarity index 100%
rename from interfaces/exchangeTodo/mivExchangeTodo.js
rename to calendar/interface/exchangeTodo/mivExchangeTodo.js
diff --git a/interfaces/exchangeTodo/mivExchangeTodo.manifest b/calendar/interface/exchangeTodo/mivExchangeTodo.manifest
similarity index 100%
rename from interfaces/exchangeTodo/mivExchangeTodo.manifest
rename to calendar/interface/exchangeTodo/mivExchangeTodo.manifest
diff --git a/interfaces/exchangeTodo/mivExchangeTodo.xpt b/calendar/interface/exchangeTodo/mivExchangeTodo.xpt
similarity index 100%
rename from interfaces/exchangeTodo/mivExchangeTodo.xpt
rename to calendar/interface/exchangeTodo/mivExchangeTodo.xpt
diff --git a/chrome.manifest b/chrome.manifest
index 03b2182b..44a3d1eb 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,68 +1,54 @@
-content exchangecalendar chrome/content/
+content exchangebase chrome/content/
 
-skin exchangecalendar fugue theme/unix/
-skin exchangecalendar fugue theme/win/ os=WINNT
-skin exchangecalendar fugue theme/winaero/ os=WINNT osversion>=6
-skin exchangecalendar fugue theme/mac/ os=Darwin
-skin exchangecalendar-common fugue theme/common/
+skin exchangebase fugue theme/unix/
+skin exchangebase fugue theme/win/ os=WINNT
+skin exchangebase fugue theme/winaero/ os=WINNT osversion>=6
+skin exchangebase fugue theme/mac/ os=Darwin
+skin exchangebase-common fugue theme/common/
 
-resource exchangecalendar components/
+resource exchangebase components/
 resource interfaces interfaces/
 
-overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendar/content/ecCalendarCreation.xul
-overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangecalendar/content/calendar-calendars-list.xul
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/progress_panel.xul
-overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
-overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecalendar/content/progress_panel.xul
 
-overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
-overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/progress_panel.xul
 
-overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
-overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendar/content/calendar-summary-dialog.xul
-overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendar/content/calendar-properties-dialog.xul
+overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangebase/content/progress_panel.xul
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/check4lightning.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/messenger-overlay-preferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/manageEWSAccounts.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/debugPreferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/cachePreferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/otherPreferences.xul
-overlay chrome://calendar/content/calendar-task-view.xul  chrome://exchangecalendar/content/calendar-task-view.xul
-overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecalendar/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecalendar/content/extra-suite-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/check4lightning.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/messenger-overlay-preferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/manageEWSAccounts.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/debugPreferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/cachePreferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/otherPreferences.xul
+overlay chrome://communicator/content/pref/preferences.xul chrome://exchangebase/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://communicator/content/pref/preferences.xul chrome://exchangebase/content/extra-suite-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 
-overlay chrome://calendar/content/calendar-common-sets.xul chrome://exchangecalendar/content/calendar-common-sets.xul
-overlay chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://exchangecalendar/content/calendar-event-dialog-attendees.xul
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/OutOfOfficeMenu.xul
-overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://exchangecalendar/content/addressingWidgetOverlay.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/timezonePreference.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/lightningtimezoneOverlay.xul
-overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchangecalendar/content/extra-messenger-preferences.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/priority-display.xul 
-overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/invite-style.xul
-overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/content/folderPropsOverlay.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/OutOfOfficeMenu.xul
+overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://exchangebase/content/addressingWidgetOverlay.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/timezonePreference.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangebase/content/lightningtimezoneOverlay.xul
+overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchangebase/content/extra-messenger-preferences.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangebase/content/priority-display.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangebase/content/invite-style.xul
+overlay chrome://messenger/content/folderProps.xul  chrome://exchangebase/content/folderPropsOverlay.xul
 
-locale exchangecalendar en locale/exchangecalendar/en/
+locale exchangebase en locale/exchangebase/en/
 
-locale exchangecalendar cs-CZ locale/exchangecalendar/cs_CZ/
-locale exchangecalendar de locale/exchangecalendar/de/
-locale exchangecalendar en-US locale/exchangecalendar/en_US/
-locale exchangecalendar fr-FR locale/exchangecalendar/fr_FR/
-locale exchangecalendar it-IT locale/exchangecalendar/it_IT/
-locale exchangecalendar ja-JP locale/exchangecalendar/ja_JP/
-locale exchangecalendar nl locale/exchangecalendar/nl/
-locale exchangecalendar ru locale/exchangecalendar/ru/
-locale exchangecalendar sv locale/exchangecalendar/sv/
-locale exchangecalendar tr locale/exchangecalendar/tr/
-
-manifest interfaces/exchangeCalendar/mivExchangeCalendar.manifest
+locale exchangebase cs-CZ locale/exchangebase/cs_CZ/
+locale exchangebase de locale/exchangebase/de/
+locale exchangebase en-US locale/exchangebase/en_US/
+locale exchangebase fr-FR locale/exchangebase/fr_FR/
+locale exchangebase it-IT locale/exchangebase/it_IT/
+locale exchangebase ja-JP locale/exchangebase/ja_JP/
+locale exchangebase nl locale/exchangebase/nl/
+locale exchangebase ru locale/exchangebase/ru/
+locale exchangebase sv locale/exchangebase/sv/
+locale exchangebase tr locale/exchangebase/tr/
 
 manifest interfaces/global/mivFunctions.manifest
 manifest interfaces/exchangeAccountManager/mivExchangeAccountManager.manifest
 manifest interfaces/exchangeStatistics/mivExchangeStatistics.manifest
-manifest interfaces/exchangeTimeZones/mivExchangeTimeZones.manifest
 manifest interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest
 manifest interfaces/xml2jxon/mivIxml2jxon.manifest
 manifest interfaces/xml2jxon/mivNameSpaces.manifest
@@ -72,13 +58,12 @@ manifest interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
 manifest interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
 manifest interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
 
-manifest interfaces/exchangeAttendee/mivExchangeAttendee.manifest
 manifest interfaces/exchangeBaseItem/mivExchangeBaseItem.manifest
-manifest interfaces/exchangeEvent/mivExchangeEvent.manifest
-manifest interfaces/exchangeTodo/mivExchangeTodo.manifest
 
 manifest addressbook/exchangeAddressBook.manifest
 
+manifest calendar/exchangebase.manifest
+
 manifest interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 manifest interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
 

From 458c140768244c37b7c397ff5ada744abccd0404 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:08:05 +0100
Subject: [PATCH 168/222] calendar and events use now exchangecalendartask
 namespace

---
 calendar/exchangeCalendar.manifest | 50 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/calendar/exchangeCalendar.manifest b/calendar/exchangeCalendar.manifest
index aaafa511..14613b2b 100644
--- a/calendar/exchangeCalendar.manifest
+++ b/calendar/exchangeCalendar.manifest
@@ -1,24 +1,24 @@
-content exchangecalendar content/
+content exchangecalendartask content/
 
-resource exchangecalendar exchangeapi/
+resource exchangecalendartask exchangeapi/
 
-overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendar/content/ecCalendarCreation.xul
-overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendar/content/calendar-properties-dialog.xul
+overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendartask/content/ecCalendarCreation.xul
+overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendartask/content/calendar-properties-dialog.xul
 
-overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangecalendar/content/calendar-calendars-list.xul
+overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangecalendartask/content/calendar-calendars-list.xul
 
-overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
-overlay chrome://calendar/content/calendar-task-view.xul  chrome://exchangecalendar/content/calendar-task-view.xul
+overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendartask/content/messenger_task_delegation.xul
+overlay chrome://calendar/content/calendar-task-view.xul  chrome://exchangecalendartask/content/calendar-task-view.xul
 
-overlay chrome://calendar/content/calendar-common-sets.xul chrome://exchangecalendar/content/calendar-common-sets.xul
+overlay chrome://calendar/content/calendar-common-sets.xul chrome://exchangecalendartask/content/calendar-common-sets.xul
 
-overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
-overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
-overlay chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://exchangecalendar/content/calendar-event-dialog-attendees.xul
+overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendartask/content/calendar-event-dialog.xul
+overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendartask/content/calendar-event-dialog-reminder.xul
+overlay chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://exchangecalendartask/content/calendar-event-dialog-attendees.xul
 
-overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendar/content/calendar-summary-dialog.xul
+overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendartask/content/calendar-summary-dialog.xul
 
-overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
+overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendartask/content/lightning-item-iframe.xul
 
 manifest exchangeapi/exchangeCalendar/mivExchangeCalendar.manifest
 manifest exchangeapi/exchangeTimeZones/mivExchangeTimeZones.manifest
@@ -27,16 +27,16 @@ manifest exchangeapi/exchangeEvent/mivExchangeEvent.manifest
 manifest exchangeapi/exchangeTodo/mivExchangeTodo.manifest
 manifest exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 
-locale exchangecalendar en locale/exchangecalendar/en/
-
-locale exchangecalendar cs-CZ locale/cs_CZ/
-locale exchangecalendar de locale/de/
-locale exchangecalendar en-US locale/en_US/
-locale exchangecalendar fr-FR locale/fr_FR/
-locale exchangecalendar it-IT locale/it_IT/
-locale exchangecalendar ja-JP locale/ja_JP/
-locale exchangecalendar nl locale/nl/
-locale exchangecalendar ru locale/ru/
-locale exchangecalendar sv locale/sv/
-locale exchangecalendar tr locale/tr/
+locale exchangecalendartask en locale/en/
+
+locale exchangecalendartask cs-CZ locale/cs_CZ/
+locale exchangecalendartask de locale/de/
+locale exchangecalendartask en-US locale/en_US/
+locale exchangecalendartask fr-FR locale/fr_FR/
+locale exchangecalendartask it-IT locale/it_IT/
+locale exchangecalendartask ja-JP locale/ja_JP/
+locale exchangecalendartask nl locale/nl/
+locale exchangecalendartask ru locale/ru/
+locale exchangecalendartask sv locale/sv/
+locale exchangecalendartask tr locale/tr/
 

From 73f000bdb00229dbf3a53546d7a1ebb1c4fb741c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:10:16 +0100
Subject: [PATCH 169/222] main code keep using exchangecalendar namespace

---
 chrome.manifest | 78 ++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 44a3d1eb..279db0ae 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,50 +1,50 @@
-content exchangebase chrome/content/
+content exchangecalendar chrome/content/
 
-skin exchangebase fugue theme/unix/
-skin exchangebase fugue theme/win/ os=WINNT
-skin exchangebase fugue theme/winaero/ os=WINNT osversion>=6
-skin exchangebase fugue theme/mac/ os=Darwin
-skin exchangebase-common fugue theme/common/
+skin exchangecalendar fugue theme/unix/
+skin exchangecalendar fugue theme/win/ os=WINNT
+skin exchangecalendar fugue theme/winaero/ os=WINNT osversion>=6
+skin exchangecalendar fugue theme/mac/ os=Darwin
+skin exchangecalendar-common fugue theme/common/
 
-resource exchangebase components/
+resource exchangecalendar components/
 resource interfaces interfaces/
 
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/progress_panel.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/progress_panel.xul
 
-overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangebase/content/progress_panel.xul
+overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecalendar/content/progress_panel.xul
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/check4lightning.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/messenger-overlay-preferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/manageEWSAccounts.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/debugPreferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/cachePreferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/otherPreferences.xul
-overlay chrome://communicator/content/pref/preferences.xul chrome://exchangebase/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-overlay chrome://communicator/content/pref/preferences.xul chrome://exchangebase/content/extra-suite-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/check4lightning.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/messenger-overlay-preferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/manageEWSAccounts.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/debugPreferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/cachePreferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/otherPreferences.xul
+overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecalendar/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecalendar/content/extra-suite-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangebase/content/OutOfOfficeMenu.xul
-overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://exchangebase/content/addressingWidgetOverlay.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangebase/content/timezonePreference.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangebase/content/lightningtimezoneOverlay.xul
-overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchangebase/content/extra-messenger-preferences.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangebase/content/priority-display.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangebase/content/invite-style.xul
-overlay chrome://messenger/content/folderProps.xul  chrome://exchangebase/content/folderPropsOverlay.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/OutOfOfficeMenu.xul
+overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://exchangecalendar/content/addressingWidgetOverlay.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/timezonePreference.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/lightningtimezoneOverlay.xul
+overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchangecalendar/content/extra-messenger-preferences.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/priority-display.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/invite-style.xul
+overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/content/folderPropsOverlay.xul
 
-locale exchangebase en locale/exchangebase/en/
+locale exchangecalendar en locale/exchangecalendar/en/
 
-locale exchangebase cs-CZ locale/exchangebase/cs_CZ/
-locale exchangebase de locale/exchangebase/de/
-locale exchangebase en-US locale/exchangebase/en_US/
-locale exchangebase fr-FR locale/exchangebase/fr_FR/
-locale exchangebase it-IT locale/exchangebase/it_IT/
-locale exchangebase ja-JP locale/exchangebase/ja_JP/
-locale exchangebase nl locale/exchangebase/nl/
-locale exchangebase ru locale/exchangebase/ru/
-locale exchangebase sv locale/exchangebase/sv/
-locale exchangebase tr locale/exchangebase/tr/
+locale exchangecalendar cs-CZ locale/exchangecalendar/cs_CZ/
+locale exchangecalendar de locale/exchangecalendar/de/
+locale exchangecalendar en-US locale/exchangecalendar/en_US/
+locale exchangecalendar fr-FR locale/exchangecalendar/fr_FR/
+locale exchangecalendar it-IT locale/exchangecalendar/it_IT/
+locale exchangecalendar ja-JP locale/exchangecalendar/ja_JP/
+locale exchangecalendar nl locale/exchangecalendar/nl/
+locale exchangecalendar ru locale/exchangecalendar/ru/
+locale exchangecalendar sv locale/exchangecalendar/sv/
+locale exchangecalendar tr locale/exchangecalendar/tr/
 
 manifest interfaces/global/mivFunctions.manifest
 manifest interfaces/exchangeAccountManager/mivExchangeAccountManager.manifest
@@ -58,11 +58,11 @@ manifest interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
 manifest interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
 manifest interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
 
-manifest interfaces/exchangeBaseItem/mivExchangeBaseItem.manifest
+manifest interfaces/exchangecalendarItem/mivexchangecalendarItem.manifest
 
 manifest addressbook/exchangeAddressBook.manifest
 
-manifest calendar/exchangebase.manifest
+manifest calendar/exchangeCalendar.manifest
 
 manifest interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 manifest interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest

From dd578493b1f0479ced78bb436391fd1158f2a28c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:11:55 +0100
Subject: [PATCH 170/222] exchangeCalendar: fix interface definition

---
 calendar/exchangeCalendar.manifest                  |  12 ++++++------
 .../mivExchangeRecurrenceInfo.idl                   |   0
 .../mivExchangeRecurrenceInfo.js                    |   0
 .../mivExchangeRecurrenceInfo.manifest              |   0
 .../mivExchangeRecurrenceInfo.xpt                   | Bin
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename calendar/{exchangeapi => interface}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl (100%)
 rename calendar/{exchangeapi => interface}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js (100%)
 rename calendar/{exchangeapi => interface}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest (100%)
 rename calendar/{exchangeapi => interface}/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt (100%)

diff --git a/calendar/exchangeCalendar.manifest b/calendar/exchangeCalendar.manifest
index 14613b2b..b4fd5ad7 100644
--- a/calendar/exchangeCalendar.manifest
+++ b/calendar/exchangeCalendar.manifest
@@ -20,12 +20,12 @@ overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangec
 
 overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendartask/content/lightning-item-iframe.xul
 
-manifest exchangeapi/exchangeCalendar/mivExchangeCalendar.manifest
-manifest exchangeapi/exchangeTimeZones/mivExchangeTimeZones.manifest
-manifest exchangeapi/exchangeAttendee/mivExchangeAttendee.manifest
-manifest exchangeapi/exchangeEvent/mivExchangeEvent.manifest
-manifest exchangeapi/exchangeTodo/mivExchangeTodo.manifest
-manifest exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
+manifest interface/exchangeCalendar/mivExchangeCalendar.manifest
+manifest interface/exchangeTimeZones/mivExchangeTimeZones.manifest
+manifest interface/exchangeAttendee/mivExchangeAttendee.manifest
+manifest interface/exchangeEvent/mivExchangeEvent.manifest
+manifest interface/exchangeTodo/mivExchangeTodo.manifest
+manifest interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 
 locale exchangecalendartask en locale/en/
 
diff --git a/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl b/calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl
similarity index 100%
rename from calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl
rename to calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.idl
diff --git a/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js b/calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
similarity index 100%
rename from calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
rename to calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.js
diff --git a/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest b/calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
similarity index 100%
rename from calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
rename to calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
diff --git a/calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt b/calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt
similarity index 100%
rename from calendar/exchangeapi/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt
rename to calendar/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.xpt

From 6eb25a239a586908028fecb20c67135e3a5a2798 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:27:20 +0100
Subject: [PATCH 171/222] exchangecalendar: move calendar and task APIs

---
 .../exchangeapi}/erCreateAttachment.js        |  0
 .../exchangeapi}/erDeleteAttachment.js        |  0
 .../exchangeapi}/erFindCalendarItems.js       |  0
 .../exchangeapi}/erFindFollowupItems.js       |  0
 .../exchangeapi}/erFindMasterOccurrences.js   |  0
 .../exchangeapi}/erFindOccurrences.js         |  0
 .../exchangeapi}/erFindTaskItems.js           |  0
 .../exchangeapi}/erGetMasterOccurrenceId.js   |  0
 .../exchangeapi}/erGetMeetingRequestByUID.js  |  0
 .../exchangeapi}/erGetOccurrenceIndex.js      |  0
 .../exchangeapi}/erGetTimeZones.js            |  0
 .../exchangeapi}/erSendMeetingRespons.js      |  0
 .../exchangeapi}/erSyncInbox.js               |  0
 .../exchangeCalendar/mivExchangeCalendar.js   | 35 +++++++++++--------
 .../exchangeTimeZones/mivExchangeTimeZones.js |  2 +-
 15 files changed, 22 insertions(+), 15 deletions(-)
 rename {components => calendar/exchangeapi}/erCreateAttachment.js (100%)
 rename {components => calendar/exchangeapi}/erDeleteAttachment.js (100%)
 rename {components => calendar/exchangeapi}/erFindCalendarItems.js (100%)
 rename {components => calendar/exchangeapi}/erFindFollowupItems.js (100%)
 rename {components => calendar/exchangeapi}/erFindMasterOccurrences.js (100%)
 rename {components => calendar/exchangeapi}/erFindOccurrences.js (100%)
 rename {components => calendar/exchangeapi}/erFindTaskItems.js (100%)
 rename {components => calendar/exchangeapi}/erGetMasterOccurrenceId.js (100%)
 rename {components => calendar/exchangeapi}/erGetMeetingRequestByUID.js (100%)
 rename {components => calendar/exchangeapi}/erGetOccurrenceIndex.js (100%)
 rename {components => calendar/exchangeapi}/erGetTimeZones.js (100%)
 rename {components => calendar/exchangeapi}/erSendMeetingRespons.js (100%)
 rename {components => calendar/exchangeapi}/erSyncInbox.js (100%)

diff --git a/components/erCreateAttachment.js b/calendar/exchangeapi/erCreateAttachment.js
similarity index 100%
rename from components/erCreateAttachment.js
rename to calendar/exchangeapi/erCreateAttachment.js
diff --git a/components/erDeleteAttachment.js b/calendar/exchangeapi/erDeleteAttachment.js
similarity index 100%
rename from components/erDeleteAttachment.js
rename to calendar/exchangeapi/erDeleteAttachment.js
diff --git a/components/erFindCalendarItems.js b/calendar/exchangeapi/erFindCalendarItems.js
similarity index 100%
rename from components/erFindCalendarItems.js
rename to calendar/exchangeapi/erFindCalendarItems.js
diff --git a/components/erFindFollowupItems.js b/calendar/exchangeapi/erFindFollowupItems.js
similarity index 100%
rename from components/erFindFollowupItems.js
rename to calendar/exchangeapi/erFindFollowupItems.js
diff --git a/components/erFindMasterOccurrences.js b/calendar/exchangeapi/erFindMasterOccurrences.js
similarity index 100%
rename from components/erFindMasterOccurrences.js
rename to calendar/exchangeapi/erFindMasterOccurrences.js
diff --git a/components/erFindOccurrences.js b/calendar/exchangeapi/erFindOccurrences.js
similarity index 100%
rename from components/erFindOccurrences.js
rename to calendar/exchangeapi/erFindOccurrences.js
diff --git a/components/erFindTaskItems.js b/calendar/exchangeapi/erFindTaskItems.js
similarity index 100%
rename from components/erFindTaskItems.js
rename to calendar/exchangeapi/erFindTaskItems.js
diff --git a/components/erGetMasterOccurrenceId.js b/calendar/exchangeapi/erGetMasterOccurrenceId.js
similarity index 100%
rename from components/erGetMasterOccurrenceId.js
rename to calendar/exchangeapi/erGetMasterOccurrenceId.js
diff --git a/components/erGetMeetingRequestByUID.js b/calendar/exchangeapi/erGetMeetingRequestByUID.js
similarity index 100%
rename from components/erGetMeetingRequestByUID.js
rename to calendar/exchangeapi/erGetMeetingRequestByUID.js
diff --git a/components/erGetOccurrenceIndex.js b/calendar/exchangeapi/erGetOccurrenceIndex.js
similarity index 100%
rename from components/erGetOccurrenceIndex.js
rename to calendar/exchangeapi/erGetOccurrenceIndex.js
diff --git a/components/erGetTimeZones.js b/calendar/exchangeapi/erGetTimeZones.js
similarity index 100%
rename from components/erGetTimeZones.js
rename to calendar/exchangeapi/erGetTimeZones.js
diff --git a/components/erSendMeetingRespons.js b/calendar/exchangeapi/erSendMeetingRespons.js
similarity index 100%
rename from components/erSendMeetingRespons.js
rename to calendar/exchangeapi/erSendMeetingRespons.js
diff --git a/components/erSyncInbox.js b/calendar/exchangeapi/erSyncInbox.js
similarity index 100%
rename from components/erSyncInbox.js
rename to calendar/exchangeapi/erSyncInbox.js
diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index 8cbc3d05..921cfc1d 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -53,26 +53,33 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/soapFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+
 Cu.import("resource://exchangecalendar/erFindFolder.js");
 Cu.import("resource://exchangecalendar/erGetFolder.js");
-Cu.import("resource://exchangecalendar/erFindCalendarItems.js");
-Cu.import("resource://exchangecalendar/erFindTaskItems.js");
-Cu.import("resource://exchangecalendar/erFindFollowupItems.js");
+
 Cu.import("resource://exchangecalendar/erGetItems.js");
-Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
-Cu.import("resource://exchangecalendar/erGetMeetingRequestByUID.js");
-Cu.import("resource://exchangecalendar/erGetOccurrenceIndex.js");
+Cu.import("resource://exchangecalendar/erCreateItem.js");
+Cu.import("resource://exchangecalendar/erUpdateItem.js");
 Cu.import("resource://exchangecalendar/erDeleteItem.js");
-Cu.import("resource://exchangecalendar/erFindMasterOccurrences.js");
+
 Cu.import("resource://exchangecalendar/erSyncFolderItems.js");
-Cu.import("resource://exchangecalendar/erFindOccurrences.js");
-Cu.import("resource://exchangecalendar/erUpdateItem.js");
 Cu.import("resource://exchangecalendar/erGetUserAvailability.js");
-Cu.import("resource://exchangecalendar/erCreateItem.js");
-Cu.import("resource://exchangecalendar/erSendMeetingRespons.js");
-Cu.import("resource://exchangecalendar/erSyncInbox.js");
-Cu.import("resource://exchangecalendar/erCreateAttachment.js");
-Cu.import("resource://exchangecalendar/erDeleteAttachment.js");
+
+Cu.import("resource://exchangecalendartask/erFindCalendarItems.js");
+Cu.import("resource://exchangecalendartask/erFindTaskItems.js");
+Cu.import("resource://exchangecalendartask/erFindFollowupItems.js");
+
+Cu.import("resource://exchangecalendartask/erFindMasterOccurrences.js");
+Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
+Cu.import("resource://exchangecalendartask/erGetMeetingRequestByUID.js");
+Cu.import("resource://exchangecalendartask/erFindOccurrences.js");
+Cu.import("resource://exchangecalendartask/erGetOccurrenceIndex.js");
+
+Cu.import("resource://exchangecalendartask/erSendMeetingRespons.js");
+Cu.import("resource://exchangecalendartask/erSyncInbox.js");
+
+Cu.import("resource://exchangecalendartask/erCreateAttachment.js");
+Cu.import("resource://exchangecalendartask/erDeleteAttachment.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
index 1c052653..e5e4d2cb 100644
--- a/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
+++ b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
-Cu.import("resource://exchangecalendar/erGetTimeZones.js");
+Cu.import("resource://exchangecalendartask/erGetTimeZones.js");
 
 //Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
 

From d24d2540b619ea853049431282b457f2bc9529f6 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:32:39 +0100
Subject: [PATCH 172/222] Makefile update file path

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f2d06326..3ae028ac 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ beautify: beautify-xml beautify-js
 
 beautify-xml:
 	find \( -name "*.xml" -o -name "*.xul" \) \
-		-a \( \! -wholename "./interfaces/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml" \) \
+		-a \( \! -wholename "./calendar/interface/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml" \) \
 		-exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \

From c8af94cb04de17939bc9a6a4f84314b96e8f4ddb Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:40:13 +0100
Subject: [PATCH 173/222] move calendar delegation to calendar folder

---
 calendar/content/calendar-calendars-list.js                     | 2 +-
 {chrome => calendar}/content/delegateCalendar.js                | 0
 {chrome => calendar}/content/delegateCalendar.xul               | 0
 {components => calendar/exchangeapi}/erAddDelegateRequest.js    | 0
 {components => calendar/exchangeapi}/erGetDelegateRequest.js    | 0
 {components => calendar/exchangeapi}/erRemoveDelegateRequest.js | 0
 {components => calendar/exchangeapi}/erUpdateDelegateRequest.js | 0
 7 files changed, 1 insertion(+), 1 deletion(-)
 rename {chrome => calendar}/content/delegateCalendar.js (100%)
 rename {chrome => calendar}/content/delegateCalendar.xul (100%)
 rename {components => calendar/exchangeapi}/erAddDelegateRequest.js (100%)
 rename {components => calendar/exchangeapi}/erGetDelegateRequest.js (100%)
 rename {components => calendar/exchangeapi}/erRemoveDelegateRequest.js (100%)
 rename {components => calendar/exchangeapi}/erUpdateDelegateRequest.js (100%)

diff --git a/calendar/content/calendar-calendars-list.js b/calendar/content/calendar-calendars-list.js
index 35518438..d7b12f86 100644
--- a/calendar/content/calendar-calendars-list.js
+++ b/calendar/content/calendar-calendars-list.js
@@ -227,7 +227,7 @@ exchCalPopUpMenu.prototype = {
                 calendar: myCal,
                 answer: ""
             };
-            this._window.openDialog("chrome://exchangecalendar/content/delegateCalendar.xul",
+            this._window.openDialog("chrome://exchangecalendartask/content/delegateCalendar.xul",
                 "delegateCalendarSettings",
                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
                 aResult);
diff --git a/chrome/content/delegateCalendar.js b/calendar/content/delegateCalendar.js
similarity index 100%
rename from chrome/content/delegateCalendar.js
rename to calendar/content/delegateCalendar.js
diff --git a/chrome/content/delegateCalendar.xul b/calendar/content/delegateCalendar.xul
similarity index 100%
rename from chrome/content/delegateCalendar.xul
rename to calendar/content/delegateCalendar.xul
diff --git a/components/erAddDelegateRequest.js b/calendar/exchangeapi/erAddDelegateRequest.js
similarity index 100%
rename from components/erAddDelegateRequest.js
rename to calendar/exchangeapi/erAddDelegateRequest.js
diff --git a/components/erGetDelegateRequest.js b/calendar/exchangeapi/erGetDelegateRequest.js
similarity index 100%
rename from components/erGetDelegateRequest.js
rename to calendar/exchangeapi/erGetDelegateRequest.js
diff --git a/components/erRemoveDelegateRequest.js b/calendar/exchangeapi/erRemoveDelegateRequest.js
similarity index 100%
rename from components/erRemoveDelegateRequest.js
rename to calendar/exchangeapi/erRemoveDelegateRequest.js
diff --git a/components/erUpdateDelegateRequest.js b/calendar/exchangeapi/erUpdateDelegateRequest.js
similarity index 100%
rename from components/erUpdateDelegateRequest.js
rename to calendar/exchangeapi/erUpdateDelegateRequest.js

From 68de70056165cb336e6dd558585cb6f35255e4cd Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:43:00 +0100
Subject: [PATCH 174/222] common: move interface and exchangeapi to common dir

---
 chrome.manifest                               |  32 +++++++++---------
 .../exchangeapi}/ecExchangeRequest.js         |   0
 .../exchangeapi}/ecFunctions.js               |   0
 .../exchangeapi}/erAutoDiscover.js            |   0
 .../exchangeapi}/erAutoDiscoverySOAP.js       |   0
 .../exchangeapi}/erBrowseFolder.js            |   0
 .../exchangeapi}/erConvertID.js               |   0
 .../exchangeapi}/erCreateItem.js              |   0
 .../exchangeapi}/erDeleteItem.js              |   0
 .../exchangeapi}/erFindFolder.js              |   0
 .../exchangeapi}/erFindInboxFolder.js         |   0
 .../exchangeapi}/erFindItems.js               |   0
 .../exchangeapi}/erForewardItem.js            |   0
 .../exchangeapi}/erGetAttachments.js          |   0
 .../exchangeapi}/erGetEvents.js               |   0
 .../exchangeapi}/erGetFolder.js               |   0
 .../exchangeapi}/erGetFolderPermission.js     |   0
 .../exchangeapi}/erGetItems.js                |   0
 .../exchangeapi}/erGetUserAvailability.js     |   0
 .../exchangeapi}/erGetUserOofSettings.js      |   0
 .../exchangeapi}/erPrimarySMTPCheck.js        |   0
 .../exchangeapi}/erSetUserOofSettings.js      |   0
 .../exchangeapi}/erSubscribe.js               |   0
 .../exchangeapi}/erSyncFolderItems.js         |   0
 .../exchangeapi}/erUnsubscribe.js             |   0
 .../exchangeapi}/erUpdateFolderPermission.js  |   0
 .../exchangeapi}/erUpdateItem.js              |   0
 .../exchangeapi}/soapFunctions.js             |   0
 .../mivExchangeAccountManager.idl             |   0
 .../mivExchangeAccountManager.js              |   0
 .../mivExchangeAccountManager.manifest        |   0
 .../mivExchangeAccountManager.xpt             | Bin
 .../mivExchangeAuthPrompt2.idl                |   0
 .../mivExchangeAuthPrompt2.js                 |   0
 .../mivExchangeAuthPrompt2.manifest           |   0
 .../mivExchangeAuthPrompt2.xpt                | Bin
 .../mivExchangeAuthPromptProvider.idl         |   0
 .../mivExchangeAuthPromptProvider.js          |   0
 .../mivExchangeAuthPromptProvider.manifest    |   0
 .../mivExchangeAuthPromptProvider.xpt         | Bin
 .../mivExchangeBadCertListener2.idl           |   0
 .../mivExchangeBadCertListener2.js            |   0
 .../mivExchangeBadCertListener2.manifest      |   0
 .../mivExchangeBadCertListener2.xpt           | Bin
 .../exchangeBaseItem/mivExchangeBaseItem.idl  |   0
 .../exchangeBaseItem/mivExchangeBaseItem.js   |   0
 .../mivExchangeBaseItem.manifest              |   0
 .../exchangeBaseItem/mivExchangeBaseItem.xpt  | Bin
 .../mivExchangeItemsManager.idl               |   0
 .../mivExchangeItemsManager.js                |   0
 .../mivExchangeItemsManager.manifest          |   0
 .../mivExchangeItemsManager.xpt               | Bin
 .../mivExchangeLightningNotifier.idl          |   0
 .../mivExchangeLightningNotifier.js           |   0
 .../mivExchangeLightningNotifier.manifest     |   0
 .../mivExchangeLightningNotifier.xpt          | Bin
 .../mivExchangeLoadBalancer.idl               |   0
 .../mivExchangeLoadBalancer.js                |   0
 .../mivExchangeLoadBalancer.manifest          |   0
 .../mivExchangeLoadBalancer.xpt               | Bin
 .../mivExchangeStatistics.idl                 |   0
 .../mivExchangeStatistics.js                  |   0
 .../mivExchangeStatistics.manifest            |   0
 .../mivExchangeStatistics.xpt                 | Bin
 .../interface}/global/mivFunctions.idl        |   0
 .../interface}/global/mivFunctions.js         |   0
 .../interface}/global/mivFunctions.manifest   |   0
 .../interface}/global/mivFunctions.xpt        | Bin
 .../interface}/updater/mivUpdater.idl         |   0
 .../interface}/updater/mivUpdater.js          |   0
 .../interface}/updater/mivUpdater.manifest    |   0
 .../interface}/updater/mivUpdater.xpt         | Bin
 .../interface}/xml2json/xml2json.js           |   0
 .../interface}/xml2jxon/mivIxml2jxon.idl      |   0
 .../interface}/xml2jxon/mivIxml2jxon.js       |   0
 .../xml2jxon/mivIxml2jxon.js.backup           |   0
 .../interface}/xml2jxon/mivIxml2jxon.manifest |   0
 .../interface}/xml2jxon/mivIxml2jxon.xpt      | Bin
 .../interface}/xml2jxon/mivNameSpaces.idl     |   0
 .../interface}/xml2jxon/mivNameSpaces.js      |   0
 .../xml2jxon/mivNameSpaces.manifest           |   0
 .../interface}/xml2jxon/mivNameSpaces.xpt     | Bin
 .../interface}/xml2jxon/mivTagNames.idl       |   0
 .../interface}/xml2jxon/mivTagNames.js        |   0
 .../interface}/xml2jxon/mivTagNames.manifest  |   0
 .../interface}/xml2jxon/mivTagNames.xpt       | Bin
 86 files changed, 16 insertions(+), 16 deletions(-)
 rename {components => common/exchangeapi}/ecExchangeRequest.js (100%)
 rename {components => common/exchangeapi}/ecFunctions.js (100%)
 rename {components => common/exchangeapi}/erAutoDiscover.js (100%)
 rename {components => common/exchangeapi}/erAutoDiscoverySOAP.js (100%)
 rename {components => common/exchangeapi}/erBrowseFolder.js (100%)
 rename {components => common/exchangeapi}/erConvertID.js (100%)
 rename {components => common/exchangeapi}/erCreateItem.js (100%)
 rename {components => common/exchangeapi}/erDeleteItem.js (100%)
 rename {components => common/exchangeapi}/erFindFolder.js (100%)
 rename {components => common/exchangeapi}/erFindInboxFolder.js (100%)
 rename {components => common/exchangeapi}/erFindItems.js (100%)
 rename {components => common/exchangeapi}/erForewardItem.js (100%)
 rename {components => common/exchangeapi}/erGetAttachments.js (100%)
 rename {components => common/exchangeapi}/erGetEvents.js (100%)
 rename {components => common/exchangeapi}/erGetFolder.js (100%)
 rename {components => common/exchangeapi}/erGetFolderPermission.js (100%)
 rename {components => common/exchangeapi}/erGetItems.js (100%)
 rename {components => common/exchangeapi}/erGetUserAvailability.js (100%)
 rename {components => common/exchangeapi}/erGetUserOofSettings.js (100%)
 rename {components => common/exchangeapi}/erPrimarySMTPCheck.js (100%)
 rename {components => common/exchangeapi}/erSetUserOofSettings.js (100%)
 rename {components => common/exchangeapi}/erSubscribe.js (100%)
 rename {components => common/exchangeapi}/erSyncFolderItems.js (100%)
 rename {components => common/exchangeapi}/erUnsubscribe.js (100%)
 rename {components => common/exchangeapi}/erUpdateFolderPermission.js (100%)
 rename {components => common/exchangeapi}/erUpdateItem.js (100%)
 rename {components => common/exchangeapi}/soapFunctions.js (100%)
 rename {interfaces => common/interface}/exchangeAccountManager/mivExchangeAccountManager.idl (100%)
 rename {interfaces => common/interface}/exchangeAccountManager/mivExchangeAccountManager.js (100%)
 rename {interfaces => common/interface}/exchangeAccountManager/mivExchangeAccountManager.manifest (100%)
 rename {interfaces => common/interface}/exchangeAccountManager/mivExchangeAccountManager.xpt (100%)
 rename {interfaces => common/interface}/exchangeAuthPrompt2/mivExchangeAuthPrompt2.idl (100%)
 rename {interfaces => common/interface}/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js (100%)
 rename {interfaces => common/interface}/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest (100%)
 rename {interfaces => common/interface}/exchangeAuthPrompt2/mivExchangeAuthPrompt2.xpt (100%)
 rename {interfaces => common/interface}/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.idl (100%)
 rename {interfaces => common/interface}/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js (100%)
 rename {interfaces => common/interface}/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest (100%)
 rename {interfaces => common/interface}/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.xpt (100%)
 rename {interfaces => common/interface}/exchangeBadCertListener2/mivExchangeBadCertListener2.idl (100%)
 rename {interfaces => common/interface}/exchangeBadCertListener2/mivExchangeBadCertListener2.js (100%)
 rename {interfaces => common/interface}/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest (100%)
 rename {interfaces => common/interface}/exchangeBadCertListener2/mivExchangeBadCertListener2.xpt (100%)
 rename {interfaces => common/interface}/exchangeBaseItem/mivExchangeBaseItem.idl (100%)
 rename {interfaces => common/interface}/exchangeBaseItem/mivExchangeBaseItem.js (100%)
 rename {interfaces => common/interface}/exchangeBaseItem/mivExchangeBaseItem.manifest (100%)
 rename {interfaces => common/interface}/exchangeBaseItem/mivExchangeBaseItem.xpt (100%)
 rename {interfaces => common/interface}/exchangeItemsManager/mivExchangeItemsManager.idl (100%)
 rename {interfaces => common/interface}/exchangeItemsManager/mivExchangeItemsManager.js (100%)
 rename {interfaces => common/interface}/exchangeItemsManager/mivExchangeItemsManager.manifest (100%)
 rename {interfaces => common/interface}/exchangeItemsManager/mivExchangeItemsManager.xpt (100%)
 rename {interfaces => common/interface}/exchangeLightningNotifier/mivExchangeLightningNotifier.idl (100%)
 rename {interfaces => common/interface}/exchangeLightningNotifier/mivExchangeLightningNotifier.js (100%)
 rename {interfaces => common/interface}/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest (100%)
 rename {interfaces => common/interface}/exchangeLightningNotifier/mivExchangeLightningNotifier.xpt (100%)
 rename {interfaces => common/interface}/exchangeLoadBalancer/mivExchangeLoadBalancer.idl (100%)
 rename {interfaces => common/interface}/exchangeLoadBalancer/mivExchangeLoadBalancer.js (100%)
 rename {interfaces => common/interface}/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest (100%)
 rename {interfaces => common/interface}/exchangeLoadBalancer/mivExchangeLoadBalancer.xpt (100%)
 rename {interfaces => common/interface}/exchangeStatistics/mivExchangeStatistics.idl (100%)
 rename {interfaces => common/interface}/exchangeStatistics/mivExchangeStatistics.js (100%)
 rename {interfaces => common/interface}/exchangeStatistics/mivExchangeStatistics.manifest (100%)
 rename {interfaces => common/interface}/exchangeStatistics/mivExchangeStatistics.xpt (100%)
 rename {interfaces => common/interface}/global/mivFunctions.idl (100%)
 rename {interfaces => common/interface}/global/mivFunctions.js (100%)
 rename {interfaces => common/interface}/global/mivFunctions.manifest (100%)
 rename {interfaces => common/interface}/global/mivFunctions.xpt (100%)
 rename {interfaces => common/interface}/updater/mivUpdater.idl (100%)
 rename {interfaces => common/interface}/updater/mivUpdater.js (100%)
 rename {interfaces => common/interface}/updater/mivUpdater.manifest (100%)
 rename {interfaces => common/interface}/updater/mivUpdater.xpt (100%)
 rename {interfaces => common/interface}/xml2json/xml2json.js (100%)
 rename {interfaces => common/interface}/xml2jxon/mivIxml2jxon.idl (100%)
 rename {interfaces => common/interface}/xml2jxon/mivIxml2jxon.js (100%)
 rename {interfaces => common/interface}/xml2jxon/mivIxml2jxon.js.backup (100%)
 rename {interfaces => common/interface}/xml2jxon/mivIxml2jxon.manifest (100%)
 rename {interfaces => common/interface}/xml2jxon/mivIxml2jxon.xpt (100%)
 rename {interfaces => common/interface}/xml2jxon/mivNameSpaces.idl (100%)
 rename {interfaces => common/interface}/xml2jxon/mivNameSpaces.js (100%)
 rename {interfaces => common/interface}/xml2jxon/mivNameSpaces.manifest (100%)
 rename {interfaces => common/interface}/xml2jxon/mivNameSpaces.xpt (100%)
 rename {interfaces => common/interface}/xml2jxon/mivTagNames.idl (100%)
 rename {interfaces => common/interface}/xml2jxon/mivTagNames.js (100%)
 rename {interfaces => common/interface}/xml2jxon/mivTagNames.manifest (100%)
 rename {interfaces => common/interface}/xml2jxon/mivTagNames.xpt (100%)

diff --git a/chrome.manifest b/chrome.manifest
index 279db0ae..3bff3edf 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -6,8 +6,8 @@ skin exchangecalendar fugue theme/winaero/ os=WINNT osversion>=6
 skin exchangecalendar fugue theme/mac/ os=Darwin
 skin exchangecalendar-common fugue theme/common/
 
-resource exchangecalendar components/
-resource interfaces interfaces/
+resource exchangecalendar common/exchangeapi
+resource interfaces common/interface/
 
 
 overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/progress_panel.xul
@@ -46,24 +46,24 @@ locale exchangecalendar ru locale/exchangecalendar/ru/
 locale exchangecalendar sv locale/exchangecalendar/sv/
 locale exchangecalendar tr locale/exchangecalendar/tr/
 
-manifest interfaces/global/mivFunctions.manifest
-manifest interfaces/exchangeAccountManager/mivExchangeAccountManager.manifest
-manifest interfaces/exchangeStatistics/mivExchangeStatistics.manifest
-manifest interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest
-manifest interfaces/xml2jxon/mivIxml2jxon.manifest
-manifest interfaces/xml2jxon/mivNameSpaces.manifest
-manifest interfaces/xml2jxon/mivTagNames.manifest
-manifest interfaces/updater/mivUpdater.manifest
-manifest interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
-manifest interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
-manifest interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
+manifest common/interface/global/mivFunctions.manifest
+manifest common/interface/exchangeAccountManager/mivExchangeAccountManager.manifest
+manifest common/interface/exchangeStatistics/mivExchangeStatistics.manifest
+manifest common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest
+manifest common/interface/xml2jxon/mivIxml2jxon.manifest
+manifest common/interface/xml2jxon/mivNameSpaces.manifest
+manifest common/interface/xml2jxon/mivTagNames.manifest
+manifest common/interface/updater/mivUpdater.manifest
+manifest common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
+manifest common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
+manifest common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
 
-manifest interfaces/exchangecalendarItem/mivexchangecalendarItem.manifest
+manifest common/interface/exchangecalendarItem/mivexchangecalendarItem.manifest
 
 manifest addressbook/exchangeAddressBook.manifest
 
 manifest calendar/exchangeCalendar.manifest
 
-manifest interfaces/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
-manifest interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
+manifest common/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
+manifest common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
 
diff --git a/components/ecExchangeRequest.js b/common/exchangeapi/ecExchangeRequest.js
similarity index 100%
rename from components/ecExchangeRequest.js
rename to common/exchangeapi/ecExchangeRequest.js
diff --git a/components/ecFunctions.js b/common/exchangeapi/ecFunctions.js
similarity index 100%
rename from components/ecFunctions.js
rename to common/exchangeapi/ecFunctions.js
diff --git a/components/erAutoDiscover.js b/common/exchangeapi/erAutoDiscover.js
similarity index 100%
rename from components/erAutoDiscover.js
rename to common/exchangeapi/erAutoDiscover.js
diff --git a/components/erAutoDiscoverySOAP.js b/common/exchangeapi/erAutoDiscoverySOAP.js
similarity index 100%
rename from components/erAutoDiscoverySOAP.js
rename to common/exchangeapi/erAutoDiscoverySOAP.js
diff --git a/components/erBrowseFolder.js b/common/exchangeapi/erBrowseFolder.js
similarity index 100%
rename from components/erBrowseFolder.js
rename to common/exchangeapi/erBrowseFolder.js
diff --git a/components/erConvertID.js b/common/exchangeapi/erConvertID.js
similarity index 100%
rename from components/erConvertID.js
rename to common/exchangeapi/erConvertID.js
diff --git a/components/erCreateItem.js b/common/exchangeapi/erCreateItem.js
similarity index 100%
rename from components/erCreateItem.js
rename to common/exchangeapi/erCreateItem.js
diff --git a/components/erDeleteItem.js b/common/exchangeapi/erDeleteItem.js
similarity index 100%
rename from components/erDeleteItem.js
rename to common/exchangeapi/erDeleteItem.js
diff --git a/components/erFindFolder.js b/common/exchangeapi/erFindFolder.js
similarity index 100%
rename from components/erFindFolder.js
rename to common/exchangeapi/erFindFolder.js
diff --git a/components/erFindInboxFolder.js b/common/exchangeapi/erFindInboxFolder.js
similarity index 100%
rename from components/erFindInboxFolder.js
rename to common/exchangeapi/erFindInboxFolder.js
diff --git a/components/erFindItems.js b/common/exchangeapi/erFindItems.js
similarity index 100%
rename from components/erFindItems.js
rename to common/exchangeapi/erFindItems.js
diff --git a/components/erForewardItem.js b/common/exchangeapi/erForewardItem.js
similarity index 100%
rename from components/erForewardItem.js
rename to common/exchangeapi/erForewardItem.js
diff --git a/components/erGetAttachments.js b/common/exchangeapi/erGetAttachments.js
similarity index 100%
rename from components/erGetAttachments.js
rename to common/exchangeapi/erGetAttachments.js
diff --git a/components/erGetEvents.js b/common/exchangeapi/erGetEvents.js
similarity index 100%
rename from components/erGetEvents.js
rename to common/exchangeapi/erGetEvents.js
diff --git a/components/erGetFolder.js b/common/exchangeapi/erGetFolder.js
similarity index 100%
rename from components/erGetFolder.js
rename to common/exchangeapi/erGetFolder.js
diff --git a/components/erGetFolderPermission.js b/common/exchangeapi/erGetFolderPermission.js
similarity index 100%
rename from components/erGetFolderPermission.js
rename to common/exchangeapi/erGetFolderPermission.js
diff --git a/components/erGetItems.js b/common/exchangeapi/erGetItems.js
similarity index 100%
rename from components/erGetItems.js
rename to common/exchangeapi/erGetItems.js
diff --git a/components/erGetUserAvailability.js b/common/exchangeapi/erGetUserAvailability.js
similarity index 100%
rename from components/erGetUserAvailability.js
rename to common/exchangeapi/erGetUserAvailability.js
diff --git a/components/erGetUserOofSettings.js b/common/exchangeapi/erGetUserOofSettings.js
similarity index 100%
rename from components/erGetUserOofSettings.js
rename to common/exchangeapi/erGetUserOofSettings.js
diff --git a/components/erPrimarySMTPCheck.js b/common/exchangeapi/erPrimarySMTPCheck.js
similarity index 100%
rename from components/erPrimarySMTPCheck.js
rename to common/exchangeapi/erPrimarySMTPCheck.js
diff --git a/components/erSetUserOofSettings.js b/common/exchangeapi/erSetUserOofSettings.js
similarity index 100%
rename from components/erSetUserOofSettings.js
rename to common/exchangeapi/erSetUserOofSettings.js
diff --git a/components/erSubscribe.js b/common/exchangeapi/erSubscribe.js
similarity index 100%
rename from components/erSubscribe.js
rename to common/exchangeapi/erSubscribe.js
diff --git a/components/erSyncFolderItems.js b/common/exchangeapi/erSyncFolderItems.js
similarity index 100%
rename from components/erSyncFolderItems.js
rename to common/exchangeapi/erSyncFolderItems.js
diff --git a/components/erUnsubscribe.js b/common/exchangeapi/erUnsubscribe.js
similarity index 100%
rename from components/erUnsubscribe.js
rename to common/exchangeapi/erUnsubscribe.js
diff --git a/components/erUpdateFolderPermission.js b/common/exchangeapi/erUpdateFolderPermission.js
similarity index 100%
rename from components/erUpdateFolderPermission.js
rename to common/exchangeapi/erUpdateFolderPermission.js
diff --git a/components/erUpdateItem.js b/common/exchangeapi/erUpdateItem.js
similarity index 100%
rename from components/erUpdateItem.js
rename to common/exchangeapi/erUpdateItem.js
diff --git a/components/soapFunctions.js b/common/exchangeapi/soapFunctions.js
similarity index 100%
rename from components/soapFunctions.js
rename to common/exchangeapi/soapFunctions.js
diff --git a/interfaces/exchangeAccountManager/mivExchangeAccountManager.idl b/common/interface/exchangeAccountManager/mivExchangeAccountManager.idl
similarity index 100%
rename from interfaces/exchangeAccountManager/mivExchangeAccountManager.idl
rename to common/interface/exchangeAccountManager/mivExchangeAccountManager.idl
diff --git a/interfaces/exchangeAccountManager/mivExchangeAccountManager.js b/common/interface/exchangeAccountManager/mivExchangeAccountManager.js
similarity index 100%
rename from interfaces/exchangeAccountManager/mivExchangeAccountManager.js
rename to common/interface/exchangeAccountManager/mivExchangeAccountManager.js
diff --git a/interfaces/exchangeAccountManager/mivExchangeAccountManager.manifest b/common/interface/exchangeAccountManager/mivExchangeAccountManager.manifest
similarity index 100%
rename from interfaces/exchangeAccountManager/mivExchangeAccountManager.manifest
rename to common/interface/exchangeAccountManager/mivExchangeAccountManager.manifest
diff --git a/interfaces/exchangeAccountManager/mivExchangeAccountManager.xpt b/common/interface/exchangeAccountManager/mivExchangeAccountManager.xpt
similarity index 100%
rename from interfaces/exchangeAccountManager/mivExchangeAccountManager.xpt
rename to common/interface/exchangeAccountManager/mivExchangeAccountManager.xpt
diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.idl b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.idl
similarity index 100%
rename from interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.idl
rename to common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.idl
diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
similarity index 100%
rename from interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
rename to common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
similarity index 100%
rename from interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
rename to common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.xpt b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.xpt
similarity index 100%
rename from interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.xpt
rename to common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.xpt
diff --git a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.idl b/common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.idl
similarity index 100%
rename from interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.idl
rename to common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.idl
diff --git a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js b/common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
similarity index 100%
rename from interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
rename to common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.js
diff --git a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest b/common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
similarity index 100%
rename from interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
rename to common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
diff --git a/interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.xpt b/common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.xpt
similarity index 100%
rename from interfaces/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.xpt
rename to common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.xpt
diff --git a/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.idl b/common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.idl
similarity index 100%
rename from interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.idl
rename to common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.idl
diff --git a/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.js b/common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.js
similarity index 100%
rename from interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.js
rename to common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.js
diff --git a/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest b/common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest
similarity index 100%
rename from interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest
rename to common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.manifest
diff --git a/interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.xpt b/common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.xpt
similarity index 100%
rename from interfaces/exchangeBadCertListener2/mivExchangeBadCertListener2.xpt
rename to common/interface/exchangeBadCertListener2/mivExchangeBadCertListener2.xpt
diff --git a/interfaces/exchangeBaseItem/mivExchangeBaseItem.idl b/common/interface/exchangeBaseItem/mivExchangeBaseItem.idl
similarity index 100%
rename from interfaces/exchangeBaseItem/mivExchangeBaseItem.idl
rename to common/interface/exchangeBaseItem/mivExchangeBaseItem.idl
diff --git a/interfaces/exchangeBaseItem/mivExchangeBaseItem.js b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
similarity index 100%
rename from interfaces/exchangeBaseItem/mivExchangeBaseItem.js
rename to common/interface/exchangeBaseItem/mivExchangeBaseItem.js
diff --git a/interfaces/exchangeBaseItem/mivExchangeBaseItem.manifest b/common/interface/exchangeBaseItem/mivExchangeBaseItem.manifest
similarity index 100%
rename from interfaces/exchangeBaseItem/mivExchangeBaseItem.manifest
rename to common/interface/exchangeBaseItem/mivExchangeBaseItem.manifest
diff --git a/interfaces/exchangeBaseItem/mivExchangeBaseItem.xpt b/common/interface/exchangeBaseItem/mivExchangeBaseItem.xpt
similarity index 100%
rename from interfaces/exchangeBaseItem/mivExchangeBaseItem.xpt
rename to common/interface/exchangeBaseItem/mivExchangeBaseItem.xpt
diff --git a/interfaces/exchangeItemsManager/mivExchangeItemsManager.idl b/common/interface/exchangeItemsManager/mivExchangeItemsManager.idl
similarity index 100%
rename from interfaces/exchangeItemsManager/mivExchangeItemsManager.idl
rename to common/interface/exchangeItemsManager/mivExchangeItemsManager.idl
diff --git a/interfaces/exchangeItemsManager/mivExchangeItemsManager.js b/common/interface/exchangeItemsManager/mivExchangeItemsManager.js
similarity index 100%
rename from interfaces/exchangeItemsManager/mivExchangeItemsManager.js
rename to common/interface/exchangeItemsManager/mivExchangeItemsManager.js
diff --git a/interfaces/exchangeItemsManager/mivExchangeItemsManager.manifest b/common/interface/exchangeItemsManager/mivExchangeItemsManager.manifest
similarity index 100%
rename from interfaces/exchangeItemsManager/mivExchangeItemsManager.manifest
rename to common/interface/exchangeItemsManager/mivExchangeItemsManager.manifest
diff --git a/interfaces/exchangeItemsManager/mivExchangeItemsManager.xpt b/common/interface/exchangeItemsManager/mivExchangeItemsManager.xpt
similarity index 100%
rename from interfaces/exchangeItemsManager/mivExchangeItemsManager.xpt
rename to common/interface/exchangeItemsManager/mivExchangeItemsManager.xpt
diff --git a/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.idl b/common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.idl
similarity index 100%
rename from interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.idl
rename to common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.idl
diff --git a/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.js b/common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.js
similarity index 100%
rename from interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.js
rename to common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.js
diff --git a/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest b/common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
similarity index 100%
rename from interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
rename to common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
diff --git a/interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.xpt b/common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.xpt
similarity index 100%
rename from interfaces/exchangeLightningNotifier/mivExchangeLightningNotifier.xpt
rename to common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.xpt
diff --git a/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.idl b/common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.idl
similarity index 100%
rename from interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.idl
rename to common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.idl
diff --git a/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.js b/common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.js
similarity index 100%
rename from interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.js
rename to common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.js
diff --git a/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest b/common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
similarity index 100%
rename from interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
rename to common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
diff --git a/interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.xpt b/common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.xpt
similarity index 100%
rename from interfaces/exchangeLoadBalancer/mivExchangeLoadBalancer.xpt
rename to common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.xpt
diff --git a/interfaces/exchangeStatistics/mivExchangeStatistics.idl b/common/interface/exchangeStatistics/mivExchangeStatistics.idl
similarity index 100%
rename from interfaces/exchangeStatistics/mivExchangeStatistics.idl
rename to common/interface/exchangeStatistics/mivExchangeStatistics.idl
diff --git a/interfaces/exchangeStatistics/mivExchangeStatistics.js b/common/interface/exchangeStatistics/mivExchangeStatistics.js
similarity index 100%
rename from interfaces/exchangeStatistics/mivExchangeStatistics.js
rename to common/interface/exchangeStatistics/mivExchangeStatistics.js
diff --git a/interfaces/exchangeStatistics/mivExchangeStatistics.manifest b/common/interface/exchangeStatistics/mivExchangeStatistics.manifest
similarity index 100%
rename from interfaces/exchangeStatistics/mivExchangeStatistics.manifest
rename to common/interface/exchangeStatistics/mivExchangeStatistics.manifest
diff --git a/interfaces/exchangeStatistics/mivExchangeStatistics.xpt b/common/interface/exchangeStatistics/mivExchangeStatistics.xpt
similarity index 100%
rename from interfaces/exchangeStatistics/mivExchangeStatistics.xpt
rename to common/interface/exchangeStatistics/mivExchangeStatistics.xpt
diff --git a/interfaces/global/mivFunctions.idl b/common/interface/global/mivFunctions.idl
similarity index 100%
rename from interfaces/global/mivFunctions.idl
rename to common/interface/global/mivFunctions.idl
diff --git a/interfaces/global/mivFunctions.js b/common/interface/global/mivFunctions.js
similarity index 100%
rename from interfaces/global/mivFunctions.js
rename to common/interface/global/mivFunctions.js
diff --git a/interfaces/global/mivFunctions.manifest b/common/interface/global/mivFunctions.manifest
similarity index 100%
rename from interfaces/global/mivFunctions.manifest
rename to common/interface/global/mivFunctions.manifest
diff --git a/interfaces/global/mivFunctions.xpt b/common/interface/global/mivFunctions.xpt
similarity index 100%
rename from interfaces/global/mivFunctions.xpt
rename to common/interface/global/mivFunctions.xpt
diff --git a/interfaces/updater/mivUpdater.idl b/common/interface/updater/mivUpdater.idl
similarity index 100%
rename from interfaces/updater/mivUpdater.idl
rename to common/interface/updater/mivUpdater.idl
diff --git a/interfaces/updater/mivUpdater.js b/common/interface/updater/mivUpdater.js
similarity index 100%
rename from interfaces/updater/mivUpdater.js
rename to common/interface/updater/mivUpdater.js
diff --git a/interfaces/updater/mivUpdater.manifest b/common/interface/updater/mivUpdater.manifest
similarity index 100%
rename from interfaces/updater/mivUpdater.manifest
rename to common/interface/updater/mivUpdater.manifest
diff --git a/interfaces/updater/mivUpdater.xpt b/common/interface/updater/mivUpdater.xpt
similarity index 100%
rename from interfaces/updater/mivUpdater.xpt
rename to common/interface/updater/mivUpdater.xpt
diff --git a/interfaces/xml2json/xml2json.js b/common/interface/xml2json/xml2json.js
similarity index 100%
rename from interfaces/xml2json/xml2json.js
rename to common/interface/xml2json/xml2json.js
diff --git a/interfaces/xml2jxon/mivIxml2jxon.idl b/common/interface/xml2jxon/mivIxml2jxon.idl
similarity index 100%
rename from interfaces/xml2jxon/mivIxml2jxon.idl
rename to common/interface/xml2jxon/mivIxml2jxon.idl
diff --git a/interfaces/xml2jxon/mivIxml2jxon.js b/common/interface/xml2jxon/mivIxml2jxon.js
similarity index 100%
rename from interfaces/xml2jxon/mivIxml2jxon.js
rename to common/interface/xml2jxon/mivIxml2jxon.js
diff --git a/interfaces/xml2jxon/mivIxml2jxon.js.backup b/common/interface/xml2jxon/mivIxml2jxon.js.backup
similarity index 100%
rename from interfaces/xml2jxon/mivIxml2jxon.js.backup
rename to common/interface/xml2jxon/mivIxml2jxon.js.backup
diff --git a/interfaces/xml2jxon/mivIxml2jxon.manifest b/common/interface/xml2jxon/mivIxml2jxon.manifest
similarity index 100%
rename from interfaces/xml2jxon/mivIxml2jxon.manifest
rename to common/interface/xml2jxon/mivIxml2jxon.manifest
diff --git a/interfaces/xml2jxon/mivIxml2jxon.xpt b/common/interface/xml2jxon/mivIxml2jxon.xpt
similarity index 100%
rename from interfaces/xml2jxon/mivIxml2jxon.xpt
rename to common/interface/xml2jxon/mivIxml2jxon.xpt
diff --git a/interfaces/xml2jxon/mivNameSpaces.idl b/common/interface/xml2jxon/mivNameSpaces.idl
similarity index 100%
rename from interfaces/xml2jxon/mivNameSpaces.idl
rename to common/interface/xml2jxon/mivNameSpaces.idl
diff --git a/interfaces/xml2jxon/mivNameSpaces.js b/common/interface/xml2jxon/mivNameSpaces.js
similarity index 100%
rename from interfaces/xml2jxon/mivNameSpaces.js
rename to common/interface/xml2jxon/mivNameSpaces.js
diff --git a/interfaces/xml2jxon/mivNameSpaces.manifest b/common/interface/xml2jxon/mivNameSpaces.manifest
similarity index 100%
rename from interfaces/xml2jxon/mivNameSpaces.manifest
rename to common/interface/xml2jxon/mivNameSpaces.manifest
diff --git a/interfaces/xml2jxon/mivNameSpaces.xpt b/common/interface/xml2jxon/mivNameSpaces.xpt
similarity index 100%
rename from interfaces/xml2jxon/mivNameSpaces.xpt
rename to common/interface/xml2jxon/mivNameSpaces.xpt
diff --git a/interfaces/xml2jxon/mivTagNames.idl b/common/interface/xml2jxon/mivTagNames.idl
similarity index 100%
rename from interfaces/xml2jxon/mivTagNames.idl
rename to common/interface/xml2jxon/mivTagNames.idl
diff --git a/interfaces/xml2jxon/mivTagNames.js b/common/interface/xml2jxon/mivTagNames.js
similarity index 100%
rename from interfaces/xml2jxon/mivTagNames.js
rename to common/interface/xml2jxon/mivTagNames.js
diff --git a/interfaces/xml2jxon/mivTagNames.manifest b/common/interface/xml2jxon/mivTagNames.manifest
similarity index 100%
rename from interfaces/xml2jxon/mivTagNames.manifest
rename to common/interface/xml2jxon/mivTagNames.manifest
diff --git a/interfaces/xml2jxon/mivTagNames.xpt b/common/interface/xml2jxon/mivTagNames.xpt
similarity index 100%
rename from interfaces/xml2jxon/mivTagNames.xpt
rename to common/interface/xml2jxon/mivTagNames.xpt

From fb8a09fbe92edf4ee75694232f08562d1006ad2e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:45:16 +0100
Subject: [PATCH 175/222] common: move chrome/content to common

---
 chrome.manifest                                                 | 2 +-
 {chrome => common}/content/OutOfOfficeMenu.js                   | 0
 {chrome => common}/content/OutOfOfficeMenu.xul                  | 0
 {chrome => common}/content/addressingWidgetOverlay.js           | 0
 {chrome => common}/content/addressingWidgetOverlay.xul          | 0
 {chrome => common}/content/adutils.js                           | 0
 {chrome => common}/content/attachments-view.js                  | 0
 {chrome => common}/content/attachments-view.xul                 | 0
 {chrome => common}/content/browseFolder.js                      | 0
 {chrome => common}/content/browseFolder.xul                     | 0
 {chrome => common}/content/cachePreferences.xul                 | 0
 {chrome => common}/content/calendar-list-tree.xml               | 0
 {chrome => common}/content/check4lightning.js                   | 0
 {chrome => common}/content/check4lightning.xul                  | 0
 {chrome => common}/content/debugPreferences.js                  | 0
 {chrome => common}/content/debugPreferences.xul                 | 0
 {chrome => common}/content/delegateFolder.js                    | 0
 .../content/exchService-followup-event-dialog.xml               | 0
 {chrome => common}/content/exchWebServiceEditor.xml             | 0
 {chrome => common}/content/exchWebService_bindings.xml          | 0
 {chrome => common}/content/exchangeCloneSettings.js             | 0
 {chrome => common}/content/exchangeCloneSettings.xul            | 0
 {chrome => common}/content/exchangeSettings.js                  | 0
 {chrome => common}/content/exchangeSettings.xul                 | 0
 {chrome => common}/content/exchangeSettingsOverlay.js           | 0
 {chrome => common}/content/exchangeSettingsOverlay.xul          | 0
 {chrome => common}/content/extra-messenger-preferences.xul      | 0
 {chrome => common}/content/extra-suite-preferences.xul          | 0
 {chrome => common}/content/folderPropsOverlay.xul               | 0
 {chrome => common}/content/invitationResponse.js                | 0
 {chrome => common}/content/invitationResponse.xul               | 0
 {chrome => common}/content/invite-style.js                      | 0
 {chrome => common}/content/invite-style.xul                     | 0
 {chrome => common}/content/lightningtimezoneOverlay.js          | 0
 {chrome => common}/content/lightningtimezoneOverlay.xul         | 0
 {chrome => common}/content/manageEWSAccounts.js                 | 0
 {chrome => common}/content/manageEWSAccounts.xul                | 0
 {chrome => common}/content/manageEWSAccountsMenu.js             | 0
 {chrome => common}/content/manageEWSAccountsMenu.xul            | 0
 {chrome => common}/content/messenger-overlay-preferences.xul    | 0
 {chrome => common}/content/msgHdrUtils.js                       | 0
 {chrome => common}/content/offlineCacheSettings.js              | 0
 {chrome => common}/content/oofSettings.js                       | 0
 {chrome => common}/content/oofSettings.xul                      | 0
 {chrome => common}/content/otherPreferences.js                  | 0
 {chrome => common}/content/otherPreferences.xul                 | 0
 {chrome => common}/content/preInvitationResponse.js             | 0
 {chrome => common}/content/preInvitationResponse.xul            | 0
 {chrome => common}/content/priority-display.js                  | 0
 {chrome => common}/content/priority-display.xul                 | 0
 {chrome => common}/content/progress_panel.js                    | 0
 {chrome => common}/content/progress_panel.xml                   | 0
 {chrome => common}/content/progress_panel.xul                   | 0
 {chrome => common}/content/selectEWSUrl.js                      | 0
 {chrome => common}/content/selectEWSUrl.xul                     | 0
 {chrome => common}/content/sendUpdateTo.js                      | 0
 {chrome => common}/content/sendUpdateTo.xul                     | 0
 {chrome => common}/content/sharedCalendarParser.js              | 0
 {chrome => common}/content/sharedCalendarParser.xul             | 0
 {chrome => common}/content/suite-overlay-preferences.xul        | 0
 {chrome => common}/content/timezonePreference.js                | 0
 {chrome => common}/content/timezonePreference.xul               | 0
 62 files changed, 1 insertion(+), 1 deletion(-)
 rename {chrome => common}/content/OutOfOfficeMenu.js (100%)
 rename {chrome => common}/content/OutOfOfficeMenu.xul (100%)
 rename {chrome => common}/content/addressingWidgetOverlay.js (100%)
 rename {chrome => common}/content/addressingWidgetOverlay.xul (100%)
 rename {chrome => common}/content/adutils.js (100%)
 rename {chrome => common}/content/attachments-view.js (100%)
 rename {chrome => common}/content/attachments-view.xul (100%)
 rename {chrome => common}/content/browseFolder.js (100%)
 rename {chrome => common}/content/browseFolder.xul (100%)
 rename {chrome => common}/content/cachePreferences.xul (100%)
 rename {chrome => common}/content/calendar-list-tree.xml (100%)
 rename {chrome => common}/content/check4lightning.js (100%)
 rename {chrome => common}/content/check4lightning.xul (100%)
 rename {chrome => common}/content/debugPreferences.js (100%)
 rename {chrome => common}/content/debugPreferences.xul (100%)
 rename {chrome => common}/content/delegateFolder.js (100%)
 rename {chrome => common}/content/exchService-followup-event-dialog.xml (100%)
 rename {chrome => common}/content/exchWebServiceEditor.xml (100%)
 rename {chrome => common}/content/exchWebService_bindings.xml (100%)
 rename {chrome => common}/content/exchangeCloneSettings.js (100%)
 rename {chrome => common}/content/exchangeCloneSettings.xul (100%)
 rename {chrome => common}/content/exchangeSettings.js (100%)
 rename {chrome => common}/content/exchangeSettings.xul (100%)
 rename {chrome => common}/content/exchangeSettingsOverlay.js (100%)
 rename {chrome => common}/content/exchangeSettingsOverlay.xul (100%)
 rename {chrome => common}/content/extra-messenger-preferences.xul (100%)
 rename {chrome => common}/content/extra-suite-preferences.xul (100%)
 rename {chrome => common}/content/folderPropsOverlay.xul (100%)
 rename {chrome => common}/content/invitationResponse.js (100%)
 rename {chrome => common}/content/invitationResponse.xul (100%)
 rename {chrome => common}/content/invite-style.js (100%)
 rename {chrome => common}/content/invite-style.xul (100%)
 rename {chrome => common}/content/lightningtimezoneOverlay.js (100%)
 rename {chrome => common}/content/lightningtimezoneOverlay.xul (100%)
 rename {chrome => common}/content/manageEWSAccounts.js (100%)
 rename {chrome => common}/content/manageEWSAccounts.xul (100%)
 rename {chrome => common}/content/manageEWSAccountsMenu.js (100%)
 rename {chrome => common}/content/manageEWSAccountsMenu.xul (100%)
 rename {chrome => common}/content/messenger-overlay-preferences.xul (100%)
 rename {chrome => common}/content/msgHdrUtils.js (100%)
 rename {chrome => common}/content/offlineCacheSettings.js (100%)
 rename {chrome => common}/content/oofSettings.js (100%)
 rename {chrome => common}/content/oofSettings.xul (100%)
 rename {chrome => common}/content/otherPreferences.js (100%)
 rename {chrome => common}/content/otherPreferences.xul (100%)
 rename {chrome => common}/content/preInvitationResponse.js (100%)
 rename {chrome => common}/content/preInvitationResponse.xul (100%)
 rename {chrome => common}/content/priority-display.js (100%)
 rename {chrome => common}/content/priority-display.xul (100%)
 rename {chrome => common}/content/progress_panel.js (100%)
 rename {chrome => common}/content/progress_panel.xml (100%)
 rename {chrome => common}/content/progress_panel.xul (100%)
 rename {chrome => common}/content/selectEWSUrl.js (100%)
 rename {chrome => common}/content/selectEWSUrl.xul (100%)
 rename {chrome => common}/content/sendUpdateTo.js (100%)
 rename {chrome => common}/content/sendUpdateTo.xul (100%)
 rename {chrome => common}/content/sharedCalendarParser.js (100%)
 rename {chrome => common}/content/sharedCalendarParser.xul (100%)
 rename {chrome => common}/content/suite-overlay-preferences.xul (100%)
 rename {chrome => common}/content/timezonePreference.js (100%)
 rename {chrome => common}/content/timezonePreference.xul (100%)

diff --git a/chrome.manifest b/chrome.manifest
index 3bff3edf..472db9bb 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,4 +1,4 @@
-content exchangecalendar chrome/content/
+content exchangecalendar common/content/
 
 skin exchangecalendar fugue theme/unix/
 skin exchangecalendar fugue theme/win/ os=WINNT
diff --git a/chrome/content/OutOfOfficeMenu.js b/common/content/OutOfOfficeMenu.js
similarity index 100%
rename from chrome/content/OutOfOfficeMenu.js
rename to common/content/OutOfOfficeMenu.js
diff --git a/chrome/content/OutOfOfficeMenu.xul b/common/content/OutOfOfficeMenu.xul
similarity index 100%
rename from chrome/content/OutOfOfficeMenu.xul
rename to common/content/OutOfOfficeMenu.xul
diff --git a/chrome/content/addressingWidgetOverlay.js b/common/content/addressingWidgetOverlay.js
similarity index 100%
rename from chrome/content/addressingWidgetOverlay.js
rename to common/content/addressingWidgetOverlay.js
diff --git a/chrome/content/addressingWidgetOverlay.xul b/common/content/addressingWidgetOverlay.xul
similarity index 100%
rename from chrome/content/addressingWidgetOverlay.xul
rename to common/content/addressingWidgetOverlay.xul
diff --git a/chrome/content/adutils.js b/common/content/adutils.js
similarity index 100%
rename from chrome/content/adutils.js
rename to common/content/adutils.js
diff --git a/chrome/content/attachments-view.js b/common/content/attachments-view.js
similarity index 100%
rename from chrome/content/attachments-view.js
rename to common/content/attachments-view.js
diff --git a/chrome/content/attachments-view.xul b/common/content/attachments-view.xul
similarity index 100%
rename from chrome/content/attachments-view.xul
rename to common/content/attachments-view.xul
diff --git a/chrome/content/browseFolder.js b/common/content/browseFolder.js
similarity index 100%
rename from chrome/content/browseFolder.js
rename to common/content/browseFolder.js
diff --git a/chrome/content/browseFolder.xul b/common/content/browseFolder.xul
similarity index 100%
rename from chrome/content/browseFolder.xul
rename to common/content/browseFolder.xul
diff --git a/chrome/content/cachePreferences.xul b/common/content/cachePreferences.xul
similarity index 100%
rename from chrome/content/cachePreferences.xul
rename to common/content/cachePreferences.xul
diff --git a/chrome/content/calendar-list-tree.xml b/common/content/calendar-list-tree.xml
similarity index 100%
rename from chrome/content/calendar-list-tree.xml
rename to common/content/calendar-list-tree.xml
diff --git a/chrome/content/check4lightning.js b/common/content/check4lightning.js
similarity index 100%
rename from chrome/content/check4lightning.js
rename to common/content/check4lightning.js
diff --git a/chrome/content/check4lightning.xul b/common/content/check4lightning.xul
similarity index 100%
rename from chrome/content/check4lightning.xul
rename to common/content/check4lightning.xul
diff --git a/chrome/content/debugPreferences.js b/common/content/debugPreferences.js
similarity index 100%
rename from chrome/content/debugPreferences.js
rename to common/content/debugPreferences.js
diff --git a/chrome/content/debugPreferences.xul b/common/content/debugPreferences.xul
similarity index 100%
rename from chrome/content/debugPreferences.xul
rename to common/content/debugPreferences.xul
diff --git a/chrome/content/delegateFolder.js b/common/content/delegateFolder.js
similarity index 100%
rename from chrome/content/delegateFolder.js
rename to common/content/delegateFolder.js
diff --git a/chrome/content/exchService-followup-event-dialog.xml b/common/content/exchService-followup-event-dialog.xml
similarity index 100%
rename from chrome/content/exchService-followup-event-dialog.xml
rename to common/content/exchService-followup-event-dialog.xml
diff --git a/chrome/content/exchWebServiceEditor.xml b/common/content/exchWebServiceEditor.xml
similarity index 100%
rename from chrome/content/exchWebServiceEditor.xml
rename to common/content/exchWebServiceEditor.xml
diff --git a/chrome/content/exchWebService_bindings.xml b/common/content/exchWebService_bindings.xml
similarity index 100%
rename from chrome/content/exchWebService_bindings.xml
rename to common/content/exchWebService_bindings.xml
diff --git a/chrome/content/exchangeCloneSettings.js b/common/content/exchangeCloneSettings.js
similarity index 100%
rename from chrome/content/exchangeCloneSettings.js
rename to common/content/exchangeCloneSettings.js
diff --git a/chrome/content/exchangeCloneSettings.xul b/common/content/exchangeCloneSettings.xul
similarity index 100%
rename from chrome/content/exchangeCloneSettings.xul
rename to common/content/exchangeCloneSettings.xul
diff --git a/chrome/content/exchangeSettings.js b/common/content/exchangeSettings.js
similarity index 100%
rename from chrome/content/exchangeSettings.js
rename to common/content/exchangeSettings.js
diff --git a/chrome/content/exchangeSettings.xul b/common/content/exchangeSettings.xul
similarity index 100%
rename from chrome/content/exchangeSettings.xul
rename to common/content/exchangeSettings.xul
diff --git a/chrome/content/exchangeSettingsOverlay.js b/common/content/exchangeSettingsOverlay.js
similarity index 100%
rename from chrome/content/exchangeSettingsOverlay.js
rename to common/content/exchangeSettingsOverlay.js
diff --git a/chrome/content/exchangeSettingsOverlay.xul b/common/content/exchangeSettingsOverlay.xul
similarity index 100%
rename from chrome/content/exchangeSettingsOverlay.xul
rename to common/content/exchangeSettingsOverlay.xul
diff --git a/chrome/content/extra-messenger-preferences.xul b/common/content/extra-messenger-preferences.xul
similarity index 100%
rename from chrome/content/extra-messenger-preferences.xul
rename to common/content/extra-messenger-preferences.xul
diff --git a/chrome/content/extra-suite-preferences.xul b/common/content/extra-suite-preferences.xul
similarity index 100%
rename from chrome/content/extra-suite-preferences.xul
rename to common/content/extra-suite-preferences.xul
diff --git a/chrome/content/folderPropsOverlay.xul b/common/content/folderPropsOverlay.xul
similarity index 100%
rename from chrome/content/folderPropsOverlay.xul
rename to common/content/folderPropsOverlay.xul
diff --git a/chrome/content/invitationResponse.js b/common/content/invitationResponse.js
similarity index 100%
rename from chrome/content/invitationResponse.js
rename to common/content/invitationResponse.js
diff --git a/chrome/content/invitationResponse.xul b/common/content/invitationResponse.xul
similarity index 100%
rename from chrome/content/invitationResponse.xul
rename to common/content/invitationResponse.xul
diff --git a/chrome/content/invite-style.js b/common/content/invite-style.js
similarity index 100%
rename from chrome/content/invite-style.js
rename to common/content/invite-style.js
diff --git a/chrome/content/invite-style.xul b/common/content/invite-style.xul
similarity index 100%
rename from chrome/content/invite-style.xul
rename to common/content/invite-style.xul
diff --git a/chrome/content/lightningtimezoneOverlay.js b/common/content/lightningtimezoneOverlay.js
similarity index 100%
rename from chrome/content/lightningtimezoneOverlay.js
rename to common/content/lightningtimezoneOverlay.js
diff --git a/chrome/content/lightningtimezoneOverlay.xul b/common/content/lightningtimezoneOverlay.xul
similarity index 100%
rename from chrome/content/lightningtimezoneOverlay.xul
rename to common/content/lightningtimezoneOverlay.xul
diff --git a/chrome/content/manageEWSAccounts.js b/common/content/manageEWSAccounts.js
similarity index 100%
rename from chrome/content/manageEWSAccounts.js
rename to common/content/manageEWSAccounts.js
diff --git a/chrome/content/manageEWSAccounts.xul b/common/content/manageEWSAccounts.xul
similarity index 100%
rename from chrome/content/manageEWSAccounts.xul
rename to common/content/manageEWSAccounts.xul
diff --git a/chrome/content/manageEWSAccountsMenu.js b/common/content/manageEWSAccountsMenu.js
similarity index 100%
rename from chrome/content/manageEWSAccountsMenu.js
rename to common/content/manageEWSAccountsMenu.js
diff --git a/chrome/content/manageEWSAccountsMenu.xul b/common/content/manageEWSAccountsMenu.xul
similarity index 100%
rename from chrome/content/manageEWSAccountsMenu.xul
rename to common/content/manageEWSAccountsMenu.xul
diff --git a/chrome/content/messenger-overlay-preferences.xul b/common/content/messenger-overlay-preferences.xul
similarity index 100%
rename from chrome/content/messenger-overlay-preferences.xul
rename to common/content/messenger-overlay-preferences.xul
diff --git a/chrome/content/msgHdrUtils.js b/common/content/msgHdrUtils.js
similarity index 100%
rename from chrome/content/msgHdrUtils.js
rename to common/content/msgHdrUtils.js
diff --git a/chrome/content/offlineCacheSettings.js b/common/content/offlineCacheSettings.js
similarity index 100%
rename from chrome/content/offlineCacheSettings.js
rename to common/content/offlineCacheSettings.js
diff --git a/chrome/content/oofSettings.js b/common/content/oofSettings.js
similarity index 100%
rename from chrome/content/oofSettings.js
rename to common/content/oofSettings.js
diff --git a/chrome/content/oofSettings.xul b/common/content/oofSettings.xul
similarity index 100%
rename from chrome/content/oofSettings.xul
rename to common/content/oofSettings.xul
diff --git a/chrome/content/otherPreferences.js b/common/content/otherPreferences.js
similarity index 100%
rename from chrome/content/otherPreferences.js
rename to common/content/otherPreferences.js
diff --git a/chrome/content/otherPreferences.xul b/common/content/otherPreferences.xul
similarity index 100%
rename from chrome/content/otherPreferences.xul
rename to common/content/otherPreferences.xul
diff --git a/chrome/content/preInvitationResponse.js b/common/content/preInvitationResponse.js
similarity index 100%
rename from chrome/content/preInvitationResponse.js
rename to common/content/preInvitationResponse.js
diff --git a/chrome/content/preInvitationResponse.xul b/common/content/preInvitationResponse.xul
similarity index 100%
rename from chrome/content/preInvitationResponse.xul
rename to common/content/preInvitationResponse.xul
diff --git a/chrome/content/priority-display.js b/common/content/priority-display.js
similarity index 100%
rename from chrome/content/priority-display.js
rename to common/content/priority-display.js
diff --git a/chrome/content/priority-display.xul b/common/content/priority-display.xul
similarity index 100%
rename from chrome/content/priority-display.xul
rename to common/content/priority-display.xul
diff --git a/chrome/content/progress_panel.js b/common/content/progress_panel.js
similarity index 100%
rename from chrome/content/progress_panel.js
rename to common/content/progress_panel.js
diff --git a/chrome/content/progress_panel.xml b/common/content/progress_panel.xml
similarity index 100%
rename from chrome/content/progress_panel.xml
rename to common/content/progress_panel.xml
diff --git a/chrome/content/progress_panel.xul b/common/content/progress_panel.xul
similarity index 100%
rename from chrome/content/progress_panel.xul
rename to common/content/progress_panel.xul
diff --git a/chrome/content/selectEWSUrl.js b/common/content/selectEWSUrl.js
similarity index 100%
rename from chrome/content/selectEWSUrl.js
rename to common/content/selectEWSUrl.js
diff --git a/chrome/content/selectEWSUrl.xul b/common/content/selectEWSUrl.xul
similarity index 100%
rename from chrome/content/selectEWSUrl.xul
rename to common/content/selectEWSUrl.xul
diff --git a/chrome/content/sendUpdateTo.js b/common/content/sendUpdateTo.js
similarity index 100%
rename from chrome/content/sendUpdateTo.js
rename to common/content/sendUpdateTo.js
diff --git a/chrome/content/sendUpdateTo.xul b/common/content/sendUpdateTo.xul
similarity index 100%
rename from chrome/content/sendUpdateTo.xul
rename to common/content/sendUpdateTo.xul
diff --git a/chrome/content/sharedCalendarParser.js b/common/content/sharedCalendarParser.js
similarity index 100%
rename from chrome/content/sharedCalendarParser.js
rename to common/content/sharedCalendarParser.js
diff --git a/chrome/content/sharedCalendarParser.xul b/common/content/sharedCalendarParser.xul
similarity index 100%
rename from chrome/content/sharedCalendarParser.xul
rename to common/content/sharedCalendarParser.xul
diff --git a/chrome/content/suite-overlay-preferences.xul b/common/content/suite-overlay-preferences.xul
similarity index 100%
rename from chrome/content/suite-overlay-preferences.xul
rename to common/content/suite-overlay-preferences.xul
diff --git a/chrome/content/timezonePreference.js b/common/content/timezonePreference.js
similarity index 100%
rename from chrome/content/timezonePreference.js
rename to common/content/timezonePreference.js
diff --git a/chrome/content/timezonePreference.xul b/common/content/timezonePreference.xul
similarity index 100%
rename from chrome/content/timezonePreference.xul
rename to common/content/timezonePreference.xul

From 58b8b6ca2e17b16b0254298d5325b3438347d043 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 21:48:11 +0100
Subject: [PATCH 176/222] common: move locale and theme (will need to better
 locate locales later)

---
 .tx/config                                    | 100 +++++++++---------
 chrome.manifest                               |  32 +++---
 .../locale}/cs_CZ/attachments-view.dtd        |   0
 .../locale}/cs_CZ/browseFolder.dtd            |   0
 .../cs_CZ/calExchangeCalendar.properties      |   0
 .../locale}/cs_CZ/calendar-calendars-list.dtd |   0
 .../locale}/cs_CZ/calendar-summary-dialog.dtd |   0
 .../cs_CZ/delegate-calendar-dialog.dtd        |   0
 .../locale}/cs_CZ/delegate-folder.dtd         |   0
 .../locale}/cs_CZ/ecCalendarCreation.dtd      |   0
 .../locale}/cs_CZ/exchangeCloneSettings.dtd   |   0
 .../locale}/cs_CZ/exchangeReminderDialog.dtd  |   0
 .../locale}/cs_CZ/exchangeSettings.dtd        |   0
 .../locale}/cs_CZ/exchangeSettingsOverlay.dtd |   0
 .../locale}/cs_CZ/extra-priority.dtd          |   0
 .../locale}/cs_CZ/invitationResponse.dtd      |   0
 .../locale}/cs_CZ/inviteStyle.dtd             |   0
 .../locale}/cs_CZ/lightning-item-iframe.dtd   |   0
 .../locale}/cs_CZ/manageEWSAccounts.dtd       |   0
 .../cs_CZ/messenger_task_delegation.dtd       |   0
 .../locale}/cs_CZ/oofSettings.dtd             |   0
 .../locale}/cs_CZ/preInvitationResponse.dtd   |   0
 .../locale}/cs_CZ/preferences.dtd             |   0
 .../locale}/cs_CZ/selectEWSUrl.dtd            |   0
 .../locale}/cs_CZ/sendUpdateTo.dtd            |   0
 .../locale}/cs_CZ/sharedCalendarParser.dtd    |   0
 .../locale}/cs_CZ/timezonePreference.dtd      |   0
 .../locale}/de/attachments-view.dtd           |   0
 .../locale}/de/browseFolder.dtd               |   0
 .../locale}/de/calExchangeCalendar.properties |   0
 .../locale}/de/calendar-calendars-list.dtd    |   0
 .../locale}/de/calendar-summary-dialog.dtd    |   0
 .../locale}/de/delegate-calendar-dialog.dtd   |   0
 .../locale}/de/delegate-folder.dtd            |   0
 .../locale}/de/ecCalendarCreation.dtd         |   0
 .../locale}/de/exchangeCloneSettings.dtd      |   0
 .../locale}/de/exchangeReminderDialog.dtd     |   0
 .../locale}/de/exchangeSettings.dtd           |   0
 .../locale}/de/exchangeSettingsOverlay.dtd    |   0
 .../locale}/de/extra-priority.dtd             |   0
 .../locale}/de/invitationResponse.dtd         |   0
 .../locale}/de/inviteStyle.dtd                |   0
 .../locale}/de/lightning-item-iframe.dtd      |   0
 .../locale}/de/manageEWSAccounts.dtd          |   0
 .../locale}/de/messenger_task_delegation.dtd  |   0
 .../locale}/de/oofSettings.dtd                |   0
 .../locale}/de/preInvitationResponse.dtd      |   0
 .../locale}/de/preferences.dtd                |   0
 .../locale}/de/selectEWSUrl.dtd               |   0
 .../locale}/de/sendUpdateTo.dtd               |   0
 .../locale}/de/sharedCalendarParser.dtd       |   0
 .../locale}/de/timezonePreference.dtd         |   0
 .../locale}/en/attachments-view.dtd           |   0
 .../locale}/en/browseFolder.dtd               |   0
 .../locale}/en/calExchangeCalendar.properties |   0
 .../locale}/en/calendar-calendars-list.dtd    |   0
 .../locale}/en/calendar-summary-dialog.dtd    |   0
 .../locale}/en/delegate-calendar-dialog.dtd   |   0
 .../locale}/en/delegate-folder.dtd            |   0
 .../locale}/en/ecCalendarCreation.dtd         |   0
 .../locale}/en/exchangeCloneSettings.dtd      |   0
 .../locale}/en/exchangeReminderDialog.dtd     |   0
 .../locale}/en/exchangeSettings.dtd           |   0
 .../locale}/en/exchangeSettingsOverlay.dtd    |   0
 .../locale}/en/extra-priority.dtd             |   0
 .../locale}/en/invitationResponse.dtd         |   0
 .../locale}/en/inviteStyle.dtd                |   0
 .../locale}/en/lightning-item-iframe.dtd      |   0
 .../locale}/en/manageEWSAccounts.dtd          |   0
 .../locale}/en/messenger_task_delegation.dtd  |   0
 .../locale}/en/oofSettings.dtd                |   0
 .../locale}/en/preInvitationResponse.dtd      |   0
 .../locale}/en/preferences.dtd                |   0
 .../locale}/en/selectEWSUrl.dtd               |   0
 .../locale}/en/sendUpdateTo.dtd               |   0
 .../locale}/en/sharedCalendarParser.dtd       |   0
 .../locale}/en/timezonePreference.dtd         |   0
 .../locale}/en_US/attachments-view.dtd        |   0
 .../locale}/en_US/browseFolder.dtd            |   0
 .../en_US/calExchangeCalendar.properties      |   0
 .../locale}/en_US/calendar-calendars-list.dtd |   0
 .../locale}/en_US/calendar-summary-dialog.dtd |   0
 .../en_US/delegate-calendar-dialog.dtd        |   0
 .../locale}/en_US/delegate-folder.dtd         |   0
 .../locale}/en_US/ecCalendarCreation.dtd      |   0
 .../locale}/en_US/exchangeCloneSettings.dtd   |   0
 .../locale}/en_US/exchangeReminderDialog.dtd  |   0
 .../locale}/en_US/exchangeSettings.dtd        |   0
 .../locale}/en_US/exchangeSettingsOverlay.dtd |   0
 .../locale}/en_US/extra-priority.dtd          |   0
 .../locale}/en_US/invitationResponse.dtd      |   0
 .../locale}/en_US/inviteStyle.dtd             |   0
 .../locale}/en_US/lightning-item-iframe.dtd   |   0
 .../locale}/en_US/manageEWSAccounts.dtd       |   0
 .../en_US/messenger_task_delegation.dtd       |   0
 .../locale}/en_US/oofSettings.dtd             |   0
 .../locale}/en_US/preInvitationResponse.dtd   |   0
 .../locale}/en_US/preferences.dtd             |   0
 .../locale}/en_US/selectEWSUrl.dtd            |   0
 .../locale}/en_US/sendUpdateTo.dtd            |   0
 .../locale}/en_US/sharedCalendarParser.dtd    |   0
 .../locale}/en_US/timezonePreference.dtd      |   0
 .../locale}/fr_FR/attachments-view.dtd        |   0
 .../locale}/fr_FR/browseFolder.dtd            |   0
 .../fr_FR/calExchangeCalendar.properties      |   0
 .../locale}/fr_FR/calendar-calendars-list.dtd |   0
 .../locale}/fr_FR/calendar-summary-dialog.dtd |   0
 .../fr_FR/delegate-calendar-dialog.dtd        |   0
 .../locale}/fr_FR/delegate-folder.dtd         |   0
 .../locale}/fr_FR/ecCalendarCreation.dtd      |   0
 .../locale}/fr_FR/exchangeCloneSettings.dtd   |   0
 .../locale}/fr_FR/exchangeReminderDialog.dtd  |   0
 .../locale}/fr_FR/exchangeSettings.dtd        |   0
 .../locale}/fr_FR/exchangeSettingsOverlay.dtd |   0
 .../locale}/fr_FR/extra-priority.dtd          |   0
 .../locale}/fr_FR/invitationResponse.dtd      |   0
 .../locale}/fr_FR/inviteStyle.dtd             |   0
 .../locale}/fr_FR/lightning-item-iframe.dtd   |   0
 .../locale}/fr_FR/manageEWSAccounts.dtd       |   0
 .../fr_FR/messenger_task_delegation.dtd       |   0
 .../locale}/fr_FR/oofSettings.dtd             |   0
 .../locale}/fr_FR/preInvitationResponse.dtd   |   0
 .../locale}/fr_FR/preferences.dtd             |   0
 .../locale}/fr_FR/selectEWSUrl.dtd            |   0
 .../locale}/fr_FR/sendUpdateTo.dtd            |   0
 .../locale}/fr_FR/sharedCalendarParser.dtd    |   0
 .../locale}/fr_FR/timezonePreference.dtd      |   0
 .../locale}/it_IT/attachments-view.dtd        |   0
 .../locale}/it_IT/browseFolder.dtd            |   0
 .../it_IT/calExchangeCalendar.properties      |   0
 .../locale}/it_IT/calendar-calendars-list.dtd |   0
 .../locale}/it_IT/calendar-summary-dialog.dtd |   0
 .../it_IT/delegate-calendar-dialog.dtd        |   0
 .../locale}/it_IT/delegate-folder.dtd         |   0
 .../locale}/it_IT/ecCalendarCreation.dtd      |   0
 .../locale}/it_IT/exchangeCloneSettings.dtd   |   0
 .../locale}/it_IT/exchangeReminderDialog.dtd  |   0
 .../locale}/it_IT/exchangeSettings.dtd        |   0
 .../locale}/it_IT/exchangeSettingsOverlay.dtd |   0
 .../locale}/it_IT/extra-priority.dtd          |   0
 .../locale}/it_IT/invitationResponse.dtd      |   0
 .../locale}/it_IT/inviteStyle.dtd             |   0
 .../locale}/it_IT/lightning-item-iframe.dtd   |   0
 .../locale}/it_IT/manageEWSAccounts.dtd       |   0
 .../it_IT/messenger_task_delegation.dtd       |   0
 .../locale}/it_IT/oofSettings.dtd             |   0
 .../locale}/it_IT/preInvitationResponse.dtd   |   0
 .../locale}/it_IT/preferences.dtd             |   0
 .../locale}/it_IT/selectEWSUrl.dtd            |   0
 .../locale}/it_IT/sendUpdateTo.dtd            |   0
 .../locale}/it_IT/sharedCalendarParser.dtd    |   0
 .../locale}/it_IT/timezonePreference.dtd      |   0
 .../locale}/ja_JP/attachments-view.dtd        |   0
 .../locale}/ja_JP/browseFolder.dtd            |   0
 .../ja_JP/calExchangeCalendar.properties      |   0
 .../locale}/ja_JP/calendar-calendars-list.dtd |   0
 .../locale}/ja_JP/calendar-summary-dialog.dtd |   0
 .../ja_JP/delegate-calendar-dialog.dtd        |   0
 .../locale}/ja_JP/delegate-folder.dtd         |   0
 .../locale}/ja_JP/ecCalendarCreation.dtd      |   0
 .../locale}/ja_JP/exchangeCloneSettings.dtd   |   0
 .../locale}/ja_JP/exchangeReminderDialog.dtd  |   0
 .../locale}/ja_JP/exchangeSettings.dtd        |   0
 .../locale}/ja_JP/exchangeSettingsOverlay.dtd |   0
 .../locale}/ja_JP/extra-priority.dtd          |   0
 .../locale}/ja_JP/invitationResponse.dtd      |   0
 .../locale}/ja_JP/inviteStyle.dtd             |   0
 .../locale}/ja_JP/lightning-item-iframe.dtd   |   0
 .../locale}/ja_JP/manageEWSAccounts.dtd       |   0
 .../ja_JP/messenger_task_delegation.dtd       |   0
 .../locale}/ja_JP/oofSettings.dtd             |   0
 .../locale}/ja_JP/preInvitationResponse.dtd   |   0
 .../locale}/ja_JP/preferences.dtd             |   0
 .../locale}/ja_JP/selectEWSUrl.dtd            |   0
 .../locale}/ja_JP/sendUpdateTo.dtd            |   0
 .../locale}/ja_JP/sharedCalendarParser.dtd    |   0
 .../locale}/ja_JP/timezonePreference.dtd      |   0
 .../locale}/nl/attachments-view.dtd           |   0
 .../locale}/nl/browseFolder.dtd               |   0
 .../locale}/nl/calExchangeCalendar.properties |   0
 .../locale}/nl/calendar-calendars-list.dtd    |   0
 .../locale}/nl/calendar-summary-dialog.dtd    |   0
 .../locale}/nl/delegate-calendar-dialog.dtd   |   0
 .../locale}/nl/delegate-folder.dtd            |   0
 .../locale}/nl/ecCalendarCreation.dtd         |   0
 .../locale}/nl/exchangeCloneSettings.dtd      |   0
 .../locale}/nl/exchangeReminderDialog.dtd     |   0
 .../locale}/nl/exchangeSettings.dtd           |   0
 .../locale}/nl/exchangeSettingsOverlay.dtd    |   0
 .../locale}/nl/extra-priority.dtd             |   0
 .../locale}/nl/invitationResponse.dtd         |   0
 .../locale}/nl/inviteStyle.dtd                |   0
 .../locale}/nl/lightning-item-iframe.dtd      |   0
 .../locale}/nl/manageEWSAccounts.dtd          |   0
 .../locale}/nl/messenger_task_delegation.dtd  |   0
 .../locale}/nl/oofSettings.dtd                |   0
 .../locale}/nl/preInvitationResponse.dtd      |   0
 .../locale}/nl/preferences.dtd                |   0
 .../locale}/nl/selectEWSUrl.dtd               |   0
 .../locale}/nl/sendUpdateTo.dtd               |   0
 .../locale}/nl/sharedCalendarParser.dtd       |   0
 .../locale}/nl/timezonePreference.dtd         |   0
 .../locale}/ru/attachments-view.dtd           |   0
 .../locale}/ru/browseFolder.dtd               |   0
 .../locale}/ru/calExchangeCalendar.properties |   0
 .../locale}/ru/calendar-calendars-list.dtd    |   0
 .../locale}/ru/calendar-summary-dialog.dtd    |   0
 .../locale}/ru/delegate-calendar-dialog.dtd   |   0
 .../locale}/ru/delegate-folder.dtd            |   0
 .../locale}/ru/ecCalendarCreation.dtd         |   0
 .../locale}/ru/exchangeCloneSettings.dtd      |   0
 .../locale}/ru/exchangeReminderDialog.dtd     |   0
 .../locale}/ru/exchangeSettings.dtd           |   0
 .../locale}/ru/exchangeSettingsOverlay.dtd    |   0
 .../locale}/ru/extra-priority.dtd             |   0
 .../locale}/ru/invitationResponse.dtd         |   0
 .../locale}/ru/inviteStyle.dtd                |   0
 .../locale}/ru/lightning-item-iframe.dtd      |   0
 .../locale}/ru/manageEWSAccounts.dtd          |   0
 .../locale}/ru/messenger_task_delegation.dtd  |   0
 .../locale}/ru/oofSettings.dtd                |   0
 .../locale}/ru/preInvitationResponse.dtd      |   0
 .../locale}/ru/preferences.dtd                |   0
 .../locale}/ru/selectEWSUrl.dtd               |   0
 .../locale}/ru/sendUpdateTo.dtd               |   0
 .../locale}/ru/sharedCalendarParser.dtd       |   0
 .../locale}/ru/timezonePreference.dtd         |   0
 .../locale}/sv/attachments-view.dtd           |   0
 .../locale}/sv/browseFolder.dtd               |   0
 .../locale}/sv/calExchangeCalendar.properties |   0
 .../locale}/sv/calendar-calendars-list.dtd    |   0
 .../locale}/sv/calendar-summary-dialog.dtd    |   0
 .../locale}/sv/delegate-calendar-dialog.dtd   |   0
 .../locale}/sv/delegate-folder.dtd            |   0
 .../locale}/sv/ecCalendarCreation.dtd         |   0
 .../locale}/sv/exchangeCloneSettings.dtd      |   0
 .../locale}/sv/exchangeReminderDialog.dtd     |   0
 .../locale}/sv/exchangeSettings.dtd           |   0
 .../locale}/sv/exchangeSettingsOverlay.dtd    |   0
 .../locale}/sv/extra-priority.dtd             |   0
 .../locale}/sv/invitationResponse.dtd         |   0
 .../locale}/sv/inviteStyle.dtd                |   0
 .../locale}/sv/lightning-item-iframe.dtd      |   0
 .../locale}/sv/manageEWSAccounts.dtd          |   0
 .../locale}/sv/messenger_task_delegation.dtd  |   0
 .../locale}/sv/oofSettings.dtd                |   0
 .../locale}/sv/preInvitationResponse.dtd      |   0
 .../locale}/sv/preferences.dtd                |   0
 .../locale}/sv/selectEWSUrl.dtd               |   0
 .../locale}/sv/sendUpdateTo.dtd               |   0
 .../locale}/sv/sharedCalendarParser.dtd       |   0
 .../locale}/sv/timezonePreference.dtd         |   0
 .../locale}/tr/attachments-view.dtd           |   0
 .../locale}/tr/browseFolder.dtd               |   0
 .../locale}/tr/calExchangeCalendar.properties |   0
 .../locale}/tr/calendar-calendars-list.dtd    |   0
 .../locale}/tr/calendar-summary-dialog.dtd    |   0
 .../locale}/tr/delegate-calendar-dialog.dtd   |   0
 .../locale}/tr/delegate-folder.dtd            |   0
 .../locale}/tr/ecCalendarCreation.dtd         |   0
 .../locale}/tr/exchangeCloneSettings.dtd      |   0
 .../locale}/tr/exchangeReminderDialog.dtd     |   0
 .../locale}/tr/exchangeSettings.dtd           |   0
 .../locale}/tr/exchangeSettingsOverlay.dtd    |   0
 .../locale}/tr/extra-priority.dtd             |   0
 .../locale}/tr/invitationResponse.dtd         |   0
 .../locale}/tr/inviteStyle.dtd                |   0
 .../locale}/tr/lightning-item-iframe.dtd      |   0
 .../locale}/tr/manageEWSAccounts.dtd          |   0
 .../locale}/tr/messenger_task_delegation.dtd  |   0
 .../locale}/tr/oofSettings.dtd                |   0
 .../locale}/tr/preInvitationResponse.dtd      |   0
 .../locale}/tr/preferences.dtd                |   0
 .../locale}/tr/selectEWSUrl.dtd               |   0
 .../locale}/tr/sendUpdateTo.dtd               |   0
 .../locale}/tr/sharedCalendarParser.dtd       |   0
 .../locale}/tr/timezonePreference.dtd         |   0
 .../theme}/common/addressingWidgetOverlay.css |   0
 .../theme}/common/browseFolder.css            |   0
 .../theme}/common/calendar-calendars-list.css |   0
 .../calendar-event-dialog-attendees.css       |   0
 .../theme}/common/calendar-summary-dialog.css |   0
 .../theme}/common/delegateCalendar.css        |   0
 .../theme}/common/exchWebServiceEditor.css    |   0
 .../theme}/common/extras-preferences.css      |   0
 .../common/images/Fugue Icons README.txt      |   0
 .../theme}/common/images/accepted.png         | Bin
 .../theme}/common/images/address-book.png     | Bin
 .../theme}/common/images/arrow-circle-135.png | Bin
 .../theme}/common/images/arrow-circle-225.png | Bin
 .../theme}/common/images/arrow-circle-315.png | Bin
 .../theme}/common/images/arrow-circle.png     | Bin
 .../common/images/asterisk-small-yellow.png   | Bin
 .../theme}/common/images/blog.png             | Bin
 .../theme}/common/images/calendar-month.png   | Bin
 .../theme}/common/images/cancelled.png        | Bin
 .../theme}/common/images/certificate.png      | Bin
 .../theme}/common/images/chain--minus.png     | Bin
 .../theme}/common/images/chain--pencil.png    | Bin
 .../theme}/common/images/chain--plus.png      | Bin
 .../theme}/common/images/cross.png            | Bin
 .../theme}/common/images/declined.png         | Bin
 .../common/images/document--exclamation.png   | Bin
 .../theme}/common/images/document-binary.png  | Bin
 .../common/images/document-excel-csv.png      | Bin
 .../theme}/common/images/document-excel.png   | Bin
 .../common/images/document-flash-movie.png    | Bin
 .../theme}/common/images/document-image.png   | Bin
 .../theme}/common/images/document-office.png  | Bin
 .../theme}/common/images/document-pdf.png     | Bin
 .../common/images/document-photoshop.png      | Bin
 .../theme}/common/images/document-php.png     | Bin
 .../common/images/document-powerpoint.png     | Bin
 .../theme}/common/images/document-tex.png     | Bin
 .../theme}/common/images/document-text.png    | Bin
 .../theme}/common/images/document-word.png    | Bin
 .../common/images/edit-alignment-center.png   | Bin
 .../common/images/edit-alignment-justify.png  | Bin
 .../common/images/edit-alignment-right.png    | Bin
 .../theme}/common/images/edit-alignment.png   | Bin
 .../theme}/common/images/edit-bold.png        | Bin
 .../theme}/common/images/edit-color.png       | Bin
 .../theme}/common/images/edit-indent.png      | Bin
 .../theme}/common/images/edit-italic.png      | Bin
 .../theme}/common/images/edit-list-order.png  | Bin
 .../theme}/common/images/edit-list.png        | Bin
 .../theme}/common/images/edit-outdent.png     | Bin
 .../theme}/common/images/edit-size-down.png   | Bin
 .../theme}/common/images/edit-size-up.png     | Bin
 .../theme}/common/images/edit-underline.png   | Bin
 .../common/images/exchange-addrbook.png       | Bin
 .../theme}/common/images/extra-icon.png       | Bin
 .../theme}/common/images/feed.png             | Bin
 .../theme}/common/images/folder-open.png      | Bin
 .../theme}/common/images/folder.png           | Bin
 .../theme}/common/images/high.gif             | Bin
 .../theme}/common/images/highest.gif          | Bin
 .../theme}/common/images/invited.png          | Bin
 .../images/lightningexchangecalendar.png      | Bin
 {theme => common/theme}/common/images/low.gif | Bin
 .../theme}/common/images/lowest.gif           | Bin
 .../theme}/common/images/mail.png             | Bin
 .../theme}/common/images/notify-icon.png      | Bin
 .../theme}/common/images/plug-connect.png     | Bin
 .../images/plug-disconnect-prohibition.png    | Bin
 .../theme}/common/images/scissors.png         | Bin
 .../theme}/common/images/sticky-notes.png     | Bin
 .../theme}/common/images/task.png             | Bin
 .../theme}/common/images/tentative.png        | Bin
 .../common/images/threadCol-PriorityIcon.gif  | Bin
 .../theme}/common/images/threadcol-invite.gif | Bin
 .../theme}/common/images/tick.png             | Bin
 .../theme}/common/images/updated.png          | Bin
 .../theme}/common/images/view-refresh.png     | Bin
 .../common/images/wrench-screwdriver.png      | Bin
 .../theme}/common/invite-style.css            |   0
 .../theme}/common/itemBodyEditor.css          |   0
 .../theme}/common/manageEWSAccounts.css       |   0
 .../theme}/common/oofSettings.css             |   0
 .../theme}/common/preferences.css             |   0
 .../theme}/common/priority-display.css        |   0
 .../theme}/common/progress_panel.css          |   0
 .../theme}/common/sharedCalendarParser.css    |   0
 .../theme}/mac/addressingWidgetOverlay.css    |   0
 .../theme}/mac/attachments-view.css           |   0
 {theme => common/theme}/mac/browseFolder.css  |   0
 .../theme}/mac/calendar-calendars-list.css    |   0
 .../mac/calendar-event-dialog-attendees.css   |   0
 .../theme}/mac/calendar-summary-dialog.css    |   0
 .../theme}/mac/delegateCalendar.css           |   0
 .../theme}/mac/exchWebServiceEditor.css       |   0
 .../theme}/mac/extras-preferences.css         |   0
 {theme => common/theme}/mac/invite-style.css  |   0
 .../theme}/mac/itemBodyEditor.css             |   0
 .../theme}/mac/manageEWSAccounts.css          |   0
 {theme => common/theme}/mac/oofSettings.css   |   0
 {theme => common/theme}/mac/preferences.css   |   0
 .../theme}/mac/priority-display.css           |   0
 .../theme}/mac/progress_panel.css             |   0
 .../theme}/mac/sharedCalendarParser.css       |   0
 .../theme}/unix/addressingWidgetOverlay.css   |   0
 .../theme}/unix/attachments-view.css          |   0
 {theme => common/theme}/unix/browseFolder.css |   0
 .../theme}/unix/calendar-calendars-list.css   |   0
 .../unix/calendar-event-dialog-attendees.css  |   0
 .../theme}/unix/calendar-summary-dialog.css   |   0
 .../theme}/unix/delegateCalendar.css          |   0
 .../theme}/unix/exchWebServiceEditor.css      |   0
 .../theme}/unix/extras-preferences.css        |   0
 {theme => common/theme}/unix/invite-style.css |   0
 .../theme}/unix/itemBodyEditor.css            |   0
 .../theme}/unix/manageEWSAccounts.css         |   0
 {theme => common/theme}/unix/oofSettings.css  |   0
 {theme => common/theme}/unix/preferences.css  |   0
 .../theme}/unix/priority-display.css          |   0
 .../theme}/unix/progress_panel.css            |   0
 .../theme}/unix/sharedCalendarParser.css      |   0
 .../theme}/win/addressingWidgetOverlay.css    |   0
 .../theme}/win/attachments-view.css           |   0
 {theme => common/theme}/win/browseFolder.css  |   0
 .../theme}/win/calendar-calendars-list.css    |   0
 .../win/calendar-event-dialog-attendees.css   |   0
 .../theme}/win/calendar-summary-dialog.css    |   0
 .../theme}/win/delegateCalendar.css           |   0
 .../theme}/win/exchWebServiceEditor.css       |   0
 .../theme}/win/extras-preferences.css         |   0
 {theme => common/theme}/win/invite-style.css  |   0
 .../theme}/win/itemBodyEditor.css             |   0
 .../theme}/win/manageEWSAccounts.css          |   0
 {theme => common/theme}/win/oofSettings.css   |   0
 {theme => common/theme}/win/preferences.css   |   0
 .../theme}/win/priority-display.css           |   0
 .../theme}/win/progress_panel.css             |   0
 .../theme}/win/sharedCalendarParser.css       |   0
 .../winaero/addressingWidgetOverlay.css       |   0
 .../theme}/winaero/attachments-view.css       |   0
 .../theme}/winaero/browseFolder.css           |   0
 .../winaero/calendar-calendars-list.css       |   0
 .../calendar-event-dialog-attendees.css       |   0
 .../winaero/calendar-summary-dialog.css       |   0
 .../theme}/winaero/delegateCalendar.css       |   0
 .../theme}/winaero/exchWebServiceEditor.css   |   0
 .../theme}/winaero/extras-preferences.css     |   0
 .../theme}/winaero/invite-style.css           |   0
 .../theme}/winaero/itemBodyEditor.css         |   0
 .../theme}/winaero/manageEWSAccounts.css      |   0
 .../theme}/winaero/oofSettings.css            |   0
 .../theme}/winaero/preferences.css            |   0
 .../theme}/winaero/priority-display.css       |   0
 .../theme}/winaero/progress_panel.css         |   0
 .../theme}/winaero/sharedCalendarParser.css   |   0
 431 files changed, 66 insertions(+), 66 deletions(-)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/cs_CZ/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/de/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/de/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/en/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/en_US/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/fr_FR/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/it_IT/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ja_JP/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/nl/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/nl/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/ru/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/ru/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/sv/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/sv/timezonePreference.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/attachments-view.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/browseFolder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/calExchangeCalendar.properties (100%)
 rename {locale/exchangecalendar => common/locale}/tr/calendar-calendars-list.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/calendar-summary-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/delegate-calendar-dialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/delegate-folder.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/ecCalendarCreation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/exchangeCloneSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/exchangeReminderDialog.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/exchangeSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/exchangeSettingsOverlay.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/extra-priority.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/invitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/inviteStyle.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/lightning-item-iframe.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/manageEWSAccounts.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/messenger_task_delegation.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/oofSettings.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/preInvitationResponse.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/preferences.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/selectEWSUrl.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/sendUpdateTo.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/sharedCalendarParser.dtd (100%)
 rename {locale/exchangecalendar => common/locale}/tr/timezonePreference.dtd (100%)
 rename {theme => common/theme}/common/addressingWidgetOverlay.css (100%)
 rename {theme => common/theme}/common/browseFolder.css (100%)
 rename {theme => common/theme}/common/calendar-calendars-list.css (100%)
 rename {theme => common/theme}/common/calendar-event-dialog-attendees.css (100%)
 rename {theme => common/theme}/common/calendar-summary-dialog.css (100%)
 rename {theme => common/theme}/common/delegateCalendar.css (100%)
 rename {theme => common/theme}/common/exchWebServiceEditor.css (100%)
 rename {theme => common/theme}/common/extras-preferences.css (100%)
 rename {theme => common/theme}/common/images/Fugue Icons README.txt (100%)
 rename {theme => common/theme}/common/images/accepted.png (100%)
 rename {theme => common/theme}/common/images/address-book.png (100%)
 rename {theme => common/theme}/common/images/arrow-circle-135.png (100%)
 rename {theme => common/theme}/common/images/arrow-circle-225.png (100%)
 rename {theme => common/theme}/common/images/arrow-circle-315.png (100%)
 rename {theme => common/theme}/common/images/arrow-circle.png (100%)
 rename {theme => common/theme}/common/images/asterisk-small-yellow.png (100%)
 rename {theme => common/theme}/common/images/blog.png (100%)
 rename {theme => common/theme}/common/images/calendar-month.png (100%)
 rename {theme => common/theme}/common/images/cancelled.png (100%)
 rename {theme => common/theme}/common/images/certificate.png (100%)
 rename {theme => common/theme}/common/images/chain--minus.png (100%)
 rename {theme => common/theme}/common/images/chain--pencil.png (100%)
 rename {theme => common/theme}/common/images/chain--plus.png (100%)
 rename {theme => common/theme}/common/images/cross.png (100%)
 rename {theme => common/theme}/common/images/declined.png (100%)
 rename {theme => common/theme}/common/images/document--exclamation.png (100%)
 rename {theme => common/theme}/common/images/document-binary.png (100%)
 rename {theme => common/theme}/common/images/document-excel-csv.png (100%)
 rename {theme => common/theme}/common/images/document-excel.png (100%)
 rename {theme => common/theme}/common/images/document-flash-movie.png (100%)
 rename {theme => common/theme}/common/images/document-image.png (100%)
 rename {theme => common/theme}/common/images/document-office.png (100%)
 rename {theme => common/theme}/common/images/document-pdf.png (100%)
 rename {theme => common/theme}/common/images/document-photoshop.png (100%)
 rename {theme => common/theme}/common/images/document-php.png (100%)
 rename {theme => common/theme}/common/images/document-powerpoint.png (100%)
 rename {theme => common/theme}/common/images/document-tex.png (100%)
 rename {theme => common/theme}/common/images/document-text.png (100%)
 rename {theme => common/theme}/common/images/document-word.png (100%)
 rename {theme => common/theme}/common/images/edit-alignment-center.png (100%)
 rename {theme => common/theme}/common/images/edit-alignment-justify.png (100%)
 rename {theme => common/theme}/common/images/edit-alignment-right.png (100%)
 rename {theme => common/theme}/common/images/edit-alignment.png (100%)
 rename {theme => common/theme}/common/images/edit-bold.png (100%)
 rename {theme => common/theme}/common/images/edit-color.png (100%)
 rename {theme => common/theme}/common/images/edit-indent.png (100%)
 rename {theme => common/theme}/common/images/edit-italic.png (100%)
 rename {theme => common/theme}/common/images/edit-list-order.png (100%)
 rename {theme => common/theme}/common/images/edit-list.png (100%)
 rename {theme => common/theme}/common/images/edit-outdent.png (100%)
 rename {theme => common/theme}/common/images/edit-size-down.png (100%)
 rename {theme => common/theme}/common/images/edit-size-up.png (100%)
 rename {theme => common/theme}/common/images/edit-underline.png (100%)
 rename {theme => common/theme}/common/images/exchange-addrbook.png (100%)
 rename {theme => common/theme}/common/images/extra-icon.png (100%)
 rename {theme => common/theme}/common/images/feed.png (100%)
 rename {theme => common/theme}/common/images/folder-open.png (100%)
 rename {theme => common/theme}/common/images/folder.png (100%)
 rename {theme => common/theme}/common/images/high.gif (100%)
 rename {theme => common/theme}/common/images/highest.gif (100%)
 rename {theme => common/theme}/common/images/invited.png (100%)
 rename {theme => common/theme}/common/images/lightningexchangecalendar.png (100%)
 rename {theme => common/theme}/common/images/low.gif (100%)
 rename {theme => common/theme}/common/images/lowest.gif (100%)
 rename {theme => common/theme}/common/images/mail.png (100%)
 rename {theme => common/theme}/common/images/notify-icon.png (100%)
 rename {theme => common/theme}/common/images/plug-connect.png (100%)
 rename {theme => common/theme}/common/images/plug-disconnect-prohibition.png (100%)
 rename {theme => common/theme}/common/images/scissors.png (100%)
 rename {theme => common/theme}/common/images/sticky-notes.png (100%)
 rename {theme => common/theme}/common/images/task.png (100%)
 rename {theme => common/theme}/common/images/tentative.png (100%)
 rename {theme => common/theme}/common/images/threadCol-PriorityIcon.gif (100%)
 rename {theme => common/theme}/common/images/threadcol-invite.gif (100%)
 rename {theme => common/theme}/common/images/tick.png (100%)
 rename {theme => common/theme}/common/images/updated.png (100%)
 rename {theme => common/theme}/common/images/view-refresh.png (100%)
 rename {theme => common/theme}/common/images/wrench-screwdriver.png (100%)
 rename {theme => common/theme}/common/invite-style.css (100%)
 rename {theme => common/theme}/common/itemBodyEditor.css (100%)
 rename {theme => common/theme}/common/manageEWSAccounts.css (100%)
 rename {theme => common/theme}/common/oofSettings.css (100%)
 rename {theme => common/theme}/common/preferences.css (100%)
 rename {theme => common/theme}/common/priority-display.css (100%)
 rename {theme => common/theme}/common/progress_panel.css (100%)
 rename {theme => common/theme}/common/sharedCalendarParser.css (100%)
 rename {theme => common/theme}/mac/addressingWidgetOverlay.css (100%)
 rename {theme => common/theme}/mac/attachments-view.css (100%)
 rename {theme => common/theme}/mac/browseFolder.css (100%)
 rename {theme => common/theme}/mac/calendar-calendars-list.css (100%)
 rename {theme => common/theme}/mac/calendar-event-dialog-attendees.css (100%)
 rename {theme => common/theme}/mac/calendar-summary-dialog.css (100%)
 rename {theme => common/theme}/mac/delegateCalendar.css (100%)
 rename {theme => common/theme}/mac/exchWebServiceEditor.css (100%)
 rename {theme => common/theme}/mac/extras-preferences.css (100%)
 rename {theme => common/theme}/mac/invite-style.css (100%)
 rename {theme => common/theme}/mac/itemBodyEditor.css (100%)
 rename {theme => common/theme}/mac/manageEWSAccounts.css (100%)
 rename {theme => common/theme}/mac/oofSettings.css (100%)
 rename {theme => common/theme}/mac/preferences.css (100%)
 rename {theme => common/theme}/mac/priority-display.css (100%)
 rename {theme => common/theme}/mac/progress_panel.css (100%)
 rename {theme => common/theme}/mac/sharedCalendarParser.css (100%)
 rename {theme => common/theme}/unix/addressingWidgetOverlay.css (100%)
 rename {theme => common/theme}/unix/attachments-view.css (100%)
 rename {theme => common/theme}/unix/browseFolder.css (100%)
 rename {theme => common/theme}/unix/calendar-calendars-list.css (100%)
 rename {theme => common/theme}/unix/calendar-event-dialog-attendees.css (100%)
 rename {theme => common/theme}/unix/calendar-summary-dialog.css (100%)
 rename {theme => common/theme}/unix/delegateCalendar.css (100%)
 rename {theme => common/theme}/unix/exchWebServiceEditor.css (100%)
 rename {theme => common/theme}/unix/extras-preferences.css (100%)
 rename {theme => common/theme}/unix/invite-style.css (100%)
 rename {theme => common/theme}/unix/itemBodyEditor.css (100%)
 rename {theme => common/theme}/unix/manageEWSAccounts.css (100%)
 rename {theme => common/theme}/unix/oofSettings.css (100%)
 rename {theme => common/theme}/unix/preferences.css (100%)
 rename {theme => common/theme}/unix/priority-display.css (100%)
 rename {theme => common/theme}/unix/progress_panel.css (100%)
 rename {theme => common/theme}/unix/sharedCalendarParser.css (100%)
 rename {theme => common/theme}/win/addressingWidgetOverlay.css (100%)
 rename {theme => common/theme}/win/attachments-view.css (100%)
 rename {theme => common/theme}/win/browseFolder.css (100%)
 rename {theme => common/theme}/win/calendar-calendars-list.css (100%)
 rename {theme => common/theme}/win/calendar-event-dialog-attendees.css (100%)
 rename {theme => common/theme}/win/calendar-summary-dialog.css (100%)
 rename {theme => common/theme}/win/delegateCalendar.css (100%)
 rename {theme => common/theme}/win/exchWebServiceEditor.css (100%)
 rename {theme => common/theme}/win/extras-preferences.css (100%)
 rename {theme => common/theme}/win/invite-style.css (100%)
 rename {theme => common/theme}/win/itemBodyEditor.css (100%)
 rename {theme => common/theme}/win/manageEWSAccounts.css (100%)
 rename {theme => common/theme}/win/oofSettings.css (100%)
 rename {theme => common/theme}/win/preferences.css (100%)
 rename {theme => common/theme}/win/priority-display.css (100%)
 rename {theme => common/theme}/win/progress_panel.css (100%)
 rename {theme => common/theme}/win/sharedCalendarParser.css (100%)
 rename {theme => common/theme}/winaero/addressingWidgetOverlay.css (100%)
 rename {theme => common/theme}/winaero/attachments-view.css (100%)
 rename {theme => common/theme}/winaero/browseFolder.css (100%)
 rename {theme => common/theme}/winaero/calendar-calendars-list.css (100%)
 rename {theme => common/theme}/winaero/calendar-event-dialog-attendees.css (100%)
 rename {theme => common/theme}/winaero/calendar-summary-dialog.css (100%)
 rename {theme => common/theme}/winaero/delegateCalendar.css (100%)
 rename {theme => common/theme}/winaero/exchWebServiceEditor.css (100%)
 rename {theme => common/theme}/winaero/extras-preferences.css (100%)
 rename {theme => common/theme}/winaero/invite-style.css (100%)
 rename {theme => common/theme}/winaero/itemBodyEditor.css (100%)
 rename {theme => common/theme}/winaero/manageEWSAccounts.css (100%)
 rename {theme => common/theme}/winaero/oofSettings.css (100%)
 rename {theme => common/theme}/winaero/preferences.css (100%)
 rename {theme => common/theme}/winaero/priority-display.css (100%)
 rename {theme => common/theme}/winaero/progress_panel.css (100%)
 rename {theme => common/theme}/winaero/sharedCalendarParser.css (100%)

diff --git a/.tx/config b/.tx/config
index 05bf7a1c..ceededa8 100644
--- a/.tx/config
+++ b/.tx/config
@@ -26,122 +26,122 @@ source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.attachments-view]
-file_filter = locale/exchangecalendar/<lang>/attachments-view.dtd
-source_file = locale/exchangecalendar/en/attachments-view.dtd
+file_filter = common/locale/<lang>/attachments-view.dtd
+source_file = common/locale/en/attachments-view.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.browseFolder]
-file_filter = locale/exchangecalendar/<lang>/browseFolder.dtd
-source_file = locale/exchangecalendar/en/browseFolder.dtd
+file_filter = common/locale/<lang>/browseFolder.dtd
+source_file = common/locale/en/browseFolder.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeCloneSettings]
-file_filter = locale/exchangecalendar/<lang>/exchangeCloneSettings.dtd
-source_file = locale/exchangecalendar/en/exchangeCloneSettings.dtd
+file_filter = common/locale/<lang>/exchangeCloneSettings.dtd
+source_file = common/locale/en/exchangeCloneSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeReminderDialog]
-file_filter = locale/exchangecalendar/<lang>/exchangeReminderDialog.dtd
-source_file = locale/exchangecalendar/en/exchangeReminderDialog.dtd
+file_filter = common/locale/<lang>/exchangeReminderDialog.dtd
+source_file = common/locale/en/exchangeReminderDialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.messenger_task_delegation]
-file_filter = locale/exchangecalendar/<lang>/messenger_task_delegation.dtd
-source_file = locale/exchangecalendar/en/messenger_task_delegation.dtd
+file_filter = common/locale/<lang>/messenger_task_delegation.dtd
+source_file = common/locale/en/messenger_task_delegation.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.sendUpdateTo]
-file_filter = locale/exchangecalendar/<lang>/sendUpdateTo.dtd
-source_file = locale/exchangecalendar/en/sendUpdateTo.dtd
+file_filter = common/locale/<lang>/sendUpdateTo.dtd
+source_file = common/locale/en/sendUpdateTo.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.timezonePreference]
-file_filter = locale/exchangecalendar/<lang>/timezonePreference.dtd
-source_file = locale/exchangecalendar/en/timezonePreference.dtd
+file_filter = common/locale/<lang>/timezonePreference.dtd
+source_file = common/locale/en/timezonePreference.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.invitationResponse]
-file_filter = locale/exchangecalendar/<lang>/invitationResponse.dtd
-source_file = locale/exchangecalendar/en/invitationResponse.dtd
+file_filter = common/locale/<lang>/invitationResponse.dtd
+source_file = common/locale/en/invitationResponse.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.lightning-item-iframe]
-file_filter = locale/exchangecalendar/<lang>/lightning-item-iframe.dtd
-source_file = locale/exchangecalendar/en/lightning-item-iframe.dtd
+file_filter = common/locale/<lang>/lightning-item-iframe.dtd
+source_file = common/locale/en/lightning-item-iframe.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calendar-calendars-list]
-file_filter = locale/exchangecalendar/<lang>/calendar-calendars-list.dtd
-source_file = locale/exchangecalendar/en/calendar-calendars-list.dtd
+file_filter = common/locale/<lang>/calendar-calendars-list.dtd
+source_file = common/locale/en/calendar-calendars-list.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calendar-summary-dialog]
-file_filter = locale/exchangecalendar/<lang>/calendar-summary-dialog.dtd
-source_file = locale/exchangecalendar/en/calendar-summary-dialog.dtd
+file_filter = common/locale/<lang>/calendar-summary-dialog.dtd
+source_file = common/locale/en/calendar-summary-dialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.delegate-calendar-dialog]
-file_filter = locale/exchangecalendar/<lang>/delegate-calendar-dialog.dtd
-source_file = locale/exchangecalendar/en/delegate-calendar-dialog.dtd
+file_filter = common/locale/<lang>/delegate-calendar-dialog.dtd
+source_file = common/locale/en/delegate-calendar-dialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.delegate-folder]
-file_filter = locale/exchangecalendar/<lang>/delegate-folder.dtd
-source_file = locale/exchangecalendar/en/delegate-folder.dtd
+file_filter = common/locale/<lang>/delegate-folder.dtd
+source_file = common/locale/en/delegate-folder.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeSettings]
-file_filter = locale/exchangecalendar/<lang>/exchangeSettings.dtd
-source_file = locale/exchangecalendar/en/exchangeSettings.dtd
+file_filter = common/locale/<lang>/exchangeSettings.dtd
+source_file = common/locale/en/exchangeSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.extra-priority]
-file_filter = locale/exchangecalendar/<lang>/extra-priority.dtd
-source_file = locale/exchangecalendar/en/extra-priority.dtd
+file_filter = common/locale/<lang>/extra-priority.dtd
+source_file = common/locale/en/extra-priority.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.inviteStyle]
-file_filter = locale/exchangecalendar/<lang>/inviteStyle.dtd
-source_file = locale/exchangecalendar/en/inviteStyle.dtd
+file_filter = common/locale/<lang>/inviteStyle.dtd
+source_file = common/locale/en/inviteStyle.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.manageEWSAccounts]
-file_filter = locale/exchangecalendar/<lang>/manageEWSAccounts.dtd
-source_file = locale/exchangecalendar/en/manageEWSAccounts.dtd
+file_filter = common/locale/<lang>/manageEWSAccounts.dtd
+source_file = common/locale/en/manageEWSAccounts.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.oofSettings]
-file_filter = locale/exchangecalendar/<lang>/oofSettings.dtd
-source_file = locale/exchangecalendar/en/oofSettings.dtd
+file_filter = common/locale/<lang>/oofSettings.dtd
+source_file = common/locale/en/oofSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.preInvitationResponse]
-file_filter = locale/exchangecalendar/<lang>/preInvitationResponse.dtd
-source_file = locale/exchangecalendar/en/preInvitationResponse.dtd
+file_filter = common/locale/<lang>/preInvitationResponse.dtd
+source_file = common/locale/en/preInvitationResponse.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.preferences]
-file_filter = locale/exchangecalendar/<lang>/preferences.dtd
-source_file = locale/exchangecalendar/en/preferences.dtd
+file_filter = common/locale/<lang>/preferences.dtd
+source_file = common/locale/en/preferences.dtd
 source_lang = en
 type = DTD
 
@@ -158,32 +158,32 @@ source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.selectEWSUrl]
-file_filter = locale/exchangecalendar/<lang>/selectEWSUrl.dtd
-source_file = locale/exchangecalendar/en/selectEWSUrl.dtd
+file_filter = common/locale/<lang>/selectEWSUrl.dtd
+source_file = common/locale/en/selectEWSUrl.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.sharedCalendarParser]
-file_filter = locale/exchangecalendar/<lang>/sharedCalendarParser.dtd
-source_file = locale/exchangecalendar/en/sharedCalendarParser.dtd
+file_filter = common/locale/<lang>/sharedCalendarParser.dtd
+source_file = common/locale/en/sharedCalendarParser.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.ecCalendarCreation]
-file_filter = locale/exchangecalendar/<lang>/ecCalendarCreation.dtd
-source_file = locale/exchangecalendar/en/ecCalendarCreation.dtd
+file_filter = common/locale/<lang>/ecCalendarCreation.dtd
+source_file = common/locale/en/ecCalendarCreation.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeSettingsOverlay]
-file_filter = locale/exchangecalendar/<lang>/exchangeSettingsOverlay.dtd
-source_file = locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
+file_filter = common/locale/<lang>/exchangeSettingsOverlay.dtd
+source_file = common/locale/en/exchangeSettingsOverlay.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calExchangeCalendar]
-file_filter = locale/exchangecalendar/<lang>/calExchangeCalendar.properties
-source_file = locale/exchangecalendar/en/calExchangeCalendar.properties
+file_filter = common/locale/<lang>/calExchangeCalendar.properties
+source_file = common/locale/en/calExchangeCalendar.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 
diff --git a/chrome.manifest b/chrome.manifest
index 472db9bb..c9d32e85 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,10 +1,10 @@
 content exchangecalendar common/content/
 
-skin exchangecalendar fugue theme/unix/
-skin exchangecalendar fugue theme/win/ os=WINNT
-skin exchangecalendar fugue theme/winaero/ os=WINNT osversion>=6
-skin exchangecalendar fugue theme/mac/ os=Darwin
-skin exchangecalendar-common fugue theme/common/
+skin exchangecalendar fugue common/unix/
+skin exchangecalendar fugue common/win/ os=WINNT
+skin exchangecalendar fugue common/winaero/ os=WINNT osversion>=6
+skin exchangecalendar fugue common/mac/ os=Darwin
+skin exchangecalendar-common fugue common/common/
 
 resource exchangecalendar common/exchangeapi
 resource interfaces common/interface/
@@ -33,18 +33,18 @@ overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/cont
 overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/invite-style.xul
 overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/content/folderPropsOverlay.xul
 
-locale exchangecalendar en locale/exchangecalendar/en/
+locale exchangecalendar en common/locale/en/
 
-locale exchangecalendar cs-CZ locale/exchangecalendar/cs_CZ/
-locale exchangecalendar de locale/exchangecalendar/de/
-locale exchangecalendar en-US locale/exchangecalendar/en_US/
-locale exchangecalendar fr-FR locale/exchangecalendar/fr_FR/
-locale exchangecalendar it-IT locale/exchangecalendar/it_IT/
-locale exchangecalendar ja-JP locale/exchangecalendar/ja_JP/
-locale exchangecalendar nl locale/exchangecalendar/nl/
-locale exchangecalendar ru locale/exchangecalendar/ru/
-locale exchangecalendar sv locale/exchangecalendar/sv/
-locale exchangecalendar tr locale/exchangecalendar/tr/
+locale exchangecalendar cs-CZ common/locale/cs_CZ/
+locale exchangecalendar de common/locale/de/
+locale exchangecalendar en-US common/locale/en_US/
+locale exchangecalendar fr-FR common/locale/fr_FR/
+locale exchangecalendar it-IT common/locale/it_IT/
+locale exchangecalendar ja-JP common/locale/ja_JP/
+locale exchangecalendar nl common/locale/nl/
+locale exchangecalendar ru common/locale/ru/
+locale exchangecalendar sv common/locale/sv/
+locale exchangecalendar tr common/locale/tr/
 
 manifest common/interface/global/mivFunctions.manifest
 manifest common/interface/exchangeAccountManager/mivExchangeAccountManager.manifest
diff --git a/locale/exchangecalendar/cs_CZ/attachments-view.dtd b/common/locale/cs_CZ/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/attachments-view.dtd
rename to common/locale/cs_CZ/attachments-view.dtd
diff --git a/locale/exchangecalendar/cs_CZ/browseFolder.dtd b/common/locale/cs_CZ/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/browseFolder.dtd
rename to common/locale/cs_CZ/browseFolder.dtd
diff --git a/locale/exchangecalendar/cs_CZ/calExchangeCalendar.properties b/common/locale/cs_CZ/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/calExchangeCalendar.properties
rename to common/locale/cs_CZ/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/cs_CZ/calendar-calendars-list.dtd b/common/locale/cs_CZ/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/calendar-calendars-list.dtd
rename to common/locale/cs_CZ/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/cs_CZ/calendar-summary-dialog.dtd b/common/locale/cs_CZ/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/calendar-summary-dialog.dtd
rename to common/locale/cs_CZ/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/cs_CZ/delegate-calendar-dialog.dtd b/common/locale/cs_CZ/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/delegate-calendar-dialog.dtd
rename to common/locale/cs_CZ/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/cs_CZ/delegate-folder.dtd b/common/locale/cs_CZ/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/delegate-folder.dtd
rename to common/locale/cs_CZ/delegate-folder.dtd
diff --git a/locale/exchangecalendar/cs_CZ/ecCalendarCreation.dtd b/common/locale/cs_CZ/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/ecCalendarCreation.dtd
rename to common/locale/cs_CZ/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/cs_CZ/exchangeCloneSettings.dtd b/common/locale/cs_CZ/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/exchangeCloneSettings.dtd
rename to common/locale/cs_CZ/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/cs_CZ/exchangeReminderDialog.dtd b/common/locale/cs_CZ/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/exchangeReminderDialog.dtd
rename to common/locale/cs_CZ/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/cs_CZ/exchangeSettings.dtd b/common/locale/cs_CZ/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/exchangeSettings.dtd
rename to common/locale/cs_CZ/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/cs_CZ/exchangeSettingsOverlay.dtd b/common/locale/cs_CZ/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/exchangeSettingsOverlay.dtd
rename to common/locale/cs_CZ/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/cs_CZ/extra-priority.dtd b/common/locale/cs_CZ/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/extra-priority.dtd
rename to common/locale/cs_CZ/extra-priority.dtd
diff --git a/locale/exchangecalendar/cs_CZ/invitationResponse.dtd b/common/locale/cs_CZ/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/invitationResponse.dtd
rename to common/locale/cs_CZ/invitationResponse.dtd
diff --git a/locale/exchangecalendar/cs_CZ/inviteStyle.dtd b/common/locale/cs_CZ/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/inviteStyle.dtd
rename to common/locale/cs_CZ/inviteStyle.dtd
diff --git a/locale/exchangecalendar/cs_CZ/lightning-item-iframe.dtd b/common/locale/cs_CZ/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/lightning-item-iframe.dtd
rename to common/locale/cs_CZ/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/cs_CZ/manageEWSAccounts.dtd b/common/locale/cs_CZ/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/manageEWSAccounts.dtd
rename to common/locale/cs_CZ/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/cs_CZ/messenger_task_delegation.dtd b/common/locale/cs_CZ/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/messenger_task_delegation.dtd
rename to common/locale/cs_CZ/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/cs_CZ/oofSettings.dtd b/common/locale/cs_CZ/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/oofSettings.dtd
rename to common/locale/cs_CZ/oofSettings.dtd
diff --git a/locale/exchangecalendar/cs_CZ/preInvitationResponse.dtd b/common/locale/cs_CZ/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/preInvitationResponse.dtd
rename to common/locale/cs_CZ/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/cs_CZ/preferences.dtd b/common/locale/cs_CZ/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/preferences.dtd
rename to common/locale/cs_CZ/preferences.dtd
diff --git a/locale/exchangecalendar/cs_CZ/selectEWSUrl.dtd b/common/locale/cs_CZ/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/selectEWSUrl.dtd
rename to common/locale/cs_CZ/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/cs_CZ/sendUpdateTo.dtd b/common/locale/cs_CZ/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/sendUpdateTo.dtd
rename to common/locale/cs_CZ/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/cs_CZ/sharedCalendarParser.dtd b/common/locale/cs_CZ/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/sharedCalendarParser.dtd
rename to common/locale/cs_CZ/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/cs_CZ/timezonePreference.dtd b/common/locale/cs_CZ/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/cs_CZ/timezonePreference.dtd
rename to common/locale/cs_CZ/timezonePreference.dtd
diff --git a/locale/exchangecalendar/de/attachments-view.dtd b/common/locale/de/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/de/attachments-view.dtd
rename to common/locale/de/attachments-view.dtd
diff --git a/locale/exchangecalendar/de/browseFolder.dtd b/common/locale/de/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/de/browseFolder.dtd
rename to common/locale/de/browseFolder.dtd
diff --git a/locale/exchangecalendar/de/calExchangeCalendar.properties b/common/locale/de/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/de/calExchangeCalendar.properties
rename to common/locale/de/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/de/calendar-calendars-list.dtd b/common/locale/de/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/de/calendar-calendars-list.dtd
rename to common/locale/de/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/de/calendar-summary-dialog.dtd b/common/locale/de/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/de/calendar-summary-dialog.dtd
rename to common/locale/de/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/de/delegate-calendar-dialog.dtd b/common/locale/de/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/de/delegate-calendar-dialog.dtd
rename to common/locale/de/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/de/delegate-folder.dtd b/common/locale/de/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/de/delegate-folder.dtd
rename to common/locale/de/delegate-folder.dtd
diff --git a/locale/exchangecalendar/de/ecCalendarCreation.dtd b/common/locale/de/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/de/ecCalendarCreation.dtd
rename to common/locale/de/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/de/exchangeCloneSettings.dtd b/common/locale/de/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/de/exchangeCloneSettings.dtd
rename to common/locale/de/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/de/exchangeReminderDialog.dtd b/common/locale/de/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/de/exchangeReminderDialog.dtd
rename to common/locale/de/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/de/exchangeSettings.dtd b/common/locale/de/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/de/exchangeSettings.dtd
rename to common/locale/de/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd b/common/locale/de/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/de/exchangeSettingsOverlay.dtd
rename to common/locale/de/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/de/extra-priority.dtd b/common/locale/de/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/de/extra-priority.dtd
rename to common/locale/de/extra-priority.dtd
diff --git a/locale/exchangecalendar/de/invitationResponse.dtd b/common/locale/de/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/de/invitationResponse.dtd
rename to common/locale/de/invitationResponse.dtd
diff --git a/locale/exchangecalendar/de/inviteStyle.dtd b/common/locale/de/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/de/inviteStyle.dtd
rename to common/locale/de/inviteStyle.dtd
diff --git a/locale/exchangecalendar/de/lightning-item-iframe.dtd b/common/locale/de/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/de/lightning-item-iframe.dtd
rename to common/locale/de/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/de/manageEWSAccounts.dtd b/common/locale/de/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/de/manageEWSAccounts.dtd
rename to common/locale/de/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/de/messenger_task_delegation.dtd b/common/locale/de/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/de/messenger_task_delegation.dtd
rename to common/locale/de/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/de/oofSettings.dtd b/common/locale/de/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/de/oofSettings.dtd
rename to common/locale/de/oofSettings.dtd
diff --git a/locale/exchangecalendar/de/preInvitationResponse.dtd b/common/locale/de/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/de/preInvitationResponse.dtd
rename to common/locale/de/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/de/preferences.dtd b/common/locale/de/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/de/preferences.dtd
rename to common/locale/de/preferences.dtd
diff --git a/locale/exchangecalendar/de/selectEWSUrl.dtd b/common/locale/de/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/de/selectEWSUrl.dtd
rename to common/locale/de/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/de/sendUpdateTo.dtd b/common/locale/de/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/de/sendUpdateTo.dtd
rename to common/locale/de/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/de/sharedCalendarParser.dtd b/common/locale/de/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/de/sharedCalendarParser.dtd
rename to common/locale/de/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/de/timezonePreference.dtd b/common/locale/de/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/de/timezonePreference.dtd
rename to common/locale/de/timezonePreference.dtd
diff --git a/locale/exchangecalendar/en/attachments-view.dtd b/common/locale/en/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/en/attachments-view.dtd
rename to common/locale/en/attachments-view.dtd
diff --git a/locale/exchangecalendar/en/browseFolder.dtd b/common/locale/en/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/en/browseFolder.dtd
rename to common/locale/en/browseFolder.dtd
diff --git a/locale/exchangecalendar/en/calExchangeCalendar.properties b/common/locale/en/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/en/calExchangeCalendar.properties
rename to common/locale/en/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/en/calendar-calendars-list.dtd b/common/locale/en/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/en/calendar-calendars-list.dtd
rename to common/locale/en/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/en/calendar-summary-dialog.dtd b/common/locale/en/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en/calendar-summary-dialog.dtd
rename to common/locale/en/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/en/delegate-calendar-dialog.dtd b/common/locale/en/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en/delegate-calendar-dialog.dtd
rename to common/locale/en/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/en/delegate-folder.dtd b/common/locale/en/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/en/delegate-folder.dtd
rename to common/locale/en/delegate-folder.dtd
diff --git a/locale/exchangecalendar/en/ecCalendarCreation.dtd b/common/locale/en/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/en/ecCalendarCreation.dtd
rename to common/locale/en/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/en/exchangeCloneSettings.dtd b/common/locale/en/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en/exchangeCloneSettings.dtd
rename to common/locale/en/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/en/exchangeReminderDialog.dtd b/common/locale/en/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en/exchangeReminderDialog.dtd
rename to common/locale/en/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/en/exchangeSettings.dtd b/common/locale/en/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en/exchangeSettings.dtd
rename to common/locale/en/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/en/exchangeSettingsOverlay.dtd b/common/locale/en/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
rename to common/locale/en/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/en/extra-priority.dtd b/common/locale/en/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/en/extra-priority.dtd
rename to common/locale/en/extra-priority.dtd
diff --git a/locale/exchangecalendar/en/invitationResponse.dtd b/common/locale/en/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/en/invitationResponse.dtd
rename to common/locale/en/invitationResponse.dtd
diff --git a/locale/exchangecalendar/en/inviteStyle.dtd b/common/locale/en/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/en/inviteStyle.dtd
rename to common/locale/en/inviteStyle.dtd
diff --git a/locale/exchangecalendar/en/lightning-item-iframe.dtd b/common/locale/en/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/en/lightning-item-iframe.dtd
rename to common/locale/en/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/en/manageEWSAccounts.dtd b/common/locale/en/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/en/manageEWSAccounts.dtd
rename to common/locale/en/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/en/messenger_task_delegation.dtd b/common/locale/en/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/en/messenger_task_delegation.dtd
rename to common/locale/en/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/en/oofSettings.dtd b/common/locale/en/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en/oofSettings.dtd
rename to common/locale/en/oofSettings.dtd
diff --git a/locale/exchangecalendar/en/preInvitationResponse.dtd b/common/locale/en/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/en/preInvitationResponse.dtd
rename to common/locale/en/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/en/preferences.dtd b/common/locale/en/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/en/preferences.dtd
rename to common/locale/en/preferences.dtd
diff --git a/locale/exchangecalendar/en/selectEWSUrl.dtd b/common/locale/en/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/en/selectEWSUrl.dtd
rename to common/locale/en/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/en/sendUpdateTo.dtd b/common/locale/en/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/en/sendUpdateTo.dtd
rename to common/locale/en/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/en/sharedCalendarParser.dtd b/common/locale/en/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/en/sharedCalendarParser.dtd
rename to common/locale/en/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/en/timezonePreference.dtd b/common/locale/en/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/en/timezonePreference.dtd
rename to common/locale/en/timezonePreference.dtd
diff --git a/locale/exchangecalendar/en_US/attachments-view.dtd b/common/locale/en_US/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/attachments-view.dtd
rename to common/locale/en_US/attachments-view.dtd
diff --git a/locale/exchangecalendar/en_US/browseFolder.dtd b/common/locale/en_US/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/browseFolder.dtd
rename to common/locale/en_US/browseFolder.dtd
diff --git a/locale/exchangecalendar/en_US/calExchangeCalendar.properties b/common/locale/en_US/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/en_US/calExchangeCalendar.properties
rename to common/locale/en_US/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/en_US/calendar-calendars-list.dtd b/common/locale/en_US/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/calendar-calendars-list.dtd
rename to common/locale/en_US/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/en_US/calendar-summary-dialog.dtd b/common/locale/en_US/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/calendar-summary-dialog.dtd
rename to common/locale/en_US/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/en_US/delegate-calendar-dialog.dtd b/common/locale/en_US/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/delegate-calendar-dialog.dtd
rename to common/locale/en_US/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/en_US/delegate-folder.dtd b/common/locale/en_US/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/delegate-folder.dtd
rename to common/locale/en_US/delegate-folder.dtd
diff --git a/locale/exchangecalendar/en_US/ecCalendarCreation.dtd b/common/locale/en_US/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/ecCalendarCreation.dtd
rename to common/locale/en_US/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/en_US/exchangeCloneSettings.dtd b/common/locale/en_US/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/exchangeCloneSettings.dtd
rename to common/locale/en_US/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/en_US/exchangeReminderDialog.dtd b/common/locale/en_US/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/exchangeReminderDialog.dtd
rename to common/locale/en_US/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/en_US/exchangeSettings.dtd b/common/locale/en_US/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/exchangeSettings.dtd
rename to common/locale/en_US/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/en_US/exchangeSettingsOverlay.dtd b/common/locale/en_US/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/exchangeSettingsOverlay.dtd
rename to common/locale/en_US/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/en_US/extra-priority.dtd b/common/locale/en_US/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/extra-priority.dtd
rename to common/locale/en_US/extra-priority.dtd
diff --git a/locale/exchangecalendar/en_US/invitationResponse.dtd b/common/locale/en_US/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/invitationResponse.dtd
rename to common/locale/en_US/invitationResponse.dtd
diff --git a/locale/exchangecalendar/en_US/inviteStyle.dtd b/common/locale/en_US/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/inviteStyle.dtd
rename to common/locale/en_US/inviteStyle.dtd
diff --git a/locale/exchangecalendar/en_US/lightning-item-iframe.dtd b/common/locale/en_US/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/lightning-item-iframe.dtd
rename to common/locale/en_US/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/en_US/manageEWSAccounts.dtd b/common/locale/en_US/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/manageEWSAccounts.dtd
rename to common/locale/en_US/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/en_US/messenger_task_delegation.dtd b/common/locale/en_US/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/messenger_task_delegation.dtd
rename to common/locale/en_US/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/en_US/oofSettings.dtd b/common/locale/en_US/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/oofSettings.dtd
rename to common/locale/en_US/oofSettings.dtd
diff --git a/locale/exchangecalendar/en_US/preInvitationResponse.dtd b/common/locale/en_US/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/preInvitationResponse.dtd
rename to common/locale/en_US/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/en_US/preferences.dtd b/common/locale/en_US/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/preferences.dtd
rename to common/locale/en_US/preferences.dtd
diff --git a/locale/exchangecalendar/en_US/selectEWSUrl.dtd b/common/locale/en_US/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/selectEWSUrl.dtd
rename to common/locale/en_US/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/en_US/sendUpdateTo.dtd b/common/locale/en_US/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/sendUpdateTo.dtd
rename to common/locale/en_US/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/en_US/sharedCalendarParser.dtd b/common/locale/en_US/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/sharedCalendarParser.dtd
rename to common/locale/en_US/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/en_US/timezonePreference.dtd b/common/locale/en_US/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/en_US/timezonePreference.dtd
rename to common/locale/en_US/timezonePreference.dtd
diff --git a/locale/exchangecalendar/fr_FR/attachments-view.dtd b/common/locale/fr_FR/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/attachments-view.dtd
rename to common/locale/fr_FR/attachments-view.dtd
diff --git a/locale/exchangecalendar/fr_FR/browseFolder.dtd b/common/locale/fr_FR/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/browseFolder.dtd
rename to common/locale/fr_FR/browseFolder.dtd
diff --git a/locale/exchangecalendar/fr_FR/calExchangeCalendar.properties b/common/locale/fr_FR/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/fr_FR/calExchangeCalendar.properties
rename to common/locale/fr_FR/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/fr_FR/calendar-calendars-list.dtd b/common/locale/fr_FR/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/calendar-calendars-list.dtd
rename to common/locale/fr_FR/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/fr_FR/calendar-summary-dialog.dtd b/common/locale/fr_FR/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/calendar-summary-dialog.dtd
rename to common/locale/fr_FR/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/fr_FR/delegate-calendar-dialog.dtd b/common/locale/fr_FR/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/delegate-calendar-dialog.dtd
rename to common/locale/fr_FR/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/fr_FR/delegate-folder.dtd b/common/locale/fr_FR/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/delegate-folder.dtd
rename to common/locale/fr_FR/delegate-folder.dtd
diff --git a/locale/exchangecalendar/fr_FR/ecCalendarCreation.dtd b/common/locale/fr_FR/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/ecCalendarCreation.dtd
rename to common/locale/fr_FR/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/fr_FR/exchangeCloneSettings.dtd b/common/locale/fr_FR/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/exchangeCloneSettings.dtd
rename to common/locale/fr_FR/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/fr_FR/exchangeReminderDialog.dtd b/common/locale/fr_FR/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/exchangeReminderDialog.dtd
rename to common/locale/fr_FR/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/fr_FR/exchangeSettings.dtd b/common/locale/fr_FR/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/exchangeSettings.dtd
rename to common/locale/fr_FR/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/fr_FR/exchangeSettingsOverlay.dtd b/common/locale/fr_FR/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/exchangeSettingsOverlay.dtd
rename to common/locale/fr_FR/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/fr_FR/extra-priority.dtd b/common/locale/fr_FR/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/extra-priority.dtd
rename to common/locale/fr_FR/extra-priority.dtd
diff --git a/locale/exchangecalendar/fr_FR/invitationResponse.dtd b/common/locale/fr_FR/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/invitationResponse.dtd
rename to common/locale/fr_FR/invitationResponse.dtd
diff --git a/locale/exchangecalendar/fr_FR/inviteStyle.dtd b/common/locale/fr_FR/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/inviteStyle.dtd
rename to common/locale/fr_FR/inviteStyle.dtd
diff --git a/locale/exchangecalendar/fr_FR/lightning-item-iframe.dtd b/common/locale/fr_FR/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/lightning-item-iframe.dtd
rename to common/locale/fr_FR/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/fr_FR/manageEWSAccounts.dtd b/common/locale/fr_FR/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/manageEWSAccounts.dtd
rename to common/locale/fr_FR/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/fr_FR/messenger_task_delegation.dtd b/common/locale/fr_FR/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/messenger_task_delegation.dtd
rename to common/locale/fr_FR/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/fr_FR/oofSettings.dtd b/common/locale/fr_FR/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/oofSettings.dtd
rename to common/locale/fr_FR/oofSettings.dtd
diff --git a/locale/exchangecalendar/fr_FR/preInvitationResponse.dtd b/common/locale/fr_FR/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/preInvitationResponse.dtd
rename to common/locale/fr_FR/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/fr_FR/preferences.dtd b/common/locale/fr_FR/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/preferences.dtd
rename to common/locale/fr_FR/preferences.dtd
diff --git a/locale/exchangecalendar/fr_FR/selectEWSUrl.dtd b/common/locale/fr_FR/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/selectEWSUrl.dtd
rename to common/locale/fr_FR/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/fr_FR/sendUpdateTo.dtd b/common/locale/fr_FR/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/sendUpdateTo.dtd
rename to common/locale/fr_FR/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/fr_FR/sharedCalendarParser.dtd b/common/locale/fr_FR/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/sharedCalendarParser.dtd
rename to common/locale/fr_FR/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/fr_FR/timezonePreference.dtd b/common/locale/fr_FR/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/fr_FR/timezonePreference.dtd
rename to common/locale/fr_FR/timezonePreference.dtd
diff --git a/locale/exchangecalendar/it_IT/attachments-view.dtd b/common/locale/it_IT/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/attachments-view.dtd
rename to common/locale/it_IT/attachments-view.dtd
diff --git a/locale/exchangecalendar/it_IT/browseFolder.dtd b/common/locale/it_IT/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/browseFolder.dtd
rename to common/locale/it_IT/browseFolder.dtd
diff --git a/locale/exchangecalendar/it_IT/calExchangeCalendar.properties b/common/locale/it_IT/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/it_IT/calExchangeCalendar.properties
rename to common/locale/it_IT/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/it_IT/calendar-calendars-list.dtd b/common/locale/it_IT/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/calendar-calendars-list.dtd
rename to common/locale/it_IT/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/it_IT/calendar-summary-dialog.dtd b/common/locale/it_IT/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/calendar-summary-dialog.dtd
rename to common/locale/it_IT/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/it_IT/delegate-calendar-dialog.dtd b/common/locale/it_IT/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/delegate-calendar-dialog.dtd
rename to common/locale/it_IT/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/it_IT/delegate-folder.dtd b/common/locale/it_IT/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/delegate-folder.dtd
rename to common/locale/it_IT/delegate-folder.dtd
diff --git a/locale/exchangecalendar/it_IT/ecCalendarCreation.dtd b/common/locale/it_IT/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/ecCalendarCreation.dtd
rename to common/locale/it_IT/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/it_IT/exchangeCloneSettings.dtd b/common/locale/it_IT/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/exchangeCloneSettings.dtd
rename to common/locale/it_IT/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/it_IT/exchangeReminderDialog.dtd b/common/locale/it_IT/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/exchangeReminderDialog.dtd
rename to common/locale/it_IT/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/it_IT/exchangeSettings.dtd b/common/locale/it_IT/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/exchangeSettings.dtd
rename to common/locale/it_IT/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/it_IT/exchangeSettingsOverlay.dtd b/common/locale/it_IT/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/exchangeSettingsOverlay.dtd
rename to common/locale/it_IT/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/it_IT/extra-priority.dtd b/common/locale/it_IT/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/extra-priority.dtd
rename to common/locale/it_IT/extra-priority.dtd
diff --git a/locale/exchangecalendar/it_IT/invitationResponse.dtd b/common/locale/it_IT/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/invitationResponse.dtd
rename to common/locale/it_IT/invitationResponse.dtd
diff --git a/locale/exchangecalendar/it_IT/inviteStyle.dtd b/common/locale/it_IT/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/inviteStyle.dtd
rename to common/locale/it_IT/inviteStyle.dtd
diff --git a/locale/exchangecalendar/it_IT/lightning-item-iframe.dtd b/common/locale/it_IT/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/lightning-item-iframe.dtd
rename to common/locale/it_IT/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/it_IT/manageEWSAccounts.dtd b/common/locale/it_IT/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/manageEWSAccounts.dtd
rename to common/locale/it_IT/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/it_IT/messenger_task_delegation.dtd b/common/locale/it_IT/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/messenger_task_delegation.dtd
rename to common/locale/it_IT/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/it_IT/oofSettings.dtd b/common/locale/it_IT/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/oofSettings.dtd
rename to common/locale/it_IT/oofSettings.dtd
diff --git a/locale/exchangecalendar/it_IT/preInvitationResponse.dtd b/common/locale/it_IT/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/preInvitationResponse.dtd
rename to common/locale/it_IT/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/it_IT/preferences.dtd b/common/locale/it_IT/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/preferences.dtd
rename to common/locale/it_IT/preferences.dtd
diff --git a/locale/exchangecalendar/it_IT/selectEWSUrl.dtd b/common/locale/it_IT/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/selectEWSUrl.dtd
rename to common/locale/it_IT/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/it_IT/sendUpdateTo.dtd b/common/locale/it_IT/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/sendUpdateTo.dtd
rename to common/locale/it_IT/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/it_IT/sharedCalendarParser.dtd b/common/locale/it_IT/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/sharedCalendarParser.dtd
rename to common/locale/it_IT/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/it_IT/timezonePreference.dtd b/common/locale/it_IT/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/it_IT/timezonePreference.dtd
rename to common/locale/it_IT/timezonePreference.dtd
diff --git a/locale/exchangecalendar/ja_JP/attachments-view.dtd b/common/locale/ja_JP/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/attachments-view.dtd
rename to common/locale/ja_JP/attachments-view.dtd
diff --git a/locale/exchangecalendar/ja_JP/browseFolder.dtd b/common/locale/ja_JP/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/browseFolder.dtd
rename to common/locale/ja_JP/browseFolder.dtd
diff --git a/locale/exchangecalendar/ja_JP/calExchangeCalendar.properties b/common/locale/ja_JP/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/ja_JP/calExchangeCalendar.properties
rename to common/locale/ja_JP/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/ja_JP/calendar-calendars-list.dtd b/common/locale/ja_JP/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/calendar-calendars-list.dtd
rename to common/locale/ja_JP/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/ja_JP/calendar-summary-dialog.dtd b/common/locale/ja_JP/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/calendar-summary-dialog.dtd
rename to common/locale/ja_JP/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/ja_JP/delegate-calendar-dialog.dtd b/common/locale/ja_JP/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/delegate-calendar-dialog.dtd
rename to common/locale/ja_JP/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/ja_JP/delegate-folder.dtd b/common/locale/ja_JP/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/delegate-folder.dtd
rename to common/locale/ja_JP/delegate-folder.dtd
diff --git a/locale/exchangecalendar/ja_JP/ecCalendarCreation.dtd b/common/locale/ja_JP/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/ecCalendarCreation.dtd
rename to common/locale/ja_JP/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/ja_JP/exchangeCloneSettings.dtd b/common/locale/ja_JP/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/exchangeCloneSettings.dtd
rename to common/locale/ja_JP/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/ja_JP/exchangeReminderDialog.dtd b/common/locale/ja_JP/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/exchangeReminderDialog.dtd
rename to common/locale/ja_JP/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/ja_JP/exchangeSettings.dtd b/common/locale/ja_JP/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/exchangeSettings.dtd
rename to common/locale/ja_JP/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/ja_JP/exchangeSettingsOverlay.dtd b/common/locale/ja_JP/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/exchangeSettingsOverlay.dtd
rename to common/locale/ja_JP/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/ja_JP/extra-priority.dtd b/common/locale/ja_JP/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/extra-priority.dtd
rename to common/locale/ja_JP/extra-priority.dtd
diff --git a/locale/exchangecalendar/ja_JP/invitationResponse.dtd b/common/locale/ja_JP/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/invitationResponse.dtd
rename to common/locale/ja_JP/invitationResponse.dtd
diff --git a/locale/exchangecalendar/ja_JP/inviteStyle.dtd b/common/locale/ja_JP/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/inviteStyle.dtd
rename to common/locale/ja_JP/inviteStyle.dtd
diff --git a/locale/exchangecalendar/ja_JP/lightning-item-iframe.dtd b/common/locale/ja_JP/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/lightning-item-iframe.dtd
rename to common/locale/ja_JP/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/ja_JP/manageEWSAccounts.dtd b/common/locale/ja_JP/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/manageEWSAccounts.dtd
rename to common/locale/ja_JP/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/ja_JP/messenger_task_delegation.dtd b/common/locale/ja_JP/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/messenger_task_delegation.dtd
rename to common/locale/ja_JP/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/ja_JP/oofSettings.dtd b/common/locale/ja_JP/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/oofSettings.dtd
rename to common/locale/ja_JP/oofSettings.dtd
diff --git a/locale/exchangecalendar/ja_JP/preInvitationResponse.dtd b/common/locale/ja_JP/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/preInvitationResponse.dtd
rename to common/locale/ja_JP/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/ja_JP/preferences.dtd b/common/locale/ja_JP/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/preferences.dtd
rename to common/locale/ja_JP/preferences.dtd
diff --git a/locale/exchangecalendar/ja_JP/selectEWSUrl.dtd b/common/locale/ja_JP/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/selectEWSUrl.dtd
rename to common/locale/ja_JP/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/ja_JP/sendUpdateTo.dtd b/common/locale/ja_JP/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/sendUpdateTo.dtd
rename to common/locale/ja_JP/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/ja_JP/sharedCalendarParser.dtd b/common/locale/ja_JP/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/sharedCalendarParser.dtd
rename to common/locale/ja_JP/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/ja_JP/timezonePreference.dtd b/common/locale/ja_JP/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/ja_JP/timezonePreference.dtd
rename to common/locale/ja_JP/timezonePreference.dtd
diff --git a/locale/exchangecalendar/nl/attachments-view.dtd b/common/locale/nl/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/attachments-view.dtd
rename to common/locale/nl/attachments-view.dtd
diff --git a/locale/exchangecalendar/nl/browseFolder.dtd b/common/locale/nl/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/browseFolder.dtd
rename to common/locale/nl/browseFolder.dtd
diff --git a/locale/exchangecalendar/nl/calExchangeCalendar.properties b/common/locale/nl/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/nl/calExchangeCalendar.properties
rename to common/locale/nl/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/nl/calendar-calendars-list.dtd b/common/locale/nl/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/calendar-calendars-list.dtd
rename to common/locale/nl/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/nl/calendar-summary-dialog.dtd b/common/locale/nl/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/calendar-summary-dialog.dtd
rename to common/locale/nl/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/nl/delegate-calendar-dialog.dtd b/common/locale/nl/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/delegate-calendar-dialog.dtd
rename to common/locale/nl/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/nl/delegate-folder.dtd b/common/locale/nl/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/delegate-folder.dtd
rename to common/locale/nl/delegate-folder.dtd
diff --git a/locale/exchangecalendar/nl/ecCalendarCreation.dtd b/common/locale/nl/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/ecCalendarCreation.dtd
rename to common/locale/nl/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/nl/exchangeCloneSettings.dtd b/common/locale/nl/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/exchangeCloneSettings.dtd
rename to common/locale/nl/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/nl/exchangeReminderDialog.dtd b/common/locale/nl/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/exchangeReminderDialog.dtd
rename to common/locale/nl/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/nl/exchangeSettings.dtd b/common/locale/nl/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/exchangeSettings.dtd
rename to common/locale/nl/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/nl/exchangeSettingsOverlay.dtd b/common/locale/nl/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/exchangeSettingsOverlay.dtd
rename to common/locale/nl/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/nl/extra-priority.dtd b/common/locale/nl/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/extra-priority.dtd
rename to common/locale/nl/extra-priority.dtd
diff --git a/locale/exchangecalendar/nl/invitationResponse.dtd b/common/locale/nl/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/invitationResponse.dtd
rename to common/locale/nl/invitationResponse.dtd
diff --git a/locale/exchangecalendar/nl/inviteStyle.dtd b/common/locale/nl/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/inviteStyle.dtd
rename to common/locale/nl/inviteStyle.dtd
diff --git a/locale/exchangecalendar/nl/lightning-item-iframe.dtd b/common/locale/nl/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/lightning-item-iframe.dtd
rename to common/locale/nl/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/nl/manageEWSAccounts.dtd b/common/locale/nl/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/manageEWSAccounts.dtd
rename to common/locale/nl/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/nl/messenger_task_delegation.dtd b/common/locale/nl/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/messenger_task_delegation.dtd
rename to common/locale/nl/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/nl/oofSettings.dtd b/common/locale/nl/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/oofSettings.dtd
rename to common/locale/nl/oofSettings.dtd
diff --git a/locale/exchangecalendar/nl/preInvitationResponse.dtd b/common/locale/nl/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/preInvitationResponse.dtd
rename to common/locale/nl/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/nl/preferences.dtd b/common/locale/nl/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/preferences.dtd
rename to common/locale/nl/preferences.dtd
diff --git a/locale/exchangecalendar/nl/selectEWSUrl.dtd b/common/locale/nl/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/selectEWSUrl.dtd
rename to common/locale/nl/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/nl/sendUpdateTo.dtd b/common/locale/nl/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/sendUpdateTo.dtd
rename to common/locale/nl/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/nl/sharedCalendarParser.dtd b/common/locale/nl/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/sharedCalendarParser.dtd
rename to common/locale/nl/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/nl/timezonePreference.dtd b/common/locale/nl/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/nl/timezonePreference.dtd
rename to common/locale/nl/timezonePreference.dtd
diff --git a/locale/exchangecalendar/ru/attachments-view.dtd b/common/locale/ru/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/attachments-view.dtd
rename to common/locale/ru/attachments-view.dtd
diff --git a/locale/exchangecalendar/ru/browseFolder.dtd b/common/locale/ru/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/browseFolder.dtd
rename to common/locale/ru/browseFolder.dtd
diff --git a/locale/exchangecalendar/ru/calExchangeCalendar.properties b/common/locale/ru/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/ru/calExchangeCalendar.properties
rename to common/locale/ru/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/ru/calendar-calendars-list.dtd b/common/locale/ru/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/calendar-calendars-list.dtd
rename to common/locale/ru/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/ru/calendar-summary-dialog.dtd b/common/locale/ru/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/calendar-summary-dialog.dtd
rename to common/locale/ru/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/ru/delegate-calendar-dialog.dtd b/common/locale/ru/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/delegate-calendar-dialog.dtd
rename to common/locale/ru/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/ru/delegate-folder.dtd b/common/locale/ru/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/delegate-folder.dtd
rename to common/locale/ru/delegate-folder.dtd
diff --git a/locale/exchangecalendar/ru/ecCalendarCreation.dtd b/common/locale/ru/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/ecCalendarCreation.dtd
rename to common/locale/ru/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/ru/exchangeCloneSettings.dtd b/common/locale/ru/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/exchangeCloneSettings.dtd
rename to common/locale/ru/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/ru/exchangeReminderDialog.dtd b/common/locale/ru/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/exchangeReminderDialog.dtd
rename to common/locale/ru/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/ru/exchangeSettings.dtd b/common/locale/ru/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/exchangeSettings.dtd
rename to common/locale/ru/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/ru/exchangeSettingsOverlay.dtd b/common/locale/ru/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/exchangeSettingsOverlay.dtd
rename to common/locale/ru/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/ru/extra-priority.dtd b/common/locale/ru/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/extra-priority.dtd
rename to common/locale/ru/extra-priority.dtd
diff --git a/locale/exchangecalendar/ru/invitationResponse.dtd b/common/locale/ru/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/invitationResponse.dtd
rename to common/locale/ru/invitationResponse.dtd
diff --git a/locale/exchangecalendar/ru/inviteStyle.dtd b/common/locale/ru/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/inviteStyle.dtd
rename to common/locale/ru/inviteStyle.dtd
diff --git a/locale/exchangecalendar/ru/lightning-item-iframe.dtd b/common/locale/ru/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/lightning-item-iframe.dtd
rename to common/locale/ru/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/ru/manageEWSAccounts.dtd b/common/locale/ru/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/manageEWSAccounts.dtd
rename to common/locale/ru/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/ru/messenger_task_delegation.dtd b/common/locale/ru/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/messenger_task_delegation.dtd
rename to common/locale/ru/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/ru/oofSettings.dtd b/common/locale/ru/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/oofSettings.dtd
rename to common/locale/ru/oofSettings.dtd
diff --git a/locale/exchangecalendar/ru/preInvitationResponse.dtd b/common/locale/ru/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/preInvitationResponse.dtd
rename to common/locale/ru/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/ru/preferences.dtd b/common/locale/ru/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/preferences.dtd
rename to common/locale/ru/preferences.dtd
diff --git a/locale/exchangecalendar/ru/selectEWSUrl.dtd b/common/locale/ru/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/selectEWSUrl.dtd
rename to common/locale/ru/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/ru/sendUpdateTo.dtd b/common/locale/ru/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/sendUpdateTo.dtd
rename to common/locale/ru/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/ru/sharedCalendarParser.dtd b/common/locale/ru/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/sharedCalendarParser.dtd
rename to common/locale/ru/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/ru/timezonePreference.dtd b/common/locale/ru/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/ru/timezonePreference.dtd
rename to common/locale/ru/timezonePreference.dtd
diff --git a/locale/exchangecalendar/sv/attachments-view.dtd b/common/locale/sv/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/attachments-view.dtd
rename to common/locale/sv/attachments-view.dtd
diff --git a/locale/exchangecalendar/sv/browseFolder.dtd b/common/locale/sv/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/browseFolder.dtd
rename to common/locale/sv/browseFolder.dtd
diff --git a/locale/exchangecalendar/sv/calExchangeCalendar.properties b/common/locale/sv/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/sv/calExchangeCalendar.properties
rename to common/locale/sv/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/sv/calendar-calendars-list.dtd b/common/locale/sv/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/calendar-calendars-list.dtd
rename to common/locale/sv/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/sv/calendar-summary-dialog.dtd b/common/locale/sv/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/calendar-summary-dialog.dtd
rename to common/locale/sv/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/sv/delegate-calendar-dialog.dtd b/common/locale/sv/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/delegate-calendar-dialog.dtd
rename to common/locale/sv/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/sv/delegate-folder.dtd b/common/locale/sv/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/delegate-folder.dtd
rename to common/locale/sv/delegate-folder.dtd
diff --git a/locale/exchangecalendar/sv/ecCalendarCreation.dtd b/common/locale/sv/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/ecCalendarCreation.dtd
rename to common/locale/sv/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/sv/exchangeCloneSettings.dtd b/common/locale/sv/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/exchangeCloneSettings.dtd
rename to common/locale/sv/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/sv/exchangeReminderDialog.dtd b/common/locale/sv/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/exchangeReminderDialog.dtd
rename to common/locale/sv/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/sv/exchangeSettings.dtd b/common/locale/sv/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/exchangeSettings.dtd
rename to common/locale/sv/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/sv/exchangeSettingsOverlay.dtd b/common/locale/sv/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/exchangeSettingsOverlay.dtd
rename to common/locale/sv/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/sv/extra-priority.dtd b/common/locale/sv/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/extra-priority.dtd
rename to common/locale/sv/extra-priority.dtd
diff --git a/locale/exchangecalendar/sv/invitationResponse.dtd b/common/locale/sv/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/invitationResponse.dtd
rename to common/locale/sv/invitationResponse.dtd
diff --git a/locale/exchangecalendar/sv/inviteStyle.dtd b/common/locale/sv/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/inviteStyle.dtd
rename to common/locale/sv/inviteStyle.dtd
diff --git a/locale/exchangecalendar/sv/lightning-item-iframe.dtd b/common/locale/sv/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/lightning-item-iframe.dtd
rename to common/locale/sv/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/sv/manageEWSAccounts.dtd b/common/locale/sv/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/manageEWSAccounts.dtd
rename to common/locale/sv/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/sv/messenger_task_delegation.dtd b/common/locale/sv/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/messenger_task_delegation.dtd
rename to common/locale/sv/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/sv/oofSettings.dtd b/common/locale/sv/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/oofSettings.dtd
rename to common/locale/sv/oofSettings.dtd
diff --git a/locale/exchangecalendar/sv/preInvitationResponse.dtd b/common/locale/sv/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/preInvitationResponse.dtd
rename to common/locale/sv/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/sv/preferences.dtd b/common/locale/sv/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/preferences.dtd
rename to common/locale/sv/preferences.dtd
diff --git a/locale/exchangecalendar/sv/selectEWSUrl.dtd b/common/locale/sv/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/selectEWSUrl.dtd
rename to common/locale/sv/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/sv/sendUpdateTo.dtd b/common/locale/sv/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/sendUpdateTo.dtd
rename to common/locale/sv/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/sv/sharedCalendarParser.dtd b/common/locale/sv/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/sharedCalendarParser.dtd
rename to common/locale/sv/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/sv/timezonePreference.dtd b/common/locale/sv/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/sv/timezonePreference.dtd
rename to common/locale/sv/timezonePreference.dtd
diff --git a/locale/exchangecalendar/tr/attachments-view.dtd b/common/locale/tr/attachments-view.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/attachments-view.dtd
rename to common/locale/tr/attachments-view.dtd
diff --git a/locale/exchangecalendar/tr/browseFolder.dtd b/common/locale/tr/browseFolder.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/browseFolder.dtd
rename to common/locale/tr/browseFolder.dtd
diff --git a/locale/exchangecalendar/tr/calExchangeCalendar.properties b/common/locale/tr/calExchangeCalendar.properties
similarity index 100%
rename from locale/exchangecalendar/tr/calExchangeCalendar.properties
rename to common/locale/tr/calExchangeCalendar.properties
diff --git a/locale/exchangecalendar/tr/calendar-calendars-list.dtd b/common/locale/tr/calendar-calendars-list.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/calendar-calendars-list.dtd
rename to common/locale/tr/calendar-calendars-list.dtd
diff --git a/locale/exchangecalendar/tr/calendar-summary-dialog.dtd b/common/locale/tr/calendar-summary-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/calendar-summary-dialog.dtd
rename to common/locale/tr/calendar-summary-dialog.dtd
diff --git a/locale/exchangecalendar/tr/delegate-calendar-dialog.dtd b/common/locale/tr/delegate-calendar-dialog.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/delegate-calendar-dialog.dtd
rename to common/locale/tr/delegate-calendar-dialog.dtd
diff --git a/locale/exchangecalendar/tr/delegate-folder.dtd b/common/locale/tr/delegate-folder.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/delegate-folder.dtd
rename to common/locale/tr/delegate-folder.dtd
diff --git a/locale/exchangecalendar/tr/ecCalendarCreation.dtd b/common/locale/tr/ecCalendarCreation.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/ecCalendarCreation.dtd
rename to common/locale/tr/ecCalendarCreation.dtd
diff --git a/locale/exchangecalendar/tr/exchangeCloneSettings.dtd b/common/locale/tr/exchangeCloneSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/exchangeCloneSettings.dtd
rename to common/locale/tr/exchangeCloneSettings.dtd
diff --git a/locale/exchangecalendar/tr/exchangeReminderDialog.dtd b/common/locale/tr/exchangeReminderDialog.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/exchangeReminderDialog.dtd
rename to common/locale/tr/exchangeReminderDialog.dtd
diff --git a/locale/exchangecalendar/tr/exchangeSettings.dtd b/common/locale/tr/exchangeSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/exchangeSettings.dtd
rename to common/locale/tr/exchangeSettings.dtd
diff --git a/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd b/common/locale/tr/exchangeSettingsOverlay.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
rename to common/locale/tr/exchangeSettingsOverlay.dtd
diff --git a/locale/exchangecalendar/tr/extra-priority.dtd b/common/locale/tr/extra-priority.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/extra-priority.dtd
rename to common/locale/tr/extra-priority.dtd
diff --git a/locale/exchangecalendar/tr/invitationResponse.dtd b/common/locale/tr/invitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/invitationResponse.dtd
rename to common/locale/tr/invitationResponse.dtd
diff --git a/locale/exchangecalendar/tr/inviteStyle.dtd b/common/locale/tr/inviteStyle.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/inviteStyle.dtd
rename to common/locale/tr/inviteStyle.dtd
diff --git a/locale/exchangecalendar/tr/lightning-item-iframe.dtd b/common/locale/tr/lightning-item-iframe.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/lightning-item-iframe.dtd
rename to common/locale/tr/lightning-item-iframe.dtd
diff --git a/locale/exchangecalendar/tr/manageEWSAccounts.dtd b/common/locale/tr/manageEWSAccounts.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/manageEWSAccounts.dtd
rename to common/locale/tr/manageEWSAccounts.dtd
diff --git a/locale/exchangecalendar/tr/messenger_task_delegation.dtd b/common/locale/tr/messenger_task_delegation.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/messenger_task_delegation.dtd
rename to common/locale/tr/messenger_task_delegation.dtd
diff --git a/locale/exchangecalendar/tr/oofSettings.dtd b/common/locale/tr/oofSettings.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/oofSettings.dtd
rename to common/locale/tr/oofSettings.dtd
diff --git a/locale/exchangecalendar/tr/preInvitationResponse.dtd b/common/locale/tr/preInvitationResponse.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/preInvitationResponse.dtd
rename to common/locale/tr/preInvitationResponse.dtd
diff --git a/locale/exchangecalendar/tr/preferences.dtd b/common/locale/tr/preferences.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/preferences.dtd
rename to common/locale/tr/preferences.dtd
diff --git a/locale/exchangecalendar/tr/selectEWSUrl.dtd b/common/locale/tr/selectEWSUrl.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/selectEWSUrl.dtd
rename to common/locale/tr/selectEWSUrl.dtd
diff --git a/locale/exchangecalendar/tr/sendUpdateTo.dtd b/common/locale/tr/sendUpdateTo.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/sendUpdateTo.dtd
rename to common/locale/tr/sendUpdateTo.dtd
diff --git a/locale/exchangecalendar/tr/sharedCalendarParser.dtd b/common/locale/tr/sharedCalendarParser.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/sharedCalendarParser.dtd
rename to common/locale/tr/sharedCalendarParser.dtd
diff --git a/locale/exchangecalendar/tr/timezonePreference.dtd b/common/locale/tr/timezonePreference.dtd
similarity index 100%
rename from locale/exchangecalendar/tr/timezonePreference.dtd
rename to common/locale/tr/timezonePreference.dtd
diff --git a/theme/common/addressingWidgetOverlay.css b/common/theme/common/addressingWidgetOverlay.css
similarity index 100%
rename from theme/common/addressingWidgetOverlay.css
rename to common/theme/common/addressingWidgetOverlay.css
diff --git a/theme/common/browseFolder.css b/common/theme/common/browseFolder.css
similarity index 100%
rename from theme/common/browseFolder.css
rename to common/theme/common/browseFolder.css
diff --git a/theme/common/calendar-calendars-list.css b/common/theme/common/calendar-calendars-list.css
similarity index 100%
rename from theme/common/calendar-calendars-list.css
rename to common/theme/common/calendar-calendars-list.css
diff --git a/theme/common/calendar-event-dialog-attendees.css b/common/theme/common/calendar-event-dialog-attendees.css
similarity index 100%
rename from theme/common/calendar-event-dialog-attendees.css
rename to common/theme/common/calendar-event-dialog-attendees.css
diff --git a/theme/common/calendar-summary-dialog.css b/common/theme/common/calendar-summary-dialog.css
similarity index 100%
rename from theme/common/calendar-summary-dialog.css
rename to common/theme/common/calendar-summary-dialog.css
diff --git a/theme/common/delegateCalendar.css b/common/theme/common/delegateCalendar.css
similarity index 100%
rename from theme/common/delegateCalendar.css
rename to common/theme/common/delegateCalendar.css
diff --git a/theme/common/exchWebServiceEditor.css b/common/theme/common/exchWebServiceEditor.css
similarity index 100%
rename from theme/common/exchWebServiceEditor.css
rename to common/theme/common/exchWebServiceEditor.css
diff --git a/theme/common/extras-preferences.css b/common/theme/common/extras-preferences.css
similarity index 100%
rename from theme/common/extras-preferences.css
rename to common/theme/common/extras-preferences.css
diff --git a/theme/common/images/Fugue Icons README.txt b/common/theme/common/images/Fugue Icons README.txt
similarity index 100%
rename from theme/common/images/Fugue Icons README.txt
rename to common/theme/common/images/Fugue Icons README.txt
diff --git a/theme/common/images/accepted.png b/common/theme/common/images/accepted.png
similarity index 100%
rename from theme/common/images/accepted.png
rename to common/theme/common/images/accepted.png
diff --git a/theme/common/images/address-book.png b/common/theme/common/images/address-book.png
similarity index 100%
rename from theme/common/images/address-book.png
rename to common/theme/common/images/address-book.png
diff --git a/theme/common/images/arrow-circle-135.png b/common/theme/common/images/arrow-circle-135.png
similarity index 100%
rename from theme/common/images/arrow-circle-135.png
rename to common/theme/common/images/arrow-circle-135.png
diff --git a/theme/common/images/arrow-circle-225.png b/common/theme/common/images/arrow-circle-225.png
similarity index 100%
rename from theme/common/images/arrow-circle-225.png
rename to common/theme/common/images/arrow-circle-225.png
diff --git a/theme/common/images/arrow-circle-315.png b/common/theme/common/images/arrow-circle-315.png
similarity index 100%
rename from theme/common/images/arrow-circle-315.png
rename to common/theme/common/images/arrow-circle-315.png
diff --git a/theme/common/images/arrow-circle.png b/common/theme/common/images/arrow-circle.png
similarity index 100%
rename from theme/common/images/arrow-circle.png
rename to common/theme/common/images/arrow-circle.png
diff --git a/theme/common/images/asterisk-small-yellow.png b/common/theme/common/images/asterisk-small-yellow.png
similarity index 100%
rename from theme/common/images/asterisk-small-yellow.png
rename to common/theme/common/images/asterisk-small-yellow.png
diff --git a/theme/common/images/blog.png b/common/theme/common/images/blog.png
similarity index 100%
rename from theme/common/images/blog.png
rename to common/theme/common/images/blog.png
diff --git a/theme/common/images/calendar-month.png b/common/theme/common/images/calendar-month.png
similarity index 100%
rename from theme/common/images/calendar-month.png
rename to common/theme/common/images/calendar-month.png
diff --git a/theme/common/images/cancelled.png b/common/theme/common/images/cancelled.png
similarity index 100%
rename from theme/common/images/cancelled.png
rename to common/theme/common/images/cancelled.png
diff --git a/theme/common/images/certificate.png b/common/theme/common/images/certificate.png
similarity index 100%
rename from theme/common/images/certificate.png
rename to common/theme/common/images/certificate.png
diff --git a/theme/common/images/chain--minus.png b/common/theme/common/images/chain--minus.png
similarity index 100%
rename from theme/common/images/chain--minus.png
rename to common/theme/common/images/chain--minus.png
diff --git a/theme/common/images/chain--pencil.png b/common/theme/common/images/chain--pencil.png
similarity index 100%
rename from theme/common/images/chain--pencil.png
rename to common/theme/common/images/chain--pencil.png
diff --git a/theme/common/images/chain--plus.png b/common/theme/common/images/chain--plus.png
similarity index 100%
rename from theme/common/images/chain--plus.png
rename to common/theme/common/images/chain--plus.png
diff --git a/theme/common/images/cross.png b/common/theme/common/images/cross.png
similarity index 100%
rename from theme/common/images/cross.png
rename to common/theme/common/images/cross.png
diff --git a/theme/common/images/declined.png b/common/theme/common/images/declined.png
similarity index 100%
rename from theme/common/images/declined.png
rename to common/theme/common/images/declined.png
diff --git a/theme/common/images/document--exclamation.png b/common/theme/common/images/document--exclamation.png
similarity index 100%
rename from theme/common/images/document--exclamation.png
rename to common/theme/common/images/document--exclamation.png
diff --git a/theme/common/images/document-binary.png b/common/theme/common/images/document-binary.png
similarity index 100%
rename from theme/common/images/document-binary.png
rename to common/theme/common/images/document-binary.png
diff --git a/theme/common/images/document-excel-csv.png b/common/theme/common/images/document-excel-csv.png
similarity index 100%
rename from theme/common/images/document-excel-csv.png
rename to common/theme/common/images/document-excel-csv.png
diff --git a/theme/common/images/document-excel.png b/common/theme/common/images/document-excel.png
similarity index 100%
rename from theme/common/images/document-excel.png
rename to common/theme/common/images/document-excel.png
diff --git a/theme/common/images/document-flash-movie.png b/common/theme/common/images/document-flash-movie.png
similarity index 100%
rename from theme/common/images/document-flash-movie.png
rename to common/theme/common/images/document-flash-movie.png
diff --git a/theme/common/images/document-image.png b/common/theme/common/images/document-image.png
similarity index 100%
rename from theme/common/images/document-image.png
rename to common/theme/common/images/document-image.png
diff --git a/theme/common/images/document-office.png b/common/theme/common/images/document-office.png
similarity index 100%
rename from theme/common/images/document-office.png
rename to common/theme/common/images/document-office.png
diff --git a/theme/common/images/document-pdf.png b/common/theme/common/images/document-pdf.png
similarity index 100%
rename from theme/common/images/document-pdf.png
rename to common/theme/common/images/document-pdf.png
diff --git a/theme/common/images/document-photoshop.png b/common/theme/common/images/document-photoshop.png
similarity index 100%
rename from theme/common/images/document-photoshop.png
rename to common/theme/common/images/document-photoshop.png
diff --git a/theme/common/images/document-php.png b/common/theme/common/images/document-php.png
similarity index 100%
rename from theme/common/images/document-php.png
rename to common/theme/common/images/document-php.png
diff --git a/theme/common/images/document-powerpoint.png b/common/theme/common/images/document-powerpoint.png
similarity index 100%
rename from theme/common/images/document-powerpoint.png
rename to common/theme/common/images/document-powerpoint.png
diff --git a/theme/common/images/document-tex.png b/common/theme/common/images/document-tex.png
similarity index 100%
rename from theme/common/images/document-tex.png
rename to common/theme/common/images/document-tex.png
diff --git a/theme/common/images/document-text.png b/common/theme/common/images/document-text.png
similarity index 100%
rename from theme/common/images/document-text.png
rename to common/theme/common/images/document-text.png
diff --git a/theme/common/images/document-word.png b/common/theme/common/images/document-word.png
similarity index 100%
rename from theme/common/images/document-word.png
rename to common/theme/common/images/document-word.png
diff --git a/theme/common/images/edit-alignment-center.png b/common/theme/common/images/edit-alignment-center.png
similarity index 100%
rename from theme/common/images/edit-alignment-center.png
rename to common/theme/common/images/edit-alignment-center.png
diff --git a/theme/common/images/edit-alignment-justify.png b/common/theme/common/images/edit-alignment-justify.png
similarity index 100%
rename from theme/common/images/edit-alignment-justify.png
rename to common/theme/common/images/edit-alignment-justify.png
diff --git a/theme/common/images/edit-alignment-right.png b/common/theme/common/images/edit-alignment-right.png
similarity index 100%
rename from theme/common/images/edit-alignment-right.png
rename to common/theme/common/images/edit-alignment-right.png
diff --git a/theme/common/images/edit-alignment.png b/common/theme/common/images/edit-alignment.png
similarity index 100%
rename from theme/common/images/edit-alignment.png
rename to common/theme/common/images/edit-alignment.png
diff --git a/theme/common/images/edit-bold.png b/common/theme/common/images/edit-bold.png
similarity index 100%
rename from theme/common/images/edit-bold.png
rename to common/theme/common/images/edit-bold.png
diff --git a/theme/common/images/edit-color.png b/common/theme/common/images/edit-color.png
similarity index 100%
rename from theme/common/images/edit-color.png
rename to common/theme/common/images/edit-color.png
diff --git a/theme/common/images/edit-indent.png b/common/theme/common/images/edit-indent.png
similarity index 100%
rename from theme/common/images/edit-indent.png
rename to common/theme/common/images/edit-indent.png
diff --git a/theme/common/images/edit-italic.png b/common/theme/common/images/edit-italic.png
similarity index 100%
rename from theme/common/images/edit-italic.png
rename to common/theme/common/images/edit-italic.png
diff --git a/theme/common/images/edit-list-order.png b/common/theme/common/images/edit-list-order.png
similarity index 100%
rename from theme/common/images/edit-list-order.png
rename to common/theme/common/images/edit-list-order.png
diff --git a/theme/common/images/edit-list.png b/common/theme/common/images/edit-list.png
similarity index 100%
rename from theme/common/images/edit-list.png
rename to common/theme/common/images/edit-list.png
diff --git a/theme/common/images/edit-outdent.png b/common/theme/common/images/edit-outdent.png
similarity index 100%
rename from theme/common/images/edit-outdent.png
rename to common/theme/common/images/edit-outdent.png
diff --git a/theme/common/images/edit-size-down.png b/common/theme/common/images/edit-size-down.png
similarity index 100%
rename from theme/common/images/edit-size-down.png
rename to common/theme/common/images/edit-size-down.png
diff --git a/theme/common/images/edit-size-up.png b/common/theme/common/images/edit-size-up.png
similarity index 100%
rename from theme/common/images/edit-size-up.png
rename to common/theme/common/images/edit-size-up.png
diff --git a/theme/common/images/edit-underline.png b/common/theme/common/images/edit-underline.png
similarity index 100%
rename from theme/common/images/edit-underline.png
rename to common/theme/common/images/edit-underline.png
diff --git a/theme/common/images/exchange-addrbook.png b/common/theme/common/images/exchange-addrbook.png
similarity index 100%
rename from theme/common/images/exchange-addrbook.png
rename to common/theme/common/images/exchange-addrbook.png
diff --git a/theme/common/images/extra-icon.png b/common/theme/common/images/extra-icon.png
similarity index 100%
rename from theme/common/images/extra-icon.png
rename to common/theme/common/images/extra-icon.png
diff --git a/theme/common/images/feed.png b/common/theme/common/images/feed.png
similarity index 100%
rename from theme/common/images/feed.png
rename to common/theme/common/images/feed.png
diff --git a/theme/common/images/folder-open.png b/common/theme/common/images/folder-open.png
similarity index 100%
rename from theme/common/images/folder-open.png
rename to common/theme/common/images/folder-open.png
diff --git a/theme/common/images/folder.png b/common/theme/common/images/folder.png
similarity index 100%
rename from theme/common/images/folder.png
rename to common/theme/common/images/folder.png
diff --git a/theme/common/images/high.gif b/common/theme/common/images/high.gif
similarity index 100%
rename from theme/common/images/high.gif
rename to common/theme/common/images/high.gif
diff --git a/theme/common/images/highest.gif b/common/theme/common/images/highest.gif
similarity index 100%
rename from theme/common/images/highest.gif
rename to common/theme/common/images/highest.gif
diff --git a/theme/common/images/invited.png b/common/theme/common/images/invited.png
similarity index 100%
rename from theme/common/images/invited.png
rename to common/theme/common/images/invited.png
diff --git a/theme/common/images/lightningexchangecalendar.png b/common/theme/common/images/lightningexchangecalendar.png
similarity index 100%
rename from theme/common/images/lightningexchangecalendar.png
rename to common/theme/common/images/lightningexchangecalendar.png
diff --git a/theme/common/images/low.gif b/common/theme/common/images/low.gif
similarity index 100%
rename from theme/common/images/low.gif
rename to common/theme/common/images/low.gif
diff --git a/theme/common/images/lowest.gif b/common/theme/common/images/lowest.gif
similarity index 100%
rename from theme/common/images/lowest.gif
rename to common/theme/common/images/lowest.gif
diff --git a/theme/common/images/mail.png b/common/theme/common/images/mail.png
similarity index 100%
rename from theme/common/images/mail.png
rename to common/theme/common/images/mail.png
diff --git a/theme/common/images/notify-icon.png b/common/theme/common/images/notify-icon.png
similarity index 100%
rename from theme/common/images/notify-icon.png
rename to common/theme/common/images/notify-icon.png
diff --git a/theme/common/images/plug-connect.png b/common/theme/common/images/plug-connect.png
similarity index 100%
rename from theme/common/images/plug-connect.png
rename to common/theme/common/images/plug-connect.png
diff --git a/theme/common/images/plug-disconnect-prohibition.png b/common/theme/common/images/plug-disconnect-prohibition.png
similarity index 100%
rename from theme/common/images/plug-disconnect-prohibition.png
rename to common/theme/common/images/plug-disconnect-prohibition.png
diff --git a/theme/common/images/scissors.png b/common/theme/common/images/scissors.png
similarity index 100%
rename from theme/common/images/scissors.png
rename to common/theme/common/images/scissors.png
diff --git a/theme/common/images/sticky-notes.png b/common/theme/common/images/sticky-notes.png
similarity index 100%
rename from theme/common/images/sticky-notes.png
rename to common/theme/common/images/sticky-notes.png
diff --git a/theme/common/images/task.png b/common/theme/common/images/task.png
similarity index 100%
rename from theme/common/images/task.png
rename to common/theme/common/images/task.png
diff --git a/theme/common/images/tentative.png b/common/theme/common/images/tentative.png
similarity index 100%
rename from theme/common/images/tentative.png
rename to common/theme/common/images/tentative.png
diff --git a/theme/common/images/threadCol-PriorityIcon.gif b/common/theme/common/images/threadCol-PriorityIcon.gif
similarity index 100%
rename from theme/common/images/threadCol-PriorityIcon.gif
rename to common/theme/common/images/threadCol-PriorityIcon.gif
diff --git a/theme/common/images/threadcol-invite.gif b/common/theme/common/images/threadcol-invite.gif
similarity index 100%
rename from theme/common/images/threadcol-invite.gif
rename to common/theme/common/images/threadcol-invite.gif
diff --git a/theme/common/images/tick.png b/common/theme/common/images/tick.png
similarity index 100%
rename from theme/common/images/tick.png
rename to common/theme/common/images/tick.png
diff --git a/theme/common/images/updated.png b/common/theme/common/images/updated.png
similarity index 100%
rename from theme/common/images/updated.png
rename to common/theme/common/images/updated.png
diff --git a/theme/common/images/view-refresh.png b/common/theme/common/images/view-refresh.png
similarity index 100%
rename from theme/common/images/view-refresh.png
rename to common/theme/common/images/view-refresh.png
diff --git a/theme/common/images/wrench-screwdriver.png b/common/theme/common/images/wrench-screwdriver.png
similarity index 100%
rename from theme/common/images/wrench-screwdriver.png
rename to common/theme/common/images/wrench-screwdriver.png
diff --git a/theme/common/invite-style.css b/common/theme/common/invite-style.css
similarity index 100%
rename from theme/common/invite-style.css
rename to common/theme/common/invite-style.css
diff --git a/theme/common/itemBodyEditor.css b/common/theme/common/itemBodyEditor.css
similarity index 100%
rename from theme/common/itemBodyEditor.css
rename to common/theme/common/itemBodyEditor.css
diff --git a/theme/common/manageEWSAccounts.css b/common/theme/common/manageEWSAccounts.css
similarity index 100%
rename from theme/common/manageEWSAccounts.css
rename to common/theme/common/manageEWSAccounts.css
diff --git a/theme/common/oofSettings.css b/common/theme/common/oofSettings.css
similarity index 100%
rename from theme/common/oofSettings.css
rename to common/theme/common/oofSettings.css
diff --git a/theme/common/preferences.css b/common/theme/common/preferences.css
similarity index 100%
rename from theme/common/preferences.css
rename to common/theme/common/preferences.css
diff --git a/theme/common/priority-display.css b/common/theme/common/priority-display.css
similarity index 100%
rename from theme/common/priority-display.css
rename to common/theme/common/priority-display.css
diff --git a/theme/common/progress_panel.css b/common/theme/common/progress_panel.css
similarity index 100%
rename from theme/common/progress_panel.css
rename to common/theme/common/progress_panel.css
diff --git a/theme/common/sharedCalendarParser.css b/common/theme/common/sharedCalendarParser.css
similarity index 100%
rename from theme/common/sharedCalendarParser.css
rename to common/theme/common/sharedCalendarParser.css
diff --git a/theme/mac/addressingWidgetOverlay.css b/common/theme/mac/addressingWidgetOverlay.css
similarity index 100%
rename from theme/mac/addressingWidgetOverlay.css
rename to common/theme/mac/addressingWidgetOverlay.css
diff --git a/theme/mac/attachments-view.css b/common/theme/mac/attachments-view.css
similarity index 100%
rename from theme/mac/attachments-view.css
rename to common/theme/mac/attachments-view.css
diff --git a/theme/mac/browseFolder.css b/common/theme/mac/browseFolder.css
similarity index 100%
rename from theme/mac/browseFolder.css
rename to common/theme/mac/browseFolder.css
diff --git a/theme/mac/calendar-calendars-list.css b/common/theme/mac/calendar-calendars-list.css
similarity index 100%
rename from theme/mac/calendar-calendars-list.css
rename to common/theme/mac/calendar-calendars-list.css
diff --git a/theme/mac/calendar-event-dialog-attendees.css b/common/theme/mac/calendar-event-dialog-attendees.css
similarity index 100%
rename from theme/mac/calendar-event-dialog-attendees.css
rename to common/theme/mac/calendar-event-dialog-attendees.css
diff --git a/theme/mac/calendar-summary-dialog.css b/common/theme/mac/calendar-summary-dialog.css
similarity index 100%
rename from theme/mac/calendar-summary-dialog.css
rename to common/theme/mac/calendar-summary-dialog.css
diff --git a/theme/mac/delegateCalendar.css b/common/theme/mac/delegateCalendar.css
similarity index 100%
rename from theme/mac/delegateCalendar.css
rename to common/theme/mac/delegateCalendar.css
diff --git a/theme/mac/exchWebServiceEditor.css b/common/theme/mac/exchWebServiceEditor.css
similarity index 100%
rename from theme/mac/exchWebServiceEditor.css
rename to common/theme/mac/exchWebServiceEditor.css
diff --git a/theme/mac/extras-preferences.css b/common/theme/mac/extras-preferences.css
similarity index 100%
rename from theme/mac/extras-preferences.css
rename to common/theme/mac/extras-preferences.css
diff --git a/theme/mac/invite-style.css b/common/theme/mac/invite-style.css
similarity index 100%
rename from theme/mac/invite-style.css
rename to common/theme/mac/invite-style.css
diff --git a/theme/mac/itemBodyEditor.css b/common/theme/mac/itemBodyEditor.css
similarity index 100%
rename from theme/mac/itemBodyEditor.css
rename to common/theme/mac/itemBodyEditor.css
diff --git a/theme/mac/manageEWSAccounts.css b/common/theme/mac/manageEWSAccounts.css
similarity index 100%
rename from theme/mac/manageEWSAccounts.css
rename to common/theme/mac/manageEWSAccounts.css
diff --git a/theme/mac/oofSettings.css b/common/theme/mac/oofSettings.css
similarity index 100%
rename from theme/mac/oofSettings.css
rename to common/theme/mac/oofSettings.css
diff --git a/theme/mac/preferences.css b/common/theme/mac/preferences.css
similarity index 100%
rename from theme/mac/preferences.css
rename to common/theme/mac/preferences.css
diff --git a/theme/mac/priority-display.css b/common/theme/mac/priority-display.css
similarity index 100%
rename from theme/mac/priority-display.css
rename to common/theme/mac/priority-display.css
diff --git a/theme/mac/progress_panel.css b/common/theme/mac/progress_panel.css
similarity index 100%
rename from theme/mac/progress_panel.css
rename to common/theme/mac/progress_panel.css
diff --git a/theme/mac/sharedCalendarParser.css b/common/theme/mac/sharedCalendarParser.css
similarity index 100%
rename from theme/mac/sharedCalendarParser.css
rename to common/theme/mac/sharedCalendarParser.css
diff --git a/theme/unix/addressingWidgetOverlay.css b/common/theme/unix/addressingWidgetOverlay.css
similarity index 100%
rename from theme/unix/addressingWidgetOverlay.css
rename to common/theme/unix/addressingWidgetOverlay.css
diff --git a/theme/unix/attachments-view.css b/common/theme/unix/attachments-view.css
similarity index 100%
rename from theme/unix/attachments-view.css
rename to common/theme/unix/attachments-view.css
diff --git a/theme/unix/browseFolder.css b/common/theme/unix/browseFolder.css
similarity index 100%
rename from theme/unix/browseFolder.css
rename to common/theme/unix/browseFolder.css
diff --git a/theme/unix/calendar-calendars-list.css b/common/theme/unix/calendar-calendars-list.css
similarity index 100%
rename from theme/unix/calendar-calendars-list.css
rename to common/theme/unix/calendar-calendars-list.css
diff --git a/theme/unix/calendar-event-dialog-attendees.css b/common/theme/unix/calendar-event-dialog-attendees.css
similarity index 100%
rename from theme/unix/calendar-event-dialog-attendees.css
rename to common/theme/unix/calendar-event-dialog-attendees.css
diff --git a/theme/unix/calendar-summary-dialog.css b/common/theme/unix/calendar-summary-dialog.css
similarity index 100%
rename from theme/unix/calendar-summary-dialog.css
rename to common/theme/unix/calendar-summary-dialog.css
diff --git a/theme/unix/delegateCalendar.css b/common/theme/unix/delegateCalendar.css
similarity index 100%
rename from theme/unix/delegateCalendar.css
rename to common/theme/unix/delegateCalendar.css
diff --git a/theme/unix/exchWebServiceEditor.css b/common/theme/unix/exchWebServiceEditor.css
similarity index 100%
rename from theme/unix/exchWebServiceEditor.css
rename to common/theme/unix/exchWebServiceEditor.css
diff --git a/theme/unix/extras-preferences.css b/common/theme/unix/extras-preferences.css
similarity index 100%
rename from theme/unix/extras-preferences.css
rename to common/theme/unix/extras-preferences.css
diff --git a/theme/unix/invite-style.css b/common/theme/unix/invite-style.css
similarity index 100%
rename from theme/unix/invite-style.css
rename to common/theme/unix/invite-style.css
diff --git a/theme/unix/itemBodyEditor.css b/common/theme/unix/itemBodyEditor.css
similarity index 100%
rename from theme/unix/itemBodyEditor.css
rename to common/theme/unix/itemBodyEditor.css
diff --git a/theme/unix/manageEWSAccounts.css b/common/theme/unix/manageEWSAccounts.css
similarity index 100%
rename from theme/unix/manageEWSAccounts.css
rename to common/theme/unix/manageEWSAccounts.css
diff --git a/theme/unix/oofSettings.css b/common/theme/unix/oofSettings.css
similarity index 100%
rename from theme/unix/oofSettings.css
rename to common/theme/unix/oofSettings.css
diff --git a/theme/unix/preferences.css b/common/theme/unix/preferences.css
similarity index 100%
rename from theme/unix/preferences.css
rename to common/theme/unix/preferences.css
diff --git a/theme/unix/priority-display.css b/common/theme/unix/priority-display.css
similarity index 100%
rename from theme/unix/priority-display.css
rename to common/theme/unix/priority-display.css
diff --git a/theme/unix/progress_panel.css b/common/theme/unix/progress_panel.css
similarity index 100%
rename from theme/unix/progress_panel.css
rename to common/theme/unix/progress_panel.css
diff --git a/theme/unix/sharedCalendarParser.css b/common/theme/unix/sharedCalendarParser.css
similarity index 100%
rename from theme/unix/sharedCalendarParser.css
rename to common/theme/unix/sharedCalendarParser.css
diff --git a/theme/win/addressingWidgetOverlay.css b/common/theme/win/addressingWidgetOverlay.css
similarity index 100%
rename from theme/win/addressingWidgetOverlay.css
rename to common/theme/win/addressingWidgetOverlay.css
diff --git a/theme/win/attachments-view.css b/common/theme/win/attachments-view.css
similarity index 100%
rename from theme/win/attachments-view.css
rename to common/theme/win/attachments-view.css
diff --git a/theme/win/browseFolder.css b/common/theme/win/browseFolder.css
similarity index 100%
rename from theme/win/browseFolder.css
rename to common/theme/win/browseFolder.css
diff --git a/theme/win/calendar-calendars-list.css b/common/theme/win/calendar-calendars-list.css
similarity index 100%
rename from theme/win/calendar-calendars-list.css
rename to common/theme/win/calendar-calendars-list.css
diff --git a/theme/win/calendar-event-dialog-attendees.css b/common/theme/win/calendar-event-dialog-attendees.css
similarity index 100%
rename from theme/win/calendar-event-dialog-attendees.css
rename to common/theme/win/calendar-event-dialog-attendees.css
diff --git a/theme/win/calendar-summary-dialog.css b/common/theme/win/calendar-summary-dialog.css
similarity index 100%
rename from theme/win/calendar-summary-dialog.css
rename to common/theme/win/calendar-summary-dialog.css
diff --git a/theme/win/delegateCalendar.css b/common/theme/win/delegateCalendar.css
similarity index 100%
rename from theme/win/delegateCalendar.css
rename to common/theme/win/delegateCalendar.css
diff --git a/theme/win/exchWebServiceEditor.css b/common/theme/win/exchWebServiceEditor.css
similarity index 100%
rename from theme/win/exchWebServiceEditor.css
rename to common/theme/win/exchWebServiceEditor.css
diff --git a/theme/win/extras-preferences.css b/common/theme/win/extras-preferences.css
similarity index 100%
rename from theme/win/extras-preferences.css
rename to common/theme/win/extras-preferences.css
diff --git a/theme/win/invite-style.css b/common/theme/win/invite-style.css
similarity index 100%
rename from theme/win/invite-style.css
rename to common/theme/win/invite-style.css
diff --git a/theme/win/itemBodyEditor.css b/common/theme/win/itemBodyEditor.css
similarity index 100%
rename from theme/win/itemBodyEditor.css
rename to common/theme/win/itemBodyEditor.css
diff --git a/theme/win/manageEWSAccounts.css b/common/theme/win/manageEWSAccounts.css
similarity index 100%
rename from theme/win/manageEWSAccounts.css
rename to common/theme/win/manageEWSAccounts.css
diff --git a/theme/win/oofSettings.css b/common/theme/win/oofSettings.css
similarity index 100%
rename from theme/win/oofSettings.css
rename to common/theme/win/oofSettings.css
diff --git a/theme/win/preferences.css b/common/theme/win/preferences.css
similarity index 100%
rename from theme/win/preferences.css
rename to common/theme/win/preferences.css
diff --git a/theme/win/priority-display.css b/common/theme/win/priority-display.css
similarity index 100%
rename from theme/win/priority-display.css
rename to common/theme/win/priority-display.css
diff --git a/theme/win/progress_panel.css b/common/theme/win/progress_panel.css
similarity index 100%
rename from theme/win/progress_panel.css
rename to common/theme/win/progress_panel.css
diff --git a/theme/win/sharedCalendarParser.css b/common/theme/win/sharedCalendarParser.css
similarity index 100%
rename from theme/win/sharedCalendarParser.css
rename to common/theme/win/sharedCalendarParser.css
diff --git a/theme/winaero/addressingWidgetOverlay.css b/common/theme/winaero/addressingWidgetOverlay.css
similarity index 100%
rename from theme/winaero/addressingWidgetOverlay.css
rename to common/theme/winaero/addressingWidgetOverlay.css
diff --git a/theme/winaero/attachments-view.css b/common/theme/winaero/attachments-view.css
similarity index 100%
rename from theme/winaero/attachments-view.css
rename to common/theme/winaero/attachments-view.css
diff --git a/theme/winaero/browseFolder.css b/common/theme/winaero/browseFolder.css
similarity index 100%
rename from theme/winaero/browseFolder.css
rename to common/theme/winaero/browseFolder.css
diff --git a/theme/winaero/calendar-calendars-list.css b/common/theme/winaero/calendar-calendars-list.css
similarity index 100%
rename from theme/winaero/calendar-calendars-list.css
rename to common/theme/winaero/calendar-calendars-list.css
diff --git a/theme/winaero/calendar-event-dialog-attendees.css b/common/theme/winaero/calendar-event-dialog-attendees.css
similarity index 100%
rename from theme/winaero/calendar-event-dialog-attendees.css
rename to common/theme/winaero/calendar-event-dialog-attendees.css
diff --git a/theme/winaero/calendar-summary-dialog.css b/common/theme/winaero/calendar-summary-dialog.css
similarity index 100%
rename from theme/winaero/calendar-summary-dialog.css
rename to common/theme/winaero/calendar-summary-dialog.css
diff --git a/theme/winaero/delegateCalendar.css b/common/theme/winaero/delegateCalendar.css
similarity index 100%
rename from theme/winaero/delegateCalendar.css
rename to common/theme/winaero/delegateCalendar.css
diff --git a/theme/winaero/exchWebServiceEditor.css b/common/theme/winaero/exchWebServiceEditor.css
similarity index 100%
rename from theme/winaero/exchWebServiceEditor.css
rename to common/theme/winaero/exchWebServiceEditor.css
diff --git a/theme/winaero/extras-preferences.css b/common/theme/winaero/extras-preferences.css
similarity index 100%
rename from theme/winaero/extras-preferences.css
rename to common/theme/winaero/extras-preferences.css
diff --git a/theme/winaero/invite-style.css b/common/theme/winaero/invite-style.css
similarity index 100%
rename from theme/winaero/invite-style.css
rename to common/theme/winaero/invite-style.css
diff --git a/theme/winaero/itemBodyEditor.css b/common/theme/winaero/itemBodyEditor.css
similarity index 100%
rename from theme/winaero/itemBodyEditor.css
rename to common/theme/winaero/itemBodyEditor.css
diff --git a/theme/winaero/manageEWSAccounts.css b/common/theme/winaero/manageEWSAccounts.css
similarity index 100%
rename from theme/winaero/manageEWSAccounts.css
rename to common/theme/winaero/manageEWSAccounts.css
diff --git a/theme/winaero/oofSettings.css b/common/theme/winaero/oofSettings.css
similarity index 100%
rename from theme/winaero/oofSettings.css
rename to common/theme/winaero/oofSettings.css
diff --git a/theme/winaero/preferences.css b/common/theme/winaero/preferences.css
similarity index 100%
rename from theme/winaero/preferences.css
rename to common/theme/winaero/preferences.css
diff --git a/theme/winaero/priority-display.css b/common/theme/winaero/priority-display.css
similarity index 100%
rename from theme/winaero/priority-display.css
rename to common/theme/winaero/priority-display.css
diff --git a/theme/winaero/progress_panel.css b/common/theme/winaero/progress_panel.css
similarity index 100%
rename from theme/winaero/progress_panel.css
rename to common/theme/winaero/progress_panel.css
diff --git a/theme/winaero/sharedCalendarParser.css b/common/theme/winaero/sharedCalendarParser.css
similarity index 100%
rename from theme/winaero/sharedCalendarParser.css
rename to common/theme/winaero/sharedCalendarParser.css

From 04e49c628c72528a02869eb054b7551faa42d61b Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 22:21:13 +0100
Subject: [PATCH 177/222] update namespace

---
 calendar/content/delegateCalendar.js         | 8 ++++----
 calendar/exchangeapi/erFindOccurrences.js    | 2 +-
 calendar/exchangeapi/erGetOccurrenceIndex.js | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/calendar/content/delegateCalendar.js b/calendar/content/delegateCalendar.js
index aa6254ab..8745421e 100644
--- a/calendar/content/delegateCalendar.js
+++ b/calendar/content/delegateCalendar.js
@@ -16,10 +16,10 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/erFindFolder.js");
 
-Cu.import("resource://exchangecalendar/erGetDelegateRequest.js");
-Cu.import("resource://exchangecalendar/erAddDelegateRequest.js");
-Cu.import("resource://exchangecalendar/erRemoveDelegateRequest.js");
-Cu.import("resource://exchangecalendar/erUpdateDelegateRequest.js");
+Cu.import("resource://exchangecalendartask/erGetDelegateRequest.js");
+Cu.import("resource://exchangecalendartask/erAddDelegateRequest.js");
+Cu.import("resource://exchangecalendartask/erRemoveDelegateRequest.js");
+Cu.import("resource://exchangecalendartask/erUpdateDelegateRequest.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
diff --git a/calendar/exchangeapi/erFindOccurrences.js b/calendar/exchangeapi/erFindOccurrences.js
index 916e7f6e..16b28c7c 100644
--- a/calendar/exchangeapi/erFindOccurrences.js
+++ b/calendar/exchangeapi/erFindOccurrences.js
@@ -48,7 +48,7 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/soapFunctions.js");
 
-Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
+Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erGetOccurrenceIndex.js b/calendar/exchangeapi/erGetOccurrenceIndex.js
index 99e92360..a6e4c9ee 100644
--- a/calendar/exchangeapi/erGetOccurrenceIndex.js
+++ b/calendar/exchangeapi/erGetOccurrenceIndex.js
@@ -48,7 +48,7 @@ Cu.import("resource://exchangecalendar/ecFunctions.js");
 Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 Cu.import("resource://exchangecalendar/soapFunctions.js");
 
-Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
+Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
 
 var EXPORTED_SYMBOLS = ["erGetOccurrenceIndexRequest"];
 

From 0c51a4028dfeb0e49c938a6f4c50f6fd5c4c5e67 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 22:30:41 +0100
Subject: [PATCH 178/222] namespace update for chrome://

---
 calendar/content/calendar-calendars-list.xul         | 2 +-
 calendar/content/calendar-common-sets.xul            | 2 +-
 calendar/content/calendar-event-dialog-attendees.xul | 2 +-
 calendar/content/calendar-event-dialog-reminder.xul  | 2 +-
 calendar/content/calendar-event-dialog.xul           | 2 +-
 calendar/content/calendar-properties-dialog.xul      | 2 +-
 calendar/content/calendar-summary-dialog.xul         | 2 +-
 calendar/content/calendar-task-view.xul              | 2 +-
 calendar/content/delegateCalendar.xul                | 2 +-
 calendar/content/lightning-item-iframe.xul           | 2 +-
 calendar/content/messenger_task_delegation.xul       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/calendar/content/calendar-calendars-list.xul b/calendar/content/calendar-calendars-list.xul
index 472b4506..926d5e92 100644
--- a/calendar/content/calendar-calendars-list.xul
+++ b/calendar/content/calendar-calendars-list.xul
@@ -43,7 +43,7 @@ overlay SYSTEM "chrome://exchangecalendar/locale/calendar-calendars-list.dtd">
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-calendars-list.js" />
+            src="chrome://exchangecalendartask/content/calendar-calendars-list.js" />
     <commandset id="calendar_commands">
         <command id="exchWebService_convert_calendar_command"
                  oncommand="tmpCalPopUpMenu.convertSettings()" />
diff --git a/calendar/content/calendar-common-sets.xul b/calendar/content/calendar-common-sets.xul
index 0e92a3e0..3e02e3f0 100644
--- a/calendar/content/calendar-common-sets.xul
+++ b/calendar/content/calendar-common-sets.xul
@@ -44,7 +44,7 @@
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-common-sets.js" />
+            src="chrome://exchangecalendartask/content/calendar-common-sets.js" />
     <commandset id="calendar_commands"
                 commandupdater="true"
                 events="calendar_commands"
diff --git a/calendar/content/calendar-event-dialog-attendees.xul b/calendar/content/calendar-event-dialog-attendees.xul
index ee77850b..9d3e8727 100644
--- a/calendar/content/calendar-event-dialog-attendees.xul
+++ b/calendar/content/calendar-event-dialog-attendees.xul
@@ -40,5 +40,5 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-event-dialog-attendees.js" />
+            src="chrome://exchangecalendartask/content/calendar-event-dialog-attendees.js" />
 </overlay>
diff --git a/calendar/content/calendar-event-dialog-reminder.xul b/calendar/content/calendar-event-dialog-reminder.xul
index 7f4188e3..6e0f9606 100644
--- a/calendar/content/calendar-event-dialog-reminder.xul
+++ b/calendar/content/calendar-event-dialog-reminder.xul
@@ -45,7 +45,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-event-dialog-reminder.js" />
+            src="chrome://exchangecalendartask/content/calendar-event-dialog-reminder.js" />
     <button id="reminder-new-button"
             oncommand="tmpChangeCalendarPropertiesReminder.onNewReminder();" />
     <vbox id="reminder-relation-radiogroup">
diff --git a/calendar/content/calendar-event-dialog.xul b/calendar/content/calendar-event-dialog.xul
index be9824b8..1ce589e3 100644
--- a/calendar/content/calendar-event-dialog.xul
+++ b/calendar/content/calendar-event-dialog.xul
@@ -13,7 +13,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-event-dialog.js" />
+            src="chrome://exchangecalendartask/content/calendar-event-dialog.js" />
     <!-- Commands -->
     <commandset id="itemCommands">
         <command id="exchWebService_addAttachmentDialog"
diff --git a/calendar/content/calendar-properties-dialog.xul b/calendar/content/calendar-properties-dialog.xul
index 8ac1a7c0..61b114c5 100644
--- a/calendar/content/calendar-properties-dialog.xul
+++ b/calendar/content/calendar-properties-dialog.xul
@@ -40,7 +40,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-properties-dialog.js" />
+            src="chrome://exchangecalendartask/content/calendar-properties-dialog.js" />
     <rows id="calendar-properties-rows">
         <row id="exchange-cache-row"
              align="center">
diff --git a/calendar/content/calendar-summary-dialog.xul b/calendar/content/calendar-summary-dialog.xul
index 1398bc2f..83009f2c 100644
--- a/calendar/content/calendar-summary-dialog.xul
+++ b/calendar/content/calendar-summary-dialog.xul
@@ -51,7 +51,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
         <script type="application/javascript"
-                src="chrome://exchangecalendar/content/calendar-summary-dialog.js" />
+                src="chrome://exchangecalendartask/content/calendar-summary-dialog.js" />
         <box id="item-general-box"
              orient="vertical">
             <box orient="horizontal">
diff --git a/calendar/content/calendar-task-view.xul b/calendar/content/calendar-task-view.xul
index df442a2e..f71bda16 100644
--- a/calendar/content/calendar-task-view.xul
+++ b/calendar/content/calendar-task-view.xul
@@ -42,7 +42,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/calendar-task-view.js" />
+            src="chrome://exchangecalendartask/content/calendar-task-view.js" />
     <!-- Commands -->
     <commandset id="mailCommands">
         <command id="exchWebService_openAttachment"
diff --git a/calendar/content/delegateCalendar.xul b/calendar/content/delegateCalendar.xul
index 0c493e48..a5d931c1 100644
--- a/calendar/content/delegateCalendar.xul
+++ b/calendar/content/delegateCalendar.xul
@@ -23,7 +23,7 @@
     <script type="application/x-javascript"
             src="chrome://exchangecalendar/content/adutils.js" />
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/delegateCalendar.js" />
+            src="chrome://exchangecalendartask/content/delegateCalendar.js" />
     <tabbox id="myTabList"
             flex="1"
             width="600"
diff --git a/calendar/content/lightning-item-iframe.xul b/calendar/content/lightning-item-iframe.xul
index b798d33e..8c6551d9 100644
--- a/calendar/content/lightning-item-iframe.xul
+++ b/calendar/content/lightning-item-iframe.xul
@@ -49,7 +49,7 @@
 
     <!-- Manage special Exchange items and provide attendee speicific dialog -->
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/lightning-item-iframe.js" />
+            src="chrome://exchangecalendartask/content/lightning-item-iframe.js" />
     <!-- These rows correspond to the full form under the toolbar -->
     <rows id="event-grid-rows">
         <!-- If the current element is a Task and is an Exchange one, add a label to show the current owner of the task. -->
diff --git a/calendar/content/messenger_task_delegation.xul b/calendar/content/messenger_task_delegation.xul
index 8a9a6000..06f62e8c 100644
--- a/calendar/content/messenger_task_delegation.xul
+++ b/calendar/content/messenger_task_delegation.xul
@@ -36,7 +36,7 @@ overlay SYSTEM "chrome://exchangecalendar/locale/messenger_task_delegation.dtd">
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/messenger_task_delegation.js" />
+            src="chrome://exchangecalendartask/content/messenger_task_delegation.js" />
     <rows id="calendar-task-details-rows">
         <row id="exchWebService-task-delegation-owner"
              align="end">

From 86793aca3e6e67158c84a7da93f78cb105e9be02 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 22:38:31 +0100
Subject: [PATCH 179/222] still namespace update

---
 {common => calendar}/content/calendar-list-tree.xml     | 0
 calendar/content/ecCalendarCreation.xul                 | 2 +-
 common/theme/common/calendar-calendars-list.css         | 2 +-
 common/theme/common/calendar-event-dialog-attendees.css | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {common => calendar}/content/calendar-list-tree.xml (100%)

diff --git a/common/content/calendar-list-tree.xml b/calendar/content/calendar-list-tree.xml
similarity index 100%
rename from common/content/calendar-list-tree.xml
rename to calendar/content/calendar-list-tree.xml
diff --git a/calendar/content/ecCalendarCreation.xul b/calendar/content/ecCalendarCreation.xul
index 467e423a..87194e89 100644
--- a/calendar/content/ecCalendarCreation.xul
+++ b/calendar/content/ecCalendarCreation.xul
@@ -47,7 +47,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/ecCalendarCreation.js" />
+            src="chrome://exchangecalendartask/content/ecCalendarCreation.js" />
     <script type="application/javascript"
             src="chrome://gdata-provider/content/gdata-calendar-creation.js" />
     <radiogroup id="calendar-format"
diff --git a/common/theme/common/calendar-calendars-list.css b/common/theme/common/calendar-calendars-list.css
index cd844486..c2b58768 100644
--- a/common/theme/common/calendar-calendars-list.css
+++ b/common/theme/common/calendar-calendars-list.css
@@ -9,5 +9,5 @@ calendar-list-tree > tree > treechildren::-moz-tree-image(exchange-status-treeco
 }
 
 calendar-list-tree[type="exchange"] {
-	-moz-binding: url(chrome://exchangecalendar/content/calendar-list-tree.xml#exchange-calendar-list-tree);
+	-moz-binding: url(chrome://exchangecalendartask/content/calendar-list-tree.xml#exchange-calendar-list-tree);
 }
diff --git a/common/theme/common/calendar-event-dialog-attendees.css b/common/theme/common/calendar-event-dialog-attendees.css
index 88bbc8cb..c0b5f2a5 100644
--- a/common/theme/common/calendar-event-dialog-attendees.css
+++ b/common/theme/common/calendar-event-dialog-attendees.css
@@ -36,6 +36,6 @@
 @import url(chrome://global/skin/);
 
 attendees-list {
-	-moz-binding: url(chrome://exchangecalendar/content/calendar-event-dialog-attendees.xml#attendees-list);
+	-moz-binding: url(chrome://exchangecalendartask/content/calendar-event-dialog-attendees.xml#attendees-list);
 	-moz-user-focus: normal;
 }

From 1048c383fab8ba7b7f244c77d400a179dcb667d2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Thu, 25 Jan 2018 22:54:21 +0100
Subject: [PATCH 180/222] fix chrome.manifest

---
 chrome.manifest | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index c9d32e85..ae7771ee 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -6,7 +6,7 @@ skin exchangecalendar fugue common/winaero/ os=WINNT osversion>=6
 skin exchangecalendar fugue common/mac/ os=Darwin
 skin exchangecalendar-common fugue common/common/
 
-resource exchangecalendar common/exchangeapi
+resource exchangecalendar common/exchangeapi/
 resource interfaces common/interface/
 
 
@@ -58,12 +58,11 @@ manifest common/interface/exchangeLoadBalancer/mivExchangeLoadBalancer.manifest
 manifest common/interface/exchangeAuthPromptProvider/mivExchangeAuthPromptProvider.manifest
 manifest common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.manifest
 
-manifest common/interface/exchangecalendarItem/mivexchangecalendarItem.manifest
+manifest common/interface/exchangeBaseItem/mivExchangeBaseItem.manifest
 
 manifest addressbook/exchangeAddressBook.manifest
 
 manifest calendar/exchangeCalendar.manifest
 
-manifest common/interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 manifest common/interface/exchangeLightningNotifier/mivExchangeLightningNotifier.manifest
 

From 36159a57d0b13641152a9018eab37d832ef7212a Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 11:39:00 -0800
Subject: [PATCH 181/222] Create install.rdf from a template

This avoids modifying source-controlled files from build.  This also
avoids use of nonstandard -i option (whose backup-less form differs
between the GNU version and the BSD/macOS version).
---
 .gitignore                          | 1 +
 Makefile                            | 9 +++++----
 install.rdf => install.rdf.template | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 rename install.rdf => install.rdf.template (98%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..7510c97d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/install.rdf
diff --git a/Makefile b/Makefile
index 94c2b398..dee6c6c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,17 @@
 version = $(shell cat VERSION)
-excludefromxpi = .git/\* .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION
+excludefromxpi = .git/\* .gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
 releasebranch = ec-4.0
 
 # Default target is build package
-build:
-	# Update version number inside install.rdf file from VERSION file
-	sed -i 's/\(\s*\)<em:version>[^<]*\?<\/em:version>/\1<em:version>$(version)<\/em:version>/' install.rdf
+build: install.rdf
 	# Disable automatic updates of the extension
 	cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
 	# Finally, create the xpi file
 	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
 
+install.rdf: install.rdf.template
+	sed 's/@VERSION@/$(version)/g' install.rdf.template > install.rdf
+
 # Target to publish a new release:
 release: l10n-auto-commit build
 	git add -- install.rdf
diff --git a/install.rdf b/install.rdf.template
similarity index 98%
rename from install.rdf
rename to install.rdf.template
index cb2dc3d2..f3cb0cd1 100644
--- a/install.rdf
+++ b/install.rdf.template
@@ -3,7 +3,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
     <Description about="urn:mozilla:install-manifest">
         <em:id>exchangecalendar@extensions.1st-setup.nl</em:id>
-        <em:version>4.0.0-beta5</em:version>
+        <em:version>@VERSION@</em:version>
         <em:targetApplication>
             <Description>
                 <!-- Thunderbird -->

From a6601385cd41b0c251e06b8561ac38394fd8bbe6 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 11:44:00 -0800
Subject: [PATCH 182/222] .gitignore the build output

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7510c97d..1ee23e6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /install.rdf
+/exchangecalendar-v*.xpi

From 4be1e78b1ef74889f6f2e71fff1d4a0380207a1c Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 11:51:19 -0800
Subject: [PATCH 183/222] Declare task targets as .PHONY

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index dee6c6c0..a32e3906 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ version = $(shell cat VERSION)
 excludefromxpi = .git/\* .gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
 releasebranch = ec-4.0
 
+.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js
+
 # Default target is build package
 build: install.rdf
 	# Disable automatic updates of the extension

From dedddbc04b4567b1be071eba67d3085f3f15324f Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 11:55:29 -0800
Subject: [PATCH 184/222] Create update.js upon build time

The source is one of the two update_*.txt files.  Create
unconditionally, because the $(update) value may change from time to
time and there is no way to determine if it has changed.
---
 Makefile                        | 12 +++++++-----
 defaults/preferences/.gitignore |  1 +
 defaults/preferences/update.js  |  1 -
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 defaults/preferences/.gitignore
 delete mode 100644 defaults/preferences/update.js

diff --git a/Makefile b/Makefile
index a32e3906..cfe2a248 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,21 @@
 version = $(shell cat VERSION)
-excludefromxpi = .git/\* .gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
+excludefromxpi = .git/\* .gitignore \*/.gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
 releasebranch = ec-4.0
+update = disable
 
-.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js
+.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js
 
 # Default target is build package
-build: install.rdf
-	# Disable automatic updates of the extension
-	cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
+build: install.rdf defaults/preferences/update.js
 	# Finally, create the xpi file
 	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
 
 install.rdf: install.rdf.template
 	sed 's/@VERSION@/$(version)/g' install.rdf.template > install.rdf
 
+defaults/preferences/update.js:
+	cp defaults/preferences/update_$(update).txt defaults/preferences/update.js
+
 # Target to publish a new release:
 release: l10n-auto-commit build
 	git add -- install.rdf
diff --git a/defaults/preferences/.gitignore b/defaults/preferences/.gitignore
new file mode 100644
index 00000000..42e79b56
--- /dev/null
+++ b/defaults/preferences/.gitignore
@@ -0,0 +1 @@
+/update.js
diff --git a/defaults/preferences/update.js b/defaults/preferences/update.js
deleted file mode 100644
index 1fc5400b..00000000
--- a/defaults/preferences/update.js
+++ /dev/null
@@ -1 +0,0 @@
-user_pref("extensions.1st-setup.others.updateRequired", true);

From 293f410d2a77f3fa251e5bd4e664c077d2f9a4c9 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:09:37 -0800
Subject: [PATCH 185/222] Factor XPI filename into $(xpi)

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cfe2a248..38279678 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,14 @@ version = $(shell cat VERSION)
 excludefromxpi = .git/\* .gitignore \*/.gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
 releasebranch = ec-4.0
 update = disable
+xpi = exchangecalendar-v$(version).xpi
 
 .PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js
 
 # Default target is build package
 build: install.rdf defaults/preferences/update.js
 	# Finally, create the xpi file
-	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
+	zip -r $(xpi) -x $(excludefromxpi) -- . 
 
 install.rdf: install.rdf.template
 	sed 's/@VERSION@/$(version)/g' install.rdf.template > install.rdf

From 701c44707fa55015a571306ddb53c0458167cd33 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:11:34 -0800
Subject: [PATCH 186/222] Convert $(xpi) into a real make target

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 38279678..57140636 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,12 @@ releasebranch = ec-4.0
 update = disable
 xpi = exchangecalendar-v$(version).xpi
 
-.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js
+.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js $(xpi)
 
 # Default target is build package
-build: install.rdf defaults/preferences/update.js
-	# Finally, create the xpi file
+build: $(xpi)
+
+$(xpi): install.rdf defaults/preferences/update.js
 	zip -r $(xpi) -x $(excludefromxpi) -- . 
 
 install.rdf: install.rdf.template

From 273e4efabf7a518231518b7ee978d3f6e35d1be5 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:18:23 -0800
Subject: [PATCH 187/222] Use $< and $@ for current rule's source/target

This is to avoid repetition and, in turn, copy-and-paste glitches later.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 57140636..9d2f0126 100644
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,13 @@ xpi = exchangecalendar-v$(version).xpi
 build: $(xpi)
 
 $(xpi): install.rdf defaults/preferences/update.js
-	zip -r $(xpi) -x $(excludefromxpi) -- . 
+	zip -r $@ -x $(excludefromxpi) -- .
 
 install.rdf: install.rdf.template
-	sed 's/@VERSION@/$(version)/g' install.rdf.template > install.rdf
+	sed 's/@VERSION@/$(version)/g' $< > $@
 
 defaults/preferences/update.js:
-	cp defaults/preferences/update_$(update).txt defaults/preferences/update.js
+	cp defaults/preferences/update_$(update).txt $@
 
 # Target to publish a new release:
 release: l10n-auto-commit build

From 40833048e60ec5ccd625bfc2141a17e8b20f2836 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:20:07 -0800
Subject: [PATCH 188/222] Always recreate the XPI from scratch

Without this, if make were re-run after removing a source file from the
repository, the removed file would not be retired out of the XPI file,
causing confusion.
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 9d2f0126..0be4eb1a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ xpi = exchangecalendar-v$(version).xpi
 build: $(xpi)
 
 $(xpi): install.rdf defaults/preferences/update.js
+	rm -f $@
 	zip -r $@ -x $(excludefromxpi) -- .
 
 install.rdf: install.rdf.template

From 2a4adeb1b1c18c04218b6d7efc7e5effb305ecec Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:26:48 -0800
Subject: [PATCH 189/222] Do not add install.rdf at release time

This is because install.rdf is no longer source-controlled.
---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0be4eb1a..9ec74c7a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,6 @@ defaults/preferences/update.js:
 
 # Target to publish a new release:
 release: l10n-auto-commit build
-	git add -- install.rdf
-	git commit -m "releases v$(version)"
 	git tag "v$(version)"
 	@echo 'Translations updated, build done, tag added.'
 	@echo 'Now, if the release is well done, please run one "git push" to publish code and one "git push v$(version)" to publish the new tag.'

From 34f1956ad4212117304b0e34653b2e1771af4695 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:30:12 -0800
Subject: [PATCH 190/222] Beautify install.rdf.template

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9ec74c7a..5486b29b 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ beautify-xml:
 		--strict-tags-attributes no --write-back yes \
 		{} \;
 	# For rdf files, we don't want to wrap lines to keep em:description on one line.
-	find -name "*.rdf" -exec \
+	find \( -name "*.rdf" -o -name "*.rdf.template" \) -exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes --wrap 0 \

From b11f1809fd33f51202f7e7de97d5118c60b9fe39 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Fri, 26 Jan 2018 12:34:39 -0800
Subject: [PATCH 191/222] Explicitly give current directory to find(1)

Taking the current directory when no path is given is a GNU extension
and breaks macOS builds.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5486b29b..0d897892 100644
--- a/Makefile
+++ b/Makefile
@@ -50,19 +50,19 @@ dev: beautify build
 beautify: beautify-xml beautify-js
 
 beautify-xml:
-	find \( -name "*.xml" -o -name "*.xul" \) -exec \
+	find . \( -name "*.xml" -o -name "*.xul" \) -exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes \
 		{} \;
 	# For rdf files, we don't want to wrap lines to keep em:description on one line.
-	find \( -name "*.rdf" -o -name "*.rdf.template" \) -exec \
+	find . \( -name "*.rdf" -o -name "*.rdf.template" \) -exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes --wrap 0 \
 		{} \;
 beautify-js:
-	find -name "*.js" -exec \
+	find . -name "*.js" -exec \
 		js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \
 		--operator-position after-newline --brace-style end-expand --replace \
 		--end-with-newline \

From bf4fb0cc6901c0191449bc93207294124fb16809 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 27 Jan 2018 20:17:25 +0100
Subject: [PATCH 192/222] fixup chrome.manifest

---
 chrome.manifest | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index ae7771ee..f70a8dec 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,10 +1,10 @@
 content exchangecalendar common/content/
 
-skin exchangecalendar fugue common/unix/
-skin exchangecalendar fugue common/win/ os=WINNT
-skin exchangecalendar fugue common/winaero/ os=WINNT osversion>=6
-skin exchangecalendar fugue common/mac/ os=Darwin
-skin exchangecalendar-common fugue common/common/
+skin exchangecalendar fugue common/theme/unix/
+skin exchangecalendar fugue common/theme/win/ os=WINNT
+skin exchangecalendar fugue common/theme/winaero/ os=WINNT osversion>=6
+skin exchangecalendar fugue common/theme/mac/ os=Darwin
+skin exchangecalendar-common fugue common/theme/common/
 
 resource exchangecalendar common/exchangeapi/
 resource interfaces common/interface/

From ccca0f7c2eb7d5e39828bddae9f5c3ada7e613d0 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 27 Jan 2018 20:33:19 +0100
Subject: [PATCH 193/222] exchancalendar task: add interfaces namespace

---
 calendar/exchangeCalendar.manifest                         | 1 +
 calendar/interface/exchangeCalendar/mivExchangeCalendar.js | 4 ++--
 common/interface/exchangeBaseItem/mivExchangeBaseItem.js   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/calendar/exchangeCalendar.manifest b/calendar/exchangeCalendar.manifest
index b4fd5ad7..f90d3e75 100644
--- a/calendar/exchangeCalendar.manifest
+++ b/calendar/exchangeCalendar.manifest
@@ -1,6 +1,7 @@
 content exchangecalendartask content/
 
 resource exchangecalendartask exchangeapi/
+resource interfacescalendartask interface/
 
 overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendartask/content/ecCalendarCreation.xul
 overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendartask/content/calendar-properties-dialog.xul
diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index 921cfc1d..5442b1a8 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -83,8 +83,8 @@ Cu.import("resource://exchangecalendartask/erDeleteAttachment.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
-Cu.import("resource://interfaces/exchangeTodo/mivExchangeTodo.js");
-Cu.import("resource://interfaces/exchangeEvent/mivExchangeEvent.js");
+Cu.import("resource://interfacescalendartask/exchangeTodo/mivExchangeTodo.js");
+Cu.import("resource://interfacescalendartask/exchangeEvent/mivExchangeEvent.js");
 
 var globalStart = new Date().getTime();
 
diff --git a/common/interface/exchangeBaseItem/mivExchangeBaseItem.js b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
index 922d567b..0ba8eefb 100644
--- a/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
+++ b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
@@ -31,7 +31,7 @@ Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
-Cu.import("resource://interfaces/exchangeAttendee/mivExchangeAttendee.js");
+Cu.import("resource://interfacescalendartask/exchangeAttendee/mivExchangeAttendee.js");
 
 Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
 

From 9a0ed57d64dea21e62e6a313a204bb6d83e46cb7 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 27 Jan 2018 20:45:07 +0100
Subject: [PATCH 194/222] replace exchangecalendar namespace by exchangecommon

---
 addressbook/content/abCardOverlay.js          |  4 +-
 addressbook/content/addressbookOverlay.js     |  4 +-
 .../content/exchangeContactSettings.xul       |  2 +-
 addressbook/exchangeapi/erExpandDL.js         |  6 +-
 addressbook/exchangeapi/erFindContacts.js     |  6 +-
 addressbook/exchangeapi/erGetContacts.js      |  6 +-
 addressbook/exchangeapi/erResolveNames.js     |  6 +-
 .../exchangeapi/erSyncContactsFolder.js       |  6 +-
 .../exchangeapi/exchangeAbFunctions.js        |  2 +-
 .../exchangeAbDirFactory.js                   |  2 +-
 .../exchangeAbDistListDirectory.js            |  4 +-
 .../exchangeAbFolderDirectory.js              |  4 +-
 .../exchangeAbRootDirectory.js                |  4 +-
 .../mivExchangeAutoCompleteResult.js          |  2 +-
 calendar/content/calendar-calendars-list.js   |  6 +-
 calendar/content/calendar-calendars-list.xul  |  4 +-
 calendar/content/calendar-common-sets.js      |  8 +-
 .../calendar-event-dialog-attendees.xul       |  2 +-
 .../calendar-event-dialog-reminder.xul        |  2 +-
 calendar/content/calendar-event-dialog.xul    |  4 +-
 calendar/content/calendar-summary-dialog.js   |  6 +-
 calendar/content/calendar-summary-dialog.xul  |  6 +-
 calendar/content/calendar-task-view.js        |  2 +-
 calendar/content/calendar-task-view.xul       |  4 +-
 calendar/content/delegateCalendar.js          |  6 +-
 calendar/content/delegateCalendar.xul         |  8 +-
 calendar/content/ecCalendarCreation.xul       |  4 +-
 calendar/content/lightning-item-iframe.xul    |  8 +-
 calendar/content/messenger_task_delegation.js |  2 +-
 .../content/messenger_task_delegation.xul     |  2 +-
 calendar/exchangeapi/erAddDelegateRequest.js  |  6 +-
 calendar/exchangeapi/erCreateAttachment.js    |  6 +-
 calendar/exchangeapi/erDeleteAttachment.js    |  6 +-
 calendar/exchangeapi/erFindCalendarItems.js   |  6 +-
 calendar/exchangeapi/erFindFollowupItems.js   |  6 +-
 .../exchangeapi/erFindMasterOccurrences.js    |  6 +-
 calendar/exchangeapi/erFindOccurrences.js     |  6 +-
 calendar/exchangeapi/erFindTaskItems.js       |  6 +-
 calendar/exchangeapi/erGetDelegateRequest.js  |  6 +-
 .../exchangeapi/erGetMasterOccurrenceId.js    |  6 +-
 .../exchangeapi/erGetMeetingRequestByUID.js   |  6 +-
 calendar/exchangeapi/erGetOccurrenceIndex.js  |  6 +-
 calendar/exchangeapi/erGetTimeZones.js        |  4 +-
 .../exchangeapi/erRemoveDelegateRequest.js    |  6 +-
 calendar/exchangeapi/erSendMeetingRespons.js  |  6 +-
 calendar/exchangeapi/erSyncInbox.js           |  6 +-
 .../exchangeapi/erUpdateDelegateRequest.js    |  6 +-
 .../exchangeCalendar/mivExchangeCalendar.js   | 30 ++++----
 .../exchangeEvent/mivExchangeEvent.js         |  2 +-
 .../interface/exchangeTodo/mivExchangeTodo.js |  2 +-
 chrome.manifest                               | 74 +++++++++----------
 common/content/OutOfOfficeMenu.js             |  4 +-
 common/content/OutOfOfficeMenu.xul            |  2 +-
 common/content/addressingWidgetOverlay.xul    |  4 +-
 common/content/attachments-view.js            |  6 +-
 common/content/attachments-view.xul           |  6 +-
 common/content/browseFolder.js                | 24 +++---
 common/content/browseFolder.xul               |  6 +-
 common/content/cachePreferences.xul           |  4 +-
 common/content/check4lightning.xul            |  2 +-
 common/content/debugPreferences.js            |  2 +-
 common/content/debugPreferences.xul           |  6 +-
 common/content/delegateFolder.js              | 12 +--
 common/content/exchangeCloneSettings.xul      |  6 +-
 common/content/exchangeSettings.js            |  2 +-
 common/content/exchangeSettings.xul           |  8 +-
 common/content/exchangeSettingsOverlay.js     | 18 ++---
 common/content/exchangeSettingsOverlay.xul    |  4 +-
 .../content/extra-messenger-preferences.xul   |  4 +-
 common/content/extra-suite-preferences.xul    |  4 +-
 common/content/folderPropsOverlay.xul         |  4 +-
 common/content/invitationResponse.js          |  2 +-
 common/content/invitationResponse.xul         |  4 +-
 common/content/invite-style.js                | 12 +--
 common/content/invite-style.xul               |  6 +-
 common/content/lightningtimezoneOverlay.js    |  2 +-
 common/content/lightningtimezoneOverlay.xul   |  2 +-
 common/content/manageEWSAccounts.js           | 10 +--
 common/content/manageEWSAccounts.xul          |  6 +-
 common/content/manageEWSAccountsMenu.js       |  4 +-
 common/content/manageEWSAccountsMenu.xul      |  4 +-
 .../content/messenger-overlay-preferences.xul |  4 +-
 common/content/oofSettings.js                 |  8 +-
 common/content/oofSettings.xul                |  8 +-
 common/content/otherPreferences.xul           |  6 +-
 common/content/preInvitationResponse.js       |  2 +-
 common/content/preInvitationResponse.xul      |  4 +-
 common/content/priority-display.xul           |  4 +-
 common/content/progress_panel.js              | 10 +--
 common/content/progress_panel.xul             |  4 +-
 common/content/selectEWSUrl.js                |  2 +-
 common/content/selectEWSUrl.xul               |  4 +-
 common/content/sendUpdateTo.js                |  2 +-
 common/content/sendUpdateTo.xul               |  4 +-
 common/content/sharedCalendarParser.js        |  4 +-
 common/content/sharedCalendarParser.xul       |  8 +-
 common/content/suite-overlay-preferences.xul  |  8 +-
 common/content/timezonePreference.js          |  2 +-
 common/content/timezonePreference.xul         |  4 +-
 common/exchangeapi/ecExchangeRequest.js       |  2 +-
 common/exchangeapi/erAutoDiscover.js          |  4 +-
 common/exchangeapi/erAutoDiscoverySOAP.js     |  4 +-
 common/exchangeapi/erBrowseFolder.js          |  6 +-
 common/exchangeapi/erConvertID.js             |  4 +-
 common/exchangeapi/erCreateItem.js            |  6 +-
 common/exchangeapi/erDeleteItem.js            |  6 +-
 common/exchangeapi/erFindFolder.js            |  6 +-
 common/exchangeapi/erFindInboxFolder.js       |  6 +-
 common/exchangeapi/erFindItems.js             |  6 +-
 common/exchangeapi/erForewardItem.js          |  6 +-
 common/exchangeapi/erGetAttachments.js        |  6 +-
 common/exchangeapi/erGetEvents.js             |  6 +-
 common/exchangeapi/erGetFolder.js             |  6 +-
 common/exchangeapi/erGetFolderPermission.js   |  6 +-
 common/exchangeapi/erGetItems.js              |  6 +-
 common/exchangeapi/erGetUserAvailability.js   |  6 +-
 common/exchangeapi/erGetUserOofSettings.js    |  6 +-
 common/exchangeapi/erPrimarySMTPCheck.js      |  6 +-
 common/exchangeapi/erSetUserOofSettings.js    |  6 +-
 common/exchangeapi/erSubscribe.js             |  6 +-
 common/exchangeapi/erSyncFolderItems.js       |  6 +-
 common/exchangeapi/erUnsubscribe.js           |  6 +-
 .../exchangeapi/erUpdateFolderPermission.js   |  6 +-
 common/exchangeapi/erUpdateItem.js            |  6 +-
 common/exchangeapi/soapFunctions.js           |  4 +-
 .../exchangeBaseItem/mivExchangeBaseItem.js   |  2 +-
 .../theme/common/addressingWidgetOverlay.css  |  2 +-
 common/theme/common/browseFolder.css          |  2 +-
 .../theme/common/calendar-calendars-list.css  |  4 +-
 common/theme/common/exchWebServiceEditor.css  | 32 ++++----
 common/theme/common/extras-preferences.css    |  2 +-
 common/theme/common/invite-style.css          |  2 +-
 common/theme/common/itemBodyEditor.css        |  2 +-
 common/theme/common/manageEWSAccounts.css     |  8 +-
 common/theme/common/oofSettings.css           |  2 +-
 common/theme/common/preferences.css           |  2 +-
 common/theme/common/priority-display.css      |  2 +-
 common/theme/common/progress_panel.css        |  4 +-
 common/theme/mac/addressingWidgetOverlay.css  |  2 +-
 common/theme/mac/browseFolder.css             |  2 +-
 common/theme/mac/calendar-calendars-list.css  |  2 +-
 .../mac/calendar-event-dialog-attendees.css   |  2 +-
 common/theme/mac/calendar-summary-dialog.css  |  2 +-
 common/theme/mac/delegateCalendar.css         |  2 +-
 common/theme/mac/exchWebServiceEditor.css     |  2 +-
 common/theme/mac/extras-preferences.css       |  2 +-
 common/theme/mac/invite-style.css             |  2 +-
 common/theme/mac/itemBodyEditor.css           |  2 +-
 common/theme/mac/manageEWSAccounts.css        |  2 +-
 common/theme/mac/oofSettings.css              |  2 +-
 common/theme/mac/preferences.css              |  2 +-
 common/theme/mac/priority-display.css         |  2 +-
 common/theme/mac/progress_panel.css           |  2 +-
 common/theme/mac/sharedCalendarParser.css     |  2 +-
 common/theme/unix/addressingWidgetOverlay.css |  2 +-
 common/theme/unix/browseFolder.css            |  2 +-
 common/theme/unix/calendar-calendars-list.css |  2 +-
 .../unix/calendar-event-dialog-attendees.css  |  2 +-
 common/theme/unix/calendar-summary-dialog.css |  2 +-
 common/theme/unix/delegateCalendar.css        |  2 +-
 common/theme/unix/exchWebServiceEditor.css    |  2 +-
 common/theme/unix/extras-preferences.css      |  2 +-
 common/theme/unix/invite-style.css            |  2 +-
 common/theme/unix/itemBodyEditor.css          |  2 +-
 common/theme/unix/manageEWSAccounts.css       |  2 +-
 common/theme/unix/oofSettings.css             |  2 +-
 common/theme/unix/preferences.css             |  2 +-
 common/theme/unix/priority-display.css        |  2 +-
 common/theme/unix/progress_panel.css          |  2 +-
 common/theme/unix/sharedCalendarParser.css    |  2 +-
 common/theme/win/addressingWidgetOverlay.css  |  2 +-
 common/theme/win/browseFolder.css             |  2 +-
 common/theme/win/calendar-calendars-list.css  |  2 +-
 .../win/calendar-event-dialog-attendees.css   |  2 +-
 common/theme/win/calendar-summary-dialog.css  |  2 +-
 common/theme/win/delegateCalendar.css         |  2 +-
 common/theme/win/exchWebServiceEditor.css     |  2 +-
 common/theme/win/extras-preferences.css       |  2 +-
 common/theme/win/invite-style.css             |  2 +-
 common/theme/win/itemBodyEditor.css           |  2 +-
 common/theme/win/manageEWSAccounts.css        |  2 +-
 common/theme/win/oofSettings.css              |  2 +-
 common/theme/win/preferences.css              |  2 +-
 common/theme/win/priority-display.css         |  2 +-
 common/theme/win/progress_panel.css           |  2 +-
 common/theme/win/sharedCalendarParser.css     |  2 +-
 .../theme/winaero/addressingWidgetOverlay.css |  2 +-
 common/theme/winaero/browseFolder.css         |  2 +-
 .../theme/winaero/calendar-calendars-list.css |  2 +-
 .../calendar-event-dialog-attendees.css       |  2 +-
 .../theme/winaero/calendar-summary-dialog.css |  2 +-
 common/theme/winaero/delegateCalendar.css     |  2 +-
 common/theme/winaero/exchWebServiceEditor.css |  2 +-
 common/theme/winaero/extras-preferences.css   |  2 +-
 common/theme/winaero/invite-style.css         |  2 +-
 common/theme/winaero/itemBodyEditor.css       |  2 +-
 common/theme/winaero/manageEWSAccounts.css    |  2 +-
 common/theme/winaero/oofSettings.css          |  2 +-
 common/theme/winaero/preferences.css          |  2 +-
 common/theme/winaero/priority-display.css     |  2 +-
 common/theme/winaero/progress_panel.css       |  2 +-
 common/theme/winaero/sharedCalendarParser.css |  2 +-
 defaults/preferences/debug.js                 |  8 +-
 .../preferences/extensions.extras.pref.js     |  8 +-
 emailtag/content/emailtag.js                  | 14 ++--
 install.rdf                                   |  2 +-
 206 files changed, 489 insertions(+), 489 deletions(-)

diff --git a/addressbook/content/abCardOverlay.js b/addressbook/content/abCardOverlay.js
index 92fd8e20..688565bf 100644
--- a/addressbook/content/abCardOverlay.js
+++ b/addressbook/content/abCardOverlay.js
@@ -31,9 +31,9 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource:///modules/mailServices.js");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
-Cu.import("resource://exchangecalendar/erGetAttachments.js");
+Cu.import("resource://exchangecommon/erGetAttachments.js");
 
 var photoHandlerInline = {
     onLoad: function _onLoad(aCard, aDocument) {
diff --git a/addressbook/content/addressbookOverlay.js b/addressbook/content/addressbookOverlay.js
index de9697c0..0e994a26 100644
--- a/addressbook/content/addressbookOverlay.js
+++ b/addressbook/content/addressbookOverlay.js
@@ -31,9 +31,9 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource:///modules/mailServices.js");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
-Cu.import("resource://exchangecalendar/erGetAttachments.js");
+Cu.import("resource://exchangecommon/erGetAttachments.js");
 
 function exchAddressbookOverlay(aDocument, aWindow) {
     this._document = aDocument;
diff --git a/addressbook/content/exchangeContactSettings.xul b/addressbook/content/exchangeContactSettings.xul
index e94b75d0..acd68b6d 100644
--- a/addressbook/content/exchangeContactSettings.xul
+++ b/addressbook/content/exchangeContactSettings.xul
@@ -28,7 +28,7 @@
 [
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecontacts/locale/exchangeContactSettings.dtd" > %dtd1;
 ]>
-<?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/exchangeSettingsOverlay.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_ContactSettings_dialog"
         title="Exchange Contact Settings"
diff --git a/addressbook/exchangeapi/erExpandDL.js b/addressbook/exchangeapi/erExpandDL.js
index 180e0c12..027cda53 100644
--- a/addressbook/exchangeapi/erExpandDL.js
+++ b/addressbook/exchangeapi/erExpandDL.js
@@ -29,9 +29,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erExpandDLRequest"];
 
diff --git a/addressbook/exchangeapi/erFindContacts.js b/addressbook/exchangeapi/erFindContacts.js
index 518b8049..5a387ffe 100644
--- a/addressbook/exchangeapi/erFindContacts.js
+++ b/addressbook/exchangeapi/erFindContacts.js
@@ -25,9 +25,9 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindContactsRequest"];
 
diff --git a/addressbook/exchangeapi/erGetContacts.js b/addressbook/exchangeapi/erGetContacts.js
index a63271f3..a435ff05 100644
--- a/addressbook/exchangeapi/erGetContacts.js
+++ b/addressbook/exchangeapi/erGetContacts.js
@@ -29,9 +29,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetContactsRequest"];
 
diff --git a/addressbook/exchangeapi/erResolveNames.js b/addressbook/exchangeapi/erResolveNames.js
index b4cd93da..45a614f0 100644
--- a/addressbook/exchangeapi/erResolveNames.js
+++ b/addressbook/exchangeapi/erResolveNames.js
@@ -29,9 +29,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erResolveNames"];
 
diff --git a/addressbook/exchangeapi/erSyncContactsFolder.js b/addressbook/exchangeapi/erSyncContactsFolder.js
index 9ddd8042..748345ff 100644
--- a/addressbook/exchangeapi/erSyncContactsFolder.js
+++ b/addressbook/exchangeapi/erSyncContactsFolder.js
@@ -29,9 +29,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSyncContactsFolderRequest"];
 
diff --git a/addressbook/exchangeapi/exchangeAbFunctions.js b/addressbook/exchangeapi/exchangeAbFunctions.js
index b7ce831f..fb06fd05 100644
--- a/addressbook/exchangeapi/exchangeAbFunctions.js
+++ b/addressbook/exchangeapi/exchangeAbFunctions.js
@@ -30,7 +30,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/iteratorUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = [];
 
diff --git a/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
index 79a93bd6..3e91c0b8 100644
--- a/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
+++ b/addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
@@ -31,7 +31,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
 
 
diff --git a/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
index d548ff87..bc0d4706 100644
--- a/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
+++ b/addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
@@ -29,8 +29,8 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
diff --git a/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
index d81e66a0..0e62bc1d 100644
--- a/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
+++ b/addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
@@ -29,8 +29,8 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
diff --git a/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
index 897bc22e..5679e5d3 100644
--- a/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
+++ b/addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
@@ -29,8 +29,8 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource:///modules/mailServices.js");
 Cu.import("resource:///modules/iteratorUtils.jsm");
diff --git a/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js b/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
index 7b0ba875..c4c8abce 100644
--- a/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
+++ b/addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
@@ -230,7 +230,7 @@ mivExchangeAutoCompleteResult.prototype = {
     //AString getImageAt(in long index);
     getImageAt: function _getImageAt(aIndex) {
         //dump("getImageAt: aIndex:"+aIndex+"\n");
-        return "chrome://exchangecalendar/content/exchange-addrbook.png";
+        return "chrome://exchangecommon/content/exchange-addrbook.png";
     },
 
     /**
diff --git a/calendar/content/calendar-calendars-list.js b/calendar/content/calendar-calendars-list.js
index d7b12f86..6b127f40 100644
--- a/calendar/content/calendar-calendars-list.js
+++ b/calendar/content/calendar-calendars-list.js
@@ -57,7 +57,7 @@ exchCalPopUpMenu.prototype = {
                 calendar: myCal,
                 answer: ""
             };
-            this._window.openDialog("chrome://exchangecalendar/content/exchangeSettings.xul",
+            this._window.openDialog("chrome://exchangecommon/content/exchangeSettings.xul",
                 "exchangeSettings",
                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
                 aResult);
@@ -72,7 +72,7 @@ exchCalPopUpMenu.prototype = {
                 calendar: myCal,
                 answer: ""
             };
-            this._window.openDialog("chrome://exchangecalendar/content/oofSettings.xul",
+            this._window.openDialog("chrome://exchangecommon/content/oofSettings.xul",
                 "oofSettings",
                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
                 aResult);
@@ -207,7 +207,7 @@ exchCalPopUpMenu.prototype = {
                 calendar: myCal,
                 answer: ""
             };
-            this._window.openDialog("chrome://exchangecalendar/content/exchangeCloneSettings.xul",
+            this._window.openDialog("chrome://exchangecommon/content/exchangeCloneSettings.xul",
                 "exchangeCloneSettings",
                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
                 aResult);
diff --git a/calendar/content/calendar-calendars-list.xul b/calendar/content/calendar-calendars-list.xul
index 926d5e92..5b61ce9c 100644
--- a/calendar/content/calendar-calendars-list.xul
+++ b/calendar/content/calendar-calendars-list.xul
@@ -36,9 +36,9 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-calendars-list.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/calendar-calendars-list.css"?>
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecalendar/locale/calendar-calendars-list.dtd">
+overlay SYSTEM "chrome://exchangecommon/locale/calendar-calendars-list.dtd">
 <overlay id="calendar-list-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/calendar/content/calendar-common-sets.js b/calendar/content/calendar-common-sets.js
index a9417bfa..6093f118 100644
--- a/calendar/content/calendar-common-sets.js
+++ b/calendar/content/calendar-common-sets.js
@@ -40,9 +40,9 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-//Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/erForewardItem.js");
+//Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/erForewardItem.js");
 
 
 //if (! exchWebService) var exchWebService = {};
@@ -105,7 +105,7 @@ exchForewardEvent.prototype = {
         if (aResp) {
             var title = "Forwarding Event";
             var msg = aResp;
-            var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+            var image = "chrome://exchangecommon-common/skin/images/notify-icon.png";
             var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
             getService(Components.interfaces.nsIWindowWatcher).
             openWindow(null, 'chrome://global/content/alerts/alert.xul',
diff --git a/calendar/content/calendar-event-dialog-attendees.xul b/calendar/content/calendar-event-dialog-attendees.xul
index 9d3e8727..990aaafc 100644
--- a/calendar/content/calendar-event-dialog-attendees.xul
+++ b/calendar/content/calendar-event-dialog-attendees.xul
@@ -35,7 +35,7 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-event-dialog-attendees.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/calendar-event-dialog-attendees.css"?>
 <overlay id="forwardOnRightClick"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/calendar/content/calendar-event-dialog-reminder.xul b/calendar/content/calendar-event-dialog-reminder.xul
index 6e0f9606..12f7aaaf 100644
--- a/calendar/content/calendar-event-dialog-reminder.xul
+++ b/calendar/content/calendar-event-dialog-reminder.xul
@@ -38,7 +38,7 @@
 -->
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeReminderDialog.dtd" > 
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/exchangeReminderDialog.dtd" > 
     %dtd1;
 ]>
 <overlay id="ecCalendarProperties.Reminder"
diff --git a/calendar/content/calendar-event-dialog.xul b/calendar/content/calendar-event-dialog.xul
index 1ce589e3..f74b8935 100644
--- a/calendar/content/calendar-event-dialog.xul
+++ b/calendar/content/calendar-event-dialog.xul
@@ -3,10 +3,10 @@
 [
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/attachments-view.dtd" >
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/attachments-view.dtd" >
     %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/attachments-view.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/attachments-view.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <overlay id="exchWebService-calendar-event-dialog"
diff --git a/calendar/content/calendar-summary-dialog.js b/calendar/content/calendar-summary-dialog.js
index cd144436..68b0f65b 100644
--- a/calendar/content/calendar-summary-dialog.js
+++ b/calendar/content/calendar-summary-dialog.js
@@ -40,9 +40,9 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/erForewardItem.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/erForewardItem.js");
 
 
 //if (! exchWebService) var exchWebService = {};
diff --git a/calendar/content/calendar-summary-dialog.xul b/calendar/content/calendar-summary-dialog.xul
index 83009f2c..9821dbee 100644
--- a/calendar/content/calendar-summary-dialog.xul
+++ b/calendar/content/calendar-summary-dialog.xul
@@ -30,15 +30,15 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-summary-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/calendar-summary-dialog.css"?>
 <!DOCTYPE dialog
 [
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
-        <!ENTITY % summaryDialogDTD SYSTEM "chrome://exchangecalendar/locale/calendar-summary-dialog.dtd">
+        <!ENTITY % summaryDialogDTD SYSTEM "chrome://exchangecommon/locale/calendar-summary-dialog.dtd">
     %summaryDialogDTD;
 ]>
-<?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/attachments-view.xul"?>
 <overlay id="exchWebService-calendar-summary-dialog"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/calendar/content/calendar-task-view.js b/calendar/content/calendar-task-view.js
index 5764c393..e868e8d9 100644
--- a/calendar/content/calendar-task-view.js
+++ b/calendar/content/calendar-task-view.js
@@ -7,7 +7,7 @@ var Cu = Components.utils;
 var Cr = Components.results;
 var components = Components;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource:///modules/gloda/public.js")
 Cu.import("resource:///modules/MailUtils.js");
 Cu.import("resource://calendar/modules/calUtils.jsm");
diff --git a/calendar/content/calendar-task-view.xul b/calendar/content/calendar-task-view.xul
index f71bda16..03febf70 100644
--- a/calendar/content/calendar-task-view.xul
+++ b/calendar/content/calendar-task-view.xul
@@ -35,8 +35,8 @@
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/calendar-task-view.css"?>
-<?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/calendar-task-view.css"?>
+<?xul-overlay href="chrome://exchangecommon/content/attachments-view.xul"?>
 <overlay id="calendar-task-view.xul"
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/calendar/content/delegateCalendar.js b/calendar/content/delegateCalendar.js
index 8745421e..e0230454 100644
--- a/calendar/content/delegateCalendar.js
+++ b/calendar/content/delegateCalendar.js
@@ -12,9 +12,9 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/erFindFolder.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/erFindFolder.js");
 
 Cu.import("resource://exchangecalendartask/erGetDelegateRequest.js");
 Cu.import("resource://exchangecalendartask/erAddDelegateRequest.js");
diff --git a/calendar/content/delegateCalendar.xul b/calendar/content/delegateCalendar.xul
index a5d931c1..e91cbc2f 100644
--- a/calendar/content/delegateCalendar.xul
+++ b/calendar/content/delegateCalendar.xul
@@ -7,10 +7,10 @@
 --><?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css" ?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/delegateCalendar.css" ?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/delegateCalendar.css" ?>
 <!DOCTYPE dialog
 [ 
-    <!ENTITY % delegateDialogDTD SYSTEM "chrome://exchangecalendar/locale/delegate-calendar-dialog.dtd" > 
+    <!ENTITY % delegateDialogDTD SYSTEM "chrome://exchangecommon/locale/delegate-calendar-dialog.dtd" > 
       %delegateDialogDTD;
 ]>
 <dialog id="DelegateUserPopup"
@@ -21,7 +21,7 @@
         ondialogcancel="window.close();"
         onload="tmpDelegateCalendarSettings.onLoad();">
     <script type="application/x-javascript"
-            src="chrome://exchangecalendar/content/adutils.js" />
+            src="chrome://exchangecommon/content/adutils.js" />
     <script type="application/javascript"
             src="chrome://exchangecalendartask/content/delegateCalendar.js" />
     <tabbox id="myTabList"
@@ -92,7 +92,7 @@
                                              ignoreblurwhilesearching="true"
                                              oninput="this.setAttribute('dirty', 'true');"
                                              ontextentered="" />
-                                    <!--          onselect='openDialog("chrome://exchangecalendar/content/contact-lookup.xul","_blank", "chrome,titlebar,modal,resizable",args);'
+                                    <!--          onselect='openDialog("chrome://exchangecommon/content/contact-lookup.xul","_blank", "chrome,titlebar,modal,resizable",args);'
                         -->
                                 </hbox>
                                 <html:div>
diff --git a/calendar/content/ecCalendarCreation.xul b/calendar/content/ecCalendarCreation.xul
index 87194e89..f4f70cbb 100644
--- a/calendar/content/ecCalendarCreation.xul
+++ b/calendar/content/ecCalendarCreation.xul
@@ -40,9 +40,9 @@
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-    <!ENTITY % dtd3 SYSTEM "chrome://exchangecalendar/locale/ecCalendarCreation.dtd" > %dtd3;
+    <!ENTITY % dtd3 SYSTEM "chrome://exchangecommon/locale/ecCalendarCreation.dtd" > %dtd3;
 ]>
-<?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/exchangeSettingsOverlay.xul"?>
 <overlay id="calendarCreation"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/calendar/content/lightning-item-iframe.xul b/calendar/content/lightning-item-iframe.xul
index 8c6551d9..449fee1f 100644
--- a/calendar/content/lightning-item-iframe.xul
+++ b/calendar/content/lightning-item-iframe.xul
@@ -31,17 +31,17 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <!-- CSS for the HTML content editor -->
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/itemBodyEditor.css"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/itemBodyEditor.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/exchWebServiceEditor.css"?>
 <!-- Attachment overlay -->
-<?xul-overlay href="chrome://exchangecalendar/content/attachments-view.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/attachments-view.xul"?>
 <!DOCTYPE dialog
 [
 
 <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
 
-<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/lightning-item-iframe.dtd" >
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/lightning-item-iframe.dtd" >
     %dtd1;
 ]>
 <overlay id="exchangecalendar-lightning-item-iframe.xul"
diff --git a/calendar/content/messenger_task_delegation.js b/calendar/content/messenger_task_delegation.js
index 7390fd8a..a6c35771 100644
--- a/calendar/content/messenger_task_delegation.js
+++ b/calendar/content/messenger_task_delegation.js
@@ -31,7 +31,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-//Cu.import("resource://exchangecalendar/ecFunctions.js");
+//Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://calendar/modules/calUtils.jsm");
 
 //if (! exchWebService) var exchWebService = {};
diff --git a/calendar/content/messenger_task_delegation.xul b/calendar/content/messenger_task_delegation.xul
index 06f62e8c..ae9d1d92 100644
--- a/calendar/content/messenger_task_delegation.xul
+++ b/calendar/content/messenger_task_delegation.xul
@@ -30,7 +30,7 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecalendar/locale/messenger_task_delegation.dtd">
+overlay SYSTEM "chrome://exchangecommon/locale/messenger_task_delegation.dtd">
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 <overlay id="exchWebService-calendar-task-delegation-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/calendar/exchangeapi/erAddDelegateRequest.js b/calendar/exchangeapi/erAddDelegateRequest.js
index d2882c84..3b536c5f 100644
--- a/calendar/exchangeapi/erAddDelegateRequest.js
+++ b/calendar/exchangeapi/erAddDelegateRequest.js
@@ -17,9 +17,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erCreateAttachment.js b/calendar/exchangeapi/erCreateAttachment.js
index abfa8c71..27b67a66 100644
--- a/calendar/exchangeapi/erCreateAttachment.js
+++ b/calendar/exchangeapi/erCreateAttachment.js
@@ -48,9 +48,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erCreateAttachmentRequest"];
 
diff --git a/calendar/exchangeapi/erDeleteAttachment.js b/calendar/exchangeapi/erDeleteAttachment.js
index 58ebca2d..1dc160ec 100644
--- a/calendar/exchangeapi/erDeleteAttachment.js
+++ b/calendar/exchangeapi/erDeleteAttachment.js
@@ -46,9 +46,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erDeleteAttachmentRequest"];
 
diff --git a/calendar/exchangeapi/erFindCalendarItems.js b/calendar/exchangeapi/erFindCalendarItems.js
index 25fa07df..299664b9 100644
--- a/calendar/exchangeapi/erFindCalendarItems.js
+++ b/calendar/exchangeapi/erFindCalendarItems.js
@@ -43,9 +43,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erFindFollowupItems.js b/calendar/exchangeapi/erFindFollowupItems.js
index 892b667f..ae0539ae 100644
--- a/calendar/exchangeapi/erFindFollowupItems.js
+++ b/calendar/exchangeapi/erFindFollowupItems.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindFollowupItemsRequest"];
 
diff --git a/calendar/exchangeapi/erFindMasterOccurrences.js b/calendar/exchangeapi/erFindMasterOccurrences.js
index 3c01d38d..974e85b5 100644
--- a/calendar/exchangeapi/erFindMasterOccurrences.js
+++ b/calendar/exchangeapi/erFindMasterOccurrences.js
@@ -50,9 +50,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindMasterOccurrencesRequest"];
 
diff --git a/calendar/exchangeapi/erFindOccurrences.js b/calendar/exchangeapi/erFindOccurrences.js
index 16b28c7c..e9392149 100644
--- a/calendar/exchangeapi/erFindOccurrences.js
+++ b/calendar/exchangeapi/erFindOccurrences.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
 
diff --git a/calendar/exchangeapi/erFindTaskItems.js b/calendar/exchangeapi/erFindTaskItems.js
index 587e7c61..1d2b0aa3 100644
--- a/calendar/exchangeapi/erFindTaskItems.js
+++ b/calendar/exchangeapi/erFindTaskItems.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindTaskItemsRequest"];
 
diff --git a/calendar/exchangeapi/erGetDelegateRequest.js b/calendar/exchangeapi/erGetDelegateRequest.js
index a262f177..2ad48dc9 100644
--- a/calendar/exchangeapi/erGetDelegateRequest.js
+++ b/calendar/exchangeapi/erGetDelegateRequest.js
@@ -17,9 +17,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erGetMasterOccurrenceId.js b/calendar/exchangeapi/erGetMasterOccurrenceId.js
index 2296d220..261df18a 100644
--- a/calendar/exchangeapi/erGetMasterOccurrenceId.js
+++ b/calendar/exchangeapi/erGetMasterOccurrenceId.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetMasterOccurrenceIdRequest"];
 
diff --git a/calendar/exchangeapi/erGetMeetingRequestByUID.js b/calendar/exchangeapi/erGetMeetingRequestByUID.js
index 2c46c5dd..3d073f13 100644
--- a/calendar/exchangeapi/erGetMeetingRequestByUID.js
+++ b/calendar/exchangeapi/erGetMeetingRequestByUID.js
@@ -39,10 +39,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erGetOccurrenceIndex.js b/calendar/exchangeapi/erGetOccurrenceIndex.js
index a6e4c9ee..db3e1883 100644
--- a/calendar/exchangeapi/erGetOccurrenceIndex.js
+++ b/calendar/exchangeapi/erGetOccurrenceIndex.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
 
diff --git a/calendar/exchangeapi/erGetTimeZones.js b/calendar/exchangeapi/erGetTimeZones.js
index a545f363..5c3864a1 100644
--- a/calendar/exchangeapi/erGetTimeZones.js
+++ b/calendar/exchangeapi/erGetTimeZones.js
@@ -48,8 +48,8 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erRemoveDelegateRequest.js b/calendar/exchangeapi/erRemoveDelegateRequest.js
index 7c1e2466..4bc4830c 100644
--- a/calendar/exchangeapi/erRemoveDelegateRequest.js
+++ b/calendar/exchangeapi/erRemoveDelegateRequest.js
@@ -17,9 +17,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erSendMeetingRespons.js b/calendar/exchangeapi/erSendMeetingRespons.js
index d8122d7f..a0afc5db 100644
--- a/calendar/exchangeapi/erSendMeetingRespons.js
+++ b/calendar/exchangeapi/erSendMeetingRespons.js
@@ -46,9 +46,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSendMeetingResponsRequest"];
 
diff --git a/calendar/exchangeapi/erSyncInbox.js b/calendar/exchangeapi/erSyncInbox.js
index 28edd097..c6f50699 100644
--- a/calendar/exchangeapi/erSyncInbox.js
+++ b/calendar/exchangeapi/erSyncInbox.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erUpdateDelegateRequest.js b/calendar/exchangeapi/erUpdateDelegateRequest.js
index b64b5ca9..53a8e3b0 100644
--- a/calendar/exchangeapi/erUpdateDelegateRequest.js
+++ b/calendar/exchangeapi/erUpdateDelegateRequest.js
@@ -17,9 +17,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index 5442b1a8..89eefc33 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -50,20 +50,20 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
-Cu.import("resource://exchangecalendar/erFindFolder.js");
-Cu.import("resource://exchangecalendar/erGetFolder.js");
+Cu.import("resource://exchangecommon/erFindFolder.js");
+Cu.import("resource://exchangecommon/erGetFolder.js");
 
-Cu.import("resource://exchangecalendar/erGetItems.js");
-Cu.import("resource://exchangecalendar/erCreateItem.js");
-Cu.import("resource://exchangecalendar/erUpdateItem.js");
-Cu.import("resource://exchangecalendar/erDeleteItem.js");
+Cu.import("resource://exchangecommon/erGetItems.js");
+Cu.import("resource://exchangecommon/erCreateItem.js");
+Cu.import("resource://exchangecommon/erUpdateItem.js");
+Cu.import("resource://exchangecommon/erDeleteItem.js");
 
-Cu.import("resource://exchangecalendar/erSyncFolderItems.js");
-Cu.import("resource://exchangecalendar/erGetUserAvailability.js");
+Cu.import("resource://exchangecommon/erSyncFolderItems.js");
+Cu.import("resource://exchangecommon/erGetUserAvailability.js");
 
 Cu.import("resource://exchangecalendartask/erFindCalendarItems.js");
 Cu.import("resource://exchangecalendartask/erFindTaskItems.js");
@@ -1663,7 +1663,7 @@ calExchangeCalendar.prototype = {
                         }
 
                         if ((calWindow) && (attendees > 0) && (weHaveChanges)) {
-                            calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
+                            calWindow.openDialog("chrome://exchangecommon/content/sendUpdateTo.xul",
                                 "sendUpdateTo",
                                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
                                 input);
@@ -2105,7 +2105,7 @@ calExchangeCalendar.prototype = {
                 }
 
                 if ((calWindow) && (attendees > 0)) {
-                    calWindow.openDialog("chrome://exchangecalendar/content/sendUpdateTo.xul",
+                    calWindow.openDialog("chrome://exchangecommon/content/sendUpdateTo.xul",
                         "sendUpdateTo",
                         "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
                         input);
@@ -5628,7 +5628,7 @@ calExchangeCalendar.prototype = {
         };
 
         if (calWindow) {
-            calWindow.openDialog("chrome://exchangecalendar/content/preInvitationResponse.xul",
+            calWindow.openDialog("chrome://exchangecommon/content/preInvitationResponse.xul",
                 "preInvitationResponseId",
                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
                 preInput);
@@ -5658,7 +5658,7 @@ calExchangeCalendar.prototype = {
             }
 
             if ((calWindow) && (!aBodyText)) {
-                calWindow.openDialog("chrome://exchangecalendar/content/invitationResponse.xul",
+                calWindow.openDialog("chrome://exchangecommon/content/invitationResponse.xul",
                     "invitationResponseId",
                     "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
                     input);
diff --git a/calendar/interface/exchangeEvent/mivExchangeEvent.js b/calendar/interface/exchangeEvent/mivExchangeEvent.js
index 964be7db..ccc5fb39 100644
--- a/calendar/interface/exchangeEvent/mivExchangeEvent.js
+++ b/calendar/interface/exchangeEvent/mivExchangeEvent.js
@@ -27,7 +27,7 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
diff --git a/calendar/interface/exchangeTodo/mivExchangeTodo.js b/calendar/interface/exchangeTodo/mivExchangeTodo.js
index 0f921f90..401c1d51 100644
--- a/calendar/interface/exchangeTodo/mivExchangeTodo.js
+++ b/calendar/interface/exchangeTodo/mivExchangeTodo.js
@@ -27,7 +27,7 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
diff --git a/chrome.manifest b/chrome.manifest
index f70a8dec..3dbe3620 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,50 +1,50 @@
-content exchangecalendar common/content/
+content exchangecommon common/content/
 
-skin exchangecalendar fugue common/theme/unix/
-skin exchangecalendar fugue common/theme/win/ os=WINNT
-skin exchangecalendar fugue common/theme/winaero/ os=WINNT osversion>=6
-skin exchangecalendar fugue common/theme/mac/ os=Darwin
-skin exchangecalendar-common fugue common/theme/common/
+skin exchangecommon fugue common/theme/unix/
+skin exchangecommon fugue common/theme/win/ os=WINNT
+skin exchangecommon fugue common/theme/winaero/ os=WINNT osversion>=6
+skin exchangecommon fugue common/theme/mac/ os=Darwin
+skin exchangecommon-common fugue common/theme/common/
 
-resource exchangecalendar common/exchangeapi/
+resource exchangecommon common/exchangeapi/
 resource interfaces common/interface/
 
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/progress_panel.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangecommon/content/progress_panel.xul
 
-overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecalendar/content/progress_panel.xul
+overlay chrome://lightning/content/lightning-standalone.xul chrome://exchangecommon/content/progress_panel.xul
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/check4lightning.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/messenger-overlay-preferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/manageEWSAccounts.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/debugPreferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/cachePreferences.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/otherPreferences.xul
-overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecalendar/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecalendar/content/extra-suite-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://messenger/content/messenger.xul chrome://exchangecommon/content/sharedCalendarParser.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+overlay chrome://messenger/content/messenger.xul chrome://exchangecommon/content/check4lightning.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecommon/content/messenger-overlay-preferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecommon/content/manageEWSAccounts.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecommon/content/debugPreferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecommon/content/cachePreferences.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecommon/content/otherPreferences.xul
+overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecommon/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://communicator/content/pref/preferences.xul chrome://exchangecommon/content/extra-suite-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 
-overlay chrome://messenger/content/messenger.xul chrome://exchangecalendar/content/OutOfOfficeMenu.xul
-overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://exchangecalendar/content/addressingWidgetOverlay.xul
-overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecalendar/content/timezonePreference.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/lightningtimezoneOverlay.xul
-overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchangecalendar/content/extra-messenger-preferences.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/priority-display.xul
-overlay chrome://messenger/content/messenger.xul  chrome://exchangecalendar/content/invite-style.xul
-overlay chrome://messenger/content/folderProps.xul  chrome://exchangecalendar/content/folderPropsOverlay.xul
+overlay chrome://messenger/content/messenger.xul chrome://exchangecommon/content/OutOfOfficeMenu.xul
+overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://exchangecommon/content/addressingWidgetOverlay.xul
+overlay chrome://messenger/content/preferences/preferences.xul  chrome://exchangecommon/content/timezonePreference.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangecommon/content/lightningtimezoneOverlay.xul
+overlay	chrome://messenger/content/preferences/preferences.xul	chrome://exchangecommon/content/extra-messenger-preferences.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangecommon/content/priority-display.xul
+overlay chrome://messenger/content/messenger.xul  chrome://exchangecommon/content/invite-style.xul
+overlay chrome://messenger/content/folderProps.xul  chrome://exchangecommon/content/folderPropsOverlay.xul
 
-locale exchangecalendar en common/locale/en/
+locale exchangecommon en common/locale/en/
 
-locale exchangecalendar cs-CZ common/locale/cs_CZ/
-locale exchangecalendar de common/locale/de/
-locale exchangecalendar en-US common/locale/en_US/
-locale exchangecalendar fr-FR common/locale/fr_FR/
-locale exchangecalendar it-IT common/locale/it_IT/
-locale exchangecalendar ja-JP common/locale/ja_JP/
-locale exchangecalendar nl common/locale/nl/
-locale exchangecalendar ru common/locale/ru/
-locale exchangecalendar sv common/locale/sv/
-locale exchangecalendar tr common/locale/tr/
+locale exchangecommon cs-CZ common/locale/cs_CZ/
+locale exchangecommon de common/locale/de/
+locale exchangecommon en-US common/locale/en_US/
+locale exchangecommon fr-FR common/locale/fr_FR/
+locale exchangecommon it-IT common/locale/it_IT/
+locale exchangecommon ja-JP common/locale/ja_JP/
+locale exchangecommon nl common/locale/nl/
+locale exchangecommon ru common/locale/ru/
+locale exchangecommon sv common/locale/sv/
+locale exchangecommon tr common/locale/tr/
 
 manifest common/interface/global/mivFunctions.manifest
 manifest common/interface/exchangeAccountManager/mivExchangeAccountManager.manifest
diff --git a/common/content/OutOfOfficeMenu.js b/common/content/OutOfOfficeMenu.js
index 547629e9..4b042e86 100644
--- a/common/content/OutOfOfficeMenu.js
+++ b/common/content/OutOfOfficeMenu.js
@@ -38,7 +38,7 @@ var Cu = Components.utils;
 var Cr = Components.results;
 var components = Components;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 //if (! exchWebService) var exchWebService = {};
 
@@ -87,7 +87,7 @@ exchToolsMenu.prototype = {
             calendar: myCal,
             answer: ""
         };
-        this._window.openDialog("chrome://exchangecalendar/content/oofSettings.xul",
+        this._window.openDialog("chrome://exchangecommon/content/oofSettings.xul",
             "oofSettings",
             "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
             aResult);
diff --git a/common/content/OutOfOfficeMenu.xul b/common/content/OutOfOfficeMenu.xul
index 206c1b19..1d9d8a28 100644
--- a/common/content/OutOfOfficeMenu.xul
+++ b/common/content/OutOfOfficeMenu.xul
@@ -39,7 +39,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/OutOfOfficeMenu.js" />
+            src="chrome://exchangecommon/content/OutOfOfficeMenu.js" />
     <menupopup id="menu_Event_Task_Popup">
         <menuitem id="exchangecalendar-OutOfOfficeMenu"
                   label="Out of Office..."
diff --git a/common/content/addressingWidgetOverlay.xul b/common/content/addressingWidgetOverlay.xul
index 99f2267e..4b2a0600 100644
--- a/common/content/addressingWidgetOverlay.xul
+++ b/common/content/addressingWidgetOverlay.xul
@@ -19,10 +19,10 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <!DOCTYPE overlay>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/addressingWidgetOverlay.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/addressingWidgetOverlay.css"?>
 <overlay id="exchangeAddressingWidgetOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/addressingWidgetOverlay.js" />
+            src="chrome://exchangecommon/content/addressingWidgetOverlay.js" />
 </overlay>
diff --git a/common/content/attachments-view.js b/common/content/attachments-view.js
index fcbad2db..07dbf17a 100644
--- a/common/content/attachments-view.js
+++ b/common/content/attachments-view.js
@@ -32,7 +32,7 @@ var Ci = Components.interfaces;
 var Cc = Components.classes;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://exchangecalendar/erGetAttachments.js");
+Cu.import("resource://exchangecommon/erGetAttachments.js");
 
 function exchAttachments(aDocument, aWindow) {
     this._document = aDocument;
@@ -159,10 +159,10 @@ exchAttachments.prototype = {
             this.globalFunctions.LOG(" == extension:" + extension);
 
             if (ext2file[extension]) {
-                item.setAttribute("image", "chrome://exchangecalendar-common/skin/images/" + ext2file[extension]);
+                item.setAttribute("image", "chrome://exchangecommon-common/skin/images/" + ext2file[extension]);
             }
             else {
-                item.setAttribute("image", "chrome://exchangecalendar-common/skin/images/document--exclamation.png");
+                item.setAttribute("image", "chrome://exchangecommon-common/skin/images/document--exclamation.png");
             }
 
             // full attachment object is stored here
diff --git a/common/content/attachments-view.xul b/common/content/attachments-view.xul
index 8b9ec7a1..edd84e26 100644
--- a/common/content/attachments-view.xul
+++ b/common/content/attachments-view.xul
@@ -34,17 +34,17 @@
 [
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/attachments-view.dtd" > 
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/attachments-view.dtd" > 
     %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/attachments-view.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/attachments-view.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <overlay id="exchWebService-attachment-view"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/attachments-view.js" />
+            src="chrome://exchangecommon/content/attachments-view.js" />
     <!-- Commands -->
     <commandset>
         <command id="exchWebService_openAttachment"
diff --git a/common/content/browseFolder.js b/common/content/browseFolder.js
index 4ec588e7..13d1c2d9 100644
--- a/common/content/browseFolder.js
+++ b/common/content/browseFolder.js
@@ -43,8 +43,8 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/erBrowseFolder.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/erBrowseFolder.js");
 
 if (!exchWebService) var exchWebService = {};
 
@@ -195,38 +195,38 @@ exchWebService_browseTreeView.prototype = {
         if (column.id == "exchWebService_foldername") {
             switch (this.folders[idx].folderClass) {
             case "IPF.Appointment":
-                return "chrome://exchangecalendar-common/skin/images/calendar-month.png";
+                return "chrome://exchangecommon-common/skin/images/calendar-month.png";
                 break;
             case "IPF.Note":
-                return "chrome://exchangecalendar-common/skin/images/mail.png";
+                return "chrome://exchangecommon-common/skin/images/mail.png";
                 break;
             case "IPF.Contact":
-                return "chrome://exchangecalendar-common/skin/images/address-book.png";
+                return "chrome://exchangecommon-common/skin/images/address-book.png";
                 break;
             case "IPF.Configuration":
-                return "chrome://exchangecalendar-common/skin/images/wrench-screwdriver.png";
+                return "chrome://exchangecommon-common/skin/images/wrench-screwdriver.png";
                 break;
             case "IPF.Note.OutlookHomepage":
             case "IPF.Note.SocialConnector.FeedItems":
-                return "chrome://exchangecalendar-common/skin/images/feed.png";
+                return "chrome://exchangecommon-common/skin/images/feed.png";
                 break;
             case "IPF.Task":
-                return "chrome://exchangecalendar-common/skin/images/task.png";
+                return "chrome://exchangecommon-common/skin/images/task.png";
                 break;
             case "IPF.StickyNote":
-                return "chrome://exchangecalendar-common/skin/images/sticky-notes.png";
+                return "chrome://exchangecommon-common/skin/images/sticky-notes.png";
                 break;
             case "IPF.Journal":
-                return "chrome://exchangecalendar-common/skin/images/blog.png";
+                return "chrome://exchangecommon-common/skin/images/blog.png";
                 break;
 
             }
 
             if (this.folders[idx].isContainerOpen) {
-                return "chrome://exchangecalendar-common/skin/images/folder-open.png";
+                return "chrome://exchangecommon-common/skin/images/folder-open.png";
             }
 
-            return "chrome://exchangecalendar-common/skin/images/folder.png";
+            return "chrome://exchangecommon-common/skin/images/folder.png";
         }
     },
 
diff --git a/common/content/browseFolder.xul b/common/content/browseFolder.xul
index da4483a2..a6b2fab1 100644
--- a/common/content/browseFolder.xul
+++ b/common/content/browseFolder.xul
@@ -37,10 +37,10 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/browseFolder.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/browseFolder.css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/browseFolder.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/browseFolder.dtd" > %dtd1;
 ]>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_BrowseFolders"
@@ -52,7 +52,7 @@
         width="640"
         height="380">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/browseFolder.js" />
+            src="chrome://exchangecommon/content/browseFolder.js" />
     <vbox flex="1">
         <label id="exchWebService_currentSelectedPath" />
         <tree id="exchWebService_foldertree"
diff --git a/common/content/cachePreferences.xul b/common/content/cachePreferences.xul
index b6acd0cd..576318a5 100644
--- a/common/content/cachePreferences.xul
+++ b/common/content/cachePreferences.xul
@@ -40,12 +40,12 @@
 [
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/preferences.dtd" >
     %lightningDTD;
     %preferencesDTD;
     %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/preferences.css"?>
 <overlay id="exchangeWebService_cache_preferences_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/common/content/check4lightning.xul b/common/content/check4lightning.xul
index 42061885..c8654f5b 100644
--- a/common/content/check4lightning.xul
+++ b/common/content/check4lightning.xul
@@ -35,5 +35,5 @@
     <script type="application/javascript"
             src="chrome://communicator/content/utilityOverlay.js" />
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/check4lightning.js" />
+            src="chrome://exchangecommon/content/check4lightning.js" />
 </overlay>
diff --git a/common/content/debugPreferences.js b/common/content/debugPreferences.js
index cf308ece..6c47042b 100644
--- a/common/content/debugPreferences.js
+++ b/common/content/debugPreferences.js
@@ -38,7 +38,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 if (!exchWebService) var exchWebService = {};
 
diff --git a/common/content/debugPreferences.xul b/common/content/debugPreferences.xul
index 7c54643b..bacaa189 100644
--- a/common/content/debugPreferences.xul
+++ b/common/content/debugPreferences.xul
@@ -40,17 +40,17 @@
 [
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/preferences.dtd" >
     %lightningDTD;
     %preferencesDTD;
     %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/preferences.css"?>
 <overlay id="exchangeWebService_debug_preferences_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/debugPreferences.js" />
+            src="chrome://exchangecommon/content/debugPreferences.js" />
     <vbox id="exchangeWebService_debug_preferences_vbox">
         <preferences>
             <preference id="extensions.1st-setup.debug.log"
diff --git a/common/content/delegateFolder.js b/common/content/delegateFolder.js
index 60318493..aa46154b 100644
--- a/common/content/delegateFolder.js
+++ b/common/content/delegateFolder.js
@@ -12,12 +12,12 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
-Cu.import("resource://exchangecalendar/erUpdateFolderPermission.js");
-Cu.import("resource://exchangecalendar/erFindInboxFolder.js");
-Cu.import("resource://exchangecalendar/erGetFolderPermission.js");
+Cu.import("resource://exchangecommon/erUpdateFolderPermission.js");
+Cu.import("resource://exchangecommon/erFindInboxFolder.js");
+Cu.import("resource://exchangecommon/erGetFolderPermission.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
@@ -750,7 +750,7 @@ exchDelegateCalendarSettings.prototype = {
     },
 
     infoPopup: function _infoPopup(title, msg) {
-        var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+        var image = "chrome://exchangecommon-common/skin/images/notify-icon.png";
         var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
         getService(Components.interfaces.nsIWindowWatcher).
         openWindow(null, 'chrome://global/content/alerts/alert.xul',
diff --git a/common/content/exchangeCloneSettings.xul b/common/content/exchangeCloneSettings.xul
index 57b20e33..665e05bb 100644
--- a/common/content/exchangeCloneSettings.xul
+++ b/common/content/exchangeCloneSettings.xul
@@ -26,9 +26,9 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeCloneSettings.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/exchangeCloneSettings.dtd" > %dtd1;
 ]>
-<?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/exchangeSettingsOverlay.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_CloneSettings_dialog"
         title="Exchange Clone Settings"
@@ -38,7 +38,7 @@
         ondialogaccept="return tmpExchangeCloneSettings.onSave();"
         onload="tmpExchangeCloneSettings.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/exchangeCloneSettings.js" />
+            src="chrome://exchangecommon/content/exchangeCloneSettings.js" />
     <hbox>
         <label value="&label.ecExchangeSettings.title;" />
         <textbox id="exchWebService_clone_description" />
diff --git a/common/content/exchangeSettings.js b/common/content/exchangeSettings.js
index 7c7a6b27..c8a0bb0d 100644
--- a/common/content/exchangeSettings.js
+++ b/common/content/exchangeSettings.js
@@ -38,7 +38,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 function exchWebService_permissionsPropertiesView(aProperties) {
 
diff --git a/common/content/exchangeSettings.xul b/common/content/exchangeSettings.xul
index 6d3c42ea..927eb620 100644
--- a/common/content/exchangeSettings.xul
+++ b/common/content/exchangeSettings.xul
@@ -39,9 +39,9 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeSettings.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/exchangeSettings.dtd" > %dtd1;
 ]>
-<?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/exchangeSettingsOverlay.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_ExchangeSettings_dialog"
         title="&ecsettings.title; "
@@ -51,9 +51,9 @@
         ondialogaccept="tmpOfflineCacheSettings.onSave();return tmpExchangeSettings.onSave();"
         onload="tmpExchangeSettings.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/exchangeSettings.js" />
+            src="chrome://exchangecommon/content/exchangeSettings.js" />
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/offlineCacheSettings.js" />
+            src="chrome://exchangecommon/content/offlineCacheSettings.js" />
     <commandset>
         <command id="exchWebService_cmd_poll_inbox"
                  oncommand="tmpExchangeSettings.doPollInboxChanged(this);" />
diff --git a/common/content/exchangeSettingsOverlay.js b/common/content/exchangeSettingsOverlay.js
index 69cf46d1..571cddd0 100644
--- a/common/content/exchangeSettingsOverlay.js
+++ b/common/content/exchangeSettingsOverlay.js
@@ -40,13 +40,13 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/erAutoDiscover.js");
-Cu.import("resource://exchangecalendar/erAutoDiscoverySOAP.js");
-Cu.import("resource://exchangecalendar/erPrimarySMTPCheck.js");
-Cu.import("resource://exchangecalendar/erConvertID.js");
-Cu.import("resource://exchangecalendar/erFindFolder.js");
-Cu.import("resource://exchangecalendar/erGetFolder.js");
-Cu.import("resource://exchangecalendar/erGetUserAvailability.js");
+Cu.import("resource://exchangecommon/erAutoDiscover.js");
+Cu.import("resource://exchangecommon/erAutoDiscoverySOAP.js");
+Cu.import("resource://exchangecommon/erPrimarySMTPCheck.js");
+Cu.import("resource://exchangecommon/erConvertID.js");
+Cu.import("resource://exchangecommon/erFindFolder.js");
+Cu.import("resource://exchangecommon/erGetFolder.js");
+Cu.import("resource://exchangecommon/erGetUserAvailability.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 
@@ -662,7 +662,7 @@ exchSettingsOverlay.prototype = {
             if (ewsUrls.length > 1) {
                 // We have got multiple ews urls returned. Let the user choose.
 
-                this._window.openDialog("chrome://exchangecalendar/content/selectEWSUrl.xul",
+                this._window.openDialog("chrome://exchangecommon/content/selectEWSUrl.xul",
                     "selectfrommultipleews",
                     "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
                     ewsUrls, selectedEWSUrl);
@@ -860,7 +860,7 @@ exchSettingsOverlay.prototype = {
             }
         };
 
-        this._window.openDialog("chrome://exchangecalendar/content/browseFolder.xul",
+        this._window.openDialog("chrome://exchangecommon/content/browseFolder.xul",
             "browseFolder",
             "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
             input);
diff --git a/common/content/exchangeSettingsOverlay.xul b/common/content/exchangeSettingsOverlay.xul
index c33ce934..bd48bd57 100644
--- a/common/content/exchangeSettingsOverlay.xul
+++ b/common/content/exchangeSettingsOverlay.xul
@@ -38,13 +38,13 @@
 -->
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeSettingsOverlay.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/exchangeSettingsOverlay.dtd" > %dtd1;
 ]>
 <overlay id="calendarCreation"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/exchangeSettingsOverlay.js" />
+            src="chrome://exchangecommon/content/exchangeSettingsOverlay.js" />
     <vbox id="exchWebService-exchange-settings">
         <groupbox>
             <caption label="&exchWebServices.exchtype.label;" />
diff --git a/common/content/extra-messenger-preferences.xul b/common/content/extra-messenger-preferences.xul
index 24ea4e9b..616374b7 100644
--- a/common/content/extra-messenger-preferences.xul
+++ b/common/content/extra-messenger-preferences.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE 
-prefwindow SYSTEM "chrome://exchangecalendar/locale/extra-priority.dtd">
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/extras-preferences.css"?>
+prefwindow SYSTEM "chrome://exchangecommon/locale/extra-priority.dtd">
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/extras-preferences.css"?>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <prefwindow id="MailPreferences">
diff --git a/common/content/extra-suite-preferences.xul b/common/content/extra-suite-preferences.xul
index b44eab34..edd908cb 100644
--- a/common/content/extra-suite-preferences.xul
+++ b/common/content/extra-suite-preferences.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE 
-prefwindow SYSTEM "chrome://exchangecalendar/locale/extra-priority.dtd">
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/extras-preferences.css"?>
+prefwindow SYSTEM "chrome://exchangecommon/locale/extra-priority.dtd">
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/extras-preferences.css"?>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <treechildren id="prefsPanelChildren">
diff --git a/common/content/folderPropsOverlay.xul b/common/content/folderPropsOverlay.xul
index 2224ed95..acbed8c5 100644
--- a/common/content/folderPropsOverlay.xul
+++ b/common/content/folderPropsOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE dialog
 [ 
-    <!ENTITY % delegateFolder1DTD SYSTEM "chrome://exchangecalendar/locale/delegate-folder.dtd" > 
+    <!ENTITY % delegateFolder1DTD SYSTEM "chrome://exchangecommon/locale/delegate-folder.dtd" > 
       %delegateFolder1DTD;
 ]>
 <!--
@@ -14,7 +14,7 @@
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/delegateFolder.js" />
+            src="chrome://exchangecommon/content/delegateFolder.js" />
     <tabbox id="folderPropTabBox">
         <tabs id="folderPropTabs">
             <tab id="delegationTab"
diff --git a/common/content/invitationResponse.js b/common/content/invitationResponse.js
index 079b9760..38e5ca90 100644
--- a/common/content/invitationResponse.js
+++ b/common/content/invitationResponse.js
@@ -38,7 +38,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 if (!exchWebService) var exchWebService = {};
 
diff --git a/common/content/invitationResponse.xul b/common/content/invitationResponse.xul
index 2727a491..430c2676 100644
--- a/common/content/invitationResponse.xul
+++ b/common/content/invitationResponse.xul
@@ -41,7 +41,7 @@
 <!DOCTYPE dialog
 [
     
-<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/invitationResponse.dtd" > %dtd1; ]>
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/invitationResponse.dtd" > %dtd1; ]>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_invitationResponse_dialog"
         title="&description.invitationResponse;"
@@ -51,7 +51,7 @@
         ondialogaccept="return exchWebService.invitationResponse.onAccept();"
         onload="exchWebService.invitationResponse.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/invitationResponse.js" />
+            src="chrome://exchangecommon/content/invitationResponse.js" />
     <script type="application/javascript"
             src="chrome://calendar/content/calendar-ui-utils.js" />
     <script type="application/javascript"
diff --git a/common/content/invite-style.js b/common/content/invite-style.js
index f9a99ec2..20bdcf42 100644
--- a/common/content/invite-style.js
+++ b/common/content/invite-style.js
@@ -91,36 +91,36 @@ showIconsAsInviteColumn.prototype.execute = function () {
                                 res = Subject.match(/Declined:/);
                             }
                             else {
-                                return "chrome://exchangecalendar-common/skin/images/accepted.png";
+                                return "chrome://exchangecommon-common/skin/images/accepted.png";
                             }
 
                             if (!res) {
                                 res = Subject.match(/Tentative:/);
                             }
                             else {
-                                return "chrome://exchangecalendar-common/skin/images/declined.png";
+                                return "chrome://exchangecommon-common/skin/images/declined.png";
                             }
                             if (!res) {
                                 res = Subject.match(/Canceled:/);
                             }
                             else {
-                                return "chrome://exchangecalendar-common/skin/images/tentative.png";
+                                return "chrome://exchangecommon-common/skin/images/tentative.png";
                             }
 
                             if (!res) {
                                 res = Subject.match(/Updated:/);
                             }
                             else {
-                                return "chrome://exchangecalendar-common/skin/images/updated.png";
+                                return "chrome://exchangecommon-common/skin/images/updated.png";
                             }
 
                             if (!res) {
                                 res = Subject.match(/Event Invitation:/);
                             }
                             else {
-                                return "chrome://exchangecalendar-common/skin/images/updated.png";
+                                return "chrome://exchangecommon-common/skin/images/updated.png";
                             }
-                            return "chrome://exchangecalendar-common/skin/images/invited.png";
+                            return "chrome://exchangecommon-common/skin/images/invited.png";
                         }
                     },
                     getSortLongForRow: function (hdr) {},
diff --git a/common/content/invite-style.xul b/common/content/invite-style.xul
index 979d9e49..9caf7ada 100644
--- a/common/content/invite-style.xul
+++ b/common/content/invite-style.xul
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/invite-style.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/invite-style.css"?>
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecalendar/locale/inviteStyle.dtd">
+overlay SYSTEM "chrome://exchangecommon/locale/inviteStyle.dtd">
 <overlay xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script src="chrome://exchangecalendar/content/invite-style.js" />
+    <script src="chrome://exchangecommon/content/invite-style.js" />
     <tree id="threadTree">
         <treecols id="threadCols">
             <treecol id="inviteCol"
diff --git a/common/content/lightningtimezoneOverlay.js b/common/content/lightningtimezoneOverlay.js
index b788eb20..2bd19fc1 100644
--- a/common/content/lightningtimezoneOverlay.js
+++ b/common/content/lightningtimezoneOverlay.js
@@ -65,7 +65,7 @@ lightningTimzone.prototype = {
     },
 
     infoPopup: function _infoPopup(title, msg) {
-        var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+        var image = "chrome://exchangecommon-common/skin/images/notify-icon.png";
         var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
         getService(Components.interfaces.nsIWindowWatcher).
         openWindow(null, 'chrome://global/content/alerts/alert.xul',
diff --git a/common/content/lightningtimezoneOverlay.xul b/common/content/lightningtimezoneOverlay.xul
index 54be6a7f..5b4df820 100644
--- a/common/content/lightningtimezoneOverlay.xul
+++ b/common/content/lightningtimezoneOverlay.xul
@@ -2,5 +2,5 @@
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/lightningtimezoneOverlay.js" />
+            src="chrome://exchangecommon/content/lightningtimezoneOverlay.js" />
 </overlay>
diff --git a/common/content/manageEWSAccounts.js b/common/content/manageEWSAccounts.js
index 855858ac..fcce77f4 100644
--- a/common/content/manageEWSAccounts.js
+++ b/common/content/manageEWSAccounts.js
@@ -24,10 +24,10 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/erAutoDiscover.js");
-Cu.import("resource://exchangecalendar/erPrimarySMTPCheck.js");
-Cu.import("resource://exchangecalendar/erGetFolder.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/erAutoDiscover.js");
+Cu.import("resource://exchangecommon/erPrimarySMTPCheck.js");
+Cu.import("resource://exchangecommon/erGetFolder.js");
 
 if (!exchWebService) var exchWebService = {};
 
@@ -313,7 +313,7 @@ exchWebService.manageEWSAccounts = {
             if (ewsUrls.length() > 1) {
                 // We have got multiple ews urls returned. Let the use choose.
 
-                window.openDialog("chrome://exchangecalendar/content/selectEWSUrl.xul",
+                window.openDialog("chrome://exchangecommon/content/selectEWSUrl.xul",
                     "selectfrommultipleews",
                     "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
                     ewsUrls, selectedEWSUrl);
diff --git a/common/content/manageEWSAccounts.xul b/common/content/manageEWSAccounts.xul
index 52cba075..a01ed84a 100644
--- a/common/content/manageEWSAccounts.xul
+++ b/common/content/manageEWSAccounts.xul
@@ -24,15 +24,15 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/manageEWSAccounts.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/manageEWSAccounts.css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/manageEWSAccounts.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/manageEWSAccounts.dtd" > %dtd1;
 ]>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          id="manage-EWS-Accounts-dialog">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/manageEWSAccounts.js" />
+            src="chrome://exchangecommon/content/manageEWSAccounts.js" />
     <hbox id="manage-EWS-Accounts-dialog-hbox">
         <vbox>
             <listbox id="exchWebService-manageEWSAccounts-accounts-listbox"
diff --git a/common/content/manageEWSAccountsMenu.js b/common/content/manageEWSAccountsMenu.js
index 3cbd3258..c8c6606c 100644
--- a/common/content/manageEWSAccountsMenu.js
+++ b/common/content/manageEWSAccountsMenu.js
@@ -24,14 +24,14 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 if (!exchWebService) var exchWebService = {};
 
 exchWebService.manageEWSAccountsMenu = {
 
     showManager: function _showManager() {
-        window.openDialog("chrome://exchangecalendar/content/manageEWSAccounts.xul",
+        window.openDialog("chrome://exchangecommon/content/manageEWSAccounts.xul",
             "manageEWSAccounts",
             "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=yes",
             null);
diff --git a/common/content/manageEWSAccountsMenu.xul b/common/content/manageEWSAccountsMenu.xul
index 96606ff3..e99d6073 100644
--- a/common/content/manageEWSAccountsMenu.xul
+++ b/common/content/manageEWSAccountsMenu.xul
@@ -26,13 +26,13 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/manageEWSAccounts.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/manageEWSAccounts.dtd" > %dtd1;
 ]>
 <overlay id="manage_EWS_Accounts_menu"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/manageEWSAccountsMenu.js" />
+            src="chrome://exchangecommon/content/manageEWSAccountsMenu.js" />
     <commandset id="calendar_commands">
         <command id="exchWebService_manageEWSAccounts_showManager_command"
                  oncommand="exchWebService.manageEWSAccountsMenu.showManager()" />
diff --git a/common/content/messenger-overlay-preferences.xul b/common/content/messenger-overlay-preferences.xul
index afdf48e1..4a7201d6 100644
--- a/common/content/messenger-overlay-preferences.xul
+++ b/common/content/messenger-overlay-preferences.xul
@@ -40,12 +40,12 @@
 [
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/preferences.dtd" >
     %lightningDTD;
     %preferencesDTD;
     %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/preferences.css"?>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <prefwindow id="MailPreferences">
diff --git a/common/content/oofSettings.js b/common/content/oofSettings.js
index 6924a513..b665f21a 100644
--- a/common/content/oofSettings.js
+++ b/common/content/oofSettings.js
@@ -40,10 +40,10 @@ var Cu = Components.utils;
 
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
-Cu.import("resource://exchangecalendar/erGetUserOofSettings.js");
-Cu.import("resource://exchangecalendar/erSetUserOofSettings.js");
+Cu.import("resource://exchangecommon/erGetUserOofSettings.js");
+Cu.import("resource://exchangecommon/erSetUserOofSettings.js");
 
-//Cu.import("resource://exchangecalendar/ecFunctions.js");
+//Cu.import("resource://exchangecommon/ecFunctions.js");
 
 //if (! exchWebService) var exchWebService = {};
 
@@ -242,7 +242,7 @@ exchOOFSettings.prototype = {
     },
 
     infoPopup: function _infoPopup(title, msg) {
-        var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+        var image = "chrome://exchangecommon-common/skin/images/notify-icon.png";
         var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
         getService(Components.interfaces.nsIWindowWatcher).
         openWindow(null, 'chrome://global/content/alerts/alert.xul',
diff --git a/common/content/oofSettings.xul b/common/content/oofSettings.xul
index 1669cc60..a2dbc7e4 100644
--- a/common/content/oofSettings.xul
+++ b/common/content/oofSettings.xul
@@ -39,11 +39,11 @@
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://global/skin/xul.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messengercompose/messengercompose.css"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/oofSettings.css"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/exchWebServiceEditor.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/oofSettings.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/exchWebServiceEditor.css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/oofSettings.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/oofSettings.dtd" > %dtd1;
 ]>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_oofSettings_dialog"
@@ -55,7 +55,7 @@
         height="600px"
         persist="width height">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/oofSettings.js" />
+            src="chrome://exchangecommon/content/oofSettings.js" />
     <commandset>
         <command id="exchWebService_cmd_oof_scheduled"
                  oncommand="tmpOOFSettings.doScheduledChanged();" />
diff --git a/common/content/otherPreferences.xul b/common/content/otherPreferences.xul
index bcd01966..034c5cdf 100644
--- a/common/content/otherPreferences.xul
+++ b/common/content/otherPreferences.xul
@@ -43,17 +43,17 @@
 [
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd" >
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/preferences.dtd" >
     %lightningDTD;
     %preferencesDTD;
     %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/preferences.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/preferences.css"?>
 <overlay id="exchangeWebService_cache_preferences_overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/otherPreferences.js" />
+            src="chrome://exchangecommon/content/otherPreferences.js" />
     <vbox id="exchangeWebService_others_preferences_vbox">
         <preferences>
             <preference id="extensions.1st-setup.others.retryCount"
diff --git a/common/content/preInvitationResponse.js b/common/content/preInvitationResponse.js
index 718bc110..f7d5fccc 100644
--- a/common/content/preInvitationResponse.js
+++ b/common/content/preInvitationResponse.js
@@ -38,7 +38,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 if (!exchWebService) var exchWebService = {};
 
diff --git a/common/content/preInvitationResponse.xul b/common/content/preInvitationResponse.xul
index 46b40fcb..e05d4b84 100644
--- a/common/content/preInvitationResponse.xul
+++ b/common/content/preInvitationResponse.xul
@@ -39,7 +39,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preInvitationResponse.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/preInvitationResponse.dtd" > %dtd1;
 ]>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_preInvitationResponse_dialog"
@@ -50,7 +50,7 @@
         ondialogaccept="return exchWebService.preInvitationResponse.onAccept();"
         onload="exchWebService.preInvitationResponse.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/preInvitationResponse.js" />
+            src="chrome://exchangecommon/content/preInvitationResponse.js" />
     <vbox id="exchWebService_preInvitationResponse_vbox">
         <grid>
             <columns>
diff --git a/common/content/priority-display.xul b/common/content/priority-display.xul
index 19d4b709..1158e553 100644
--- a/common/content/priority-display.xul
+++ b/common/content/priority-display.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/priority-display.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/priority-display.css"?>
 <overlay xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script src="chrome://exchangecalendar/content/priority-display.js" />
+    <script src="chrome://exchangecommon/content/priority-display.js" />
     <tree id="threadTree">
         <treecols id="threadCols">
             <treecol id="priorityCol"
diff --git a/common/content/progress_panel.js b/common/content/progress_panel.js
index a773903f..0e11b531 100644
--- a/common/content/progress_panel.js
+++ b/common/content/progress_panel.js
@@ -31,7 +31,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-//Cu.import("resource://exchangecalendar/ecFunctions.js");
+//Cu.import("resource://exchangecommon/ecFunctions.js");
 
 //if (! exchWebService) var exchWebService = {};
 
@@ -53,10 +53,10 @@ exchProgressPanel.prototype = {
     isLoaded: false,
     imageCounter: 1,
     imageList: {
-        image1: "chrome://exchangecalendar-common/skin/images/arrow-circle.png",
-        image2: "chrome://exchangecalendar-common/skin/images/arrow-circle-315.png",
-        image3: "chrome://exchangecalendar-common/skin/images/arrow-circle-225.png",
-        image4: "chrome://exchangecalendar-common/skin/images/arrow-circle-135.png"
+        image1: "chrome://exchangecommon-common/skin/images/arrow-circle.png",
+        image2: "chrome://exchangecommon-common/skin/images/arrow-circle-315.png",
+        image3: "chrome://exchangecommon-common/skin/images/arrow-circle-225.png",
+        image4: "chrome://exchangecommon-common/skin/images/arrow-circle-135.png"
     },
     loadBalancer: Cc["@1st-setup.nl/exchange/loadbalancer;1"]
         .getService(Ci.mivExchangeLoadBalancer),
diff --git a/common/content/progress_panel.xul b/common/content/progress_panel.xul
index ab0ad57c..31af89b3 100644
--- a/common/content/progress_panel.xul
+++ b/common/content/progress_panel.xul
@@ -29,12 +29,12 @@
  *
  * ***** BEGIN LICENSE BLOCK *****/
 -->
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/progress_panel.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/progress_panel.css"?>
 <overlay id="exchWebService-calendar-list-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/progress_panel.js" />
+            src="chrome://exchangecommon/content/progress_panel.js" />
     <popupset>
         <tooltip id="exchWebServicesprogresstip"
                  orient="vertical">
diff --git a/common/content/selectEWSUrl.js b/common/content/selectEWSUrl.js
index c38b5cf1..775efec9 100644
--- a/common/content/selectEWSUrl.js
+++ b/common/content/selectEWSUrl.js
@@ -36,7 +36,7 @@
 
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 if (!exchWebService) var exchWebService = {};
 
diff --git a/common/content/selectEWSUrl.xul b/common/content/selectEWSUrl.xul
index f76e9552..767e5351 100644
--- a/common/content/selectEWSUrl.xul
+++ b/common/content/selectEWSUrl.xul
@@ -39,7 +39,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/selectEWSUrl.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/selectEWSUrl.dtd" > %dtd1;
 ]>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService-selectEWSurl-dialog"
@@ -50,7 +50,7 @@
         ondialogaccept="return exchWebService.selectEWSurl.onAccept();"
         onload="exchWebService.selectEWSurl.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/selectEWSUrl.js" />
+            src="chrome://exchangecommon/content/selectEWSUrl.js" />
     <vbox>
         <description value="&description.selectews;" />
         <seperator />
diff --git a/common/content/sendUpdateTo.js b/common/content/sendUpdateTo.js
index f873dff5..15643920 100644
--- a/common/content/sendUpdateTo.js
+++ b/common/content/sendUpdateTo.js
@@ -39,7 +39,7 @@ var Ci = Components.interfaces;
 var Cu = Components.utils;
 
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 if (!exchWebService) var exchWebService = {};
 
diff --git a/common/content/sendUpdateTo.xul b/common/content/sendUpdateTo.xul
index 4a2fb8b6..8b0da649 100644
--- a/common/content/sendUpdateTo.xul
+++ b/common/content/sendUpdateTo.xul
@@ -39,7 +39,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/sendUpdateTo.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/sendUpdateTo.dtd" > %dtd1;
 ]>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -50,7 +50,7 @@
         ondialogaccept="return exchWebService.sendUpdateTo.onAccept();"
         onload="exchWebService.sendUpdateTo.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/sendUpdateTo.js" />
+            src="chrome://exchangecommon/content/sendUpdateTo.js" />
     <hbox>
         <label value="&label.calendaritem.title;" />
         <label id="exchWebService_sendUpdateTo_calendaritem-title" />
diff --git a/common/content/sharedCalendarParser.js b/common/content/sharedCalendarParser.js
index 10505738..851062ad 100644
--- a/common/content/sharedCalendarParser.js
+++ b/common/content/sharedCalendarParser.js
@@ -28,8 +28,8 @@ var Ci = Components.interfaces;
 var Cu = Components.utils;
 
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("chrome://exchangecalendar/content/msgHdrUtils.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("chrome://exchangecommon/content/msgHdrUtils.js");
 Cu.import("resource:///modules/gloda/utils.js");
 
 if (!exchWebService) var exchWebService = {};
diff --git a/common/content/sharedCalendarParser.xul b/common/content/sharedCalendarParser.xul
index b129caa3..ab2fa7e2 100644
--- a/common/content/sharedCalendarParser.xul
+++ b/common/content/sharedCalendarParser.xul
@@ -38,15 +38,15 @@
 -->
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/sharedCalendarParser.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/sharedCalendarParser.dtd" > %dtd1;
 ]>
-<?xml-stylesheet type="text/css" href="chrome://exchangecalendar/skin/sharedCalendarParser.css"?>
+<?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/sharedCalendarParser.css"?>
 <overlay id="exchWebServiceMessengerOverlay"
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/x-javascript"
-            src="chrome://exchangecalendar/content/sharedCalendarParser.js" />
+            src="chrome://exchangecommon/content/sharedCalendarParser.js" />
     <vbox id="messagepanebox">
         <vbox position="1">
             <vbox id="exchWebServiceSharedCalendarBox"
@@ -54,7 +54,7 @@
                   align="center"
                   class="exchWebServiceSharedCalendarBox">
                 <hbox>
-                    <image src="chrome://exchangecalendar/content/lightningexchangecalendar.png" />
+                    <image src="chrome://exchangecommon/content/lightningexchangecalendar.png" />
                     <vbox>
                         <label value="&exchWebService_vbox_label;" />
                         <label id="exchWebServiceSharedCalendarLabel"
diff --git a/common/content/suite-overlay-preferences.xul b/common/content/suite-overlay-preferences.xul
index 5a197195..02f8b9a4 100644
--- a/common/content/suite-overlay-preferences.xul
+++ b/common/content/suite-overlay-preferences.xul
@@ -39,16 +39,16 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css"?>
-<?xul-overlay href="chrome://exchangecalendar/content/debugPreferences.xul"?>
-<?xul-overlay href="chrome://exchangecalendar/content/cachePreferences.xul"?>
-<?xul-overlay href="chrome://exchangecalendar/content/otherPreferences.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/debugPreferences.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/cachePreferences.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/otherPreferences.xul"?>
 <!DOCTYPE overlay
 [
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     %lightningDTD;
     <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
     %preferencesDTD;
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/preferences.dtd">
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/preferences.dtd">
     %dtd1;
 ]>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/common/content/timezonePreference.js b/common/content/timezonePreference.js
index fb9c72da..b5d549ed 100644
--- a/common/content/timezonePreference.js
+++ b/common/content/timezonePreference.js
@@ -21,7 +21,7 @@ function autoTimezone(aState) {
 }
 
 function infoPopup(title, msg) {
-    var image = "chrome://exchangecalendar-common/skin/images/notify-icon.png";
+    var image = "chrome://exchangecommon-common/skin/images/notify-icon.png";
     var win = Components.classes['@mozilla.org/embedcomp/window-watcher;1'].
     getService(Components.interfaces.nsIWindowWatcher).
     openWindow(null, 'chrome://global/content/alerts/alert.xul',
diff --git a/common/content/timezonePreference.xul b/common/content/timezonePreference.xul
index 0f2aa77e..a3e3c0c6 100644
--- a/common/content/timezonePreference.xul
+++ b/common/content/timezonePreference.xul
@@ -3,11 +3,11 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecalendar/locale/timezonePreference.dtd">
+overlay SYSTEM "chrome://exchangecommon/locale/timezonePreference.dtd">
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendar/content/timezonePreference.js" />
+            src="chrome://exchangecommon/content/timezonePreference.js" />
     <vbox id="calPreferencesBoxTimezones">
         <preferences>
             <preference id="calendar-timezone-local-auto"
diff --git a/common/exchangeapi/ecExchangeRequest.js b/common/exchangeapi/ecExchangeRequest.js
index a0d20ac7..f48bc50a 100644
--- a/common/exchangeapi/ecExchangeRequest.js
+++ b/common/exchangeapi/ecExchangeRequest.js
@@ -45,7 +45,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
diff --git a/common/exchangeapi/erAutoDiscover.js b/common/exchangeapi/erAutoDiscover.js
index c17f45dd..d9c63388 100644
--- a/common/exchangeapi/erAutoDiscover.js
+++ b/common/exchangeapi/erAutoDiscover.js
@@ -43,9 +43,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erAutoDiscoverRequest"];
 
diff --git a/common/exchangeapi/erAutoDiscoverySOAP.js b/common/exchangeapi/erAutoDiscoverySOAP.js
index c8ba8bb9..59705733 100644
--- a/common/exchangeapi/erAutoDiscoverySOAP.js
+++ b/common/exchangeapi/erAutoDiscoverySOAP.js
@@ -43,9 +43,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erAutoDiscoverySOAPRequest"];
 
diff --git a/common/exchangeapi/erBrowseFolder.js b/common/exchangeapi/erBrowseFolder.js
index 2d9fbc32..0e7852a4 100644
--- a/common/exchangeapi/erBrowseFolder.js
+++ b/common/exchangeapi/erBrowseFolder.js
@@ -39,10 +39,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erBrowseFolderRequest"];
 
diff --git a/common/exchangeapi/erConvertID.js b/common/exchangeapi/erConvertID.js
index 79307b2f..be0d2c7b 100644
--- a/common/exchangeapi/erConvertID.js
+++ b/common/exchangeapi/erConvertID.js
@@ -39,9 +39,9 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erConvertIDRequest"];
 
diff --git a/common/exchangeapi/erCreateItem.js b/common/exchangeapi/erCreateItem.js
index 07a97440..473cd0a7 100644
--- a/common/exchangeapi/erCreateItem.js
+++ b/common/exchangeapi/erCreateItem.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erCreateItemRequest"];
 
diff --git a/common/exchangeapi/erDeleteItem.js b/common/exchangeapi/erDeleteItem.js
index ff8e0eba..cd7cda6d 100644
--- a/common/exchangeapi/erDeleteItem.js
+++ b/common/exchangeapi/erDeleteItem.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erDeleteItemRequest"];
 
diff --git a/common/exchangeapi/erFindFolder.js b/common/exchangeapi/erFindFolder.js
index 5e86256e..de1ff8eb 100644
--- a/common/exchangeapi/erFindFolder.js
+++ b/common/exchangeapi/erFindFolder.js
@@ -39,10 +39,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindFolderRequest"];
 
diff --git a/common/exchangeapi/erFindInboxFolder.js b/common/exchangeapi/erFindInboxFolder.js
index 31656166..ec9c1165 100644
--- a/common/exchangeapi/erFindInboxFolder.js
+++ b/common/exchangeapi/erFindInboxFolder.js
@@ -12,10 +12,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erFindInboxFolderRequest"];
 
diff --git a/common/exchangeapi/erFindItems.js b/common/exchangeapi/erFindItems.js
index 926aa833..efb871d5 100644
--- a/common/exchangeapi/erFindItems.js
+++ b/common/exchangeapi/erFindItems.js
@@ -17,9 +17,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erForewardItem.js b/common/exchangeapi/erForewardItem.js
index 5ce25fd1..21e1edfc 100644
--- a/common/exchangeapi/erForewardItem.js
+++ b/common/exchangeapi/erForewardItem.js
@@ -43,9 +43,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erGetAttachments.js b/common/exchangeapi/erGetAttachments.js
index 609cab58..ee543d32 100644
--- a/common/exchangeapi/erGetAttachments.js
+++ b/common/exchangeapi/erGetAttachments.js
@@ -36,9 +36,9 @@
 
 var Cu = Components.utils;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erGetEvents.js b/common/exchangeapi/erGetEvents.js
index e9448f8f..d5a5aa32 100644
--- a/common/exchangeapi/erGetEvents.js
+++ b/common/exchangeapi/erGetEvents.js
@@ -14,10 +14,10 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetEventsRequest"];
 
diff --git a/common/exchangeapi/erGetFolder.js b/common/exchangeapi/erGetFolder.js
index 784b71c5..0c165330 100644
--- a/common/exchangeapi/erGetFolder.js
+++ b/common/exchangeapi/erGetFolder.js
@@ -39,15 +39,15 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 /*Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");*/
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetFolderRequest"];
 
diff --git a/common/exchangeapi/erGetFolderPermission.js b/common/exchangeapi/erGetFolderPermission.js
index ceca9051..95db5fca 100644
--- a/common/exchangeapi/erGetFolderPermission.js
+++ b/common/exchangeapi/erGetFolderPermission.js
@@ -39,15 +39,15 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 /*Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");*/
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetFolderPermissionRequest"];
 
diff --git a/common/exchangeapi/erGetItems.js b/common/exchangeapi/erGetItems.js
index 6395a2dc..eeeefe7d 100644
--- a/common/exchangeapi/erGetItems.js
+++ b/common/exchangeapi/erGetItems.js
@@ -42,9 +42,9 @@ var Cu = Components.utils;
 var Cr = Components.results;
 var components = Components;
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erGetUserAvailability.js b/common/exchangeapi/erGetUserAvailability.js
index 00c08bad..55a60caa 100644
--- a/common/exchangeapi/erGetUserAvailability.js
+++ b/common/exchangeapi/erGetUserAvailability.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erGetUserOofSettings.js b/common/exchangeapi/erGetUserOofSettings.js
index a6dc0eba..f0c2aa5e 100644
--- a/common/exchangeapi/erGetUserOofSettings.js
+++ b/common/exchangeapi/erGetUserOofSettings.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erGetUserOofSettingsRequest"];
 
diff --git a/common/exchangeapi/erPrimarySMTPCheck.js b/common/exchangeapi/erPrimarySMTPCheck.js
index b195807b..727edfeb 100644
--- a/common/exchangeapi/erPrimarySMTPCheck.js
+++ b/common/exchangeapi/erPrimarySMTPCheck.js
@@ -39,10 +39,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 var EXPORTED_SYMBOLS = ["erPrimarySMTPCheckRequest"];
 
diff --git a/common/exchangeapi/erSetUserOofSettings.js b/common/exchangeapi/erSetUserOofSettings.js
index b704f871..821420e7 100644
--- a/common/exchangeapi/erSetUserOofSettings.js
+++ b/common/exchangeapi/erSetUserOofSettings.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSetUserOofSettingsRequest"];
 
diff --git a/common/exchangeapi/erSubscribe.js b/common/exchangeapi/erSubscribe.js
index 0d8f0603..02cd1a4a 100644
--- a/common/exchangeapi/erSubscribe.js
+++ b/common/exchangeapi/erSubscribe.js
@@ -13,10 +13,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erSubscribeRequest"];
 
diff --git a/common/exchangeapi/erSyncFolderItems.js b/common/exchangeapi/erSyncFolderItems.js
index 0c61ad5d..1d5ced2b 100644
--- a/common/exchangeapi/erSyncFolderItems.js
+++ b/common/exchangeapi/erSyncFolderItems.js
@@ -46,9 +46,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erUnsubscribe.js b/common/exchangeapi/erUnsubscribe.js
index 028eb1f0..ed2ab136 100644
--- a/common/exchangeapi/erUnsubscribe.js
+++ b/common/exchangeapi/erUnsubscribe.js
@@ -14,10 +14,10 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erUnsubscribeRequest"];
 
diff --git a/common/exchangeapi/erUpdateFolderPermission.js b/common/exchangeapi/erUpdateFolderPermission.js
index 238a18ed..601c539d 100644
--- a/common/exchangeapi/erUpdateFolderPermission.js
+++ b/common/exchangeapi/erUpdateFolderPermission.js
@@ -17,9 +17,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
diff --git a/common/exchangeapi/erUpdateItem.js b/common/exchangeapi/erUpdateItem.js
index a0d442af..b83c7278 100644
--- a/common/exchangeapi/erUpdateItem.js
+++ b/common/exchangeapi/erUpdateItem.js
@@ -44,9 +44,9 @@ Cu.import("resource://calendar/modules/calAlarmUtils.jsm");
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erUpdateItemRequest"];
 
diff --git a/common/exchangeapi/soapFunctions.js b/common/exchangeapi/soapFunctions.js
index 9dac0c47..5d00a1b7 100644
--- a/common/exchangeapi/soapFunctions.js
+++ b/common/exchangeapi/soapFunctions.js
@@ -40,8 +40,8 @@ var Cu = Components.utils;
 var Cr = Components.results;
 var components = Components;
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-//Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+//Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["makeParentFolderIds2", "makeParentFolderIds3", "publicFoldersMap"];
diff --git a/common/interface/exchangeBaseItem/mivExchangeBaseItem.js b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
index 0ba8eefb..7dcb29e3 100644
--- a/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
+++ b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
@@ -27,7 +27,7 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
diff --git a/common/theme/common/addressingWidgetOverlay.css b/common/theme/common/addressingWidgetOverlay.css
index 6db73bb5..f333dde2 100644
--- a/common/theme/common/addressingWidgetOverlay.css
+++ b/common/theme/common/addressingWidgetOverlay.css
@@ -7,5 +7,5 @@ treechildren::-moz-tree-image(exchange-abook) {
 	margin-bottom: 2px;
 	-moz-margin-start: 2px;
 	-moz-margin-end: -3px;
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/exchange-addrbook.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/exchange-addrbook.png");
 }
diff --git a/common/theme/common/browseFolder.css b/common/theme/common/browseFolder.css
index c6a715a4..734ba70c 100644
--- a/common/theme/common/browseFolder.css
+++ b/common/theme/common/browseFolder.css
@@ -2,5 +2,5 @@
 
 treechildren:-moz-tree-image(IPFAppointment)
 {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/browser_calendar.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/browser_calendar.png");
 }
diff --git a/common/theme/common/calendar-calendars-list.css b/common/theme/common/calendar-calendars-list.css
index c2b58768..7fc27dfe 100644
--- a/common/theme/common/calendar-calendars-list.css
+++ b/common/theme/common/calendar-calendars-list.css
@@ -1,10 +1,10 @@
 calendar-list-tree > tree > treechildren::-moz-tree-image(exchange-status-treecol, exchangeCommError) {
-	list-style-image: url(chrome://exchangecalendar-common/skin/images/plug-disconnect-prohibition.png);
+	list-style-image: url(chrome://exchangecommon-common/skin/images/plug-disconnect-prohibition.png);
 	-moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(exchange-status-treecol, exchangeCommOk) {
-	list-style-image: url(chrome://exchangecalendar-common/skin/images/plug-connect.png);
+	list-style-image: url(chrome://exchangecommon-common/skin/images/plug-connect.png);
 	-moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
diff --git a/common/theme/common/exchWebServiceEditor.css b/common/theme/common/exchWebServiceEditor.css
index 12916ed1..76622e77 100644
--- a/common/theme/common/exchWebServiceEditor.css
+++ b/common/theme/common/exchWebServiceEditor.css
@@ -4,97 +4,97 @@ toolbar.embedded-toolbar {
 }
 
 toolbarbutton.bold-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-bold.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-bold.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.italic-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-italic.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-italic.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.underline-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-underline.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-underline.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.indent-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-indent.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-indent.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.outdent-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-outdent.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-outdent.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.orderedlist-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-list-order.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-list-order.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.unorderedlist-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-list.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-list.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.decreaseFont-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-size-down.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-size-down.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.increaseFont-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-size-up.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-size-up.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.align-left-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-alignment.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-alignment.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.align-center-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-alignment-center.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-alignment-center.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.align-right-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-alignment-right.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-alignment-right.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.align-justify-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/edit-alignment-justify.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/edit-alignment-justify.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.addlink-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/chain--plus.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/chain--plus.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.removelink-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/chain--minus.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/chain--minus.png");
 	height: 32px;
 	width: 32px;
 }
 
 toolbarbutton.editlink-button {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/chain--pencil.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/chain--pencil.png");
 	height: 32px;
 	width: 32px;
 }
diff --git a/common/theme/common/extras-preferences.css b/common/theme/common/extras-preferences.css
index 9458a44f..676e649e 100644
--- a/common/theme/common/extras-preferences.css
+++ b/common/theme/common/extras-preferences.css
@@ -1,3 +1,3 @@
 radio[pane=extra-pane] {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/extra-icon.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/extra-icon.png");
 }
diff --git a/common/theme/common/invite-style.css b/common/theme/common/invite-style.css
index 71e8ab0f..845a8493 100644
--- a/common/theme/common/invite-style.css
+++ b/common/theme/common/invite-style.css
@@ -1,3 +1,3 @@
 .inviteColumnHeader {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/threadcol-invite.gif");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/threadcol-invite.gif");
 }
\ No newline at end of file
diff --git a/common/theme/common/itemBodyEditor.css b/common/theme/common/itemBodyEditor.css
index ba507563..18dbb760 100644
--- a/common/theme/common/itemBodyEditor.css
+++ b/common/theme/common/itemBodyEditor.css
@@ -1,3 +1,3 @@
 itemBodyEditor {
-	-moz-binding: url(chrome://exchangecalendar/content/exchWebServiceEditor.xml#exchWebServiceEditor);
+	-moz-binding: url(chrome://exchangecommon/content/exchWebServiceEditor.xml#exchWebServiceEditor);
 }
diff --git a/common/theme/common/manageEWSAccounts.css b/common/theme/common/manageEWSAccounts.css
index 60f1186b..87fe4c44 100644
--- a/common/theme/common/manageEWSAccounts.css
+++ b/common/theme/common/manageEWSAccounts.css
@@ -1,26 +1,26 @@
 @import url(chrome://global/skin/);
 
 exchWebService-statusImage {
-	-moz-binding: url(chrome://exchangecalendar/content/exchWebService_bindings.xml#exchWebService-statusImage);
+	-moz-binding: url(chrome://exchangecommon/content/exchWebService_bindings.xml#exchWebService-statusImage);
 }
 
 image.exchWebService-statusImage-0
 {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/asterisk-small-yellow.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/asterisk-small-yellow.png");
 	height:16px;
 	width:16px;
 }
 
 image.exchWebService-statusImage-1
 {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/cross.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/cross.png");
 	height:16px;
 	width:16px;
 }
 
 image.exchWebService-statusImage-2
 {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/tick.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/tick.png");
 	height:16px;
 	width:16px;
 }
diff --git a/common/theme/common/oofSettings.css b/common/theme/common/oofSettings.css
index dc80ce54..642690dd 100644
--- a/common/theme/common/oofSettings.css
+++ b/common/theme/common/oofSettings.css
@@ -1,3 +1,3 @@
 oofEditor {
-	-moz-binding: url(chrome://exchangecalendar/content/exchWebServiceEditor.xml#exchWebServiceEditor);
+	-moz-binding: url(chrome://exchangecommon/content/exchWebServiceEditor.xml#exchWebServiceEditor);
 }
diff --git a/common/theme/common/preferences.css b/common/theme/common/preferences.css
index d8040098..2932f3a6 100644
--- a/common/theme/common/preferences.css
+++ b/common/theme/common/preferences.css
@@ -1,3 +1,3 @@
 radio[pane=exchangeWebService_paneAccounts] {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/lightningexchangecalendar.png");
 }
diff --git a/common/theme/common/priority-display.css b/common/theme/common/priority-display.css
index e5fa0471..21070732 100644
--- a/common/theme/common/priority-display.css
+++ b/common/theme/common/priority-display.css
@@ -1,6 +1,6 @@
 .priorityColumnHeaderIcon
 {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/threadCol-PriorityIcon.gif");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/threadCol-PriorityIcon.gif");
 }
 
 #threadTree treechildren::-moz-tree-row(lcolor-FFFFFF), .blcolor-FFFFFF {
diff --git a/common/theme/common/progress_panel.css b/common/theme/common/progress_panel.css
index e5501931..9ffc99b7 100644
--- a/common/theme/common/progress_panel.css
+++ b/common/theme/common/progress_panel.css
@@ -7,7 +7,7 @@
 
 #exchWebService-progress-image
 {
-	list-style-image: url("chrome://exchangecalendar-common/skin/images/arrow-circle.png");
+	list-style-image: url("chrome://exchangecommon-common/skin/images/arrow-circle.png");
 	height:16px;
 	width:16px;
 }
@@ -18,7 +18,7 @@ label.serverline-bold
 }
 
 exchangeProgressGrid {
-	-moz-binding: url("chrome://exchangecalendar/content/progress_panel.xml#exchangeProgressGrid");
+	-moz-binding: url("chrome://exchangecommon/content/progress_panel.xml#exchangeProgressGrid");
 	border-top-style: solid;
 	border-top-color: lightgray;
 }
diff --git a/common/theme/mac/addressingWidgetOverlay.css b/common/theme/mac/addressingWidgetOverlay.css
index b8529d8c..6f927a92 100644
--- a/common/theme/mac/addressingWidgetOverlay.css
+++ b/common/theme/mac/addressingWidgetOverlay.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/addressingWidgetOverlay.css);
+@import url(chrome://exchangecommon-common/skin/addressingWidgetOverlay.css);
diff --git a/common/theme/mac/browseFolder.css b/common/theme/mac/browseFolder.css
index 6c0a1e0a..952923ea 100644
--- a/common/theme/mac/browseFolder.css
+++ b/common/theme/mac/browseFolder.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/browseFolder.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/browseFolder.css);
\ No newline at end of file
diff --git a/common/theme/mac/calendar-calendars-list.css b/common/theme/mac/calendar-calendars-list.css
index 2004098b..cb27be4f 100644
--- a/common/theme/mac/calendar-calendars-list.css
+++ b/common/theme/mac/calendar-calendars-list.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-calendars-list.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-calendars-list.css);
\ No newline at end of file
diff --git a/common/theme/mac/calendar-event-dialog-attendees.css b/common/theme/mac/calendar-event-dialog-attendees.css
index 84bdbc5b..2c50e97a 100644
--- a/common/theme/mac/calendar-event-dialog-attendees.css
+++ b/common/theme/mac/calendar-event-dialog-attendees.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
diff --git a/common/theme/mac/calendar-summary-dialog.css b/common/theme/mac/calendar-summary-dialog.css
index dbb7a2e2..43fd8c44 100644
--- a/common/theme/mac/calendar-summary-dialog.css
+++ b/common/theme/mac/calendar-summary-dialog.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
diff --git a/common/theme/mac/delegateCalendar.css b/common/theme/mac/delegateCalendar.css
index a37b2a67..fffae5c8 100644
--- a/common/theme/mac/delegateCalendar.css
+++ b/common/theme/mac/delegateCalendar.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/delegateCalendar.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/delegateCalendar.css);
\ No newline at end of file
diff --git a/common/theme/mac/exchWebServiceEditor.css b/common/theme/mac/exchWebServiceEditor.css
index f86d0c35..94baaa10 100644
--- a/common/theme/mac/exchWebServiceEditor.css
+++ b/common/theme/mac/exchWebServiceEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
diff --git a/common/theme/mac/extras-preferences.css b/common/theme/mac/extras-preferences.css
index 98561bb1..2a478347 100644
--- a/common/theme/mac/extras-preferences.css
+++ b/common/theme/mac/extras-preferences.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/extras-preferences.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/extras-preferences.css);
\ No newline at end of file
diff --git a/common/theme/mac/invite-style.css b/common/theme/mac/invite-style.css
index c4c14cae..10a7a647 100644
--- a/common/theme/mac/invite-style.css
+++ b/common/theme/mac/invite-style.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/invite-style.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/invite-style.css);
\ No newline at end of file
diff --git a/common/theme/mac/itemBodyEditor.css b/common/theme/mac/itemBodyEditor.css
index c8e299aa..4cc169c9 100644
--- a/common/theme/mac/itemBodyEditor.css
+++ b/common/theme/mac/itemBodyEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/itemBodyEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/itemBodyEditor.css);
\ No newline at end of file
diff --git a/common/theme/mac/manageEWSAccounts.css b/common/theme/mac/manageEWSAccounts.css
index 391bfc66..df2908b4 100644
--- a/common/theme/mac/manageEWSAccounts.css
+++ b/common/theme/mac/manageEWSAccounts.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/manageEWSAccounts.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/manageEWSAccounts.css);
\ No newline at end of file
diff --git a/common/theme/mac/oofSettings.css b/common/theme/mac/oofSettings.css
index f308171c..2557533c 100644
--- a/common/theme/mac/oofSettings.css
+++ b/common/theme/mac/oofSettings.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/oofSettings.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/oofSettings.css);
\ No newline at end of file
diff --git a/common/theme/mac/preferences.css b/common/theme/mac/preferences.css
index 3da1c167..5b92fccf 100644
--- a/common/theme/mac/preferences.css
+++ b/common/theme/mac/preferences.css
@@ -1,2 +1,2 @@
-@import url(chrome://exchangecalendar-common/skin/preferences.css);
+@import url(chrome://exchangecommon-common/skin/preferences.css);
 
diff --git a/common/theme/mac/priority-display.css b/common/theme/mac/priority-display.css
index 995a923f..553dbf74 100644
--- a/common/theme/mac/priority-display.css
+++ b/common/theme/mac/priority-display.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/priority-display.css);
+@import url(chrome://exchangecommon-common/skin/priority-display.css);
diff --git a/common/theme/mac/progress_panel.css b/common/theme/mac/progress_panel.css
index 2abd4c9e..edd57a27 100644
--- a/common/theme/mac/progress_panel.css
+++ b/common/theme/mac/progress_panel.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/progress_panel.css);
+@import url(chrome://exchangecommon-common/skin/progress_panel.css);
diff --git a/common/theme/mac/sharedCalendarParser.css b/common/theme/mac/sharedCalendarParser.css
index 47596e29..f363aa57 100644
--- a/common/theme/mac/sharedCalendarParser.css
+++ b/common/theme/mac/sharedCalendarParser.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/sharedCalendarParser.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/sharedCalendarParser.css);
\ No newline at end of file
diff --git a/common/theme/unix/addressingWidgetOverlay.css b/common/theme/unix/addressingWidgetOverlay.css
index b8529d8c..6f927a92 100644
--- a/common/theme/unix/addressingWidgetOverlay.css
+++ b/common/theme/unix/addressingWidgetOverlay.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/addressingWidgetOverlay.css);
+@import url(chrome://exchangecommon-common/skin/addressingWidgetOverlay.css);
diff --git a/common/theme/unix/browseFolder.css b/common/theme/unix/browseFolder.css
index 6c0a1e0a..952923ea 100644
--- a/common/theme/unix/browseFolder.css
+++ b/common/theme/unix/browseFolder.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/browseFolder.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/browseFolder.css);
\ No newline at end of file
diff --git a/common/theme/unix/calendar-calendars-list.css b/common/theme/unix/calendar-calendars-list.css
index 2004098b..cb27be4f 100644
--- a/common/theme/unix/calendar-calendars-list.css
+++ b/common/theme/unix/calendar-calendars-list.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-calendars-list.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-calendars-list.css);
\ No newline at end of file
diff --git a/common/theme/unix/calendar-event-dialog-attendees.css b/common/theme/unix/calendar-event-dialog-attendees.css
index 84bdbc5b..2c50e97a 100644
--- a/common/theme/unix/calendar-event-dialog-attendees.css
+++ b/common/theme/unix/calendar-event-dialog-attendees.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
diff --git a/common/theme/unix/calendar-summary-dialog.css b/common/theme/unix/calendar-summary-dialog.css
index dbb7a2e2..43fd8c44 100644
--- a/common/theme/unix/calendar-summary-dialog.css
+++ b/common/theme/unix/calendar-summary-dialog.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
diff --git a/common/theme/unix/delegateCalendar.css b/common/theme/unix/delegateCalendar.css
index a37b2a67..fffae5c8 100644
--- a/common/theme/unix/delegateCalendar.css
+++ b/common/theme/unix/delegateCalendar.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/delegateCalendar.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/delegateCalendar.css);
\ No newline at end of file
diff --git a/common/theme/unix/exchWebServiceEditor.css b/common/theme/unix/exchWebServiceEditor.css
index f86d0c35..94baaa10 100644
--- a/common/theme/unix/exchWebServiceEditor.css
+++ b/common/theme/unix/exchWebServiceEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
diff --git a/common/theme/unix/extras-preferences.css b/common/theme/unix/extras-preferences.css
index 98561bb1..2a478347 100644
--- a/common/theme/unix/extras-preferences.css
+++ b/common/theme/unix/extras-preferences.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/extras-preferences.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/extras-preferences.css);
\ No newline at end of file
diff --git a/common/theme/unix/invite-style.css b/common/theme/unix/invite-style.css
index c4c14cae..10a7a647 100644
--- a/common/theme/unix/invite-style.css
+++ b/common/theme/unix/invite-style.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/invite-style.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/invite-style.css);
\ No newline at end of file
diff --git a/common/theme/unix/itemBodyEditor.css b/common/theme/unix/itemBodyEditor.css
index c8e299aa..4cc169c9 100644
--- a/common/theme/unix/itemBodyEditor.css
+++ b/common/theme/unix/itemBodyEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/itemBodyEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/itemBodyEditor.css);
\ No newline at end of file
diff --git a/common/theme/unix/manageEWSAccounts.css b/common/theme/unix/manageEWSAccounts.css
index 391bfc66..df2908b4 100644
--- a/common/theme/unix/manageEWSAccounts.css
+++ b/common/theme/unix/manageEWSAccounts.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/manageEWSAccounts.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/manageEWSAccounts.css);
\ No newline at end of file
diff --git a/common/theme/unix/oofSettings.css b/common/theme/unix/oofSettings.css
index f308171c..2557533c 100644
--- a/common/theme/unix/oofSettings.css
+++ b/common/theme/unix/oofSettings.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/oofSettings.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/oofSettings.css);
\ No newline at end of file
diff --git a/common/theme/unix/preferences.css b/common/theme/unix/preferences.css
index 3da1c167..5b92fccf 100644
--- a/common/theme/unix/preferences.css
+++ b/common/theme/unix/preferences.css
@@ -1,2 +1,2 @@
-@import url(chrome://exchangecalendar-common/skin/preferences.css);
+@import url(chrome://exchangecommon-common/skin/preferences.css);
 
diff --git a/common/theme/unix/priority-display.css b/common/theme/unix/priority-display.css
index 995a923f..553dbf74 100644
--- a/common/theme/unix/priority-display.css
+++ b/common/theme/unix/priority-display.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/priority-display.css);
+@import url(chrome://exchangecommon-common/skin/priority-display.css);
diff --git a/common/theme/unix/progress_panel.css b/common/theme/unix/progress_panel.css
index 2abd4c9e..edd57a27 100644
--- a/common/theme/unix/progress_panel.css
+++ b/common/theme/unix/progress_panel.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/progress_panel.css);
+@import url(chrome://exchangecommon-common/skin/progress_panel.css);
diff --git a/common/theme/unix/sharedCalendarParser.css b/common/theme/unix/sharedCalendarParser.css
index 47596e29..f363aa57 100644
--- a/common/theme/unix/sharedCalendarParser.css
+++ b/common/theme/unix/sharedCalendarParser.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/sharedCalendarParser.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/sharedCalendarParser.css);
\ No newline at end of file
diff --git a/common/theme/win/addressingWidgetOverlay.css b/common/theme/win/addressingWidgetOverlay.css
index b8529d8c..6f927a92 100644
--- a/common/theme/win/addressingWidgetOverlay.css
+++ b/common/theme/win/addressingWidgetOverlay.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/addressingWidgetOverlay.css);
+@import url(chrome://exchangecommon-common/skin/addressingWidgetOverlay.css);
diff --git a/common/theme/win/browseFolder.css b/common/theme/win/browseFolder.css
index 6c0a1e0a..952923ea 100644
--- a/common/theme/win/browseFolder.css
+++ b/common/theme/win/browseFolder.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/browseFolder.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/browseFolder.css);
\ No newline at end of file
diff --git a/common/theme/win/calendar-calendars-list.css b/common/theme/win/calendar-calendars-list.css
index 2004098b..cb27be4f 100644
--- a/common/theme/win/calendar-calendars-list.css
+++ b/common/theme/win/calendar-calendars-list.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-calendars-list.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-calendars-list.css);
\ No newline at end of file
diff --git a/common/theme/win/calendar-event-dialog-attendees.css b/common/theme/win/calendar-event-dialog-attendees.css
index 84bdbc5b..2c50e97a 100644
--- a/common/theme/win/calendar-event-dialog-attendees.css
+++ b/common/theme/win/calendar-event-dialog-attendees.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
diff --git a/common/theme/win/calendar-summary-dialog.css b/common/theme/win/calendar-summary-dialog.css
index dbb7a2e2..43fd8c44 100644
--- a/common/theme/win/calendar-summary-dialog.css
+++ b/common/theme/win/calendar-summary-dialog.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
diff --git a/common/theme/win/delegateCalendar.css b/common/theme/win/delegateCalendar.css
index a37b2a67..fffae5c8 100644
--- a/common/theme/win/delegateCalendar.css
+++ b/common/theme/win/delegateCalendar.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/delegateCalendar.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/delegateCalendar.css);
\ No newline at end of file
diff --git a/common/theme/win/exchWebServiceEditor.css b/common/theme/win/exchWebServiceEditor.css
index f86d0c35..94baaa10 100644
--- a/common/theme/win/exchWebServiceEditor.css
+++ b/common/theme/win/exchWebServiceEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
diff --git a/common/theme/win/extras-preferences.css b/common/theme/win/extras-preferences.css
index 98561bb1..2a478347 100644
--- a/common/theme/win/extras-preferences.css
+++ b/common/theme/win/extras-preferences.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/extras-preferences.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/extras-preferences.css);
\ No newline at end of file
diff --git a/common/theme/win/invite-style.css b/common/theme/win/invite-style.css
index c4c14cae..10a7a647 100644
--- a/common/theme/win/invite-style.css
+++ b/common/theme/win/invite-style.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/invite-style.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/invite-style.css);
\ No newline at end of file
diff --git a/common/theme/win/itemBodyEditor.css b/common/theme/win/itemBodyEditor.css
index c8e299aa..4cc169c9 100644
--- a/common/theme/win/itemBodyEditor.css
+++ b/common/theme/win/itemBodyEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/itemBodyEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/itemBodyEditor.css);
\ No newline at end of file
diff --git a/common/theme/win/manageEWSAccounts.css b/common/theme/win/manageEWSAccounts.css
index 391bfc66..df2908b4 100644
--- a/common/theme/win/manageEWSAccounts.css
+++ b/common/theme/win/manageEWSAccounts.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/manageEWSAccounts.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/manageEWSAccounts.css);
\ No newline at end of file
diff --git a/common/theme/win/oofSettings.css b/common/theme/win/oofSettings.css
index f308171c..2557533c 100644
--- a/common/theme/win/oofSettings.css
+++ b/common/theme/win/oofSettings.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/oofSettings.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/oofSettings.css);
\ No newline at end of file
diff --git a/common/theme/win/preferences.css b/common/theme/win/preferences.css
index 3da1c167..5b92fccf 100644
--- a/common/theme/win/preferences.css
+++ b/common/theme/win/preferences.css
@@ -1,2 +1,2 @@
-@import url(chrome://exchangecalendar-common/skin/preferences.css);
+@import url(chrome://exchangecommon-common/skin/preferences.css);
 
diff --git a/common/theme/win/priority-display.css b/common/theme/win/priority-display.css
index 995a923f..553dbf74 100644
--- a/common/theme/win/priority-display.css
+++ b/common/theme/win/priority-display.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/priority-display.css);
+@import url(chrome://exchangecommon-common/skin/priority-display.css);
diff --git a/common/theme/win/progress_panel.css b/common/theme/win/progress_panel.css
index 2abd4c9e..edd57a27 100644
--- a/common/theme/win/progress_panel.css
+++ b/common/theme/win/progress_panel.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/progress_panel.css);
+@import url(chrome://exchangecommon-common/skin/progress_panel.css);
diff --git a/common/theme/win/sharedCalendarParser.css b/common/theme/win/sharedCalendarParser.css
index 47596e29..f363aa57 100644
--- a/common/theme/win/sharedCalendarParser.css
+++ b/common/theme/win/sharedCalendarParser.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/sharedCalendarParser.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/sharedCalendarParser.css);
\ No newline at end of file
diff --git a/common/theme/winaero/addressingWidgetOverlay.css b/common/theme/winaero/addressingWidgetOverlay.css
index b8529d8c..6f927a92 100644
--- a/common/theme/winaero/addressingWidgetOverlay.css
+++ b/common/theme/winaero/addressingWidgetOverlay.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/addressingWidgetOverlay.css);
+@import url(chrome://exchangecommon-common/skin/addressingWidgetOverlay.css);
diff --git a/common/theme/winaero/browseFolder.css b/common/theme/winaero/browseFolder.css
index 6c0a1e0a..952923ea 100644
--- a/common/theme/winaero/browseFolder.css
+++ b/common/theme/winaero/browseFolder.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/browseFolder.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/browseFolder.css);
\ No newline at end of file
diff --git a/common/theme/winaero/calendar-calendars-list.css b/common/theme/winaero/calendar-calendars-list.css
index 2004098b..cb27be4f 100644
--- a/common/theme/winaero/calendar-calendars-list.css
+++ b/common/theme/winaero/calendar-calendars-list.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-calendars-list.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-calendars-list.css);
\ No newline at end of file
diff --git a/common/theme/winaero/calendar-event-dialog-attendees.css b/common/theme/winaero/calendar-event-dialog-attendees.css
index 84bdbc5b..2c50e97a 100644
--- a/common/theme/winaero/calendar-event-dialog-attendees.css
+++ b/common/theme/winaero/calendar-event-dialog-attendees.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-event-dialog-attendees.css);
\ No newline at end of file
diff --git a/common/theme/winaero/calendar-summary-dialog.css b/common/theme/winaero/calendar-summary-dialog.css
index dbb7a2e2..43fd8c44 100644
--- a/common/theme/winaero/calendar-summary-dialog.css
+++ b/common/theme/winaero/calendar-summary-dialog.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/calendar-summary-dialog.css);
\ No newline at end of file
diff --git a/common/theme/winaero/delegateCalendar.css b/common/theme/winaero/delegateCalendar.css
index a37b2a67..fffae5c8 100644
--- a/common/theme/winaero/delegateCalendar.css
+++ b/common/theme/winaero/delegateCalendar.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/delegateCalendar.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/delegateCalendar.css);
\ No newline at end of file
diff --git a/common/theme/winaero/exchWebServiceEditor.css b/common/theme/winaero/exchWebServiceEditor.css
index f86d0c35..94baaa10 100644
--- a/common/theme/winaero/exchWebServiceEditor.css
+++ b/common/theme/winaero/exchWebServiceEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/exchWebServiceEditor.css);
\ No newline at end of file
diff --git a/common/theme/winaero/extras-preferences.css b/common/theme/winaero/extras-preferences.css
index 98561bb1..2a478347 100644
--- a/common/theme/winaero/extras-preferences.css
+++ b/common/theme/winaero/extras-preferences.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/extras-preferences.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/extras-preferences.css);
\ No newline at end of file
diff --git a/common/theme/winaero/invite-style.css b/common/theme/winaero/invite-style.css
index c4c14cae..10a7a647 100644
--- a/common/theme/winaero/invite-style.css
+++ b/common/theme/winaero/invite-style.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/invite-style.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/invite-style.css);
\ No newline at end of file
diff --git a/common/theme/winaero/itemBodyEditor.css b/common/theme/winaero/itemBodyEditor.css
index c8e299aa..4cc169c9 100644
--- a/common/theme/winaero/itemBodyEditor.css
+++ b/common/theme/winaero/itemBodyEditor.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/itemBodyEditor.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/itemBodyEditor.css);
\ No newline at end of file
diff --git a/common/theme/winaero/manageEWSAccounts.css b/common/theme/winaero/manageEWSAccounts.css
index 391bfc66..df2908b4 100644
--- a/common/theme/winaero/manageEWSAccounts.css
+++ b/common/theme/winaero/manageEWSAccounts.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/manageEWSAccounts.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/manageEWSAccounts.css);
\ No newline at end of file
diff --git a/common/theme/winaero/oofSettings.css b/common/theme/winaero/oofSettings.css
index f308171c..2557533c 100644
--- a/common/theme/winaero/oofSettings.css
+++ b/common/theme/winaero/oofSettings.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/oofSettings.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/oofSettings.css);
\ No newline at end of file
diff --git a/common/theme/winaero/preferences.css b/common/theme/winaero/preferences.css
index 3da1c167..5b92fccf 100644
--- a/common/theme/winaero/preferences.css
+++ b/common/theme/winaero/preferences.css
@@ -1,2 +1,2 @@
-@import url(chrome://exchangecalendar-common/skin/preferences.css);
+@import url(chrome://exchangecommon-common/skin/preferences.css);
 
diff --git a/common/theme/winaero/priority-display.css b/common/theme/winaero/priority-display.css
index 995a923f..553dbf74 100644
--- a/common/theme/winaero/priority-display.css
+++ b/common/theme/winaero/priority-display.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/priority-display.css);
+@import url(chrome://exchangecommon-common/skin/priority-display.css);
diff --git a/common/theme/winaero/progress_panel.css b/common/theme/winaero/progress_panel.css
index 2abd4c9e..edd57a27 100644
--- a/common/theme/winaero/progress_panel.css
+++ b/common/theme/winaero/progress_panel.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/progress_panel.css);
+@import url(chrome://exchangecommon-common/skin/progress_panel.css);
diff --git a/common/theme/winaero/sharedCalendarParser.css b/common/theme/winaero/sharedCalendarParser.css
index 47596e29..f363aa57 100644
--- a/common/theme/winaero/sharedCalendarParser.css
+++ b/common/theme/winaero/sharedCalendarParser.css
@@ -1 +1 @@
-@import url(chrome://exchangecalendar-common/skin/sharedCalendarParser.css);
\ No newline at end of file
+@import url(chrome://exchangecommon-common/skin/sharedCalendarParser.css);
\ No newline at end of file
diff --git a/defaults/preferences/debug.js b/defaults/preferences/debug.js
index fd618fb9..a1b4e9b8 100644
--- a/defaults/preferences/debug.js
+++ b/defaults/preferences/debug.js
@@ -5,13 +5,13 @@ pref("javascript.options.showInConsole", true);
 pref("javascript.options.strict", true);
 pref("nglayout.debug.disable_xul_cache", true);
 pref("nglayout.debug.disable_xul_fastload", true);
-pref("extensions.extras.HighIcon", "chrome://exchangecalendar-common/skin/images/high.gif");
+pref("extensions.extras.HighIcon", "chrome://exchangecommon-common/skin/images/high.gif");
 pref("extensions.extras.HighestColor", "#FFCC99");
-pref("extensions.extras.HighestIcon", "chrome://exchangecalendar-common/skin/images/highest.gif");
+pref("extensions.extras.HighestIcon", "chrome://exchangecommon-common/skin/images/highest.gif");
 pref("extensions.extras.Iconify", true);
-pref("extensions.extras.LowIcon", "chrome://exchangecalendar-common/skin/images/low.gif");
+pref("extensions.extras.LowIcon", "chrome://exchangecommon-common/skin/images/low.gif");
 pref("extensions.extras.LowestColor", "#99FF99");
-pref("extensions.extras.LowestIcon", "chrome://exchangecalendar-common/skin/images/lowest.gif");
+pref("extensions.extras.LowestIcon", "chrome://exchangecommon-common/skin/images/lowest.gif");
 pref("extensions.extras.ShadeHigh", true);
 pref("extensions.extras.ShadeLow", false);
 pref("calendar.timezone.local.auto", true);
diff --git a/defaults/preferences/extensions.extras.pref.js b/defaults/preferences/extensions.extras.pref.js
index 726e6a72..d2d68356 100644
--- a/defaults/preferences/extensions.extras.pref.js
+++ b/defaults/preferences/extensions.extras.pref.js
@@ -1,10 +1,10 @@
-pref("extensions.extras.HighIcon", "chrome://exchangecalendar-common/skin/images/high.gif");
+pref("extensions.extras.HighIcon", "chrome://exchangecommon-common/skin/images/high.gif");
 pref("extensions.extras.HighestColor", "#FFCC99");
-pref("extensions.extras.HighestIcon", "chrome://exchangecalendar-common/skin/images/highest.gif");
+pref("extensions.extras.HighestIcon", "chrome://exchangecommon-common/skin/images/highest.gif");
 pref("extensions.extras.Iconify", true);
-pref("extensions.extras.LowIcon", "chrome://exchangecalendar-common/skin/images/low.gif");
+pref("extensions.extras.LowIcon", "chrome://exchangecommon-common/skin/images/low.gif");
 pref("extensions.extras.LowestColor", "#99FF99");
-pref("extensions.extras.LowestIcon", "chrome://exchangecalendar-common/skin/images/lowest.gif");
+pref("extensions.extras.LowestIcon", "chrome://exchangecommon-common/skin/images/lowest.gif");
 pref("extensions.extras.ShadeHigh", true);
 pref("extensions.extras.ShadeLow", false);
 pref("extensions.extras.tagImportant", true);
diff --git a/emailtag/content/emailtag.js b/emailtag/content/emailtag.js
index b9173056..6531d93a 100644
--- a/emailtag/content/emailtag.js
+++ b/emailtag/content/emailtag.js
@@ -12,13 +12,13 @@ var Cu = Components.utils;
 
 Cu.import("resource://interfaces/xml2json/xml2json.js");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://exchangecalendar/erGetItems.js");
-Cu.import("resource://exchangecalendar/erFindInboxFolder.js");
-Cu.import("resource://exchangecalendar/erSubscribe.js");
-Cu.import("resource://exchangecalendar/erGetEvents.js");
-Cu.import("resource://exchangecalendar/erFindItems.js");
-Cu.import("resource://exchangecalendar/erUpdateItem.js");
-Cu.import("resource://exchangecalendar/erUnsubscribe.js");
+Cu.import("resource://exchangecommon/erGetItems.js");
+Cu.import("resource://exchangecommon/erFindInboxFolder.js");
+Cu.import("resource://exchangecommon/erSubscribe.js");
+Cu.import("resource://exchangecommon/erGetEvents.js");
+Cu.import("resource://exchangecommon/erFindItems.js");
+Cu.import("resource://exchangecommon/erUpdateItem.js");
+Cu.import("resource://exchangecommon/erUnsubscribe.js");
 
 const eventTypes = ["NewMailEvent", "ModifiedEvent", "MovedEvent", "CopiedEvent", "CreatedEvent"];
 
diff --git a/install.rdf b/install.rdf
index cb2dc3d2..a53b9474 100644
--- a/install.rdf
+++ b/install.rdf
@@ -23,7 +23,7 @@
         <em:unpack>true</em:unpack>
         <em:name>Exchange Calendar</em:name>
         <em:homepageURL>https://github.com/ExchangeCalendar/exchangecalendar</em:homepageURL>
-        <em:iconURL>chrome://exchangecalendar-common/skin/images/lightningexchangecalendar.png</em:iconURL>
+        <em:iconURL>chrome://exchangecommon-common/skin/images/lightningexchangecalendar.png</em:iconURL>
         <em:creator>Michel Verbraak</em:creator>
         <em:developer>ExchangeCalendar community</em:developer>
         <em:translator>Michel Verbraak (nl)</em:translator>

From 7589a5bac9d17717f07108e0ce378409d2e33c95 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 27 Jan 2018 20:51:27 +0100
Subject: [PATCH 195/222] rename namespace interfaces to a less common name

---
 calendar/content/delegateCalendar.js                         | 2 +-
 calendar/exchangeapi/erAddDelegateRequest.js                 | 2 +-
 calendar/exchangeapi/erFindCalendarItems.js                  | 2 +-
 calendar/exchangeapi/erFindOccurrences.js                    | 2 +-
 calendar/exchangeapi/erGetDelegateRequest.js                 | 2 +-
 calendar/exchangeapi/erGetMeetingRequestByUID.js             | 2 +-
 calendar/exchangeapi/erGetTimeZones.js                       | 2 +-
 calendar/exchangeapi/erRemoveDelegateRequest.js              | 2 +-
 calendar/exchangeapi/erSyncInbox.js                          | 2 +-
 calendar/exchangeapi/erUpdateDelegateRequest.js              | 2 +-
 calendar/interface/exchangeAttendee/mivExchangeAttendee.js   | 2 +-
 calendar/interface/exchangeCalendar/mivExchangeCalendar.js   | 2 +-
 calendar/interface/exchangeEvent/mivExchangeEvent.js         | 4 ++--
 calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js  | 2 +-
 calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js | 4 ++--
 calendar/interface/exchangeTodo/mivExchangeTodo.js           | 4 ++--
 chrome.manifest                                              | 2 +-
 common/content/delegateFolder.js                             | 2 +-
 common/exchangeapi/ecExchangeRequest.js                      | 4 ++--
 common/exchangeapi/erFindItems.js                            | 2 +-
 common/exchangeapi/erForewardItem.js                         | 2 +-
 common/exchangeapi/erGetAttachments.js                       | 2 +-
 common/exchangeapi/erGetItems.js                             | 2 +-
 common/exchangeapi/erGetUserAvailability.js                  | 2 +-
 common/exchangeapi/erSyncFolderItems.js                      | 2 +-
 common/exchangeapi/erUpdateFolderPermission.js               | 2 +-
 common/exchangeapi/soapFunctions.js                          | 2 +-
 common/interface/exchangeBaseItem/mivExchangeBaseItem.js     | 4 ++--
 common/interface/global/mivFunctions.js                      | 4 ++--
 defaults/preferences/update.js                               | 4 +++-
 emailtag/content/emailtag.js                                 | 2 +-
 31 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/calendar/content/delegateCalendar.js b/calendar/content/delegateCalendar.js
index e0230454..b768a39b 100644
--- a/calendar/content/delegateCalendar.js
+++ b/calendar/content/delegateCalendar.js
@@ -22,7 +22,7 @@ Cu.import("resource://exchangecalendartask/erRemoveDelegateRequest.js");
 Cu.import("resource://exchangecalendartask/erUpdateDelegateRequest.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 function exchDelegateCalendarSettings(aDocument, aWindow) {
     this._document = aDocument;
diff --git a/calendar/exchangeapi/erAddDelegateRequest.js b/calendar/exchangeapi/erAddDelegateRequest.js
index 3b536c5f..48dfa459 100644
--- a/calendar/exchangeapi/erAddDelegateRequest.js
+++ b/calendar/exchangeapi/erAddDelegateRequest.js
@@ -21,7 +21,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erAddDelegateRequest"];
 
diff --git a/calendar/exchangeapi/erFindCalendarItems.js b/calendar/exchangeapi/erFindCalendarItems.js
index 299664b9..84ba8b13 100644
--- a/calendar/exchangeapi/erFindCalendarItems.js
+++ b/calendar/exchangeapi/erFindCalendarItems.js
@@ -47,7 +47,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erFindCalendarItemsRequest"];
 
diff --git a/calendar/exchangeapi/erFindOccurrences.js b/calendar/exchangeapi/erFindOccurrences.js
index e9392149..8eda2300 100644
--- a/calendar/exchangeapi/erFindOccurrences.js
+++ b/calendar/exchangeapi/erFindOccurrences.js
@@ -50,7 +50,7 @@ Cu.import("resource://exchangecommon/soapFunctions.js");
 
 Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erFindOccurrencesRequest"];
 
diff --git a/calendar/exchangeapi/erGetDelegateRequest.js b/calendar/exchangeapi/erGetDelegateRequest.js
index 2ad48dc9..2d78ca49 100644
--- a/calendar/exchangeapi/erGetDelegateRequest.js
+++ b/calendar/exchangeapi/erGetDelegateRequest.js
@@ -21,7 +21,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetDelegateRequest"];
 
diff --git a/calendar/exchangeapi/erGetMeetingRequestByUID.js b/calendar/exchangeapi/erGetMeetingRequestByUID.js
index 3d073f13..e26e7af8 100644
--- a/calendar/exchangeapi/erGetMeetingRequestByUID.js
+++ b/calendar/exchangeapi/erGetMeetingRequestByUID.js
@@ -44,7 +44,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 const MAPI_PidLidTaskAccepted = "33032";
 const MAPI_PidLidTaskLastUpdate = "33045";
diff --git a/calendar/exchangeapi/erGetTimeZones.js b/calendar/exchangeapi/erGetTimeZones.js
index 5c3864a1..be7ed70c 100644
--- a/calendar/exchangeapi/erGetTimeZones.js
+++ b/calendar/exchangeapi/erGetTimeZones.js
@@ -51,7 +51,7 @@ Cu.import("resource://calendar/modules/calAuthUtils.jsm");
 Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetTimeZonesRequest"];
 
diff --git a/calendar/exchangeapi/erRemoveDelegateRequest.js b/calendar/exchangeapi/erRemoveDelegateRequest.js
index 4bc4830c..ab11cbcd 100644
--- a/calendar/exchangeapi/erRemoveDelegateRequest.js
+++ b/calendar/exchangeapi/erRemoveDelegateRequest.js
@@ -21,7 +21,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erRemoveDelegateRequest"];
 
diff --git a/calendar/exchangeapi/erSyncInbox.js b/calendar/exchangeapi/erSyncInbox.js
index c6f50699..c862b4d6 100644
--- a/calendar/exchangeapi/erSyncInbox.js
+++ b/calendar/exchangeapi/erSyncInbox.js
@@ -48,7 +48,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erSyncInboxRequest"];
 
diff --git a/calendar/exchangeapi/erUpdateDelegateRequest.js b/calendar/exchangeapi/erUpdateDelegateRequest.js
index 53a8e3b0..52f7799a 100644
--- a/calendar/exchangeapi/erUpdateDelegateRequest.js
+++ b/calendar/exchangeapi/erUpdateDelegateRequest.js
@@ -21,7 +21,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erUpdateDelegateRequest"];
 
diff --git a/calendar/interface/exchangeAttendee/mivExchangeAttendee.js b/calendar/interface/exchangeAttendee/mivExchangeAttendee.js
index 3e05e6ef..dae5f347 100644
--- a/calendar/interface/exchangeAttendee/mivExchangeAttendee.js
+++ b/calendar/interface/exchangeAttendee/mivExchangeAttendee.js
@@ -27,7 +27,7 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 const participationMap = {
     "Unknown": "NEEDS-ACTION",
diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index 89eefc33..e94ac538 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -81,7 +81,7 @@ Cu.import("resource://exchangecalendartask/erSyncInbox.js");
 Cu.import("resource://exchangecalendartask/erCreateAttachment.js");
 Cu.import("resource://exchangecalendartask/erDeleteAttachment.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 Cu.import("resource://interfacescalendartask/exchangeTodo/mivExchangeTodo.js");
 Cu.import("resource://interfacescalendartask/exchangeEvent/mivExchangeEvent.js");
diff --git a/calendar/interface/exchangeEvent/mivExchangeEvent.js b/calendar/interface/exchangeEvent/mivExchangeEvent.js
index ccc5fb39..2597f4fa 100644
--- a/calendar/interface/exchangeEvent/mivExchangeEvent.js
+++ b/calendar/interface/exchangeEvent/mivExchangeEvent.js
@@ -31,8 +31,8 @@ Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
-Cu.import("resource://interfaces/exchangeBaseItem/mivExchangeBaseItem.js");
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/exchangeBaseItem/mivExchangeBaseItem.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 
 var EXPORTED_SYMBOLS = ["mivExchangeEvent"];
diff --git a/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js b/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js
index aeed2e6e..e9ed60ac 100644
--- a/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js
+++ b/calendar/interface/exchangeTimeZones/mivExchangeTimeZone.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 function mivExchangeTimeZone() {
     this._timeZone = null;
diff --git a/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
index e5e4d2cb..8033407b 100644
--- a/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
+++ b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
@@ -31,9 +31,9 @@ Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
 Cu.import("resource://exchangecalendartask/erGetTimeZones.js");
 
-//Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
+//Cu.import("resource://exchangecommoninterfaces/xml2jxon/mivIxml2jxon.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 function mivExchangeTimeZones() {
     this._timeZones = {};
diff --git a/calendar/interface/exchangeTodo/mivExchangeTodo.js b/calendar/interface/exchangeTodo/mivExchangeTodo.js
index 401c1d51..e6c6aefe 100644
--- a/calendar/interface/exchangeTodo/mivExchangeTodo.js
+++ b/calendar/interface/exchangeTodo/mivExchangeTodo.js
@@ -31,9 +31,9 @@ Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
-Cu.import("resource://interfaces/exchangeBaseItem/mivExchangeBaseItem.js");
+Cu.import("resource://exchangecommoninterfaces/exchangeBaseItem/mivExchangeBaseItem.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var exchGlobalFunctions = Cc["@1st-setup.nl/global/functions;1"]
     .getService(Ci.mivFunctions);
diff --git a/chrome.manifest b/chrome.manifest
index 3dbe3620..90bd9b88 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -7,7 +7,7 @@ skin exchangecommon fugue common/theme/mac/ os=Darwin
 skin exchangecommon-common fugue common/theme/common/
 
 resource exchangecommon common/exchangeapi/
-resource interfaces common/interface/
+resource exchangecommoninterfaces common/interface/
 
 
 overlay chrome://messenger/content/messenger.xul chrome://exchangecommon/content/progress_panel.xul
diff --git a/common/content/delegateFolder.js b/common/content/delegateFolder.js
index aa46154b..4f0f1d11 100644
--- a/common/content/delegateFolder.js
+++ b/common/content/delegateFolder.js
@@ -20,7 +20,7 @@ Cu.import("resource://exchangecommon/erFindInboxFolder.js");
 Cu.import("resource://exchangecommon/erGetFolderPermission.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 function exchDelegateCalendarSettings(aDocument, aWindow) {
     this._document = aDocument;
diff --git a/common/exchangeapi/ecExchangeRequest.js b/common/exchangeapi/ecExchangeRequest.js
index f48bc50a..9cbae5ec 100644
--- a/common/exchangeapi/ecExchangeRequest.js
+++ b/common/exchangeapi/ecExchangeRequest.js
@@ -47,8 +47,8 @@ Cu.import("resource://calendar/modules/calUtils.jsm");
 
 Cu.import("resource://exchangecommon/ecFunctions.js");
 
-Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2jxon/mivIxml2jxon.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["ExchangeRequest", "nsSoapStr", "nsTypesStr", "nsMessagesStr", "nsAutodiscoverResponseStr1", "nsAutodiscoverResponseStr2", "nsAutodiscover2010Str", "nsErrors", "nsWSAStr", "nsXSIStr", "xml_tag"];
 
diff --git a/common/exchangeapi/erFindItems.js b/common/exchangeapi/erFindItems.js
index efb871d5..4a0bc64e 100644
--- a/common/exchangeapi/erFindItems.js
+++ b/common/exchangeapi/erFindItems.js
@@ -21,7 +21,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erFindItemsRequest"];
 
diff --git a/common/exchangeapi/erForewardItem.js b/common/exchangeapi/erForewardItem.js
index 21e1edfc..7203d77b 100644
--- a/common/exchangeapi/erForewardItem.js
+++ b/common/exchangeapi/erForewardItem.js
@@ -47,7 +47,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erForewardItemRequest"];
 
diff --git a/common/exchangeapi/erGetAttachments.js b/common/exchangeapi/erGetAttachments.js
index ee543d32..8dd2cea2 100644
--- a/common/exchangeapi/erGetAttachments.js
+++ b/common/exchangeapi/erGetAttachments.js
@@ -40,7 +40,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetAttachmentsRequest"];
 
diff --git a/common/exchangeapi/erGetItems.js b/common/exchangeapi/erGetItems.js
index eeeefe7d..1d4aae45 100644
--- a/common/exchangeapi/erGetItems.js
+++ b/common/exchangeapi/erGetItems.js
@@ -46,7 +46,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetItemsRequest"];
 
diff --git a/common/exchangeapi/erGetUserAvailability.js b/common/exchangeapi/erGetUserAvailability.js
index 55a60caa..5eb84070 100644
--- a/common/exchangeapi/erGetUserAvailability.js
+++ b/common/exchangeapi/erGetUserAvailability.js
@@ -48,7 +48,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erGetUserAvailabilityRequest"];
 
diff --git a/common/exchangeapi/erSyncFolderItems.js b/common/exchangeapi/erSyncFolderItems.js
index 1d5ced2b..fbfd4cd0 100644
--- a/common/exchangeapi/erSyncFolderItems.js
+++ b/common/exchangeapi/erSyncFolderItems.js
@@ -50,7 +50,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erSyncFolderItemsRequest"];
 
diff --git a/common/exchangeapi/erUpdateFolderPermission.js b/common/exchangeapi/erUpdateFolderPermission.js
index 601c539d..f533eab9 100644
--- a/common/exchangeapi/erUpdateFolderPermission.js
+++ b/common/exchangeapi/erUpdateFolderPermission.js
@@ -21,7 +21,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["erUpdateFolderPermissionRequest"];
 
diff --git a/common/exchangeapi/soapFunctions.js b/common/exchangeapi/soapFunctions.js
index 5d00a1b7..2427c804 100644
--- a/common/exchangeapi/soapFunctions.js
+++ b/common/exchangeapi/soapFunctions.js
@@ -42,7 +42,7 @@ var components = Components;
 
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 //Cu.import("resource://exchangecommon/ecFunctions.js");
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 var EXPORTED_SYMBOLS = ["makeParentFolderIds2", "makeParentFolderIds3", "publicFoldersMap"];
 
diff --git a/common/interface/exchangeBaseItem/mivExchangeBaseItem.js b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
index 7dcb29e3..e330b3f3 100644
--- a/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
+++ b/common/interface/exchangeBaseItem/mivExchangeBaseItem.js
@@ -33,9 +33,9 @@ Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
 Cu.import("resource://interfacescalendartask/exchangeAttendee/mivExchangeAttendee.js");
 
-Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
+Cu.import("resource://exchangecommoninterfaces/xml2jxon/mivIxml2jxon.js");
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 const participationMap = {
     "Unknown": "NEEDS-ACTION",
diff --git a/common/interface/global/mivFunctions.js b/common/interface/global/mivFunctions.js
index b1b2794c..bf905378 100644
--- a/common/interface/global/mivFunctions.js
+++ b/common/interface/global/mivFunctions.js
@@ -30,8 +30,8 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/Services.jsm");
 
-Cu.import("resource://interfaces/xml2jxon/mivIxml2jxon.js");
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2jxon/mivIxml2jxon.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
 function mivFunctions() {
     // Mozilla helpers
diff --git a/defaults/preferences/update.js b/defaults/preferences/update.js
index 1fc5400b..532fed7e 100644
--- a/defaults/preferences/update.js
+++ b/defaults/preferences/update.js
@@ -1 +1,3 @@
-user_pref("extensions.1st-setup.others.updateRequired", true);
+user_pref("extensions.1st-setup.others.updateRequired", false);
+user_pref("extensions.1st-setup.others.warnAboutNewAddOnVersion", false);
+user_pref("extensions.1st-setup.others.checkForNewAddOnVersion", false); 
diff --git a/emailtag/content/emailtag.js b/emailtag/content/emailtag.js
index 6531d93a..e55469c0 100644
--- a/emailtag/content/emailtag.js
+++ b/emailtag/content/emailtag.js
@@ -10,7 +10,7 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-Cu.import("resource://interfaces/xml2json/xml2json.js");
+Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://exchangecommon/erGetItems.js");
 Cu.import("resource://exchangecommon/erFindInboxFolder.js");

From e7266871e1f00858ab90e0a96166207769e9c92f Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 00:01:51 +0100
Subject: [PATCH 196/222] rename back temporary namespace exchangecalendartask
 to exchangecalendar

---
 calendar/content/calendar-calendars-list.js   |  2 +-
 calendar/content/calendar-calendars-list.xul  |  2 +-
 calendar/content/calendar-common-sets.xul     |  2 +-
 .../calendar-event-dialog-attendees.xul       |  2 +-
 .../calendar-event-dialog-reminder.xul        |  2 +-
 calendar/content/calendar-event-dialog.xul    |  2 +-
 .../content/calendar-properties-dialog.xul    |  2 +-
 calendar/content/calendar-summary-dialog.xul  |  2 +-
 calendar/content/calendar-task-view.xul       |  2 +-
 calendar/content/delegateCalendar.js          |  8 +--
 calendar/content/delegateCalendar.xul         |  2 +-
 calendar/content/ecCalendarCreation.xul       |  2 +-
 calendar/content/lightning-item-iframe.xul    |  2 +-
 .../content/messenger_task_delegation.xul     |  2 +-
 calendar/exchangeCalendar.manifest            | 50 +++++++++----------
 calendar/exchangeapi/erFindOccurrences.js     |  2 +-
 calendar/exchangeapi/erGetOccurrenceIndex.js  |  2 +-
 .../exchangeCalendar/mivExchangeCalendar.js   | 24 ++++-----
 .../exchangeTimeZones/mivExchangeTimeZones.js |  2 +-
 .../theme/common/calendar-calendars-list.css  |  2 +-
 .../calendar-event-dialog-attendees.css       |  2 +-
 21 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/calendar/content/calendar-calendars-list.js b/calendar/content/calendar-calendars-list.js
index 6b127f40..0366a404 100644
--- a/calendar/content/calendar-calendars-list.js
+++ b/calendar/content/calendar-calendars-list.js
@@ -227,7 +227,7 @@ exchCalPopUpMenu.prototype = {
                 calendar: myCal,
                 answer: ""
             };
-            this._window.openDialog("chrome://exchangecalendartask/content/delegateCalendar.xul",
+            this._window.openDialog("chrome://exchangecalendar/content/delegateCalendar.xul",
                 "delegateCalendarSettings",
                 "chrome,titlebar,toolbar,centerscreen,dialog,modal=yes,resizable=no",
                 aResult);
diff --git a/calendar/content/calendar-calendars-list.xul b/calendar/content/calendar-calendars-list.xul
index 5b61ce9c..a47a8777 100644
--- a/calendar/content/calendar-calendars-list.xul
+++ b/calendar/content/calendar-calendars-list.xul
@@ -43,7 +43,7 @@ overlay SYSTEM "chrome://exchangecommon/locale/calendar-calendars-list.dtd">
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-calendars-list.js" />
+            src="chrome://exchangecalendar/content/calendar-calendars-list.js" />
     <commandset id="calendar_commands">
         <command id="exchWebService_convert_calendar_command"
                  oncommand="tmpCalPopUpMenu.convertSettings()" />
diff --git a/calendar/content/calendar-common-sets.xul b/calendar/content/calendar-common-sets.xul
index 3e02e3f0..0e92a3e0 100644
--- a/calendar/content/calendar-common-sets.xul
+++ b/calendar/content/calendar-common-sets.xul
@@ -44,7 +44,7 @@
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-common-sets.js" />
+            src="chrome://exchangecalendar/content/calendar-common-sets.js" />
     <commandset id="calendar_commands"
                 commandupdater="true"
                 events="calendar_commands"
diff --git a/calendar/content/calendar-event-dialog-attendees.xul b/calendar/content/calendar-event-dialog-attendees.xul
index 990aaafc..38b7c111 100644
--- a/calendar/content/calendar-event-dialog-attendees.xul
+++ b/calendar/content/calendar-event-dialog-attendees.xul
@@ -40,5 +40,5 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-event-dialog-attendees.js" />
+            src="chrome://exchangecalendar/content/calendar-event-dialog-attendees.js" />
 </overlay>
diff --git a/calendar/content/calendar-event-dialog-reminder.xul b/calendar/content/calendar-event-dialog-reminder.xul
index 12f7aaaf..c3dfe45a 100644
--- a/calendar/content/calendar-event-dialog-reminder.xul
+++ b/calendar/content/calendar-event-dialog-reminder.xul
@@ -45,7 +45,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-event-dialog-reminder.js" />
+            src="chrome://exchangecalendar/content/calendar-event-dialog-reminder.js" />
     <button id="reminder-new-button"
             oncommand="tmpChangeCalendarPropertiesReminder.onNewReminder();" />
     <vbox id="reminder-relation-radiogroup">
diff --git a/calendar/content/calendar-event-dialog.xul b/calendar/content/calendar-event-dialog.xul
index f74b8935..cd2cf37a 100644
--- a/calendar/content/calendar-event-dialog.xul
+++ b/calendar/content/calendar-event-dialog.xul
@@ -13,7 +13,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-event-dialog.js" />
+            src="chrome://exchangecalendar/content/calendar-event-dialog.js" />
     <!-- Commands -->
     <commandset id="itemCommands">
         <command id="exchWebService_addAttachmentDialog"
diff --git a/calendar/content/calendar-properties-dialog.xul b/calendar/content/calendar-properties-dialog.xul
index 61b114c5..8ac1a7c0 100644
--- a/calendar/content/calendar-properties-dialog.xul
+++ b/calendar/content/calendar-properties-dialog.xul
@@ -40,7 +40,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-properties-dialog.js" />
+            src="chrome://exchangecalendar/content/calendar-properties-dialog.js" />
     <rows id="calendar-properties-rows">
         <row id="exchange-cache-row"
              align="center">
diff --git a/calendar/content/calendar-summary-dialog.xul b/calendar/content/calendar-summary-dialog.xul
index 9821dbee..5b7c43d9 100644
--- a/calendar/content/calendar-summary-dialog.xul
+++ b/calendar/content/calendar-summary-dialog.xul
@@ -51,7 +51,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
         <script type="application/javascript"
-                src="chrome://exchangecalendartask/content/calendar-summary-dialog.js" />
+                src="chrome://exchangecalendar/content/calendar-summary-dialog.js" />
         <box id="item-general-box"
              orient="vertical">
             <box orient="horizontal">
diff --git a/calendar/content/calendar-task-view.xul b/calendar/content/calendar-task-view.xul
index 03febf70..c45eb9fd 100644
--- a/calendar/content/calendar-task-view.xul
+++ b/calendar/content/calendar-task-view.xul
@@ -42,7 +42,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/calendar-task-view.js" />
+            src="chrome://exchangecalendar/content/calendar-task-view.js" />
     <!-- Commands -->
     <commandset id="mailCommands">
         <command id="exchWebService_openAttachment"
diff --git a/calendar/content/delegateCalendar.js b/calendar/content/delegateCalendar.js
index b768a39b..7dcca91c 100644
--- a/calendar/content/delegateCalendar.js
+++ b/calendar/content/delegateCalendar.js
@@ -16,10 +16,10 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/erFindFolder.js");
 
-Cu.import("resource://exchangecalendartask/erGetDelegateRequest.js");
-Cu.import("resource://exchangecalendartask/erAddDelegateRequest.js");
-Cu.import("resource://exchangecalendartask/erRemoveDelegateRequest.js");
-Cu.import("resource://exchangecalendartask/erUpdateDelegateRequest.js");
+Cu.import("resource://exchangecalendar/erGetDelegateRequest.js");
+Cu.import("resource://exchangecalendar/erAddDelegateRequest.js");
+Cu.import("resource://exchangecalendar/erRemoveDelegateRequest.js");
+Cu.import("resource://exchangecalendar/erUpdateDelegateRequest.js");
 
 Cu.import("resource://calendar/modules/calUtils.jsm");
 Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
diff --git a/calendar/content/delegateCalendar.xul b/calendar/content/delegateCalendar.xul
index e91cbc2f..7d2a4be1 100644
--- a/calendar/content/delegateCalendar.xul
+++ b/calendar/content/delegateCalendar.xul
@@ -23,7 +23,7 @@
     <script type="application/x-javascript"
             src="chrome://exchangecommon/content/adutils.js" />
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/delegateCalendar.js" />
+            src="chrome://exchangecalendar/content/delegateCalendar.js" />
     <tabbox id="myTabList"
             flex="1"
             width="600"
diff --git a/calendar/content/ecCalendarCreation.xul b/calendar/content/ecCalendarCreation.xul
index f4f70cbb..66f85303 100644
--- a/calendar/content/ecCalendarCreation.xul
+++ b/calendar/content/ecCalendarCreation.xul
@@ -47,7 +47,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/ecCalendarCreation.js" />
+            src="chrome://exchangecalendar/content/ecCalendarCreation.js" />
     <script type="application/javascript"
             src="chrome://gdata-provider/content/gdata-calendar-creation.js" />
     <radiogroup id="calendar-format"
diff --git a/calendar/content/lightning-item-iframe.xul b/calendar/content/lightning-item-iframe.xul
index 449fee1f..7a96006e 100644
--- a/calendar/content/lightning-item-iframe.xul
+++ b/calendar/content/lightning-item-iframe.xul
@@ -49,7 +49,7 @@
 
     <!-- Manage special Exchange items and provide attendee speicific dialog -->
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/lightning-item-iframe.js" />
+            src="chrome://exchangecalendar/content/lightning-item-iframe.js" />
     <!-- These rows correspond to the full form under the toolbar -->
     <rows id="event-grid-rows">
         <!-- If the current element is a Task and is an Exchange one, add a label to show the current owner of the task. -->
diff --git a/calendar/content/messenger_task_delegation.xul b/calendar/content/messenger_task_delegation.xul
index ae9d1d92..04c175a6 100644
--- a/calendar/content/messenger_task_delegation.xul
+++ b/calendar/content/messenger_task_delegation.xul
@@ -36,7 +36,7 @@ overlay SYSTEM "chrome://exchangecommon/locale/messenger_task_delegation.dtd">
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript"
-            src="chrome://exchangecalendartask/content/messenger_task_delegation.js" />
+            src="chrome://exchangecalendar/content/messenger_task_delegation.js" />
     <rows id="calendar-task-details-rows">
         <row id="exchWebService-task-delegation-owner"
              align="end">
diff --git a/calendar/exchangeCalendar.manifest b/calendar/exchangeCalendar.manifest
index f90d3e75..4184297c 100644
--- a/calendar/exchangeCalendar.manifest
+++ b/calendar/exchangeCalendar.manifest
@@ -1,25 +1,25 @@
-content exchangecalendartask content/
+content exchangecalendar content/
 
-resource exchangecalendartask exchangeapi/
+resource exchangecalendar exchangeapi/
 resource interfacescalendartask interface/
 
-overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendartask/content/ecCalendarCreation.xul
-overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendartask/content/calendar-properties-dialog.xul
+overlay chrome://calendar/content/calendarCreation.xul chrome://exchangecalendar/content/ecCalendarCreation.xul
+overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://exchangecalendar/content/calendar-properties-dialog.xul
 
-overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangecalendartask/content/calendar-calendars-list.xul
+overlay chrome://calendar/content/calendar-calendars-list.xul chrome://exchangecalendar/content/calendar-calendars-list.xul
 
-overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendartask/content/messenger_task_delegation.xul
-overlay chrome://calendar/content/calendar-task-view.xul  chrome://exchangecalendartask/content/calendar-task-view.xul
+overlay chrome://calendar/content/calendar-task-view.xul chrome://exchangecalendar/content/messenger_task_delegation.xul
+overlay chrome://calendar/content/calendar-task-view.xul  chrome://exchangecalendar/content/calendar-task-view.xul
 
-overlay chrome://calendar/content/calendar-common-sets.xul chrome://exchangecalendartask/content/calendar-common-sets.xul
+overlay chrome://calendar/content/calendar-common-sets.xul chrome://exchangecalendar/content/calendar-common-sets.xul
 
-overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendartask/content/calendar-event-dialog.xul
-overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendartask/content/calendar-event-dialog-reminder.xul
-overlay chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://exchangecalendartask/content/calendar-event-dialog-attendees.xul
+overlay chrome://calendar/content/calendar-event-dialog.xul chrome://exchangecalendar/content/calendar-event-dialog.xul
+overlay chrome://calendar/content/calendar-event-dialog-reminder.xul chrome://exchangecalendar/content/calendar-event-dialog-reminder.xul
+overlay chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://exchangecalendar/content/calendar-event-dialog-attendees.xul
 
-overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendartask/content/calendar-summary-dialog.xul
+overlay chrome://calendar/content/calendar-summary-dialog.xul chrome://exchangecalendar/content/calendar-summary-dialog.xul
 
-overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendartask/content/lightning-item-iframe.xul
+overlay chrome://lightning/content/lightning-item-iframe.xul chrome://exchangecalendar/content/lightning-item-iframe.xul
 
 manifest interface/exchangeCalendar/mivExchangeCalendar.manifest
 manifest interface/exchangeTimeZones/mivExchangeTimeZones.manifest
@@ -28,16 +28,16 @@ manifest interface/exchangeEvent/mivExchangeEvent.manifest
 manifest interface/exchangeTodo/mivExchangeTodo.manifest
 manifest interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 
-locale exchangecalendartask en locale/en/
-
-locale exchangecalendartask cs-CZ locale/cs_CZ/
-locale exchangecalendartask de locale/de/
-locale exchangecalendartask en-US locale/en_US/
-locale exchangecalendartask fr-FR locale/fr_FR/
-locale exchangecalendartask it-IT locale/it_IT/
-locale exchangecalendartask ja-JP locale/ja_JP/
-locale exchangecalendartask nl locale/nl/
-locale exchangecalendartask ru locale/ru/
-locale exchangecalendartask sv locale/sv/
-locale exchangecalendartask tr locale/tr/
+locale exchangecalendar en locale/en/
+
+locale exchangecalendar cs-CZ locale/cs_CZ/
+locale exchangecalendar de locale/de/
+locale exchangecalendar en-US locale/en_US/
+locale exchangecalendar fr-FR locale/fr_FR/
+locale exchangecalendar it-IT locale/it_IT/
+locale exchangecalendar ja-JP locale/ja_JP/
+locale exchangecalendar nl locale/nl/
+locale exchangecalendar ru locale/ru/
+locale exchangecalendar sv locale/sv/
+locale exchangecalendar tr locale/tr/
 
diff --git a/calendar/exchangeapi/erFindOccurrences.js b/calendar/exchangeapi/erFindOccurrences.js
index 8eda2300..930527a3 100644
--- a/calendar/exchangeapi/erFindOccurrences.js
+++ b/calendar/exchangeapi/erFindOccurrences.js
@@ -48,7 +48,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
+Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
 
 Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
diff --git a/calendar/exchangeapi/erGetOccurrenceIndex.js b/calendar/exchangeapi/erGetOccurrenceIndex.js
index db3e1883..7d4a45ea 100644
--- a/calendar/exchangeapi/erGetOccurrenceIndex.js
+++ b/calendar/exchangeapi/erGetOccurrenceIndex.js
@@ -48,7 +48,7 @@ Cu.import("resource://exchangecommon/ecFunctions.js");
 Cu.import("resource://exchangecommon/ecExchangeRequest.js");
 Cu.import("resource://exchangecommon/soapFunctions.js");
 
-Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
+Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
 
 var EXPORTED_SYMBOLS = ["erGetOccurrenceIndexRequest"];
 
diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index e94ac538..855cabde 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -65,21 +65,21 @@ Cu.import("resource://exchangecommon/erDeleteItem.js");
 Cu.import("resource://exchangecommon/erSyncFolderItems.js");
 Cu.import("resource://exchangecommon/erGetUserAvailability.js");
 
-Cu.import("resource://exchangecalendartask/erFindCalendarItems.js");
-Cu.import("resource://exchangecalendartask/erFindTaskItems.js");
-Cu.import("resource://exchangecalendartask/erFindFollowupItems.js");
+Cu.import("resource://exchangecalendar/erFindCalendarItems.js");
+Cu.import("resource://exchangecalendar/erFindTaskItems.js");
+Cu.import("resource://exchangecalendar/erFindFollowupItems.js");
 
-Cu.import("resource://exchangecalendartask/erFindMasterOccurrences.js");
-Cu.import("resource://exchangecalendartask/erGetMasterOccurrenceId.js");
-Cu.import("resource://exchangecalendartask/erGetMeetingRequestByUID.js");
-Cu.import("resource://exchangecalendartask/erFindOccurrences.js");
-Cu.import("resource://exchangecalendartask/erGetOccurrenceIndex.js");
+Cu.import("resource://exchangecalendar/erFindMasterOccurrences.js");
+Cu.import("resource://exchangecalendar/erGetMasterOccurrenceId.js");
+Cu.import("resource://exchangecalendar/erGetMeetingRequestByUID.js");
+Cu.import("resource://exchangecalendar/erFindOccurrences.js");
+Cu.import("resource://exchangecalendar/erGetOccurrenceIndex.js");
 
-Cu.import("resource://exchangecalendartask/erSendMeetingRespons.js");
-Cu.import("resource://exchangecalendartask/erSyncInbox.js");
+Cu.import("resource://exchangecalendar/erSendMeetingRespons.js");
+Cu.import("resource://exchangecalendar/erSyncInbox.js");
 
-Cu.import("resource://exchangecalendartask/erCreateAttachment.js");
-Cu.import("resource://exchangecalendartask/erDeleteAttachment.js");
+Cu.import("resource://exchangecalendar/erCreateAttachment.js");
+Cu.import("resource://exchangecalendar/erDeleteAttachment.js");
 
 Cu.import("resource://exchangecommoninterfaces/xml2json/xml2json.js");
 
diff --git a/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
index 8033407b..ec78bcbd 100644
--- a/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
+++ b/calendar/interface/exchangeTimeZones/mivExchangeTimeZones.js
@@ -29,7 +29,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource://calendar/modules/calProviderUtils.jsm");
 
-Cu.import("resource://exchangecalendartask/erGetTimeZones.js");
+Cu.import("resource://exchangecalendar/erGetTimeZones.js");
 
 //Cu.import("resource://exchangecommoninterfaces/xml2jxon/mivIxml2jxon.js");
 
diff --git a/common/theme/common/calendar-calendars-list.css b/common/theme/common/calendar-calendars-list.css
index 7fc27dfe..35313b54 100644
--- a/common/theme/common/calendar-calendars-list.css
+++ b/common/theme/common/calendar-calendars-list.css
@@ -9,5 +9,5 @@ calendar-list-tree > tree > treechildren::-moz-tree-image(exchange-status-treeco
 }
 
 calendar-list-tree[type="exchange"] {
-	-moz-binding: url(chrome://exchangecalendartask/content/calendar-list-tree.xml#exchange-calendar-list-tree);
+	-moz-binding: url(chrome://exchangecalendar/content/calendar-list-tree.xml#exchange-calendar-list-tree);
 }
diff --git a/common/theme/common/calendar-event-dialog-attendees.css b/common/theme/common/calendar-event-dialog-attendees.css
index c0b5f2a5..88bbc8cb 100644
--- a/common/theme/common/calendar-event-dialog-attendees.css
+++ b/common/theme/common/calendar-event-dialog-attendees.css
@@ -36,6 +36,6 @@
 @import url(chrome://global/skin/);
 
 attendees-list {
-	-moz-binding: url(chrome://exchangecalendartask/content/calendar-event-dialog-attendees.xml#attendees-list);
+	-moz-binding: url(chrome://exchangecalendar/content/calendar-event-dialog-attendees.xml#attendees-list);
 	-moz-user-focus: normal;
 }

From c6cd2044fb71392d29e9140971c313562787f095 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 00:02:15 +0100
Subject: [PATCH 197/222] auth prompt: setting password chanel with
 URI.userPass interface instead of URI.password

According to the nsIURI documentation, this should change nothing, but in practice it
fixes our issues like #103
---
 .../exchangeAuthPrompt2/mivExchangeAuthPrompt2.js          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index c2bd6c58..11cef4ab 100644
--- a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -347,6 +347,7 @@ mivExchangeAuthPrompt2.prototype = {
 
                     // try to get password.
                     try {
+                        this.logInfo("asyncPromptAuthNotifyCallback: asking password to user.");
                         password = this.getPassword(aChannel, username, aURL, realm, true, !(authInfo.flags & Ci.nsIAuthInformation.PREVIOUS_FAILED));
                     }
                     catch (err) {
@@ -359,7 +360,7 @@ mivExchangeAuthPrompt2.prototype = {
                         error = true;
                     }
                     else {
-                        aChannel.URI.password = encodeURIComponent(password);
+                        aChannel.URI.userPass = encodeURIComponent(username)  + ':' + encodeURIComponent(password);
                     }
                 }
             }
@@ -374,12 +375,12 @@ mivExchangeAuthPrompt2.prototype = {
                         if (username.indexOf("\\") > -1) {
                             authInfo.domain = username.substr(0, username.indexOf("\\"));
                             authInfo.username = username.substr(username.indexOf("\\") + 1);
-                            this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain=" + authInfo.domain);
+                            this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username (after \\). Going to use it. domain=" + authInfo.domain);
                         }
                         else if (username.indexOf("@") > -1) {
                             authInfo.username = username;
                             authInfo.domain = "";
-                            this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain=" + authInfo.domain);
+                            this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username (after @). Not setting it to authInfo.");
                         }
                         else {
                             this.logInfo("asyncPromptAuthNotifyCallback: We do not have a domainname part in the username. Specifying empty one.");

From 1271b04949bd1894f91261d996b906f91dd7f39d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 06:32:11 +0100
Subject: [PATCH 198/222] move calendar specific locales

---
 .tx/config                                    | 32 +++++++++----------
 .../locale/cs_CZ/attachments-view.dtd         |  0
 .../locale/cs_CZ/calendar-calendars-list.dtd  |  0
 .../locale/cs_CZ/calendar-summary-dialog.dtd  |  0
 .../locale/cs_CZ/delegate-calendar-dialog.dtd |  0
 .../locale/cs_CZ/ecCalendarCreation.dtd       |  0
 .../locale/cs_CZ/exchangeReminderDialog.dtd   |  0
 .../locale/cs_CZ/lightning-item-iframe.dtd    |  0
 .../cs_CZ/messenger_task_delegation.dtd       |  0
 .../locale/de/attachments-view.dtd            |  0
 .../locale/de/calendar-calendars-list.dtd     |  0
 .../locale/de/calendar-summary-dialog.dtd     |  0
 .../locale/de/delegate-calendar-dialog.dtd    |  0
 .../locale/de/ecCalendarCreation.dtd          |  0
 .../locale/de/exchangeReminderDialog.dtd      |  0
 .../locale/de/lightning-item-iframe.dtd       |  0
 .../locale/de/messenger_task_delegation.dtd   |  0
 .../locale/en/attachments-view.dtd            |  0
 .../locale/en/calendar-calendars-list.dtd     |  0
 .../locale/en/calendar-summary-dialog.dtd     |  0
 .../locale/en/delegate-calendar-dialog.dtd    |  0
 .../locale/en/ecCalendarCreation.dtd          |  0
 .../locale/en/exchangeReminderDialog.dtd      |  0
 .../locale/en/lightning-item-iframe.dtd       |  0
 .../locale/en/messenger_task_delegation.dtd   |  0
 .../locale/en_US/attachments-view.dtd         |  0
 .../locale/en_US/calendar-calendars-list.dtd  |  0
 .../locale/en_US/calendar-summary-dialog.dtd  |  0
 .../locale/en_US/delegate-calendar-dialog.dtd |  0
 .../locale/en_US/ecCalendarCreation.dtd       |  0
 .../locale/en_US/exchangeReminderDialog.dtd   |  0
 .../locale/en_US/lightning-item-iframe.dtd    |  0
 .../en_US/messenger_task_delegation.dtd       |  0
 .../locale/fr_FR/attachments-view.dtd         |  0
 .../locale/fr_FR/calendar-calendars-list.dtd  |  0
 .../locale/fr_FR/calendar-summary-dialog.dtd  |  0
 .../locale/fr_FR/delegate-calendar-dialog.dtd |  0
 .../locale/fr_FR/ecCalendarCreation.dtd       |  0
 .../locale/fr_FR/exchangeReminderDialog.dtd   |  0
 .../locale/fr_FR/lightning-item-iframe.dtd    |  0
 .../fr_FR/messenger_task_delegation.dtd       |  0
 .../locale/it_IT/attachments-view.dtd         |  0
 .../locale/it_IT/calendar-calendars-list.dtd  |  0
 .../locale/it_IT/calendar-summary-dialog.dtd  |  0
 .../locale/it_IT/delegate-calendar-dialog.dtd |  0
 .../locale/it_IT/ecCalendarCreation.dtd       |  0
 .../locale/it_IT/exchangeReminderDialog.dtd   |  0
 .../locale/it_IT/lightning-item-iframe.dtd    |  0
 .../it_IT/messenger_task_delegation.dtd       |  0
 .../locale/ja_JP/attachments-view.dtd         |  0
 .../locale/ja_JP/calendar-calendars-list.dtd  |  0
 .../locale/ja_JP/calendar-summary-dialog.dtd  |  0
 .../locale/ja_JP/delegate-calendar-dialog.dtd |  0
 .../locale/ja_JP/ecCalendarCreation.dtd       |  0
 .../locale/ja_JP/exchangeReminderDialog.dtd   |  0
 .../locale/ja_JP/lightning-item-iframe.dtd    |  0
 .../ja_JP/messenger_task_delegation.dtd       |  0
 .../locale/nl/attachments-view.dtd            |  0
 .../locale/nl/calendar-calendars-list.dtd     |  0
 .../locale/nl/calendar-summary-dialog.dtd     |  0
 .../locale/nl/delegate-calendar-dialog.dtd    |  0
 .../locale/nl/ecCalendarCreation.dtd          |  0
 .../locale/nl/exchangeReminderDialog.dtd      |  0
 .../locale/nl/lightning-item-iframe.dtd       |  0
 .../locale/nl/messenger_task_delegation.dtd   |  0
 .../locale/ru/attachments-view.dtd            |  0
 .../locale/ru/calendar-calendars-list.dtd     |  0
 .../locale/ru/calendar-summary-dialog.dtd     |  0
 .../locale/ru/delegate-calendar-dialog.dtd    |  0
 .../locale/ru/ecCalendarCreation.dtd          |  0
 .../locale/ru/exchangeReminderDialog.dtd      |  0
 .../locale/ru/lightning-item-iframe.dtd       |  0
 .../locale/ru/messenger_task_delegation.dtd   |  0
 .../locale/sv/attachments-view.dtd            |  0
 .../locale/sv/calendar-calendars-list.dtd     |  0
 .../locale/sv/calendar-summary-dialog.dtd     |  0
 .../locale/sv/delegate-calendar-dialog.dtd    |  0
 .../locale/sv/ecCalendarCreation.dtd          |  0
 .../locale/sv/exchangeReminderDialog.dtd      |  0
 .../locale/sv/lightning-item-iframe.dtd       |  0
 .../locale/sv/messenger_task_delegation.dtd   |  0
 .../locale/tr/attachments-view.dtd            |  0
 .../locale/tr/calendar-calendars-list.dtd     |  0
 .../locale/tr/calendar-summary-dialog.dtd     |  0
 .../locale/tr/delegate-calendar-dialog.dtd    |  0
 .../locale/tr/ecCalendarCreation.dtd          |  0
 .../locale/tr/exchangeReminderDialog.dtd      |  0
 .../locale/tr/lightning-item-iframe.dtd       |  0
 .../locale/tr/messenger_task_delegation.dtd   |  0
 89 files changed, 16 insertions(+), 16 deletions(-)
 rename {common => calendar}/locale/cs_CZ/attachments-view.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/cs_CZ/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/de/attachments-view.dtd (100%)
 rename {common => calendar}/locale/de/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/de/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/de/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/de/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/de/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/de/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/de/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/en/attachments-view.dtd (100%)
 rename {common => calendar}/locale/en/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/en/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/en/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/en/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/en/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/en/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/en/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/en_US/attachments-view.dtd (100%)
 rename {common => calendar}/locale/en_US/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/en_US/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/en_US/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/en_US/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/en_US/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/en_US/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/en_US/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/fr_FR/attachments-view.dtd (100%)
 rename {common => calendar}/locale/fr_FR/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/fr_FR/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/fr_FR/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/fr_FR/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/fr_FR/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/fr_FR/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/fr_FR/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/it_IT/attachments-view.dtd (100%)
 rename {common => calendar}/locale/it_IT/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/it_IT/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/it_IT/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/it_IT/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/it_IT/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/it_IT/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/it_IT/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/ja_JP/attachments-view.dtd (100%)
 rename {common => calendar}/locale/ja_JP/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/ja_JP/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/ja_JP/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/ja_JP/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/ja_JP/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/ja_JP/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/ja_JP/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/nl/attachments-view.dtd (100%)
 rename {common => calendar}/locale/nl/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/nl/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/nl/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/nl/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/nl/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/nl/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/nl/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/ru/attachments-view.dtd (100%)
 rename {common => calendar}/locale/ru/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/ru/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/ru/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/ru/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/ru/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/ru/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/ru/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/sv/attachments-view.dtd (100%)
 rename {common => calendar}/locale/sv/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/sv/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/sv/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/sv/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/sv/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/sv/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/sv/messenger_task_delegation.dtd (100%)
 rename {common => calendar}/locale/tr/attachments-view.dtd (100%)
 rename {common => calendar}/locale/tr/calendar-calendars-list.dtd (100%)
 rename {common => calendar}/locale/tr/calendar-summary-dialog.dtd (100%)
 rename {common => calendar}/locale/tr/delegate-calendar-dialog.dtd (100%)
 rename {common => calendar}/locale/tr/ecCalendarCreation.dtd (100%)
 rename {common => calendar}/locale/tr/exchangeReminderDialog.dtd (100%)
 rename {common => calendar}/locale/tr/lightning-item-iframe.dtd (100%)
 rename {common => calendar}/locale/tr/messenger_task_delegation.dtd (100%)

diff --git a/.tx/config b/.tx/config
index ceededa8..62e298a7 100644
--- a/.tx/config
+++ b/.tx/config
@@ -26,8 +26,8 @@ source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.attachments-view]
-file_filter = common/locale/<lang>/attachments-view.dtd
-source_file = common/locale/en/attachments-view.dtd
+file_filter = calendar/locale/<lang>/attachments-view.dtd
+source_file = calendar/locale/en/attachments-view.dtd
 source_lang = en
 type = DTD
 
@@ -44,14 +44,14 @@ source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeReminderDialog]
-file_filter = common/locale/<lang>/exchangeReminderDialog.dtd
-source_file = common/locale/en/exchangeReminderDialog.dtd
+file_filter = calendar/locale/<lang>/exchangeReminderDialog.dtd
+source_file = calendar/locale/en/exchangeReminderDialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.messenger_task_delegation]
-file_filter = common/locale/<lang>/messenger_task_delegation.dtd
-source_file = common/locale/en/messenger_task_delegation.dtd
+file_filter = calendar/locale/<lang>/messenger_task_delegation.dtd
+source_file = calendar/locale/en/messenger_task_delegation.dtd
 source_lang = en
 type = DTD
 
@@ -74,26 +74,26 @@ source_lang = en
 type = DTD
 
 [exchangecalendar.lightning-item-iframe]
-file_filter = common/locale/<lang>/lightning-item-iframe.dtd
-source_file = common/locale/en/lightning-item-iframe.dtd
+file_filter = calendar/locale/<lang>/lightning-item-iframe.dtd
+source_file = calendar/locale/en/lightning-item-iframe.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calendar-calendars-list]
-file_filter = common/locale/<lang>/calendar-calendars-list.dtd
-source_file = common/locale/en/calendar-calendars-list.dtd
+file_filter = calendar/locale/<lang>/calendar-calendars-list.dtd
+source_file = calendar/locale/en/calendar-calendars-list.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calendar-summary-dialog]
-file_filter = common/locale/<lang>/calendar-summary-dialog.dtd
-source_file = common/locale/en/calendar-summary-dialog.dtd
+file_filter = calendar/locale/<lang>/calendar-summary-dialog.dtd
+source_file = calendar/locale/en/calendar-summary-dialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.delegate-calendar-dialog]
-file_filter = common/locale/<lang>/delegate-calendar-dialog.dtd
-source_file = common/locale/en/delegate-calendar-dialog.dtd
+file_filter = calendar/locale/<lang>/delegate-calendar-dialog.dtd
+source_file = calendar/locale/en/delegate-calendar-dialog.dtd
 source_lang = en
 type = DTD
 
@@ -170,8 +170,8 @@ source_lang = en
 type = DTD
 
 [exchangecalendar.ecCalendarCreation]
-file_filter = common/locale/<lang>/ecCalendarCreation.dtd
-source_file = common/locale/en/ecCalendarCreation.dtd
+file_filter = calendar/locale/<lang>/ecCalendarCreation.dtd
+source_file = calendar/locale/en/ecCalendarCreation.dtd
 source_lang = en
 type = DTD
 
diff --git a/common/locale/cs_CZ/attachments-view.dtd b/calendar/locale/cs_CZ/attachments-view.dtd
similarity index 100%
rename from common/locale/cs_CZ/attachments-view.dtd
rename to calendar/locale/cs_CZ/attachments-view.dtd
diff --git a/common/locale/cs_CZ/calendar-calendars-list.dtd b/calendar/locale/cs_CZ/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/cs_CZ/calendar-calendars-list.dtd
rename to calendar/locale/cs_CZ/calendar-calendars-list.dtd
diff --git a/common/locale/cs_CZ/calendar-summary-dialog.dtd b/calendar/locale/cs_CZ/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/cs_CZ/calendar-summary-dialog.dtd
rename to calendar/locale/cs_CZ/calendar-summary-dialog.dtd
diff --git a/common/locale/cs_CZ/delegate-calendar-dialog.dtd b/calendar/locale/cs_CZ/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/cs_CZ/delegate-calendar-dialog.dtd
rename to calendar/locale/cs_CZ/delegate-calendar-dialog.dtd
diff --git a/common/locale/cs_CZ/ecCalendarCreation.dtd b/calendar/locale/cs_CZ/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/cs_CZ/ecCalendarCreation.dtd
rename to calendar/locale/cs_CZ/ecCalendarCreation.dtd
diff --git a/common/locale/cs_CZ/exchangeReminderDialog.dtd b/calendar/locale/cs_CZ/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/cs_CZ/exchangeReminderDialog.dtd
rename to calendar/locale/cs_CZ/exchangeReminderDialog.dtd
diff --git a/common/locale/cs_CZ/lightning-item-iframe.dtd b/calendar/locale/cs_CZ/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/cs_CZ/lightning-item-iframe.dtd
rename to calendar/locale/cs_CZ/lightning-item-iframe.dtd
diff --git a/common/locale/cs_CZ/messenger_task_delegation.dtd b/calendar/locale/cs_CZ/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/cs_CZ/messenger_task_delegation.dtd
rename to calendar/locale/cs_CZ/messenger_task_delegation.dtd
diff --git a/common/locale/de/attachments-view.dtd b/calendar/locale/de/attachments-view.dtd
similarity index 100%
rename from common/locale/de/attachments-view.dtd
rename to calendar/locale/de/attachments-view.dtd
diff --git a/common/locale/de/calendar-calendars-list.dtd b/calendar/locale/de/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/de/calendar-calendars-list.dtd
rename to calendar/locale/de/calendar-calendars-list.dtd
diff --git a/common/locale/de/calendar-summary-dialog.dtd b/calendar/locale/de/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/de/calendar-summary-dialog.dtd
rename to calendar/locale/de/calendar-summary-dialog.dtd
diff --git a/common/locale/de/delegate-calendar-dialog.dtd b/calendar/locale/de/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/de/delegate-calendar-dialog.dtd
rename to calendar/locale/de/delegate-calendar-dialog.dtd
diff --git a/common/locale/de/ecCalendarCreation.dtd b/calendar/locale/de/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/de/ecCalendarCreation.dtd
rename to calendar/locale/de/ecCalendarCreation.dtd
diff --git a/common/locale/de/exchangeReminderDialog.dtd b/calendar/locale/de/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/de/exchangeReminderDialog.dtd
rename to calendar/locale/de/exchangeReminderDialog.dtd
diff --git a/common/locale/de/lightning-item-iframe.dtd b/calendar/locale/de/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/de/lightning-item-iframe.dtd
rename to calendar/locale/de/lightning-item-iframe.dtd
diff --git a/common/locale/de/messenger_task_delegation.dtd b/calendar/locale/de/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/de/messenger_task_delegation.dtd
rename to calendar/locale/de/messenger_task_delegation.dtd
diff --git a/common/locale/en/attachments-view.dtd b/calendar/locale/en/attachments-view.dtd
similarity index 100%
rename from common/locale/en/attachments-view.dtd
rename to calendar/locale/en/attachments-view.dtd
diff --git a/common/locale/en/calendar-calendars-list.dtd b/calendar/locale/en/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/en/calendar-calendars-list.dtd
rename to calendar/locale/en/calendar-calendars-list.dtd
diff --git a/common/locale/en/calendar-summary-dialog.dtd b/calendar/locale/en/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/en/calendar-summary-dialog.dtd
rename to calendar/locale/en/calendar-summary-dialog.dtd
diff --git a/common/locale/en/delegate-calendar-dialog.dtd b/calendar/locale/en/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/en/delegate-calendar-dialog.dtd
rename to calendar/locale/en/delegate-calendar-dialog.dtd
diff --git a/common/locale/en/ecCalendarCreation.dtd b/calendar/locale/en/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/en/ecCalendarCreation.dtd
rename to calendar/locale/en/ecCalendarCreation.dtd
diff --git a/common/locale/en/exchangeReminderDialog.dtd b/calendar/locale/en/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/en/exchangeReminderDialog.dtd
rename to calendar/locale/en/exchangeReminderDialog.dtd
diff --git a/common/locale/en/lightning-item-iframe.dtd b/calendar/locale/en/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/en/lightning-item-iframe.dtd
rename to calendar/locale/en/lightning-item-iframe.dtd
diff --git a/common/locale/en/messenger_task_delegation.dtd b/calendar/locale/en/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/en/messenger_task_delegation.dtd
rename to calendar/locale/en/messenger_task_delegation.dtd
diff --git a/common/locale/en_US/attachments-view.dtd b/calendar/locale/en_US/attachments-view.dtd
similarity index 100%
rename from common/locale/en_US/attachments-view.dtd
rename to calendar/locale/en_US/attachments-view.dtd
diff --git a/common/locale/en_US/calendar-calendars-list.dtd b/calendar/locale/en_US/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/en_US/calendar-calendars-list.dtd
rename to calendar/locale/en_US/calendar-calendars-list.dtd
diff --git a/common/locale/en_US/calendar-summary-dialog.dtd b/calendar/locale/en_US/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/en_US/calendar-summary-dialog.dtd
rename to calendar/locale/en_US/calendar-summary-dialog.dtd
diff --git a/common/locale/en_US/delegate-calendar-dialog.dtd b/calendar/locale/en_US/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/en_US/delegate-calendar-dialog.dtd
rename to calendar/locale/en_US/delegate-calendar-dialog.dtd
diff --git a/common/locale/en_US/ecCalendarCreation.dtd b/calendar/locale/en_US/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/en_US/ecCalendarCreation.dtd
rename to calendar/locale/en_US/ecCalendarCreation.dtd
diff --git a/common/locale/en_US/exchangeReminderDialog.dtd b/calendar/locale/en_US/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/en_US/exchangeReminderDialog.dtd
rename to calendar/locale/en_US/exchangeReminderDialog.dtd
diff --git a/common/locale/en_US/lightning-item-iframe.dtd b/calendar/locale/en_US/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/en_US/lightning-item-iframe.dtd
rename to calendar/locale/en_US/lightning-item-iframe.dtd
diff --git a/common/locale/en_US/messenger_task_delegation.dtd b/calendar/locale/en_US/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/en_US/messenger_task_delegation.dtd
rename to calendar/locale/en_US/messenger_task_delegation.dtd
diff --git a/common/locale/fr_FR/attachments-view.dtd b/calendar/locale/fr_FR/attachments-view.dtd
similarity index 100%
rename from common/locale/fr_FR/attachments-view.dtd
rename to calendar/locale/fr_FR/attachments-view.dtd
diff --git a/common/locale/fr_FR/calendar-calendars-list.dtd b/calendar/locale/fr_FR/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/fr_FR/calendar-calendars-list.dtd
rename to calendar/locale/fr_FR/calendar-calendars-list.dtd
diff --git a/common/locale/fr_FR/calendar-summary-dialog.dtd b/calendar/locale/fr_FR/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/fr_FR/calendar-summary-dialog.dtd
rename to calendar/locale/fr_FR/calendar-summary-dialog.dtd
diff --git a/common/locale/fr_FR/delegate-calendar-dialog.dtd b/calendar/locale/fr_FR/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/fr_FR/delegate-calendar-dialog.dtd
rename to calendar/locale/fr_FR/delegate-calendar-dialog.dtd
diff --git a/common/locale/fr_FR/ecCalendarCreation.dtd b/calendar/locale/fr_FR/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/fr_FR/ecCalendarCreation.dtd
rename to calendar/locale/fr_FR/ecCalendarCreation.dtd
diff --git a/common/locale/fr_FR/exchangeReminderDialog.dtd b/calendar/locale/fr_FR/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/fr_FR/exchangeReminderDialog.dtd
rename to calendar/locale/fr_FR/exchangeReminderDialog.dtd
diff --git a/common/locale/fr_FR/lightning-item-iframe.dtd b/calendar/locale/fr_FR/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/fr_FR/lightning-item-iframe.dtd
rename to calendar/locale/fr_FR/lightning-item-iframe.dtd
diff --git a/common/locale/fr_FR/messenger_task_delegation.dtd b/calendar/locale/fr_FR/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/fr_FR/messenger_task_delegation.dtd
rename to calendar/locale/fr_FR/messenger_task_delegation.dtd
diff --git a/common/locale/it_IT/attachments-view.dtd b/calendar/locale/it_IT/attachments-view.dtd
similarity index 100%
rename from common/locale/it_IT/attachments-view.dtd
rename to calendar/locale/it_IT/attachments-view.dtd
diff --git a/common/locale/it_IT/calendar-calendars-list.dtd b/calendar/locale/it_IT/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/it_IT/calendar-calendars-list.dtd
rename to calendar/locale/it_IT/calendar-calendars-list.dtd
diff --git a/common/locale/it_IT/calendar-summary-dialog.dtd b/calendar/locale/it_IT/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/it_IT/calendar-summary-dialog.dtd
rename to calendar/locale/it_IT/calendar-summary-dialog.dtd
diff --git a/common/locale/it_IT/delegate-calendar-dialog.dtd b/calendar/locale/it_IT/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/it_IT/delegate-calendar-dialog.dtd
rename to calendar/locale/it_IT/delegate-calendar-dialog.dtd
diff --git a/common/locale/it_IT/ecCalendarCreation.dtd b/calendar/locale/it_IT/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/it_IT/ecCalendarCreation.dtd
rename to calendar/locale/it_IT/ecCalendarCreation.dtd
diff --git a/common/locale/it_IT/exchangeReminderDialog.dtd b/calendar/locale/it_IT/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/it_IT/exchangeReminderDialog.dtd
rename to calendar/locale/it_IT/exchangeReminderDialog.dtd
diff --git a/common/locale/it_IT/lightning-item-iframe.dtd b/calendar/locale/it_IT/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/it_IT/lightning-item-iframe.dtd
rename to calendar/locale/it_IT/lightning-item-iframe.dtd
diff --git a/common/locale/it_IT/messenger_task_delegation.dtd b/calendar/locale/it_IT/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/it_IT/messenger_task_delegation.dtd
rename to calendar/locale/it_IT/messenger_task_delegation.dtd
diff --git a/common/locale/ja_JP/attachments-view.dtd b/calendar/locale/ja_JP/attachments-view.dtd
similarity index 100%
rename from common/locale/ja_JP/attachments-view.dtd
rename to calendar/locale/ja_JP/attachments-view.dtd
diff --git a/common/locale/ja_JP/calendar-calendars-list.dtd b/calendar/locale/ja_JP/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/ja_JP/calendar-calendars-list.dtd
rename to calendar/locale/ja_JP/calendar-calendars-list.dtd
diff --git a/common/locale/ja_JP/calendar-summary-dialog.dtd b/calendar/locale/ja_JP/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/ja_JP/calendar-summary-dialog.dtd
rename to calendar/locale/ja_JP/calendar-summary-dialog.dtd
diff --git a/common/locale/ja_JP/delegate-calendar-dialog.dtd b/calendar/locale/ja_JP/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/ja_JP/delegate-calendar-dialog.dtd
rename to calendar/locale/ja_JP/delegate-calendar-dialog.dtd
diff --git a/common/locale/ja_JP/ecCalendarCreation.dtd b/calendar/locale/ja_JP/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/ja_JP/ecCalendarCreation.dtd
rename to calendar/locale/ja_JP/ecCalendarCreation.dtd
diff --git a/common/locale/ja_JP/exchangeReminderDialog.dtd b/calendar/locale/ja_JP/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/ja_JP/exchangeReminderDialog.dtd
rename to calendar/locale/ja_JP/exchangeReminderDialog.dtd
diff --git a/common/locale/ja_JP/lightning-item-iframe.dtd b/calendar/locale/ja_JP/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/ja_JP/lightning-item-iframe.dtd
rename to calendar/locale/ja_JP/lightning-item-iframe.dtd
diff --git a/common/locale/ja_JP/messenger_task_delegation.dtd b/calendar/locale/ja_JP/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/ja_JP/messenger_task_delegation.dtd
rename to calendar/locale/ja_JP/messenger_task_delegation.dtd
diff --git a/common/locale/nl/attachments-view.dtd b/calendar/locale/nl/attachments-view.dtd
similarity index 100%
rename from common/locale/nl/attachments-view.dtd
rename to calendar/locale/nl/attachments-view.dtd
diff --git a/common/locale/nl/calendar-calendars-list.dtd b/calendar/locale/nl/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/nl/calendar-calendars-list.dtd
rename to calendar/locale/nl/calendar-calendars-list.dtd
diff --git a/common/locale/nl/calendar-summary-dialog.dtd b/calendar/locale/nl/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/nl/calendar-summary-dialog.dtd
rename to calendar/locale/nl/calendar-summary-dialog.dtd
diff --git a/common/locale/nl/delegate-calendar-dialog.dtd b/calendar/locale/nl/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/nl/delegate-calendar-dialog.dtd
rename to calendar/locale/nl/delegate-calendar-dialog.dtd
diff --git a/common/locale/nl/ecCalendarCreation.dtd b/calendar/locale/nl/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/nl/ecCalendarCreation.dtd
rename to calendar/locale/nl/ecCalendarCreation.dtd
diff --git a/common/locale/nl/exchangeReminderDialog.dtd b/calendar/locale/nl/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/nl/exchangeReminderDialog.dtd
rename to calendar/locale/nl/exchangeReminderDialog.dtd
diff --git a/common/locale/nl/lightning-item-iframe.dtd b/calendar/locale/nl/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/nl/lightning-item-iframe.dtd
rename to calendar/locale/nl/lightning-item-iframe.dtd
diff --git a/common/locale/nl/messenger_task_delegation.dtd b/calendar/locale/nl/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/nl/messenger_task_delegation.dtd
rename to calendar/locale/nl/messenger_task_delegation.dtd
diff --git a/common/locale/ru/attachments-view.dtd b/calendar/locale/ru/attachments-view.dtd
similarity index 100%
rename from common/locale/ru/attachments-view.dtd
rename to calendar/locale/ru/attachments-view.dtd
diff --git a/common/locale/ru/calendar-calendars-list.dtd b/calendar/locale/ru/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/ru/calendar-calendars-list.dtd
rename to calendar/locale/ru/calendar-calendars-list.dtd
diff --git a/common/locale/ru/calendar-summary-dialog.dtd b/calendar/locale/ru/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/ru/calendar-summary-dialog.dtd
rename to calendar/locale/ru/calendar-summary-dialog.dtd
diff --git a/common/locale/ru/delegate-calendar-dialog.dtd b/calendar/locale/ru/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/ru/delegate-calendar-dialog.dtd
rename to calendar/locale/ru/delegate-calendar-dialog.dtd
diff --git a/common/locale/ru/ecCalendarCreation.dtd b/calendar/locale/ru/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/ru/ecCalendarCreation.dtd
rename to calendar/locale/ru/ecCalendarCreation.dtd
diff --git a/common/locale/ru/exchangeReminderDialog.dtd b/calendar/locale/ru/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/ru/exchangeReminderDialog.dtd
rename to calendar/locale/ru/exchangeReminderDialog.dtd
diff --git a/common/locale/ru/lightning-item-iframe.dtd b/calendar/locale/ru/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/ru/lightning-item-iframe.dtd
rename to calendar/locale/ru/lightning-item-iframe.dtd
diff --git a/common/locale/ru/messenger_task_delegation.dtd b/calendar/locale/ru/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/ru/messenger_task_delegation.dtd
rename to calendar/locale/ru/messenger_task_delegation.dtd
diff --git a/common/locale/sv/attachments-view.dtd b/calendar/locale/sv/attachments-view.dtd
similarity index 100%
rename from common/locale/sv/attachments-view.dtd
rename to calendar/locale/sv/attachments-view.dtd
diff --git a/common/locale/sv/calendar-calendars-list.dtd b/calendar/locale/sv/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/sv/calendar-calendars-list.dtd
rename to calendar/locale/sv/calendar-calendars-list.dtd
diff --git a/common/locale/sv/calendar-summary-dialog.dtd b/calendar/locale/sv/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/sv/calendar-summary-dialog.dtd
rename to calendar/locale/sv/calendar-summary-dialog.dtd
diff --git a/common/locale/sv/delegate-calendar-dialog.dtd b/calendar/locale/sv/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/sv/delegate-calendar-dialog.dtd
rename to calendar/locale/sv/delegate-calendar-dialog.dtd
diff --git a/common/locale/sv/ecCalendarCreation.dtd b/calendar/locale/sv/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/sv/ecCalendarCreation.dtd
rename to calendar/locale/sv/ecCalendarCreation.dtd
diff --git a/common/locale/sv/exchangeReminderDialog.dtd b/calendar/locale/sv/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/sv/exchangeReminderDialog.dtd
rename to calendar/locale/sv/exchangeReminderDialog.dtd
diff --git a/common/locale/sv/lightning-item-iframe.dtd b/calendar/locale/sv/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/sv/lightning-item-iframe.dtd
rename to calendar/locale/sv/lightning-item-iframe.dtd
diff --git a/common/locale/sv/messenger_task_delegation.dtd b/calendar/locale/sv/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/sv/messenger_task_delegation.dtd
rename to calendar/locale/sv/messenger_task_delegation.dtd
diff --git a/common/locale/tr/attachments-view.dtd b/calendar/locale/tr/attachments-view.dtd
similarity index 100%
rename from common/locale/tr/attachments-view.dtd
rename to calendar/locale/tr/attachments-view.dtd
diff --git a/common/locale/tr/calendar-calendars-list.dtd b/calendar/locale/tr/calendar-calendars-list.dtd
similarity index 100%
rename from common/locale/tr/calendar-calendars-list.dtd
rename to calendar/locale/tr/calendar-calendars-list.dtd
diff --git a/common/locale/tr/calendar-summary-dialog.dtd b/calendar/locale/tr/calendar-summary-dialog.dtd
similarity index 100%
rename from common/locale/tr/calendar-summary-dialog.dtd
rename to calendar/locale/tr/calendar-summary-dialog.dtd
diff --git a/common/locale/tr/delegate-calendar-dialog.dtd b/calendar/locale/tr/delegate-calendar-dialog.dtd
similarity index 100%
rename from common/locale/tr/delegate-calendar-dialog.dtd
rename to calendar/locale/tr/delegate-calendar-dialog.dtd
diff --git a/common/locale/tr/ecCalendarCreation.dtd b/calendar/locale/tr/ecCalendarCreation.dtd
similarity index 100%
rename from common/locale/tr/ecCalendarCreation.dtd
rename to calendar/locale/tr/ecCalendarCreation.dtd
diff --git a/common/locale/tr/exchangeReminderDialog.dtd b/calendar/locale/tr/exchangeReminderDialog.dtd
similarity index 100%
rename from common/locale/tr/exchangeReminderDialog.dtd
rename to calendar/locale/tr/exchangeReminderDialog.dtd
diff --git a/common/locale/tr/lightning-item-iframe.dtd b/calendar/locale/tr/lightning-item-iframe.dtd
similarity index 100%
rename from common/locale/tr/lightning-item-iframe.dtd
rename to calendar/locale/tr/lightning-item-iframe.dtd
diff --git a/common/locale/tr/messenger_task_delegation.dtd b/calendar/locale/tr/messenger_task_delegation.dtd
similarity index 100%
rename from common/locale/tr/messenger_task_delegation.dtd
rename to calendar/locale/tr/messenger_task_delegation.dtd

From da19e6ff64d28cf1d29e4d6d1e930e5c27fce2f6 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 06:54:02 +0100
Subject: [PATCH 199/222] calendar: update locales location

---
 calendar/content/calendar-calendars-list.js         | 8 ++++----
 calendar/content/calendar-calendars-list.xul        | 2 +-
 calendar/content/calendar-event-dialog-reminder.xul | 2 +-
 calendar/content/calendar-event-dialog.xul          | 2 +-
 calendar/content/calendar-summary-dialog.xul        | 2 +-
 calendar/content/delegateCalendar.xul               | 2 +-
 calendar/content/ecCalendarCreation.xul             | 2 +-
 calendar/content/lightning-item-iframe.xul          | 2 +-
 calendar/content/messenger_task_delegation.xul      | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/calendar/content/calendar-calendars-list.js b/calendar/content/calendar-calendars-list.js
index 0366a404..a3fc67e4 100644
--- a/calendar/content/calendar-calendars-list.js
+++ b/calendar/content/calendar-calendars-list.js
@@ -246,18 +246,18 @@ exchCalPopUpMenu.prototype = {
             let exchangeCurrentStatus = calendar.getProperty("exchangeCurrentStatus");
             if ((!Components.isSuccessCode(exchangeCurrentStatus)) || (calendar.getProperty("disabled"))) {
                 if (calendar.readOnly) {
-                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnectedReadOnly", [calendar.name, calendar.connectionStateDescription], "exchangecalendar");
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnectedReadOnly", [calendar.name, calendar.connectionStateDescription], "exchangecommon");
                 }
                 else {
-                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnected", [calendar.name, calendar.connectionStateDescription], "exchangecalendar");
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarDisconnected", [calendar.name, calendar.connectionStateDescription], "exchangecommon");
                 }
             }
             else {
                 if (calendar.readOnly) {
-                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnectedReadOnly", [calendar.name], "exchangecalendar");
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnectedReadOnly", [calendar.name], "exchangecommon");
                 }
                 else {
-                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnected", [calendar.name], "exchangecalendar");
+                    tooltipText = this.globalFunctions.getString("calExchangeCalendar", "tooltipCalendarConnected", [calendar.name], "exchangecommon");
                 }
             }
             setElementValue("calendar-list-tooltip", tooltipText, "label");
diff --git a/calendar/content/calendar-calendars-list.xul b/calendar/content/calendar-calendars-list.xul
index a47a8777..61536e70 100644
--- a/calendar/content/calendar-calendars-list.xul
+++ b/calendar/content/calendar-calendars-list.xul
@@ -38,7 +38,7 @@
 -->
 <?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/calendar-calendars-list.css"?>
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecommon/locale/calendar-calendars-list.dtd">
+overlay SYSTEM "chrome://exchangecalendar/locale/calendar-calendars-list.dtd">
 <overlay id="calendar-list-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/calendar/content/calendar-event-dialog-reminder.xul b/calendar/content/calendar-event-dialog-reminder.xul
index c3dfe45a..7f4188e3 100644
--- a/calendar/content/calendar-event-dialog-reminder.xul
+++ b/calendar/content/calendar-event-dialog-reminder.xul
@@ -38,7 +38,7 @@
 -->
 <!DOCTYPE dialog
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/exchangeReminderDialog.dtd" > 
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/exchangeReminderDialog.dtd" > 
     %dtd1;
 ]>
 <overlay id="ecCalendarProperties.Reminder"
diff --git a/calendar/content/calendar-event-dialog.xul b/calendar/content/calendar-event-dialog.xul
index cd2cf37a..8d8d18d8 100644
--- a/calendar/content/calendar-event-dialog.xul
+++ b/calendar/content/calendar-event-dialog.xul
@@ -3,7 +3,7 @@
 [
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
-    <!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/attachments-view.dtd" >
+    <!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/attachments-view.dtd" >
     %dtd1;
 ]>
 <?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/attachments-view.css"?>
diff --git a/calendar/content/calendar-summary-dialog.xul b/calendar/content/calendar-summary-dialog.xul
index 5b7c43d9..a03be1dc 100644
--- a/calendar/content/calendar-summary-dialog.xul
+++ b/calendar/content/calendar-summary-dialog.xul
@@ -35,7 +35,7 @@
 [
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
-        <!ENTITY % summaryDialogDTD SYSTEM "chrome://exchangecommon/locale/calendar-summary-dialog.dtd">
+        <!ENTITY % summaryDialogDTD SYSTEM "chrome://exchangecalendar/locale/calendar-summary-dialog.dtd">
     %summaryDialogDTD;
 ]>
 <?xul-overlay href="chrome://exchangecommon/content/attachments-view.xul"?>
diff --git a/calendar/content/delegateCalendar.xul b/calendar/content/delegateCalendar.xul
index 7d2a4be1..4a493be1 100644
--- a/calendar/content/delegateCalendar.xul
+++ b/calendar/content/delegateCalendar.xul
@@ -10,7 +10,7 @@
 <?xml-stylesheet type="text/css" href="chrome://exchangecommon/skin/delegateCalendar.css" ?>
 <!DOCTYPE dialog
 [ 
-    <!ENTITY % delegateDialogDTD SYSTEM "chrome://exchangecommon/locale/delegate-calendar-dialog.dtd" > 
+    <!ENTITY % delegateDialogDTD SYSTEM "chrome://exchangecalendar/locale/delegate-calendar-dialog.dtd" > 
       %delegateDialogDTD;
 ]>
 <dialog id="DelegateUserPopup"
diff --git a/calendar/content/ecCalendarCreation.xul b/calendar/content/ecCalendarCreation.xul
index 66f85303..84ad02a0 100644
--- a/calendar/content/ecCalendarCreation.xul
+++ b/calendar/content/ecCalendarCreation.xul
@@ -40,7 +40,7 @@
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-    <!ENTITY % dtd3 SYSTEM "chrome://exchangecommon/locale/ecCalendarCreation.dtd" > %dtd3;
+    <!ENTITY % dtd3 SYSTEM "chrome://exchangecalendar/locale/ecCalendarCreation.dtd" > %dtd3;
 ]>
 <?xul-overlay href="chrome://exchangecommon/content/exchangeSettingsOverlay.xul"?>
 <overlay id="calendarCreation"
diff --git a/calendar/content/lightning-item-iframe.xul b/calendar/content/lightning-item-iframe.xul
index 7a96006e..df052b5c 100644
--- a/calendar/content/lightning-item-iframe.xul
+++ b/calendar/content/lightning-item-iframe.xul
@@ -41,7 +41,7 @@
 <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %eventDialogDTD;
 
-<!ENTITY % dtd1 SYSTEM "chrome://exchangecommon/locale/lightning-item-iframe.dtd" >
+<!ENTITY % dtd1 SYSTEM "chrome://exchangecalendar/locale/lightning-item-iframe.dtd" >
     %dtd1;
 ]>
 <overlay id="exchangecalendar-lightning-item-iframe.xul"
diff --git a/calendar/content/messenger_task_delegation.xul b/calendar/content/messenger_task_delegation.xul
index 04c175a6..8a9a6000 100644
--- a/calendar/content/messenger_task_delegation.xul
+++ b/calendar/content/messenger_task_delegation.xul
@@ -30,7 +30,7 @@
  * ***** BEGIN LICENSE BLOCK *****/
 -->
 <!DOCTYPE 
-overlay SYSTEM "chrome://exchangecommon/locale/messenger_task_delegation.dtd">
+overlay SYSTEM "chrome://exchangecalendar/locale/messenger_task_delegation.dtd">
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 <overlay id="exchWebService-calendar-task-delegation-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

From 74b0029d7bb606d3766f7d69fb1c40a9b8f668f6 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 07:07:48 +0100
Subject: [PATCH 200/222] code automatic beautify

---
 common/content/otherPreferences.xul                            | 3 ++-
 common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/content/otherPreferences.xul b/common/content/otherPreferences.xul
index 034c5cdf..68c3216d 100644
--- a/common/content/otherPreferences.xul
+++ b/common/content/otherPreferences.xul
@@ -168,7 +168,8 @@
                 <checkbox id="globalsearch"
                           preference="extensions.1st-setup.others.globalsearch"
                           label="&exchangeWebService.preference.globalsearch.label;" />
-                <label>&exchangeWebService.preference.globalsearch.explain;</label>
+                <label>
+                &exchangeWebService.preference.globalsearch.explain;</label>
             </vbox>
         </groupbox>
         <groupbox id="exchangeWebService_others_prefs_groupbox4">
diff --git a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index 11cef4ab..b537d410 100644
--- a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -360,7 +360,7 @@ mivExchangeAuthPrompt2.prototype = {
                         error = true;
                     }
                     else {
-                        aChannel.URI.userPass = encodeURIComponent(username)  + ':' + encodeURIComponent(password);
+                        aChannel.URI.userPass = encodeURIComponent(username) + ':' + encodeURIComponent(password);
                     }
                 }
             }

From 92f726808ed3d7cf7a888faab935dd07e51e82ba Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 18:21:03 +0100
Subject: [PATCH 201/222] l10n: automatic translations updates

---
 .../locale/cs_CZ/ExchangeContacts.properties  |  3 +
 .../locale/cs_CZ/ExchangeDistLists.properties |  3 +
 .../locale/cs_CZ/addressbookOverlay.dtd       |  9 +++
 .../locale/cs_CZ/exchangeContactSettings.dtd  | 11 ++++
 .../locale/it_IT/ExchangeContacts.properties  |  3 +
 .../locale/it_IT/ExchangeDistLists.properties |  3 +
 .../locale/it_IT/addressbookOverlay.dtd       |  9 +++
 .../locale/it_IT/exchangeContactSettings.dtd  | 11 ++++
 .../locale/pl/ExchangeContacts.properties     |  3 +
 .../locale/pl/ExchangeDistLists.properties    |  3 +
 addressbook/locale/pl/addressbookOverlay.dtd  |  9 +++
 .../locale/pl/exchangeContactSettings.dtd     | 11 ++++
 .../locale/sk/ExchangeContacts.properties     |  3 +
 .../locale/sk/ExchangeDistLists.properties    |  3 +
 addressbook/locale/sk/addressbookOverlay.dtd  |  9 +++
 .../locale/sk/exchangeContactSettings.dtd     | 11 ++++
 .../locale/tr/ExchangeContacts.properties     |  3 +
 .../locale/tr/ExchangeDistLists.properties    |  3 +
 addressbook/locale/tr/addressbookOverlay.dtd  |  9 +++
 .../locale/tr/exchangeContactSettings.dtd     | 11 ++++
 calendar/locale/pl/attachments-view.dtd       |  2 +
 .../locale/pl/calendar-calendars-list.dtd     |  5 ++
 .../locale/pl/calendar-summary-dialog.dtd     |  3 +
 .../locale/pl/delegate-calendar-dialog.dtd    | 25 +++++++++
 calendar/locale/pl/ecCalendarCreation.dtd     |  5 ++
 calendar/locale/pl/exchangeReminderDialog.dtd |  4 ++
 calendar/locale/pl/lightning-item-iframe.dtd  |  7 +++
 .../locale/pl/messenger_task_delegation.dtd   |  6 ++
 calendar/locale/sk/attachments-view.dtd       |  2 +
 .../locale/sk/calendar-calendars-list.dtd     |  5 ++
 .../locale/sk/calendar-summary-dialog.dtd     |  3 +
 .../locale/sk/delegate-calendar-dialog.dtd    | 25 +++++++++
 calendar/locale/sk/ecCalendarCreation.dtd     |  5 ++
 calendar/locale/sk/exchangeReminderDialog.dtd |  4 ++
 calendar/locale/sk/lightning-item-iframe.dtd  |  7 +++
 .../locale/sk/messenger_task_delegation.dtd   |  6 ++
 common/locale/pl/browseFolder.dtd             | 12 ++++
 .../locale/pl/calExchangeCalendar.properties  | 49 ++++++++++++++++
 common/locale/pl/delegate-folder.dtd          | 45 +++++++++++++++
 common/locale/pl/exchangeCloneSettings.dtd    |  6 ++
 common/locale/pl/exchangeSettings.dtd         | 54 ++++++++++++++++++
 common/locale/pl/exchangeSettingsOverlay.dtd  | 56 +++++++++++++++++++
 common/locale/pl/extra-priority.dtd           | 18 ++++++
 common/locale/pl/invitationResponse.dtd       | 20 +++++++
 common/locale/pl/inviteStyle.dtd              |  2 +
 common/locale/pl/manageEWSAccounts.dtd        | 16 ++++++
 common/locale/pl/oofSettings.dtd              | 26 +++++++++
 common/locale/pl/preInvitationResponse.dtd    | 14 +++++
 common/locale/pl/preferences.dtd              | 48 ++++++++++++++++
 common/locale/pl/selectEWSUrl.dtd             |  9 +++
 common/locale/pl/sendUpdateTo.dtd             |  9 +++
 common/locale/pl/sharedCalendarParser.dtd     |  3 +
 common/locale/pl/timezonePreference.dtd       |  1 +
 common/locale/sk/browseFolder.dtd             | 12 ++++
 .../locale/sk/calExchangeCalendar.properties  | 49 ++++++++++++++++
 common/locale/sk/delegate-folder.dtd          | 45 +++++++++++++++
 common/locale/sk/exchangeCloneSettings.dtd    |  6 ++
 common/locale/sk/exchangeSettings.dtd         | 54 ++++++++++++++++++
 common/locale/sk/exchangeSettingsOverlay.dtd  | 56 +++++++++++++++++++
 common/locale/sk/extra-priority.dtd           | 18 ++++++
 common/locale/sk/invitationResponse.dtd       | 20 +++++++
 common/locale/sk/inviteStyle.dtd              |  2 +
 common/locale/sk/manageEWSAccounts.dtd        | 16 ++++++
 common/locale/sk/oofSettings.dtd              | 26 +++++++++
 common/locale/sk/preInvitationResponse.dtd    | 14 +++++
 common/locale/sk/preferences.dtd              | 48 ++++++++++++++++
 common/locale/sk/selectEWSUrl.dtd             |  9 +++
 common/locale/sk/sendUpdateTo.dtd             |  9 +++
 common/locale/sk/sharedCalendarParser.dtd     |  3 +
 common/locale/sk/timezonePreference.dtd       |  1 +
 emailtag/locale/de/emailtag.properties        |  2 +
 emailtag/locale/ja_JP/emailtag.properties     |  2 +
 emailtag/locale/nl/emailtag.properties        |  2 +
 emailtag/locale/pl/emailtag.dtd               | 15 +++++
 emailtag/locale/pl/emailtag.properties        |  2 +
 emailtag/locale/ru/emailtag.properties        |  2 +
 emailtag/locale/sk/emailtag.dtd               | 15 +++++
 emailtag/locale/sk/emailtag.properties        |  2 +
 emailtag/locale/sv/emailtag.properties        |  2 +
 79 files changed, 1064 insertions(+)
 create mode 100644 addressbook/locale/cs_CZ/ExchangeContacts.properties
 create mode 100644 addressbook/locale/cs_CZ/ExchangeDistLists.properties
 create mode 100644 addressbook/locale/cs_CZ/addressbookOverlay.dtd
 create mode 100644 addressbook/locale/cs_CZ/exchangeContactSettings.dtd
 create mode 100644 addressbook/locale/it_IT/ExchangeContacts.properties
 create mode 100644 addressbook/locale/it_IT/ExchangeDistLists.properties
 create mode 100644 addressbook/locale/it_IT/addressbookOverlay.dtd
 create mode 100644 addressbook/locale/it_IT/exchangeContactSettings.dtd
 create mode 100644 addressbook/locale/pl/ExchangeContacts.properties
 create mode 100644 addressbook/locale/pl/ExchangeDistLists.properties
 create mode 100644 addressbook/locale/pl/addressbookOverlay.dtd
 create mode 100644 addressbook/locale/pl/exchangeContactSettings.dtd
 create mode 100644 addressbook/locale/sk/ExchangeContacts.properties
 create mode 100644 addressbook/locale/sk/ExchangeDistLists.properties
 create mode 100644 addressbook/locale/sk/addressbookOverlay.dtd
 create mode 100644 addressbook/locale/sk/exchangeContactSettings.dtd
 create mode 100644 addressbook/locale/tr/ExchangeContacts.properties
 create mode 100644 addressbook/locale/tr/ExchangeDistLists.properties
 create mode 100644 addressbook/locale/tr/addressbookOverlay.dtd
 create mode 100644 addressbook/locale/tr/exchangeContactSettings.dtd
 create mode 100644 calendar/locale/pl/attachments-view.dtd
 create mode 100644 calendar/locale/pl/calendar-calendars-list.dtd
 create mode 100644 calendar/locale/pl/calendar-summary-dialog.dtd
 create mode 100644 calendar/locale/pl/delegate-calendar-dialog.dtd
 create mode 100644 calendar/locale/pl/ecCalendarCreation.dtd
 create mode 100644 calendar/locale/pl/exchangeReminderDialog.dtd
 create mode 100644 calendar/locale/pl/lightning-item-iframe.dtd
 create mode 100644 calendar/locale/pl/messenger_task_delegation.dtd
 create mode 100644 calendar/locale/sk/attachments-view.dtd
 create mode 100644 calendar/locale/sk/calendar-calendars-list.dtd
 create mode 100644 calendar/locale/sk/calendar-summary-dialog.dtd
 create mode 100644 calendar/locale/sk/delegate-calendar-dialog.dtd
 create mode 100644 calendar/locale/sk/ecCalendarCreation.dtd
 create mode 100644 calendar/locale/sk/exchangeReminderDialog.dtd
 create mode 100644 calendar/locale/sk/lightning-item-iframe.dtd
 create mode 100644 calendar/locale/sk/messenger_task_delegation.dtd
 create mode 100644 common/locale/pl/browseFolder.dtd
 create mode 100644 common/locale/pl/calExchangeCalendar.properties
 create mode 100644 common/locale/pl/delegate-folder.dtd
 create mode 100644 common/locale/pl/exchangeCloneSettings.dtd
 create mode 100644 common/locale/pl/exchangeSettings.dtd
 create mode 100644 common/locale/pl/exchangeSettingsOverlay.dtd
 create mode 100644 common/locale/pl/extra-priority.dtd
 create mode 100644 common/locale/pl/invitationResponse.dtd
 create mode 100644 common/locale/pl/inviteStyle.dtd
 create mode 100644 common/locale/pl/manageEWSAccounts.dtd
 create mode 100644 common/locale/pl/oofSettings.dtd
 create mode 100644 common/locale/pl/preInvitationResponse.dtd
 create mode 100644 common/locale/pl/preferences.dtd
 create mode 100644 common/locale/pl/selectEWSUrl.dtd
 create mode 100644 common/locale/pl/sendUpdateTo.dtd
 create mode 100644 common/locale/pl/sharedCalendarParser.dtd
 create mode 100644 common/locale/pl/timezonePreference.dtd
 create mode 100644 common/locale/sk/browseFolder.dtd
 create mode 100644 common/locale/sk/calExchangeCalendar.properties
 create mode 100644 common/locale/sk/delegate-folder.dtd
 create mode 100644 common/locale/sk/exchangeCloneSettings.dtd
 create mode 100644 common/locale/sk/exchangeSettings.dtd
 create mode 100644 common/locale/sk/exchangeSettingsOverlay.dtd
 create mode 100644 common/locale/sk/extra-priority.dtd
 create mode 100644 common/locale/sk/invitationResponse.dtd
 create mode 100644 common/locale/sk/inviteStyle.dtd
 create mode 100644 common/locale/sk/manageEWSAccounts.dtd
 create mode 100644 common/locale/sk/oofSettings.dtd
 create mode 100644 common/locale/sk/preInvitationResponse.dtd
 create mode 100644 common/locale/sk/preferences.dtd
 create mode 100644 common/locale/sk/selectEWSUrl.dtd
 create mode 100644 common/locale/sk/sendUpdateTo.dtd
 create mode 100644 common/locale/sk/sharedCalendarParser.dtd
 create mode 100644 common/locale/sk/timezonePreference.dtd
 create mode 100644 emailtag/locale/de/emailtag.properties
 create mode 100644 emailtag/locale/ja_JP/emailtag.properties
 create mode 100644 emailtag/locale/nl/emailtag.properties
 create mode 100644 emailtag/locale/pl/emailtag.dtd
 create mode 100644 emailtag/locale/pl/emailtag.properties
 create mode 100644 emailtag/locale/ru/emailtag.properties
 create mode 100644 emailtag/locale/sk/emailtag.dtd
 create mode 100644 emailtag/locale/sk/emailtag.properties
 create mode 100644 emailtag/locale/sv/emailtag.properties

diff --git a/addressbook/locale/cs_CZ/ExchangeContacts.properties b/addressbook/locale/cs_CZ/ExchangeContacts.properties
new file mode 100644
index 00000000..460c2fcb
--- /dev/null
+++ b/addressbook/locale/cs_CZ/ExchangeContacts.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage=„%4$S“: Obdrženy aktualizace kontaktů z EWS serveru (nové: %1$S, změněné: %2$S, odebrané: %3$S).
+promtpDeleteDirectoryTitle=Odebrat složku s kontakty?
+promptDeleteDirectoryText=Opravdu chcete odebrat „%1$S“?
diff --git a/addressbook/locale/cs_CZ/ExchangeDistLists.properties b/addressbook/locale/cs_CZ/ExchangeDistLists.properties
new file mode 100644
index 00000000..189ccdcc
--- /dev/null
+++ b/addressbook/locale/cs_CZ/ExchangeDistLists.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage=„%4$S“: Obdrženy aktualizace distribučních seznamů z EWS serveru (nové: %1$S, změněné: %2$S, odebrané: %3$S).
+promtpDeleteDirectoryTitle=Odebrat složku s kontakty?
+promptDeleteDirectoryText=Opravdu chcete odebrat „%1$S“?
diff --git a/addressbook/locale/cs_CZ/addressbookOverlay.dtd b/addressbook/locale/cs_CZ/addressbookOverlay.dtd
new file mode 100644
index 00000000..51a4e8c0
--- /dev/null
+++ b/addressbook/locale/cs_CZ/addressbookOverlay.dtd
@@ -0,0 +1,9 @@
+<!ENTITY toolbar.button.label.addaccount "Přidat složku s kontakty z Exchange">
+<!ENTITY toolbar.button.tooltip.addaccount "Toto přidá novou složku s kontakty z Exchange">
+
+<!ENTITY toolbar.button.label.deleteaccount "Odebrat složku s kontakty z Exchange">
+<!ENTITY toolbar.button.tooltip.deleteaccount "Toto odebere existující složku s kontakty z Exchange">
+
+<!ENTITY deleteExchangeCmd.label "Odebrat složku s kontakty z Exchange">
+
+
diff --git a/addressbook/locale/cs_CZ/exchangeContactSettings.dtd b/addressbook/locale/cs_CZ/exchangeContactSettings.dtd
new file mode 100644
index 00000000..0d6e5098
--- /dev/null
+++ b/addressbook/locale/cs_CZ/exchangeContactSettings.dtd
@@ -0,0 +1,11 @@
+<!ENTITY label.acceptbutton "Uložit">
+<!ENTITY label.cancelbutton "Storno">
+
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Žádost o schůzku">
+
+<!ENTITY label.ecExchangeSettings.title "Název v seznamu:">
+<!ENTITY exchangeWebService.preference.contacts.pollinterval "Interval obnovování (v sekundách):">
+
+<!ENTITY exchWebService.add.globaladdresslist.label "Zahrnout globální adresář kontaktů do výsledků vyhledávání.">
+
diff --git a/addressbook/locale/it_IT/ExchangeContacts.properties b/addressbook/locale/it_IT/ExchangeContacts.properties
new file mode 100644
index 00000000..b3ce0023
--- /dev/null
+++ b/addressbook/locale/it_IT/ExchangeContacts.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received contact update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/addressbook/locale/it_IT/ExchangeDistLists.properties b/addressbook/locale/it_IT/ExchangeDistLists.properties
new file mode 100644
index 00000000..6b147ee3
--- /dev/null
+++ b/addressbook/locale/it_IT/ExchangeDistLists.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received distribution list update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/addressbook/locale/it_IT/addressbookOverlay.dtd b/addressbook/locale/it_IT/addressbookOverlay.dtd
new file mode 100644
index 00000000..c49542bf
--- /dev/null
+++ b/addressbook/locale/it_IT/addressbookOverlay.dtd
@@ -0,0 +1,9 @@
+<!ENTITY toolbar.button.label.addaccount "Add Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.addaccount "This will add a new Exchange contact folder">
+
+<!ENTITY toolbar.button.label.deleteaccount "Remove Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.deleteaccount "This will remove an existing Exchange contact folder">
+
+<!ENTITY deleteExchangeCmd.label "Remove Exchange contact folder">
+
+
diff --git a/addressbook/locale/it_IT/exchangeContactSettings.dtd b/addressbook/locale/it_IT/exchangeContactSettings.dtd
new file mode 100644
index 00000000..d2500dd0
--- /dev/null
+++ b/addressbook/locale/it_IT/exchangeContactSettings.dtd
@@ -0,0 +1,11 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting request">
+
+<!ENTITY label.ecExchangeSettings.title "Name in list:">
+<!ENTITY exchangeWebService.preference.contacts.pollinterval "Refresh interval in seconds:">
+
+<!ENTITY exchWebService.add.globaladdresslist.label "Add global address list to search results.">
+
diff --git a/addressbook/locale/pl/ExchangeContacts.properties b/addressbook/locale/pl/ExchangeContacts.properties
new file mode 100644
index 00000000..b3ce0023
--- /dev/null
+++ b/addressbook/locale/pl/ExchangeContacts.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received contact update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/addressbook/locale/pl/ExchangeDistLists.properties b/addressbook/locale/pl/ExchangeDistLists.properties
new file mode 100644
index 00000000..6b147ee3
--- /dev/null
+++ b/addressbook/locale/pl/ExchangeDistLists.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received distribution list update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/addressbook/locale/pl/addressbookOverlay.dtd b/addressbook/locale/pl/addressbookOverlay.dtd
new file mode 100644
index 00000000..c49542bf
--- /dev/null
+++ b/addressbook/locale/pl/addressbookOverlay.dtd
@@ -0,0 +1,9 @@
+<!ENTITY toolbar.button.label.addaccount "Add Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.addaccount "This will add a new Exchange contact folder">
+
+<!ENTITY toolbar.button.label.deleteaccount "Remove Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.deleteaccount "This will remove an existing Exchange contact folder">
+
+<!ENTITY deleteExchangeCmd.label "Remove Exchange contact folder">
+
+
diff --git a/addressbook/locale/pl/exchangeContactSettings.dtd b/addressbook/locale/pl/exchangeContactSettings.dtd
new file mode 100644
index 00000000..d2500dd0
--- /dev/null
+++ b/addressbook/locale/pl/exchangeContactSettings.dtd
@@ -0,0 +1,11 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting request">
+
+<!ENTITY label.ecExchangeSettings.title "Name in list:">
+<!ENTITY exchangeWebService.preference.contacts.pollinterval "Refresh interval in seconds:">
+
+<!ENTITY exchWebService.add.globaladdresslist.label "Add global address list to search results.">
+
diff --git a/addressbook/locale/sk/ExchangeContacts.properties b/addressbook/locale/sk/ExchangeContacts.properties
new file mode 100644
index 00000000..b3ce0023
--- /dev/null
+++ b/addressbook/locale/sk/ExchangeContacts.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received contact update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/addressbook/locale/sk/ExchangeDistLists.properties b/addressbook/locale/sk/ExchangeDistLists.properties
new file mode 100644
index 00000000..6b147ee3
--- /dev/null
+++ b/addressbook/locale/sk/ExchangeDistLists.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": Received distribution list update(s) from EWS server (New: %1$S, Changed: %2$S, Removed: %3$S).
+promtpDeleteDirectoryTitle=Remove contacts folder?
+promptDeleteDirectoryText=Are you really sure you want to remove "%1$S"?
diff --git a/addressbook/locale/sk/addressbookOverlay.dtd b/addressbook/locale/sk/addressbookOverlay.dtd
new file mode 100644
index 00000000..c49542bf
--- /dev/null
+++ b/addressbook/locale/sk/addressbookOverlay.dtd
@@ -0,0 +1,9 @@
+<!ENTITY toolbar.button.label.addaccount "Add Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.addaccount "This will add a new Exchange contact folder">
+
+<!ENTITY toolbar.button.label.deleteaccount "Remove Exchange contact folder">
+<!ENTITY toolbar.button.tooltip.deleteaccount "This will remove an existing Exchange contact folder">
+
+<!ENTITY deleteExchangeCmd.label "Remove Exchange contact folder">
+
+
diff --git a/addressbook/locale/sk/exchangeContactSettings.dtd b/addressbook/locale/sk/exchangeContactSettings.dtd
new file mode 100644
index 00000000..d2500dd0
--- /dev/null
+++ b/addressbook/locale/sk/exchangeContactSettings.dtd
@@ -0,0 +1,11 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting request">
+
+<!ENTITY label.ecExchangeSettings.title "Name in list:">
+<!ENTITY exchangeWebService.preference.contacts.pollinterval "Refresh interval in seconds:">
+
+<!ENTITY exchWebService.add.globaladdresslist.label "Add global address list to search results.">
+
diff --git a/addressbook/locale/tr/ExchangeContacts.properties b/addressbook/locale/tr/ExchangeContacts.properties
new file mode 100644
index 00000000..b04bf561
--- /dev/null
+++ b/addressbook/locale/tr/ExchangeContacts.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": EWS sunucusundan kişilerin güncellemesi alındı (Yeni: %1$S, Değiştirilmiş: %2$S, Kaldırılmış: %3$S).
+promtpDeleteDirectoryTitle=Kişiler klasörü kaldırılıyor?
+promptDeleteDirectoryText="%1$S" klasörünü kaldırmak istediğinize emin misiniz?
diff --git a/addressbook/locale/tr/ExchangeDistLists.properties b/addressbook/locale/tr/ExchangeDistLists.properties
new file mode 100644
index 00000000..6506350e
--- /dev/null
+++ b/addressbook/locale/tr/ExchangeDistLists.properties
@@ -0,0 +1,3 @@
+syncFolderEventMessage="%4$S": EWS sunucusundan dağıtım listesi güncellemesi alındı (Yeni: %1$S, Değiştirilmiş: %2$S, Kaldırılmış: %3$S).
+promtpDeleteDirectoryTitle=Kişiler klasörü kaldırılıyor?
+promptDeleteDirectoryText="%1$S" klasörünü kaldırmak istediğinize emin misiniz?
diff --git a/addressbook/locale/tr/addressbookOverlay.dtd b/addressbook/locale/tr/addressbookOverlay.dtd
new file mode 100644
index 00000000..81012949
--- /dev/null
+++ b/addressbook/locale/tr/addressbookOverlay.dtd
@@ -0,0 +1,9 @@
+<!ENTITY toolbar.button.label.addaccount "Exchange kişiler klasörü ekle">
+<!ENTITY toolbar.button.tooltip.addaccount "Bu, yeni bir Exchange kişiler klasörü ekleyecektir">
+
+<!ENTITY toolbar.button.label.deleteaccount "Exchange kişiler klasörünü kaldır">
+<!ENTITY toolbar.button.tooltip.deleteaccount "Bu, bulunmakta olan bir Exchange kişiler klasörünü kaldıracaktır">
+
+<!ENTITY deleteExchangeCmd.label "Exchange kişiler klasörünü kaldır">
+
+
diff --git a/addressbook/locale/tr/exchangeContactSettings.dtd b/addressbook/locale/tr/exchangeContactSettings.dtd
new file mode 100644
index 00000000..c9a75915
--- /dev/null
+++ b/addressbook/locale/tr/exchangeContactSettings.dtd
@@ -0,0 +1,11 @@
+<!ENTITY label.acceptbutton "Kaydet">
+<!ENTITY label.cancelbutton "İptal Et">
+
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Toplantı talebi">
+
+<!ENTITY label.ecExchangeSettings.title "Listedeki isim:">
+<!ENTITY exchangeWebService.preference.contacts.pollinterval "Güncelleme aralığı (saniye):">
+
+<!ENTITY exchWebService.add.globaladdresslist.label "Arama sonuçlarına küresel adres listesini ekle.">
+
diff --git a/calendar/locale/pl/attachments-view.dtd b/calendar/locale/pl/attachments-view.dtd
new file mode 100644
index 00000000..f97a6d55
--- /dev/null
+++ b/calendar/locale/pl/attachments-view.dtd
@@ -0,0 +1,2 @@
+<!ENTITY exchWebServie.add.attachment.button.label "Attachments">
+
diff --git a/calendar/locale/pl/calendar-calendars-list.dtd b/calendar/locale/pl/calendar-calendars-list.dtd
new file mode 100644
index 00000000..0e815eff
--- /dev/null
+++ b/calendar/locale/pl/calendar-calendars-list.dtd
@@ -0,0 +1,5 @@
+<!ENTITY calendar.context.exchange.convert.label "Convert to Exchange 2007/2010 Calendar and Tasks Add-on">
+<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) properties">
+<!ENTITY calendar.context.exchange.oof.settings.label "Out of office settings">
+<!ENTITY calendar.context.exchange.clone.settings.label "Clone settings to new calendar">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delegate calendar">
diff --git a/calendar/locale/pl/calendar-summary-dialog.dtd b/calendar/locale/pl/calendar-summary-dialog.dtd
new file mode 100644
index 00000000..ba560434
--- /dev/null
+++ b/calendar/locale/pl/calendar-summary-dialog.dtd
@@ -0,0 +1,3 @@
+<!ENTITY forward.invite.label "Forward invite">
+<!ENTITY required.attendee.label "Required attendee">
+<!ENTITY optional.attendee.label "Optional attendee">
diff --git a/calendar/locale/pl/delegate-calendar-dialog.dtd b/calendar/locale/pl/delegate-calendar-dialog.dtd
new file mode 100644
index 00000000..2b13f6fe
--- /dev/null
+++ b/calendar/locale/pl/delegate-calendar-dialog.dtd
@@ -0,0 +1,25 @@
+ 
+<!ENTITY  label.delegateCalendar.cancelbutton "Cancel">
+<!ENTITY  label.delegateCalendar.userEmail "Email">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Deliver meeting requests">
+
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates Only">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and Me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Delegates and Send Notifications to Me">
+
+<!ENTITY  label.delegateCalendar.permission "Permission">
+<!ENTITY  menuitem.delegateCalendar.permission.author "Author">
+<!ENTITY  menuitem.delegateCalendar.permission.editor "Editor">
+<!ENTITY  menuitem.delegateCalendar.permission.reviewer "Reviewer">
+<!ENTITY  menuitem.delegateCalendar.permission.none "None">
+
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Receive copies Of meeting messages" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "View private items" >
+
+
+<!ENTITY  delegateCalendar.permission.description.author "Read and create items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.editor "Read, create, and modify items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.reviewer "Read items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.none "No access permissions to the calendar folder." >
+
+<!ENTITY  delegateCalendar.permission.details.label "Permission details: " >
diff --git a/calendar/locale/pl/ecCalendarCreation.dtd b/calendar/locale/pl/ecCalendarCreation.dtd
new file mode 100644
index 00000000..4c90ead9
--- /dev/null
+++ b/calendar/locale/pl/ecCalendarCreation.dtd
@@ -0,0 +1,5 @@
+<!ENTITY exchange1.description "Exchange/Windows Active Directory settings">
+<!ENTITY exchange.cache.label "Use offline cache">
+
+
+
diff --git a/calendar/locale/pl/exchangeReminderDialog.dtd b/calendar/locale/pl/exchangeReminderDialog.dtd
new file mode 100644
index 00000000..84bc01fe
--- /dev/null
+++ b/calendar/locale/pl/exchangeReminderDialog.dtd
@@ -0,0 +1,4 @@
+<!ENTITY exchWebService.reminder.relation.origin.label "before the event starts">
+
+
+
diff --git a/calendar/locale/pl/lightning-item-iframe.dtd b/calendar/locale/pl/lightning-item-iframe.dtd
new file mode 100644
index 00000000..e6606773
--- /dev/null
+++ b/calendar/locale/pl/lightning-item-iframe.dtd
@@ -0,0 +1,7 @@
+<!ENTITY exchWebService.owner.label "Owner:">
+<!ENTITY exchWebService.totalWork.label "Total work:">
+<!ENTITY exchWebService.actualWork.label "Actual work:">
+<!ENTITY exchWebService.mileage.label "Mileage:">
+<!ENTITY exchWebService.billingInformation.label "Billing information:">
+<!ENTITY exchWebService.companies.label "Company:">
+
diff --git a/calendar/locale/pl/messenger_task_delegation.dtd b/calendar/locale/pl/messenger_task_delegation.dtd
new file mode 100644
index 00000000..7009f00b
--- /dev/null
+++ b/calendar/locale/pl/messenger_task_delegation.dtd
@@ -0,0 +1,6 @@
+<!ENTITY exchWebService.task.delegation.owner.name "Task owner">
+<!ENTITY exchWebService.task.delegation.delegator.name "Task delegator">
+<!ENTITY exchWebService.task.delegation.accept.button "Accept">
+<!ENTITY exchWebService.task.delegation.decline.button "Decline">
+<!ENTITY exchWebService.task.delegation.lastUpdateDate "Last change on">
+
diff --git a/calendar/locale/sk/attachments-view.dtd b/calendar/locale/sk/attachments-view.dtd
new file mode 100644
index 00000000..f97a6d55
--- /dev/null
+++ b/calendar/locale/sk/attachments-view.dtd
@@ -0,0 +1,2 @@
+<!ENTITY exchWebServie.add.attachment.button.label "Attachments">
+
diff --git a/calendar/locale/sk/calendar-calendars-list.dtd b/calendar/locale/sk/calendar-calendars-list.dtd
new file mode 100644
index 00000000..0e815eff
--- /dev/null
+++ b/calendar/locale/sk/calendar-calendars-list.dtd
@@ -0,0 +1,5 @@
+<!ENTITY calendar.context.exchange.convert.label "Convert to Exchange 2007/2010 Calendar and Tasks Add-on">
+<!ENTITY calendar.context.exchange.properties.label "Exchange (EWS) properties">
+<!ENTITY calendar.context.exchange.oof.settings.label "Out of office settings">
+<!ENTITY calendar.context.exchange.clone.settings.label "Clone settings to new calendar">
+<!ENTITY calendar.context.exchange.delegate.calendar.settings.label "Delegate calendar">
diff --git a/calendar/locale/sk/calendar-summary-dialog.dtd b/calendar/locale/sk/calendar-summary-dialog.dtd
new file mode 100644
index 00000000..ba560434
--- /dev/null
+++ b/calendar/locale/sk/calendar-summary-dialog.dtd
@@ -0,0 +1,3 @@
+<!ENTITY forward.invite.label "Forward invite">
+<!ENTITY required.attendee.label "Required attendee">
+<!ENTITY optional.attendee.label "Optional attendee">
diff --git a/calendar/locale/sk/delegate-calendar-dialog.dtd b/calendar/locale/sk/delegate-calendar-dialog.dtd
new file mode 100644
index 00000000..2b13f6fe
--- /dev/null
+++ b/calendar/locale/sk/delegate-calendar-dialog.dtd
@@ -0,0 +1,25 @@
+ 
+<!ENTITY  label.delegateCalendar.cancelbutton "Cancel">
+<!ENTITY  label.delegateCalendar.userEmail "Email">
+<!ENTITY  label.delegateCalendar.deliveryMeetingRerquestControl "Deliver meeting requests">
+
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateOnly "Delegates Only">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndMe "Delegates and Me">
+<!ENTITY  menuitem.delegateCalendar.deliverMeetingRequestslist.delegateAndInfo "Delegates and Send Notifications to Me">
+
+<!ENTITY  label.delegateCalendar.permission "Permission">
+<!ENTITY  menuitem.delegateCalendar.permission.author "Author">
+<!ENTITY  menuitem.delegateCalendar.permission.editor "Editor">
+<!ENTITY  menuitem.delegateCalendar.permission.reviewer "Reviewer">
+<!ENTITY  menuitem.delegateCalendar.permission.none "None">
+
+<!ENTITY  label.delegateCalendar.permission.receiveInvitationCopy "Receive copies Of meeting messages" >
+<!ENTITY  label.delegateCalendar.permission.viewPrivateItems "View private items" >
+
+
+<!ENTITY  delegateCalendar.permission.description.author "Read and create items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.editor "Read, create, and modify items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.reviewer "Read items in the calendar folder." >
+<!ENTITY  delegateCalendar.permission.description.none "No access permissions to the calendar folder." >
+
+<!ENTITY  delegateCalendar.permission.details.label "Permission details: " >
diff --git a/calendar/locale/sk/ecCalendarCreation.dtd b/calendar/locale/sk/ecCalendarCreation.dtd
new file mode 100644
index 00000000..4c90ead9
--- /dev/null
+++ b/calendar/locale/sk/ecCalendarCreation.dtd
@@ -0,0 +1,5 @@
+<!ENTITY exchange1.description "Exchange/Windows Active Directory settings">
+<!ENTITY exchange.cache.label "Use offline cache">
+
+
+
diff --git a/calendar/locale/sk/exchangeReminderDialog.dtd b/calendar/locale/sk/exchangeReminderDialog.dtd
new file mode 100644
index 00000000..84bc01fe
--- /dev/null
+++ b/calendar/locale/sk/exchangeReminderDialog.dtd
@@ -0,0 +1,4 @@
+<!ENTITY exchWebService.reminder.relation.origin.label "before the event starts">
+
+
+
diff --git a/calendar/locale/sk/lightning-item-iframe.dtd b/calendar/locale/sk/lightning-item-iframe.dtd
new file mode 100644
index 00000000..e6606773
--- /dev/null
+++ b/calendar/locale/sk/lightning-item-iframe.dtd
@@ -0,0 +1,7 @@
+<!ENTITY exchWebService.owner.label "Owner:">
+<!ENTITY exchWebService.totalWork.label "Total work:">
+<!ENTITY exchWebService.actualWork.label "Actual work:">
+<!ENTITY exchWebService.mileage.label "Mileage:">
+<!ENTITY exchWebService.billingInformation.label "Billing information:">
+<!ENTITY exchWebService.companies.label "Company:">
+
diff --git a/calendar/locale/sk/messenger_task_delegation.dtd b/calendar/locale/sk/messenger_task_delegation.dtd
new file mode 100644
index 00000000..7009f00b
--- /dev/null
+++ b/calendar/locale/sk/messenger_task_delegation.dtd
@@ -0,0 +1,6 @@
+<!ENTITY exchWebService.task.delegation.owner.name "Task owner">
+<!ENTITY exchWebService.task.delegation.delegator.name "Task delegator">
+<!ENTITY exchWebService.task.delegation.accept.button "Accept">
+<!ENTITY exchWebService.task.delegation.decline.button "Decline">
+<!ENTITY exchWebService.task.delegation.lastUpdateDate "Last change on">
+
diff --git a/common/locale/pl/browseFolder.dtd b/common/locale/pl/browseFolder.dtd
new file mode 100644
index 00000000..88334642
--- /dev/null
+++ b/common/locale/pl/browseFolder.dtd
@@ -0,0 +1,12 @@
+<!ENTITY label.acceptbutton "Select">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY browsefolder.title "Browse folders">
+
+<!ENTITY treecol.label.foldername "Folder name">
+<!ENTITY treecol.label.folderclass "Folder class">
+
+
+
+
+
diff --git a/common/locale/pl/calExchangeCalendar.properties b/common/locale/pl/calExchangeCalendar.properties
new file mode 100644
index 00000000..feb1af9c
--- /dev/null
+++ b/common/locale/pl/calExchangeCalendar.properties
@@ -0,0 +1,49 @@
+displayName=Exchange 2007/2010 Calendar and Tasks Provider
+
+resetEventMessage=Calendar "%1$S" has been reset.
+addTaskEventMessage=Added task "%1$S" (%2$S).
+addCalendarEventMessage=Added appointment "%1$S" (%2$S).
+ewsErrorEventMessage=Error in communication with EWS server for "%1$S". Error: %2$S, Code: %3$S.
+updateCalendarEventMessage=Appointment "%1$S" has been modified (%2$S).
+updateTaskEventMessage=Task "%1$S" has been modified (%2$S).
+deleteCalendarEventMessage=Appointment "%1$S" has been removed (%2$S).
+deleteTaskEventMessage=Task "%1$S" has been removed (%2$S).
+syncFolderEventMessage="%4$S": Received updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxRequests="%4$S": Inbox received meeting invitation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxCancelations="%4$S": Inbox received meeting cancelation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxResponses="%4$S": Inbox received meeting response updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+ewsMeetingResponsEventMessage=Meeting request "%1$S" answered with "%2$S" (%3$S). Your message:
+
+ecErrorServerCheck=Error while checking with server: %1$S (%2$S)
+ecErrorAutodiscovery=Error during autodiscovery: %1$S (%2$S)
+ecErrorAutodiscoveryURLInvalid=It was not possible to find settings through autodiscovery using the domain name part of the mailbox (%1$S).\nUsually this means there is not an autodiscovery server defined with the domain name part as hostname.
+ecErrorServerCheckURLInvalid=Server "%1$S" does not exist.
+ecErrorServerAndMailboxCheck=Error during checking of server and mailbox: %1$S (Code: %2$S)
+
+updateUserPrefs1=User preferences updated for new version (since 0.7.26)
+
+autoRemoveConfirmedInvitationOnCancellation=Confirmed appointment "%1$S" has been canceled and was automatically removed as specified by user settings (%2$S).
+
+sendAutoRespondMeetingRequestMessage=Meeting request "%1$S" has been automatically answered as specified by the user settings (%2$S).
+
+ecLoadingOofSettings=(Retrieving data)
+ecLoadedOofSettings=(Data retrieved)
+ecErrorLoadingOofSettings=Error during loading of out of office settings. Code: %2$S, Message: %1$S.
+ecSavingOofSettings=(Saving data)
+ecSavedOofSettings=(Data saved)
+ecErrorSavingOofSettings=Error during saving of out of office settings. Code: %2$S, Message: %1$S.
+
+
+exchWebService.PidLidTaskHistory.duedate.changed=Due date was changed
+exchWebService.PidLidTaskHistory.some.property.changed=A property was changed
+exchWebService.PidLidTaskHistory.accepted=Task accepted by %1$S
+exchWebService.PidLidTaskHistory.rejected=Task rejected by %1$S
+exchWebService.PidLidTaskHistory.assigned=Task assigned to %1$S
+exchWebService.PidLidTaskHistory.no.changes=No changes
+
+ecErrorServerAndMailboxCheckFolderNotFound=Either you do not have read permission on the selected mailbox or the mailbox is incorrect.\n\nWhen the mailbox is corrected you might have permissions to view the busy/tentative/OOO user availability status for its calendar.\n\n(%2$S: %1$S)
+
+tooltipCalendarDisconnected=The calendar %1$S is not connected to the Exchange server\n(Reason: %2$S).
+tooltipCalendarDisconnectedReadOnly=The calendar %1$S is not connected to the Exchange server and is read only\n(Reason: %2$S).
+tooltipCalendarConnected=The calendar %1$S is connected to the Exchange server.
+tooltipCalendarConnectedReadOnly=The calendar %1$S is connected to the Exchange server and is readonly.
diff --git a/common/locale/pl/delegate-folder.dtd b/common/locale/pl/delegate-folder.dtd
new file mode 100644
index 00000000..28dbfd40
--- /dev/null
+++ b/common/locale/pl/delegate-folder.dtd
@@ -0,0 +1,45 @@
+ 
+<!ENTITY  label.delegatefolder.cancelbutton "Cancel">
+<!ENTITY  label.delegatefolder.userEmail "Email">
+ 
+<!ENTITY  label.delegatefolder.permissionLevel "Permission level">
+<!ENTITY  label.delegatefolder.userboxcolumn1 "User"> 
+<!ENTITY  label.delegatefolder.userboxcolumn2 "Permissions"> 
+
+<!ENTITY  menuitem.delegatefolder.permission.author "Author">
+<!ENTITY  menuitem.delegatefolder.permission.editor "Editor">
+<!ENTITY  menuitem.delegatefolder.permission.reviewer "Reviewer">
+<!ENTITY  menuitem.delegatefolder.permission.none "None">
+<!ENTITY  menuitem.delegatefolder.permission.owner "Owner" > 
+<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "PublishingEditor" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "PublishingAuthor" >
+<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "NoneditingAuthor" >
+<!ENTITY  menuitem.delegatefolder.permission.contributor "Contributor" >
+<!ENTITY  menuitem.delegatefolder.permission.custom "Custom" >
+                            
+<!ENTITY  delegatefolder.permission.description.author "Read and create items in the folder." >
+<!ENTITY  delegatefolder.permission.description.editor "Read, create, and modify items in the folder." >
+<!ENTITY  delegatefolder.permission.description.reviewer "Read items in the folder." >
+<!ENTITY  delegatefolder.permission.description.none "No access permissions to the folder." >
+
+ <!ENTITY  delegatefolder.permission.details.caption "Permission "> 
+
+<!ENTITY  delegatefolder.tab.msg.label  "No calendar or task found for this mail account.">
+<!ENTITY  delegatefolder.tab.name  "Exchange folder sharing">
+
+<!ENTITY  delegatefolder.permissions.none  "None">
+<!ENTITY  delegatefolder.permissions.own  "Own items">
+<!ENTITY  delegatefolder.permissions.all  "All items">
+<!ENTITY  delegatefolder.permissions.full  "Full details">
+
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Create items">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Create subfolders">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Folder owner">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Folder visible">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Folder contact">
+<!ENTITY  delegatefolder.permissions.edititems  "Edit items">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Delete items">
+<!ENTITY  delegatefolder.permissions.readitems  "Read items">  
+ 
+<!ENTITY  delegatefolder.permissions.true  "True">
+<!ENTITY  delegatefolder.permissions.false  "False">
diff --git a/common/locale/pl/exchangeCloneSettings.dtd b/common/locale/pl/exchangeCloneSettings.dtd
new file mode 100644
index 00000000..01f7f685
--- /dev/null
+++ b/common/locale/pl/exchangeCloneSettings.dtd
@@ -0,0 +1,6 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY label.ecExchangeSettings.title "New description:">
+
+
diff --git a/common/locale/pl/exchangeSettings.dtd b/common/locale/pl/exchangeSettings.dtd
new file mode 100644
index 00000000..9e88575e
--- /dev/null
+++ b/common/locale/pl/exchangeSettings.dtd
@@ -0,0 +1,54 @@
+<!ENTITY label.acceptbutton "Save and reset">
+<!ENTITY label.cancelbutton "Cancel">
+<!ENTITY ecsettings.title "EWS calendar and mail settings">
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting requests">
+<!ENTITY ecsettings.tab.calendarfolderproperties "Folder properties">
+
+<!ENTITY label.ecExchangeSettings.title "Settings for calendar:">
+
+<!ENTITY label.poll.inbox "Poll inbox for requests, changes and cancellations.">
+<!ENTITY label.poll.inbox.interval "Frequency (in seconds) to poll inbox:">
+<!ENTITY label.poll.calendar.interval "Frequency (in seconds) to poll calendar:">
+
+<!ENTITY label.nomeetingrequestsettings "You cannot set a meeting request because you did not select the main calendar for the mailbox">
+
+<!ENTITY label.autorespond.meetingrequest "Automatically respond to a new invitation with ">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "I might attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
+
+<!ENTITY label.autoremove.invitation_cancellation1 "Automatically remove the invitation and accompanying cancelation message if you did not yet respond to the invitation request.">
+<!ENTITY label.autoremove.invitation_cancellation2 "Automatically remove a confirmed invitation when you receive a cancelation message.">
+
+<!ENTITY label.autoremove.invitation_response1 "Automatically remove a response from others to a meeting invitation of which you are not the organizer.">
+
+<!ENTITY label.doautorespond.meetingrequest.message "Send the following message with responses instead of asking for a message.">
+<!ENTITY label.autorespond.meetingrequest.message "Your message:">
+
+<!ENTITY treecol.label.userid "User ID">
+<!ENTITY treecol.label.email "Email">
+
+
+<!ENTITY ecsettings.tab.offlineCachingproperties "Offline caching">
+
+<!ENTITY label.offlineCacheproperties.cachingStartDate "Start date of caching:">
+<!ENTITY label.offlineCacheproperties.cachingEndDate "End date of caching:">
+<!ENTITY label.offlineCacheproperties.totalEvents "Total number of events cached:">
+<!ENTITY label.offlineCacheproperties.totalTasks "Total number of tasks cached:">
+
+<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate "Number of months to cache items prior to today:">
+<!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Number of months to cache items after today:">
+
+<!ENTITY button.offlineCacheproperties.clearCache "Clear offline cached data">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Automatic processing">
+<!ENTITY ecsettings.tab.mailitemsProperties "EWS settings (mail)">
+
+<!ENTITY label.syncmailitems.interval "Delay syncing mail items (tags, etc.)">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove canceled events">
+<!ENTITY label.autoprocessingproperties.markeventtentative "Automatically mark event as tentative and send response to organizer">
+<!ENTITY label.syncmailitems.active "Keep enabled syncing mail items (tags, etc.)">
+
+<!ENTITY label.syncfollowup.deactivtate "Disable followup task">
+ 
diff --git a/common/locale/pl/exchangeSettingsOverlay.dtd b/common/locale/pl/exchangeSettingsOverlay.dtd
new file mode 100644
index 00000000..cc52398a
--- /dev/null
+++ b/common/locale/pl/exchangeSettingsOverlay.dtd
@@ -0,0 +1,56 @@
+<!ENTITY ecautodiscover "Use Exchange's autodiscovery function.">
+<!ENTITY ecfolderbase.label "Folder base:">
+<!ENTITY ecfolderpath.label "Path below folder base:">
+<!ENTITY ecfolderidofshare.label "Share Folder ID:">
+<!ENTITY exchWebServices.SharedFolderID.label "Shared display name:">
+
+<!ENTITY menuitem.label.ecfolderbase.calendar "Calendar folder">
+<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Public folders">
+<!ENTITY menuitem.label.ecfolderbase.inbox "Mail inbox folder">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Voice mail folder">
+<!ENTITY menuitem.label.ecfolderbase.msgfolderroot "Message folder root">
+<!ENTITY menuitem.label.ecfolderbase.root "Root of the mailbox">
+<!ENTITY menuitem.label.ecfolderbase.tasks "Tasks folder">
+
+<!ENTITY menuitem.label.ecfolderbase.contacts "Contacts folder">
+<!ENTITY menuitem.label.ecfolderbase.deleteditems "Deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.drafts "Drafts folder">
+<!ENTITY menuitem.label.ecfolderbase.journal "Journal folder">
+<!ENTITY menuitem.label.ecfolderbase.notes "Notes folder">
+<!ENTITY menuitem.label.ecfolderbase.outbox "Mail outbox folder">
+<!ENTITY menuitem.label.ecfolderbase.sentitems "Sent items folder">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Junk email folder">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Search folders folder">
+<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Options below are only for Exchange 2010 --">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Dumpster root folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Dumpster deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Dumpster versions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges "Dumpster purges folder">
+<!ENTITY menuitem.label.ecfolderbase.archiveroot "Root archive folder">
+<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot "Root archive message folder">
+<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems "Archive deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot "Archive recoverable items root folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions "Archive recoverable items deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsversions "Archive recoverable items versions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemspurges "Archive recoverable items purges folder">
+
+<!ENTITY button.label.autodiscovercheck "Perform autodiscovery">
+<!ENTITY button.label.serverandmailboxcheck "Check server and mailbox">
+<!ENTITY button.label.servercheck "Check server and account">
+
+<!ENTITY ecmailbox.label "Primary email address:">
+<!ENTITY ecmailbox.tooltip "If you do not specify a mailbox you will only have access to public folders.">
+<!ENTITY ecwindowsuser.label "Username:">
+<!ENTITY ecwindowsdomain.label "Domain name:">
+<!ENTITY ecwindowspassword.label "Password:">
+
+<!ENTITY button.label.folderpathcheck "Check">
+<!ENTITY button.label.folderbrowse "Browse">
+
+<!ENTITY exchWebServices.UserAvailability.label "Only user availability status for the mailbox's calendar will be visible.">
+
+<!ENTITY exchWebServices.exchtype.label "Exchange type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office 365">
+<!ENTITY exchWebServices.detail.label "Details">
+ 
diff --git a/common/locale/pl/extra-priority.dtd b/common/locale/pl/extra-priority.dtd
new file mode 100644
index 00000000..f06cd6e4
--- /dev/null
+++ b/common/locale/pl/extra-priority.dtd
@@ -0,0 +1,18 @@
+<!ENTITY prefwindow.title "Extras">
+<!ENTITY general.label  "General"> 
+<!ENTITY about.label "About"> 
+ 
+<!ENTITY about.description.label "Enhanced Features for Thunderbird and SeaMonkey applications">
+<!ENTITY iconify.label "Display priority icons only"> 
+<!ENTITY shadeHigh.label "Color background for high-priority messages">
+<!ENTITY shadeLow.label "Color background for low-priority messages">
+<!ENTITY tagImportant.label "Automatically tag high-priority mail as important">
+ 
+<!ENTITY highestColor.label "Highest">
+
+<!ENTITY highColor.label "High">
+<!ENTITY lowColor.label "Low">
+<!ENTITY lowestColor.label "Lowest">
+ 
+<!ENTITY prioritycolor  "Custom Color">
+<!ENTITY pref.color "Color preferences:">
diff --git a/common/locale/pl/invitationResponse.dtd b/common/locale/pl/invitationResponse.dtd
new file mode 100644
index 00000000..5ac9a7e6
--- /dev/null
+++ b/common/locale/pl/invitationResponse.dtd
@@ -0,0 +1,20 @@
+<!ENTITY label.acceptbutton "Confirm change">
+<!ENTITY label.cancelbutton "Cancel change">
+
+<!ENTITY description.invitationResponse "Confirm change of your meeting response.">
+
+<!ENTITY label.calendarName "Calendar:">
+<!ENTITY label.itemTitle "Subject:">
+<!ENTITY label.itemStart "Start time:">
+<!ENTITY label.itemResponse "Your response:">
+<!ENTITY label.meetingOrganiser "Organizer:">
+
+<!ENTITY label.messageReponseBody "Response message:">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "I might attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
+
+<!ENTITY label.proposenewtime.title "Propose new time (&gt;= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/common/locale/pl/inviteStyle.dtd b/common/locale/pl/inviteStyle.dtd
new file mode 100644
index 00000000..ada3d520
--- /dev/null
+++ b/common/locale/pl/inviteStyle.dtd
@@ -0,0 +1,2 @@
+<!ENTITY label.inviteCol "Calendar invite">
+<!ENTITY tooltip.inviteCol "Sort by invitation">
diff --git a/common/locale/pl/manageEWSAccounts.dtd b/common/locale/pl/manageEWSAccounts.dtd
new file mode 100644
index 00000000..21b6c947
--- /dev/null
+++ b/common/locale/pl/manageEWSAccounts.dtd
@@ -0,0 +1,16 @@
+<!ENTITY label.acceptbutton "Close">
+
+<!ENTITY exchWebService.manageEWSAccounts.newAccount.button "Add account">
+<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button "Remove account">
+<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button "Save settings">
+
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.label "Use Exchange's autodiscovery function.">
+<!ENTITY exchWebService.manageEWSAccounts.mailbox.label "Mailbox name:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label "Username:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label "Domain name:">
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button "Perform autodiscovery">
+<!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Check server and account">
+<!ENTITY exchWebService.manageEWSAccounts.name.label "Name:">
+
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services accounts">
+
diff --git a/common/locale/pl/oofSettings.dtd b/common/locale/pl/oofSettings.dtd
new file mode 100644
index 00000000..19061349
--- /dev/null
+++ b/common/locale/pl/oofSettings.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.oofsettings "Out of office settings">
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Close">
+<!ENTITY label.oofsettings.title "Out of office settings for:">
+
+<!ENTITY label.oofstatus "Out of office status:">
+
+<!ENTITY label.externalaudience "To which external persons do you want to send out of office messages: ">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "To nobody">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Only to persons in my contact list">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "To everybody">
+
+<!ENTITY button.label.internal "Internal message">
+<!ENTITY button.label.external "External message">
+<!ENTITY label.internalreply "Message that will be sent to people within my organization:">
+<!ENTITY label.externalreply "Message that will be sent to people outside my organization:">
+
+<!ENTITY menuitem.label.exchWebService-oof-status.disabled "Disabled">
+<!ENTITY menuitem.label.exchWebService-oof-status.enabled "Enabled">
+
+<!ENTITY checkbox.label.exchWebService-oof-scheduled "Only enabled in specified time frame:">
+<!ENTITY label.hbox-oof-scheduled-startTime "Start time:">
+<!ENTITY label.hbox-oof-scheduled-endTime "End time:">
+
+
+
diff --git a/common/locale/pl/preInvitationResponse.dtd b/common/locale/pl/preInvitationResponse.dtd
new file mode 100644
index 00000000..d8c0ea54
--- /dev/null
+++ b/common/locale/pl/preInvitationResponse.dtd
@@ -0,0 +1,14 @@
+<!ENTITY dialog.exchWebService.preInvitationResponse.title "How do you want to react?">
+<!ENTITY label.acceptbutton "OK">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY label.calendarName "Calendar:">
+<!ENTITY label.itemTitle "Subject:">
+<!ENTITY label.itemStart "Start time:">
+<!ENTITY label.itemResponse "Your response:">
+<!ENTITY label.meetingOrganiser "Organizer:">
+
+<!ENTITY radio.label.exchWebService.preInvitationResponse.edit "Edit the response before sending.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow "Send the response now.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend "Don't send a response.">
+
diff --git a/common/locale/pl/preferences.dtd b/common/locale/pl/preferences.dtd
new file mode 100644
index 00000000..b5922ad7
--- /dev/null
+++ b/common/locale/pl/preferences.dtd
@@ -0,0 +1,48 @@
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Logging">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Accounts">
+<!ENTITY exchangeWebService.preferences.tab.debug "Logging">
+<!ENTITY exchangeWebService.preference.debug.file "Log file location:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Communication with Exchange server:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Log information to the console and/or a file">
+<!ENTITY exchangeWebService.preference.debug.file.button "Browse">
+<!ENTITY exchangeWebService.preference.network.debug.label "Log communication with Exchange server">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Log level">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Log communication progress information (e.g., Authentication)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Show password in clear text in log file.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Addressbook/Contacts:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Log level">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Log info about addressbook/contacts part">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) Preferences">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Core provider object:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = None, 1 = Basic information, 2 = Extended information">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Caching">
+<!ENTITY exchangeWebService.preference.cache.memory.label "Minimal temporary memory cache">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Number of days to download before start date of program:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Number of days to download after start date of program:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Others">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Communication preferences:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Maximum number of retries for exchange communication:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Add-on update function:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatically check for a new add-on version online when starting Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Show warning when a new version is available so you can easily install it.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximum number of simultaneous request to exchange server:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
+
+<!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
+<!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
+<!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/pl/selectEWSUrl.dtd b/common/locale/pl/selectEWSUrl.dtd
new file mode 100644
index 00000000..b69a27b8
--- /dev/null
+++ b/common/locale/pl/selectEWSUrl.dtd
@@ -0,0 +1,9 @@
+<!ENTITY label.acceptbutton "Select">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY description.selectews "Choose an EWS server from the list which is suitable for your current location.">
+<!ENTITY label.selectews "EWS server list:">
+
+
+
+
diff --git a/common/locale/pl/sendUpdateTo.dtd b/common/locale/pl/sendUpdateTo.dtd
new file mode 100644
index 00000000..5f44675b
--- /dev/null
+++ b/common/locale/pl/sendUpdateTo.dtd
@@ -0,0 +1,9 @@
+<!ENTITY title.sendupdateto "To whom do you want to send this update?">
+<!ENTITY label.acceptbutton "Execute">
+<!ENTITY label.cancelbutton "Cancel">
+<!ENTITY label.calendaritem.title "Send update for meeting:">
+
+<!ENTITY radio.label.sendtonone "Send to nobody.">
+<!ENTITY radio.label.sendtoall "Send to everyone invited.">
+<!ENTITY radio.label.sendtochanged "Send only to added or removed persons.">
+
diff --git a/common/locale/pl/sharedCalendarParser.dtd b/common/locale/pl/sharedCalendarParser.dtd
new file mode 100644
index 00000000..39c9f897
--- /dev/null
+++ b/common/locale/pl/sharedCalendarParser.dtd
@@ -0,0 +1,3 @@
+<!ENTITY exchWebService_vbox_label "Detected an Exchange sharing invitation">
+<!ENTITY exchWebService_button_label_add_calendar "Add calendar">
+
diff --git a/common/locale/pl/timezonePreference.dtd b/common/locale/pl/timezonePreference.dtd
new file mode 100644
index 00000000..a61aa649
--- /dev/null
+++ b/common/locale/pl/timezonePreference.dtd
@@ -0,0 +1 @@
+<!ENTITY calendar.timezone.local.auto.label  "Automatically change timezone">
diff --git a/common/locale/sk/browseFolder.dtd b/common/locale/sk/browseFolder.dtd
new file mode 100644
index 00000000..88334642
--- /dev/null
+++ b/common/locale/sk/browseFolder.dtd
@@ -0,0 +1,12 @@
+<!ENTITY label.acceptbutton "Select">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY browsefolder.title "Browse folders">
+
+<!ENTITY treecol.label.foldername "Folder name">
+<!ENTITY treecol.label.folderclass "Folder class">
+
+
+
+
+
diff --git a/common/locale/sk/calExchangeCalendar.properties b/common/locale/sk/calExchangeCalendar.properties
new file mode 100644
index 00000000..feb1af9c
--- /dev/null
+++ b/common/locale/sk/calExchangeCalendar.properties
@@ -0,0 +1,49 @@
+displayName=Exchange 2007/2010 Calendar and Tasks Provider
+
+resetEventMessage=Calendar "%1$S" has been reset.
+addTaskEventMessage=Added task "%1$S" (%2$S).
+addCalendarEventMessage=Added appointment "%1$S" (%2$S).
+ewsErrorEventMessage=Error in communication with EWS server for "%1$S". Error: %2$S, Code: %3$S.
+updateCalendarEventMessage=Appointment "%1$S" has been modified (%2$S).
+updateTaskEventMessage=Task "%1$S" has been modified (%2$S).
+deleteCalendarEventMessage=Appointment "%1$S" has been removed (%2$S).
+deleteTaskEventMessage=Task "%1$S" has been removed (%2$S).
+syncFolderEventMessage="%4$S": Received updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxRequests="%4$S": Inbox received meeting invitation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxCancelations="%4$S": Inbox received meeting cancelation updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+syncInboxResponses="%4$S": Inbox received meeting response updates from EWS server (New: %1$S, Changed: %2$S, Deleted: %3$S).
+ewsMeetingResponsEventMessage=Meeting request "%1$S" answered with "%2$S" (%3$S). Your message:
+
+ecErrorServerCheck=Error while checking with server: %1$S (%2$S)
+ecErrorAutodiscovery=Error during autodiscovery: %1$S (%2$S)
+ecErrorAutodiscoveryURLInvalid=It was not possible to find settings through autodiscovery using the domain name part of the mailbox (%1$S).\nUsually this means there is not an autodiscovery server defined with the domain name part as hostname.
+ecErrorServerCheckURLInvalid=Server "%1$S" does not exist.
+ecErrorServerAndMailboxCheck=Error during checking of server and mailbox: %1$S (Code: %2$S)
+
+updateUserPrefs1=User preferences updated for new version (since 0.7.26)
+
+autoRemoveConfirmedInvitationOnCancellation=Confirmed appointment "%1$S" has been canceled and was automatically removed as specified by user settings (%2$S).
+
+sendAutoRespondMeetingRequestMessage=Meeting request "%1$S" has been automatically answered as specified by the user settings (%2$S).
+
+ecLoadingOofSettings=(Retrieving data)
+ecLoadedOofSettings=(Data retrieved)
+ecErrorLoadingOofSettings=Error during loading of out of office settings. Code: %2$S, Message: %1$S.
+ecSavingOofSettings=(Saving data)
+ecSavedOofSettings=(Data saved)
+ecErrorSavingOofSettings=Error during saving of out of office settings. Code: %2$S, Message: %1$S.
+
+
+exchWebService.PidLidTaskHistory.duedate.changed=Due date was changed
+exchWebService.PidLidTaskHistory.some.property.changed=A property was changed
+exchWebService.PidLidTaskHistory.accepted=Task accepted by %1$S
+exchWebService.PidLidTaskHistory.rejected=Task rejected by %1$S
+exchWebService.PidLidTaskHistory.assigned=Task assigned to %1$S
+exchWebService.PidLidTaskHistory.no.changes=No changes
+
+ecErrorServerAndMailboxCheckFolderNotFound=Either you do not have read permission on the selected mailbox or the mailbox is incorrect.\n\nWhen the mailbox is corrected you might have permissions to view the busy/tentative/OOO user availability status for its calendar.\n\n(%2$S: %1$S)
+
+tooltipCalendarDisconnected=The calendar %1$S is not connected to the Exchange server\n(Reason: %2$S).
+tooltipCalendarDisconnectedReadOnly=The calendar %1$S is not connected to the Exchange server and is read only\n(Reason: %2$S).
+tooltipCalendarConnected=The calendar %1$S is connected to the Exchange server.
+tooltipCalendarConnectedReadOnly=The calendar %1$S is connected to the Exchange server and is readonly.
diff --git a/common/locale/sk/delegate-folder.dtd b/common/locale/sk/delegate-folder.dtd
new file mode 100644
index 00000000..28dbfd40
--- /dev/null
+++ b/common/locale/sk/delegate-folder.dtd
@@ -0,0 +1,45 @@
+ 
+<!ENTITY  label.delegatefolder.cancelbutton "Cancel">
+<!ENTITY  label.delegatefolder.userEmail "Email">
+ 
+<!ENTITY  label.delegatefolder.permissionLevel "Permission level">
+<!ENTITY  label.delegatefolder.userboxcolumn1 "User"> 
+<!ENTITY  label.delegatefolder.userboxcolumn2 "Permissions"> 
+
+<!ENTITY  menuitem.delegatefolder.permission.author "Author">
+<!ENTITY  menuitem.delegatefolder.permission.editor "Editor">
+<!ENTITY  menuitem.delegatefolder.permission.reviewer "Reviewer">
+<!ENTITY  menuitem.delegatefolder.permission.none "None">
+<!ENTITY  menuitem.delegatefolder.permission.owner "Owner" > 
+<!ENTITY  menuitem.delegatefolder.permission.publishingEditor "PublishingEditor" >
+<!ENTITY  menuitem.delegatefolder.permission.publishingAuthor "PublishingAuthor" >
+<!ENTITY  menuitem.delegatefolder.permission.noneditingAuthor "NoneditingAuthor" >
+<!ENTITY  menuitem.delegatefolder.permission.contributor "Contributor" >
+<!ENTITY  menuitem.delegatefolder.permission.custom "Custom" >
+                            
+<!ENTITY  delegatefolder.permission.description.author "Read and create items in the folder." >
+<!ENTITY  delegatefolder.permission.description.editor "Read, create, and modify items in the folder." >
+<!ENTITY  delegatefolder.permission.description.reviewer "Read items in the folder." >
+<!ENTITY  delegatefolder.permission.description.none "No access permissions to the folder." >
+
+ <!ENTITY  delegatefolder.permission.details.caption "Permission "> 
+
+<!ENTITY  delegatefolder.tab.msg.label  "No calendar or task found for this mail account.">
+<!ENTITY  delegatefolder.tab.name  "Exchange folder sharing">
+
+<!ENTITY  delegatefolder.permissions.none  "None">
+<!ENTITY  delegatefolder.permissions.own  "Own items">
+<!ENTITY  delegatefolder.permissions.all  "All items">
+<!ENTITY  delegatefolder.permissions.full  "Full details">
+
+<!ENTITY  delegatefolder.permissions.cancreateitems  "Create items">
+<!ENTITY  delegatefolder.permissions.cancreatesubfolders  "Create subfolders">
+<!ENTITY  delegatefolder.permissions.isfolderowner  "Folder owner">
+<!ENTITY  delegatefolder.permissions.isfoldervisible  "Folder visible">
+<!ENTITY  delegatefolder.permissions.isfoldercontact  "Folder contact">
+<!ENTITY  delegatefolder.permissions.edititems  "Edit items">
+<!ENTITY  delegatefolder.permissions.deleteitems  "Delete items">
+<!ENTITY  delegatefolder.permissions.readitems  "Read items">  
+ 
+<!ENTITY  delegatefolder.permissions.true  "True">
+<!ENTITY  delegatefolder.permissions.false  "False">
diff --git a/common/locale/sk/exchangeCloneSettings.dtd b/common/locale/sk/exchangeCloneSettings.dtd
new file mode 100644
index 00000000..01f7f685
--- /dev/null
+++ b/common/locale/sk/exchangeCloneSettings.dtd
@@ -0,0 +1,6 @@
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY label.ecExchangeSettings.title "New description:">
+
+
diff --git a/common/locale/sk/exchangeSettings.dtd b/common/locale/sk/exchangeSettings.dtd
new file mode 100644
index 00000000..9e88575e
--- /dev/null
+++ b/common/locale/sk/exchangeSettings.dtd
@@ -0,0 +1,54 @@
+<!ENTITY label.acceptbutton "Save and reset">
+<!ENTITY label.cancelbutton "Cancel">
+<!ENTITY ecsettings.title "EWS calendar and mail settings">
+<!ENTITY ecsettings.tab.adsettings "Exchange/Windows AD">
+<!ENTITY ecsettings.tab.meetingrequestsettings "Meeting requests">
+<!ENTITY ecsettings.tab.calendarfolderproperties "Folder properties">
+
+<!ENTITY label.ecExchangeSettings.title "Settings for calendar:">
+
+<!ENTITY label.poll.inbox "Poll inbox for requests, changes and cancellations.">
+<!ENTITY label.poll.inbox.interval "Frequency (in seconds) to poll inbox:">
+<!ENTITY label.poll.calendar.interval "Frequency (in seconds) to poll calendar:">
+
+<!ENTITY label.nomeetingrequestsettings "You cannot set a meeting request because you did not select the main calendar for the mailbox">
+
+<!ENTITY label.autorespond.meetingrequest "Automatically respond to a new invitation with ">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "I might attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
+
+<!ENTITY label.autoremove.invitation_cancellation1 "Automatically remove the invitation and accompanying cancelation message if you did not yet respond to the invitation request.">
+<!ENTITY label.autoremove.invitation_cancellation2 "Automatically remove a confirmed invitation when you receive a cancelation message.">
+
+<!ENTITY label.autoremove.invitation_response1 "Automatically remove a response from others to a meeting invitation of which you are not the organizer.">
+
+<!ENTITY label.doautorespond.meetingrequest.message "Send the following message with responses instead of asking for a message.">
+<!ENTITY label.autorespond.meetingrequest.message "Your message:">
+
+<!ENTITY treecol.label.userid "User ID">
+<!ENTITY treecol.label.email "Email">
+
+
+<!ENTITY ecsettings.tab.offlineCachingproperties "Offline caching">
+
+<!ENTITY label.offlineCacheproperties.cachingStartDate "Start date of caching:">
+<!ENTITY label.offlineCacheproperties.cachingEndDate "End date of caching:">
+<!ENTITY label.offlineCacheproperties.totalEvents "Total number of events cached:">
+<!ENTITY label.offlineCacheproperties.totalTasks "Total number of tasks cached:">
+
+<!ENTITY label.offlineCacheproperties.monthsBeforeStartDate "Number of months to cache items prior to today:">
+<!ENTITY label.offlineCacheproperties.monthsBeforeEndDate "Number of months to cache items after today:">
+
+<!ENTITY button.offlineCacheproperties.clearCache "Clear offline cached data">
+<!ENTITY ecsettings.tab.autoprocessingproperties "Automatic processing">
+<!ENTITY ecsettings.tab.mailitemsProperties "EWS settings (mail)">
+
+<!ENTITY label.syncmailitems.interval "Delay syncing mail items (tags, etc.)">
+<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove canceled events">
+<!ENTITY label.autoprocessingproperties.markeventtentative "Automatically mark event as tentative and send response to organizer">
+<!ENTITY label.syncmailitems.active "Keep enabled syncing mail items (tags, etc.)">
+
+<!ENTITY label.syncfollowup.deactivtate "Disable followup task">
+ 
diff --git a/common/locale/sk/exchangeSettingsOverlay.dtd b/common/locale/sk/exchangeSettingsOverlay.dtd
new file mode 100644
index 00000000..cc52398a
--- /dev/null
+++ b/common/locale/sk/exchangeSettingsOverlay.dtd
@@ -0,0 +1,56 @@
+<!ENTITY ecautodiscover "Use Exchange's autodiscovery function.">
+<!ENTITY ecfolderbase.label "Folder base:">
+<!ENTITY ecfolderpath.label "Path below folder base:">
+<!ENTITY ecfolderidofshare.label "Share Folder ID:">
+<!ENTITY exchWebServices.SharedFolderID.label "Shared display name:">
+
+<!ENTITY menuitem.label.ecfolderbase.calendar "Calendar folder">
+<!ENTITY menuitem.label.ecfolderbase.publicfoldersroot "Public folders">
+<!ENTITY menuitem.label.ecfolderbase.inbox "Mail inbox folder">
+<!ENTITY menuitem.label.ecfolderbase.voicemail "Voice mail folder">
+<!ENTITY menuitem.label.ecfolderbase.msgfolderroot "Message folder root">
+<!ENTITY menuitem.label.ecfolderbase.root "Root of the mailbox">
+<!ENTITY menuitem.label.ecfolderbase.tasks "Tasks folder">
+
+<!ENTITY menuitem.label.ecfolderbase.contacts "Contacts folder">
+<!ENTITY menuitem.label.ecfolderbase.deleteditems "Deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.drafts "Drafts folder">
+<!ENTITY menuitem.label.ecfolderbase.journal "Journal folder">
+<!ENTITY menuitem.label.ecfolderbase.notes "Notes folder">
+<!ENTITY menuitem.label.ecfolderbase.outbox "Mail outbox folder">
+<!ENTITY menuitem.label.ecfolderbase.sentitems "Sent items folder">
+<!ENTITY menuitem.label.ecfolderbase.junkemail "Junk email folder">
+<!ENTITY menuitem.label.ecfolderbase.searchfolders "Search folders folder">
+<!ENTITY menuitem.label.ecfolderbase.version2010 "-- Options below are only for Exchange 2010 --">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsroot "Dumpster root folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsdeletions "Dumpster deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemsversion "Dumpster versions folder">
+<!ENTITY menuitem.label.ecfolderbase.recoverableitemspurges "Dumpster purges folder">
+<!ENTITY menuitem.label.ecfolderbase.archiveroot "Root archive folder">
+<!ENTITY menuitem.label.ecfolderbase.archivemsgfolderroot "Root archive message folder">
+<!ENTITY menuitem.label.ecfolderbase.archivedeleteditems "Archive deleted items folder">
+<!ENTITY menuitem.label.ecfolderbase.archiverecoverableitemsroot "Archive recoverable items root folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsdeletions "Archive recoverable items deletions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemsversions "Archive recoverable items versions folder">
+<!ENTITY menuitem.label.ecfolderbase.Archiverecoverableitemspurges "Archive recoverable items purges folder">
+
+<!ENTITY button.label.autodiscovercheck "Perform autodiscovery">
+<!ENTITY button.label.serverandmailboxcheck "Check server and mailbox">
+<!ENTITY button.label.servercheck "Check server and account">
+
+<!ENTITY ecmailbox.label "Primary email address:">
+<!ENTITY ecmailbox.tooltip "If you do not specify a mailbox you will only have access to public folders.">
+<!ENTITY ecwindowsuser.label "Username:">
+<!ENTITY ecwindowsdomain.label "Domain name:">
+<!ENTITY ecwindowspassword.label "Password:">
+
+<!ENTITY button.label.folderpathcheck "Check">
+<!ENTITY button.label.folderbrowse "Browse">
+
+<!ENTITY exchWebServices.UserAvailability.label "Only user availability status for the mailbox's calendar will be visible.">
+
+<!ENTITY exchWebServices.exchtype.label "Exchange type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office 365">
+<!ENTITY exchWebServices.detail.label "Details">
+ 
diff --git a/common/locale/sk/extra-priority.dtd b/common/locale/sk/extra-priority.dtd
new file mode 100644
index 00000000..f06cd6e4
--- /dev/null
+++ b/common/locale/sk/extra-priority.dtd
@@ -0,0 +1,18 @@
+<!ENTITY prefwindow.title "Extras">
+<!ENTITY general.label  "General"> 
+<!ENTITY about.label "About"> 
+ 
+<!ENTITY about.description.label "Enhanced Features for Thunderbird and SeaMonkey applications">
+<!ENTITY iconify.label "Display priority icons only"> 
+<!ENTITY shadeHigh.label "Color background for high-priority messages">
+<!ENTITY shadeLow.label "Color background for low-priority messages">
+<!ENTITY tagImportant.label "Automatically tag high-priority mail as important">
+ 
+<!ENTITY highestColor.label "Highest">
+
+<!ENTITY highColor.label "High">
+<!ENTITY lowColor.label "Low">
+<!ENTITY lowestColor.label "Lowest">
+ 
+<!ENTITY prioritycolor  "Custom Color">
+<!ENTITY pref.color "Color preferences:">
diff --git a/common/locale/sk/invitationResponse.dtd b/common/locale/sk/invitationResponse.dtd
new file mode 100644
index 00000000..5ac9a7e6
--- /dev/null
+++ b/common/locale/sk/invitationResponse.dtd
@@ -0,0 +1,20 @@
+<!ENTITY label.acceptbutton "Confirm change">
+<!ENTITY label.cancelbutton "Cancel change">
+
+<!ENTITY description.invitationResponse "Confirm change of your meeting response.">
+
+<!ENTITY label.calendarName "Calendar:">
+<!ENTITY label.itemTitle "Subject:">
+<!ENTITY label.itemStart "Start time:">
+<!ENTITY label.itemResponse "Your response:">
+<!ENTITY label.meetingOrganiser "Organizer:">
+
+<!ENTITY label.messageReponseBody "Response message:">
+
+<!ENTITY menuitem.label.ec-autorespond-answer.tentative "I might attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.accepted "I will attend">
+<!ENTITY menuitem.label.ec-autorespond-answer.declined "I will not attend">
+
+<!ENTITY label.proposenewtime.title "Propose new time (&gt;= Exchange2013)">
+<!ENTITY label.proposenewtime.start "Start time">
+<!ENTITY label.proposenewtime.end "End time">
diff --git a/common/locale/sk/inviteStyle.dtd b/common/locale/sk/inviteStyle.dtd
new file mode 100644
index 00000000..ada3d520
--- /dev/null
+++ b/common/locale/sk/inviteStyle.dtd
@@ -0,0 +1,2 @@
+<!ENTITY label.inviteCol "Calendar invite">
+<!ENTITY tooltip.inviteCol "Sort by invitation">
diff --git a/common/locale/sk/manageEWSAccounts.dtd b/common/locale/sk/manageEWSAccounts.dtd
new file mode 100644
index 00000000..21b6c947
--- /dev/null
+++ b/common/locale/sk/manageEWSAccounts.dtd
@@ -0,0 +1,16 @@
+<!ENTITY label.acceptbutton "Close">
+
+<!ENTITY exchWebService.manageEWSAccounts.newAccount.button "Add account">
+<!ENTITY exchWebService.manageEWSAccounts.removeAccount.button "Remove account">
+<!ENTITY exchWebService.manageEWSAccounts.saveAccount.button "Save settings">
+
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.label "Use Exchange's autodiscovery function.">
+<!ENTITY exchWebService.manageEWSAccounts.mailbox.label "Mailbox name:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsuser.label "Username:">
+<!ENTITY exchWebService.manageEWSAccounts.windowsdomain.label "Domain name:">
+<!ENTITY exchWebService.manageEWSAccounts.autodiscover.button "Perform autodiscovery">
+<!ENTITY exchWebService.manageEWSAccounts.servercheck.button "Check server and account">
+<!ENTITY exchWebService.manageEWSAccounts.name.label "Name:">
+
+<!ENTITY exchWebService.manageEWSAccounts.menuitem "Exchange Web Services accounts">
+
diff --git a/common/locale/sk/oofSettings.dtd b/common/locale/sk/oofSettings.dtd
new file mode 100644
index 00000000..19061349
--- /dev/null
+++ b/common/locale/sk/oofSettings.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.oofsettings "Out of office settings">
+<!ENTITY label.acceptbutton "Save">
+<!ENTITY label.cancelbutton "Close">
+<!ENTITY label.oofsettings.title "Out of office settings for:">
+
+<!ENTITY label.oofstatus "Out of office status:">
+
+<!ENTITY label.externalaudience "To which external persons do you want to send out of office messages: ">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.none "To nobody">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.known "Only to persons in my contact list">
+<!ENTITY menuitem.label.exchWebService-oof-externalaudience.all "To everybody">
+
+<!ENTITY button.label.internal "Internal message">
+<!ENTITY button.label.external "External message">
+<!ENTITY label.internalreply "Message that will be sent to people within my organization:">
+<!ENTITY label.externalreply "Message that will be sent to people outside my organization:">
+
+<!ENTITY menuitem.label.exchWebService-oof-status.disabled "Disabled">
+<!ENTITY menuitem.label.exchWebService-oof-status.enabled "Enabled">
+
+<!ENTITY checkbox.label.exchWebService-oof-scheduled "Only enabled in specified time frame:">
+<!ENTITY label.hbox-oof-scheduled-startTime "Start time:">
+<!ENTITY label.hbox-oof-scheduled-endTime "End time:">
+
+
+
diff --git a/common/locale/sk/preInvitationResponse.dtd b/common/locale/sk/preInvitationResponse.dtd
new file mode 100644
index 00000000..d8c0ea54
--- /dev/null
+++ b/common/locale/sk/preInvitationResponse.dtd
@@ -0,0 +1,14 @@
+<!ENTITY dialog.exchWebService.preInvitationResponse.title "How do you want to react?">
+<!ENTITY label.acceptbutton "OK">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY label.calendarName "Calendar:">
+<!ENTITY label.itemTitle "Subject:">
+<!ENTITY label.itemStart "Start time:">
+<!ENTITY label.itemResponse "Your response:">
+<!ENTITY label.meetingOrganiser "Organizer:">
+
+<!ENTITY radio.label.exchWebService.preInvitationResponse.edit "Edit the response before sending.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.sendnow "Send the response now.">
+<!ENTITY radio.label.exchWebService.preInvitationResponse.donotsend "Don't send a response.">
+
diff --git a/common/locale/sk/preferences.dtd b/common/locale/sk/preferences.dtd
new file mode 100644
index 00000000..b5922ad7
--- /dev/null
+++ b/common/locale/sk/preferences.dtd
@@ -0,0 +1,48 @@
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Logging">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Accounts">
+<!ENTITY exchangeWebService.preferences.tab.debug "Logging">
+<!ENTITY exchangeWebService.preference.debug.file "Log file location:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Communication with Exchange server:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Log information to the console and/or a file">
+<!ENTITY exchangeWebService.preference.debug.file.button "Browse">
+<!ENTITY exchangeWebService.preference.network.debug.label "Log communication with Exchange server">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Log level">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Log communication progress information (e.g., Authentication)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Show password in clear text in log file.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Addressbook/Contacts:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Log level">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Basic information, 2 = Complete communication">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Log info about addressbook/contacts part">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) Preferences">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Core provider object:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = None, 1 = Basic information, 2 = Extended information">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Caching">
+<!ENTITY exchangeWebService.preference.cache.memory.label "Minimal temporary memory cache">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Number of days to download before start date of program:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Number of days to download after start date of program:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Others">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Communication preferences:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Maximum number of retries for exchange communication:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Add-on update function:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatically check for a new add-on version online when starting Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Show warning when a new version is available so you can easily install it.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximum number of simultaneous request to exchange server:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
+
+<!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
+<!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
+<!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/sk/selectEWSUrl.dtd b/common/locale/sk/selectEWSUrl.dtd
new file mode 100644
index 00000000..b69a27b8
--- /dev/null
+++ b/common/locale/sk/selectEWSUrl.dtd
@@ -0,0 +1,9 @@
+<!ENTITY label.acceptbutton "Select">
+<!ENTITY label.cancelbutton "Cancel">
+
+<!ENTITY description.selectews "Choose an EWS server from the list which is suitable for your current location.">
+<!ENTITY label.selectews "EWS server list:">
+
+
+
+
diff --git a/common/locale/sk/sendUpdateTo.dtd b/common/locale/sk/sendUpdateTo.dtd
new file mode 100644
index 00000000..5f44675b
--- /dev/null
+++ b/common/locale/sk/sendUpdateTo.dtd
@@ -0,0 +1,9 @@
+<!ENTITY title.sendupdateto "To whom do you want to send this update?">
+<!ENTITY label.acceptbutton "Execute">
+<!ENTITY label.cancelbutton "Cancel">
+<!ENTITY label.calendaritem.title "Send update for meeting:">
+
+<!ENTITY radio.label.sendtonone "Send to nobody.">
+<!ENTITY radio.label.sendtoall "Send to everyone invited.">
+<!ENTITY radio.label.sendtochanged "Send only to added or removed persons.">
+
diff --git a/common/locale/sk/sharedCalendarParser.dtd b/common/locale/sk/sharedCalendarParser.dtd
new file mode 100644
index 00000000..39c9f897
--- /dev/null
+++ b/common/locale/sk/sharedCalendarParser.dtd
@@ -0,0 +1,3 @@
+<!ENTITY exchWebService_vbox_label "Detected an Exchange sharing invitation">
+<!ENTITY exchWebService_button_label_add_calendar "Add calendar">
+
diff --git a/common/locale/sk/timezonePreference.dtd b/common/locale/sk/timezonePreference.dtd
new file mode 100644
index 00000000..a61aa649
--- /dev/null
+++ b/common/locale/sk/timezonePreference.dtd
@@ -0,0 +1 @@
+<!ENTITY calendar.timezone.local.auto.label  "Automatically change timezone">
diff --git a/emailtag/locale/de/emailtag.properties b/emailtag/locale/de/emailtag.properties
new file mode 100644
index 00000000..3b8c523d
--- /dev/null
+++ b/emailtag/locale/de/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=Fehler beim Anlegen des Tags für die Kategorie
diff --git a/emailtag/locale/ja_JP/emailtag.properties b/emailtag/locale/ja_JP/emailtag.properties
new file mode 100644
index 00000000..1cd977a4
--- /dev/null
+++ b/emailtag/locale/ja_JP/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/emailtag/locale/nl/emailtag.properties b/emailtag/locale/nl/emailtag.properties
new file mode 100644
index 00000000..1cd977a4
--- /dev/null
+++ b/emailtag/locale/nl/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/emailtag/locale/pl/emailtag.dtd b/emailtag/locale/pl/emailtag.dtd
new file mode 100644
index 00000000..bb3cd384
--- /dev/null
+++ b/emailtag/locale/pl/emailtag.dtd
@@ -0,0 +1,15 @@
+ <!ENTITY rtews.selectaccountdesc "Select Microsoft Exchange mail account for which to configure.">
+ <!ENTITY rtews.accconfigured "Account already configured">
+ <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Exchange Web Services (EWS) URL or configure it manually">
+ <!ENTITY rtews.dicoverdesc2 "To configure it manually enter the URL in the field below.">
+ <!ENTITY rtews.autodiscover "Autodiscover">
+ <!ENTITY rtews.doautodicover "Do autodiscovery">
+ <!ENTITY rtews.manual "Manual">
+ <!ENTITY rtews.test "Click here to verify the EWS URL">
+ <!ENTITY rtews.msexchewsurl "Verified EWS URL. Click Finish to complete the configuration">
+ <!ENTITY rtews.selectaccount "Select account">
+ <!ENTITY rtews.configure.label "Configure...">
+ <!ENTITY rtews.rtforexch "Remote tagger for Microsoft Exchange">
+ <!ENTITY rtews.confirmAccDetail "Confirm following account details">
+ <!ENTITY rtews.username "Username">
+ <!ENTITY rtews.domain "Domain">
diff --git a/emailtag/locale/pl/emailtag.properties b/emailtag/locale/pl/emailtag.properties
new file mode 100644
index 00000000..1cd977a4
--- /dev/null
+++ b/emailtag/locale/pl/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/emailtag/locale/ru/emailtag.properties b/emailtag/locale/ru/emailtag.properties
new file mode 100644
index 00000000..1cd977a4
--- /dev/null
+++ b/emailtag/locale/ru/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/emailtag/locale/sk/emailtag.dtd b/emailtag/locale/sk/emailtag.dtd
new file mode 100644
index 00000000..bb3cd384
--- /dev/null
+++ b/emailtag/locale/sk/emailtag.dtd
@@ -0,0 +1,15 @@
+ <!ENTITY rtews.selectaccountdesc "Select Microsoft Exchange mail account for which to configure.">
+ <!ENTITY rtews.accconfigured "Account already configured">
+ <!ENTITY rtews.dicoverdesc "You may choose to autodiscover the Exchange Web Services (EWS) URL or configure it manually">
+ <!ENTITY rtews.dicoverdesc2 "To configure it manually enter the URL in the field below.">
+ <!ENTITY rtews.autodiscover "Autodiscover">
+ <!ENTITY rtews.doautodicover "Do autodiscovery">
+ <!ENTITY rtews.manual "Manual">
+ <!ENTITY rtews.test "Click here to verify the EWS URL">
+ <!ENTITY rtews.msexchewsurl "Verified EWS URL. Click Finish to complete the configuration">
+ <!ENTITY rtews.selectaccount "Select account">
+ <!ENTITY rtews.configure.label "Configure...">
+ <!ENTITY rtews.rtforexch "Remote tagger for Microsoft Exchange">
+ <!ENTITY rtews.confirmAccDetail "Confirm following account details">
+ <!ENTITY rtews.username "Username">
+ <!ENTITY rtews.domain "Domain">
diff --git a/emailtag/locale/sk/emailtag.properties b/emailtag/locale/sk/emailtag.properties
new file mode 100644
index 00000000..1cd977a4
--- /dev/null
+++ b/emailtag/locale/sk/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=There was an error creating the tag for the category
diff --git a/emailtag/locale/sv/emailtag.properties b/emailtag/locale/sv/emailtag.properties
new file mode 100644
index 00000000..1cd977a4
--- /dev/null
+++ b/emailtag/locale/sv/emailtag.properties
@@ -0,0 +1,2 @@
+rtews.title=EWStagger
+rtews.tagAddError=There was an error creating the tag for the category

From 0f679e9bf9fdf7f09847b04d9ab9970f8561d012 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 18:27:32 +0100
Subject: [PATCH 202/222] l10n: adding strings to preferences resource.

As the strings have just been added on Transifex, they are currently not translated
---
 common/locale/cs_CZ/preferences.dtd |  4 ++
 common/locale/de/preferences.dtd    | 93 +++++++++++++++--------------
 common/locale/fr_FR/preferences.dtd |  5 ++
 common/locale/it_IT/preferences.dtd |  4 ++
 common/locale/ja_JP/preferences.dtd |  7 ++-
 common/locale/nl/preferences.dtd    |  7 ++-
 common/locale/pl/preferences.dtd    |  4 ++
 common/locale/ru/preferences.dtd    | 93 +++++++++++++++--------------
 common/locale/sk/preferences.dtd    |  4 ++
 common/locale/sv/preferences.dtd    |  7 ++-
 common/locale/tr/preferences.dtd    |  5 +-
 11 files changed, 140 insertions(+), 93 deletions(-)

diff --git a/common/locale/cs_CZ/preferences.dtd b/common/locale/cs_CZ/preferences.dtd
index 8382bbed..6b693016 100644
--- a/common/locale/cs_CZ/preferences.dtd
+++ b/common/locale/cs_CZ/preferences.dtd
@@ -43,6 +43,10 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Mezi jednotlivými požadavky na exchange server počkat alespoň:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Předvolby Ntlm-v1:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Zapnout">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Vypnout">
diff --git a/common/locale/de/preferences.dtd b/common/locale/de/preferences.dtd
index cfb29b1c..ab378426 100644
--- a/common/locale/de/preferences.dtd
+++ b/common/locale/de/preferences.dtd
@@ -1,47 +1,52 @@
-<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
-<!ENTITY exchangeWebService.paneDebug.title "Logging">
-
-<!ENTITY exchangeWebService.preferences.tab.accounts "Konten">
-<!ENTITY exchangeWebService.preferences.tab.debug "Protokollierung">
-<!ENTITY exchangeWebService.preference.debug.file "Speicherort der Protokolldatei:">
-<!ENTITY exchangeWebService.preference.network.debug.caption "Kommunikation mit dem Exchange-Server:">
-<!ENTITY exchangeWebService.preference.debug.log.label "Informationen in Konsole und/oder in eine Datei protokollieren">
-<!ENTITY exchangeWebService.preference.debug.file.button "Durchsuchen">
-<!ENTITY exchangeWebService.preference.network.debug.label "Kommunikation mit dem Exchange Server protokollieren">
-<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Protokollumfang">
-<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Basisinformationen, 2 = Komplette Kommunikation">
-<!ENTITY exchangeWebService.preference.authentication.debug.label "Kommunikationsstatusinformationen (zb. Authentifizierung) protokollieren">
-<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Passwort im Klartext protokollieren.">
-
-<!ENTITY exchangeWebService.preference.contacts.debug.caption "Addressbuch/Kontakte:">
-<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Protokollumfang">
-<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Basisinformationen, 2 = Komplette Kommunikation">
-<!ENTITY exchangeWebService.preference.contacts.debug.label "Informationen über den Adressbuch/Kontakte-Teil protokollieren">
-
-<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS)-Eigenschaften">
-
-<!ENTITY exchangeWebService.preference.core.debug.caption "Protokollumfang der Kernfunktionalität:">
-<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Nichts, 1 = Basisinformationen, 2 = Erweiterte Informationen">
-
-<!ENTITY exchangeWebService.preferences.tab.cache "Caching">
-<!ENTITY exchangeWebService.preference.cache.memory.label "Minimaler Zwischenspeicher">
-<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Wieviele Tage vor dem aktuellen Datum soll der Cache-Download aktiv werden, wenn das Programm startet:">
-<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Wieviele Tage nach dem aktuellen Datum soll der Cache-Download aktiv werden, wenn das Programm startet:">
-
-<!ENTITY exchangeWebService.preferences.tab.others "Anderes">
-<!ENTITY exchangeWebService.preference.others.prefs.label "Kommunikationseigenschaften:">
-<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Maximale Anzahl an Versuchen für die Kommunikation mit dem Exchange-Server:">
-
-<!ENTITY exchangeWebService.preference.updateFunction.label "Updatefunktion:">
-<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatisch nach neuer Version suchen, wenn Thunderbird startet.">
-<!ENTITY exchangeWebService.preference.warnForUpdates.label "Warnung anzeigen, wenn eine neue Version verfügbar ist, so dass Sie diese einfach installieren können.">
-<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Warnung anzeigen, wenn eine neue Entwicklerversion (Beta, RC, etc.) verfügbar ist.">
-
-<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximale gleichzeitige Zugriffe auf den Exchange-Server:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimale Wartezeit zwischen Zugriffen auf den Exchange-Server:">
-<!ENTITY exchangeWebService.preference.userAgent.label "HTTP-User-Agent:">
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Logging">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Konten">
+<!ENTITY exchangeWebService.preferences.tab.debug "Protokollierung">
+<!ENTITY exchangeWebService.preference.debug.file "Speicherort der Protokolldatei:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Kommunikation mit dem Exchange-Server:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Informationen in Konsole und/oder in eine Datei protokollieren">
+<!ENTITY exchangeWebService.preference.debug.file.button "Durchsuchen">
+<!ENTITY exchangeWebService.preference.network.debug.label "Kommunikation mit dem Exchange Server protokollieren">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Protokollumfang">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Basisinformationen, 2 = Komplette Kommunikation">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Kommunikationsstatusinformationen (zb. Authentifizierung) protokollieren">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Passwort im Klartext protokollieren.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Addressbuch/Kontakte:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Protokollumfang">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Basisinformationen, 2 = Komplette Kommunikation">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Informationen über den Adressbuch/Kontakte-Teil protokollieren">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS)-Eigenschaften">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Protokollumfang der Kernfunktionalität:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Nichts, 1 = Basisinformationen, 2 = Erweiterte Informationen">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Caching">
+<!ENTITY exchangeWebService.preference.cache.memory.label "Minimaler Zwischenspeicher">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Wieviele Tage vor dem aktuellen Datum soll der Cache-Download aktiv werden, wenn das Programm startet:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Wieviele Tage nach dem aktuellen Datum soll der Cache-Download aktiv werden, wenn das Programm startet:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Anderes">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Kommunikationseigenschaften:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Maximale Anzahl an Versuchen für die Kommunikation mit dem Exchange-Server:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Updatefunktion:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatisch nach neuer Version suchen, wenn Thunderbird startet.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Warnung anzeigen, wenn eine neue Version verfügbar ist, so dass Sie diese einfach installieren können.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Warnung anzeigen, wenn eine neue Entwicklerversion (Beta, RC, etc.) verfügbar ist.">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximale gleichzeitige Zugriffe auf den Exchange-Server:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimale Wartezeit zwischen Zugriffen auf den Exchange-Server:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP-User-Agent:">
+
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/fr_FR/preferences.dtd b/common/locale/fr_FR/preferences.dtd
index 4cf1bc79..57f6d621 100644
--- a/common/locale/fr_FR/preferences.dtd
+++ b/common/locale/fr_FR/preferences.dtd
@@ -42,6 +42,11 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Nombre Max de connexions simultanées vers le serveur Exchange:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Temps minimum entre les requètes vers le serveur Exchange:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
+
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Préférence Ntlm-v1:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "En service">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Hors service">
diff --git a/common/locale/it_IT/preferences.dtd b/common/locale/it_IT/preferences.dtd
index 2979c1de..2449602a 100644
--- a/common/locale/it_IT/preferences.dtd
+++ b/common/locale/it_IT/preferences.dtd
@@ -43,6 +43,10 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Tempo minimo di attesa fra richieste al server Exchange:">
 <!ENTITY exchangeWebService.preference.userAgent.label "Agente utente HTTP:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Opzioni NTLM-v1:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Abilita">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disabilita">
diff --git a/common/locale/ja_JP/preferences.dtd b/common/locale/ja_JP/preferences.dtd
index c5371302..c211ebd9 100644
--- a/common/locale/ja_JP/preferences.dtd
+++ b/common/locale/ja_JP/preferences.dtd
@@ -35,13 +35,18 @@
 <!ENTITY exchangeWebService.preference.updateFunction.label "Addon update function:">
 <!ENTITY exchangeWebService.preference.checkForUpdates.label "Automatically check for a new addon version online when starting Thunderbird.">
 <!ENTITY exchangeWebService.preference.warnForUpdates.label "Show warning when a new version is available. So you can easily install it.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
 
 <!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximum number of simultanious request to exchange server:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time, to wait, between request to exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
-<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/nl/preferences.dtd b/common/locale/nl/preferences.dtd
index 38b1834a..6cdf10bf 100644
--- a/common/locale/nl/preferences.dtd
+++ b/common/locale/nl/preferences.dtd
@@ -35,13 +35,18 @@
 <!ENTITY exchangeWebService.preference.updateFunction.label "Addon update functie:">
 <!ENTITY exchangeWebService.preference.checkForUpdates.label "Controleer automatisch online voor een nieuwe versie als Thunderbird start.">
 <!ENTITY exchangeWebService.preference.warnForUpdates.label "Waarschuw als er een nieuwe versie beschikbaar is zodat je deze makelijk kan installeren.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
 
 <!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Loadbalancer:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Loadbalancer:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximaal aantal gelijktijdige verzoeken aan één exchange server:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimale tijd tussen verzoeken aan één exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
-<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/pl/preferences.dtd b/common/locale/pl/preferences.dtd
index b5922ad7..6f99a599 100644
--- a/common/locale/pl/preferences.dtd
+++ b/common/locale/pl/preferences.dtd
@@ -43,6 +43,10 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/ru/preferences.dtd b/common/locale/ru/preferences.dtd
index 8474fd6b..90071e8b 100644
--- a/common/locale/ru/preferences.dtd
+++ b/common/locale/ru/preferences.dtd
@@ -1,49 +1,52 @@
-<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
-<!ENTITY exchangeWebService.paneDebug.title "Логирование">
-
-<!ENTITY exchangeWebService.preferences.tab.accounts "Аккаунты">
-<!ENTITY exchangeWebService.preferences.tab.debug "Логирование">
-<!ENTITY exchangeWebService.preference.debug.file "Расположение файла лога:">
-<!ENTITY exchangeWebService.preference.network.debug.caption "Обмен с Exchange сервером:">
-<!ENTITY exchangeWebService.preference.debug.log.label "Лог информации на консоль или/и в файл">
-<!ENTITY exchangeWebService.preference.debug.file.button "Просмотр">
-<!ENTITY exchangeWebService.preference.network.debug.label "Лог обмена с Exchange сервером">
-<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Уровень логирования">
-<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Базовая информация, 2 = Полный обмен">
-<!ENTITY exchangeWebService.preference.authentication.debug.label "Лог выполнения передачи информации (например, идентификации)">
-<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Показать пароль в незашифрованном виде в файле журнала.">
-
-<!ENTITY exchangeWebService.preference.contacts.debug.caption "Адресная книга/Контакты:">
-<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Уровень логирования">
-<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Базовая информация, 2 = Полный обмен">
-<!ENTITY exchangeWebService.preference.contacts.debug.label "Лог информации об адресной книге/контактах">
-
-<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) настройки">
-
-<!ENTITY exchangeWebService.preference.core.debug.caption "Ядро поставщиков объектов:">
-<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Ничего, 1 = Базовая информация, 2 = Полная информация">
-
-<!ENTITY exchangeWebService.preferences.tab.cache "Кэширование">
-<!ENTITY exchangeWebService.preference.cache.memory.label "Минимальная временная память кэша">
-<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Количество дней для скачивания до даты пуска программы:">
-<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Количество дней для скачивания после даты пуска программы:">
-
-<!ENTITY exchangeWebService.preferences.tab.others "Прочие">
-<!ENTITY exchangeWebService.preference.others.prefs.label "Настройки связи:">
-<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Максимальное количество попыток для связи с exchange:">
-
-<!ENTITY exchangeWebService.preference.updateFunction.label "Функция обновления дополнения:">
-<!ENTITY exchangeWebService.preference.checkForUpdates.label "Автоматически проверять наличие новой версии дополнения онлайн при запуске Thunderbird.">
-<!ENTITY exchangeWebService.preference.warnForUpdates.label "Предупреждать, что доступна новая версия. Таким образом, вы можете легко установить ее.">
-
-<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Балансировка нагрузки:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Балансировка нагрузки:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Максимальное число одновременных запросов к exchange серверу:">
-<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Минимальное время ожидания между запросами exchange сервера:">
-<!ENTITY exchangeWebService.preference.userAgent.label "HTTP агент пользователя:">
-
-
+<!ENTITY exchangeWebService.paneAccounts.title "Exchange (EWS)">
+<!ENTITY exchangeWebService.paneDebug.title "Логирование">
+
+<!ENTITY exchangeWebService.preferences.tab.accounts "Аккаунты">
+<!ENTITY exchangeWebService.preferences.tab.debug "Логирование">
+<!ENTITY exchangeWebService.preference.debug.file "Расположение файла лога:">
+<!ENTITY exchangeWebService.preference.network.debug.caption "Обмен с Exchange сервером:">
+<!ENTITY exchangeWebService.preference.debug.log.label "Лог информации на консоль или/и в файл">
+<!ENTITY exchangeWebService.preference.debug.file.button "Просмотр">
+<!ENTITY exchangeWebService.preference.network.debug.label "Лог обмена с Exchange сервером">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label1 "Уровень логирования">
+<!ENTITY exchangeWebService.preference.network.debuglevel.label2 "1 = Базовая информация, 2 = Полный обмен">
+<!ENTITY exchangeWebService.preference.authentication.debug.label "Лог выполнения передачи информации (например, идентификации)">
+<!ENTITY exchangeWebService.preference.authentication.showpassword.label "Показать пароль в незашифрованном виде в файле журнала.">
+
+<!ENTITY exchangeWebService.preference.contacts.debug.caption "Адресная книга/Контакты:">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label1 "Уровень логирования">
+<!ENTITY exchangeWebService.preference.contacts.debuglevel.label2 "1 = Базовая информация, 2 = Полный обмен">
+<!ENTITY exchangeWebService.preference.contacts.debug.label "Лог информации об адресной книге/контактах">
+
+<!ENTITY exchangeWebService.preferences.titleWin "Exchange (EWS) настройки">
+
+<!ENTITY exchangeWebService.preference.core.debug.caption "Ядро поставщиков объектов:">
+<!ENTITY exchangeWebService.preference.core.debuglevel.label2 "0 = Ничего, 1 = Базовая информация, 2 = Полная информация">
+
+<!ENTITY exchangeWebService.preferences.tab.cache "Кэширование">
+<!ENTITY exchangeWebService.preference.cache.memory.label "Минимальная временная память кэша">
+<!ENTITY exchangeWebService.preference.cache.memory.startupBefore.label "Количество дней для скачивания до даты пуска программы:">
+<!ENTITY exchangeWebService.preference.cache.memory.startupAfter.label "Количество дней для скачивания после даты пуска программы:">
+
+<!ENTITY exchangeWebService.preferences.tab.others "Прочие">
+<!ENTITY exchangeWebService.preference.others.prefs.label "Настройки связи:">
+<!ENTITY exchangeWebService.preference.others.prefs.retryCount.label "Максимальное количество попыток для связи с exchange:">
+
+<!ENTITY exchangeWebService.preference.updateFunction.label "Функция обновления дополнения:">
+<!ENTITY exchangeWebService.preference.checkForUpdates.label "Автоматически проверять наличие новой версии дополнения онлайн при запуске Thunderbird.">
+<!ENTITY exchangeWebService.preference.warnForUpdates.label "Предупреждать, что доступна новая версия. Таким образом, вы можете легко установить ее.">
 <!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Балансировка нагрузки:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Балансировка нагрузки:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Максимальное число одновременных запросов к exchange серверу:">
+<!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Минимальное время ожидания между запросами exchange сервера:">
+<!ENTITY exchangeWebService.preference.userAgent.label "HTTP агент пользователя:">
+
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/sk/preferences.dtd b/common/locale/sk/preferences.dtd
index b5922ad7..6f99a599 100644
--- a/common/locale/sk/preferences.dtd
+++ b/common/locale/sk/preferences.dtd
@@ -43,6 +43,10 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minimum time to wait between requests to Exchange server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "NTLM-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/sv/preferences.dtd b/common/locale/sv/preferences.dtd
index 0f8b7730..4d2d1803 100644
--- a/common/locale/sv/preferences.dtd
+++ b/common/locale/sv/preferences.dtd
@@ -35,13 +35,18 @@
 <!ENTITY exchangeWebService.preference.updateFunction.label "Uppdateringsfunktion för tillägg:">
 <!ENTITY exchangeWebService.preference.checkForUpdates.label "Kontrollera automatiskt om en ny version av tillägget finns tillgänglig när Thunderbird startar.">
 <!ENTITY exchangeWebService.preference.warnForUpdates.label "Visa ett varningsmeddelande när en ny version finns tillgänglig.">
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
 
 <!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "Lastbalansering:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "Lastbalansering:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.maxJobs.label "Maximalt antal samtidiga förfrågningar mot Exchange-server:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Minsta väntetid mellan förfrågningar mot Exchange-server:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
-<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Show warning when a new pre-release (beta, RC, etc.) is available.">
+
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Preferences:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Enable">
 <!ENTITY exchangeWebService.preference.ntlmv1.false.label "Disable">
diff --git a/common/locale/tr/preferences.dtd b/common/locale/tr/preferences.dtd
index 11d28af4..9798c25d 100644
--- a/common/locale/tr/preferences.dtd
+++ b/common/locale/tr/preferences.dtd
@@ -35,7 +35,7 @@
 <!ENTITY exchangeWebService.preference.updateFunction.label "Eklenti güncelleme işlevi:">
 <!ENTITY exchangeWebService.preference.checkForUpdates.label "Thunderbird başlarken yen bir eklenti sürümü olup olmadığını otomatik olarak denetle.">
 <!ENTITY exchangeWebService.preference.warnForUpdates.label "Sürümleri kolayca yükleyebilmeniz için, yeni bir sürüm olduğunda bir uyarı göster.">
-<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Beta, rc, vs. gibi yeni bir ön sürüm mevcut olduğunda bir uyarı göster."> 
+<!ENTITY exchangeWebService.preference.warnForPrereleaseUpdates.label "Beta, rc, vs. gibi yeni bir ön sürüm mevcut olduğunda bir uyarı göster.">
 
 <!ENTITY exchangeWebService.preference.loadbalancer.debug.caption "YükDengeleyici:">
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.label "YükDengeleyici:">
@@ -43,6 +43,9 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Exchange sunucuna gönderilen istekler arasındaki en kısa bekleme süresi:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP kullanıcı aracısı:">
 
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
 
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Tercihleri:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Etkinleştir">

From 85646809f2c10815c6134e90d14e40ab4197c66c Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 18:29:33 +0100
Subject: [PATCH 203/222] Makefile: update l10n-push to push only strings from
 the source language (en).

Translations update have to be done on Transifex.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2c8fe6d4..e6b37627 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ l10n-auto-commit: l10n-get
 # Send new texts to translate to Transifex
 l10n-push:
 	git checkout $(releasebranch)
-	tx push
+	tx push -s
 
 # Target to beautify and build your code while developing it
 dev: beautify build

From 5751702e65ff7c2e2d7993705816d7516b63c1d1 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 19:24:25 +0100
Subject: [PATCH 204/222] l10n: enable new locale files in manifests

---
 addressbook/exchangeAddressBook.manifest |  5 +++++
 calendar/exchangeCalendar.manifest       | 14 ++++++++------
 chrome.manifest                          |  2 ++
 emailtag/exchangeEmailTag.manifest       |  5 +++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/addressbook/exchangeAddressBook.manifest b/addressbook/exchangeAddressBook.manifest
index 5ec2af32..9df16a66 100644
--- a/addressbook/exchangeAddressBook.manifest
+++ b/addressbook/exchangeAddressBook.manifest
@@ -16,10 +16,15 @@ manifest interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.mani
 
 locale exchangecontacts en    locale/en/
 
+locale exchangecontacts cs-CZ locale/cs_CZ/
 locale exchangecontacts de    locale/de/
 locale exchangecontacts en-US locale/en_US/
 locale exchangecontacts fr-FR locale/fr_FR/
+locale exchangecontacts it-IT locale/it_IT/
 locale exchangecontacts ja-JP locale/ja_JP/
 locale exchangecontacts nl    locale/nl/
+locale exchangecontacts pl    locale/pl/
 locale exchangecontacts ru    locale/ru/
+locale exchangecontacts sk    locale/sk/
 locale exchangecontacts sv    locale/sv/
+locale exchangecontacts tr    locale/tr/
diff --git a/calendar/exchangeCalendar.manifest b/calendar/exchangeCalendar.manifest
index 4184297c..d6dbce73 100644
--- a/calendar/exchangeCalendar.manifest
+++ b/calendar/exchangeCalendar.manifest
@@ -28,16 +28,18 @@ manifest interface/exchangeEvent/mivExchangeEvent.manifest
 manifest interface/exchangeTodo/mivExchangeTodo.manifest
 manifest interface/exchangeRecurrenceInfo/mivExchangeRecurrenceInfo.manifest
 
-locale exchangecalendar en locale/en/
+locale exchangecalendar en    locale/en/
 
 locale exchangecalendar cs-CZ locale/cs_CZ/
-locale exchangecalendar de locale/de/
+locale exchangecalendar de    locale/de/
 locale exchangecalendar en-US locale/en_US/
 locale exchangecalendar fr-FR locale/fr_FR/
 locale exchangecalendar it-IT locale/it_IT/
 locale exchangecalendar ja-JP locale/ja_JP/
-locale exchangecalendar nl locale/nl/
-locale exchangecalendar ru locale/ru/
-locale exchangecalendar sv locale/sv/
-locale exchangecalendar tr locale/tr/
+locale exchangecalendar nl    locale/nl/
+locale exchangecalendar pl    locale/pl/
+locale exchangecalendar ru    locale/ru/
+locale exchangecalendar sk    locale/sk/
+locale exchangecalendar sv    locale/sv/
+locale exchangecalendar tr    locale/tr/
 
diff --git a/chrome.manifest b/chrome.manifest
index 90bd9b88..366cb38f 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -42,7 +42,9 @@ locale exchangecommon fr-FR common/locale/fr_FR/
 locale exchangecommon it-IT common/locale/it_IT/
 locale exchangecommon ja-JP common/locale/ja_JP/
 locale exchangecommon nl common/locale/nl/
+locale exchangecommon pl common/locale/pl/
 locale exchangecommon ru common/locale/ru/
+locale exchangecommon sk common/locale/sk/
 locale exchangecommon sv common/locale/sv/
 locale exchangecommon tr common/locale/tr/
 
diff --git a/emailtag/exchangeEmailTag.manifest b/emailtag/exchangeEmailTag.manifest
index ecd08876..84202cf0 100644
--- a/emailtag/exchangeEmailTag.manifest
+++ b/emailtag/exchangeEmailTag.manifest
@@ -4,10 +4,15 @@ overlay chrome://messenger/content/messenger.xul chrome://exchangeemailtag/conte
 
 locale exchangeemailtag en    locale/en/
 
+locale exchangeemailtag cs-CZ locale/cs_CZ/
 locale exchangeemailtag de    locale/de/
 locale exchangeemailtag en-US locale/en_US/
 locale exchangeemailtag fr-FR locale/fr_FR/
+locale exchangeemailtag it-IT locale/it_IT/
 locale exchangeemailtag ja-JP locale/ja_JP/
 locale exchangeemailtag nl    locale/nl/
+locale exchangeemailtag pl    locale/pl/
 locale exchangeemailtag ru    locale/ru/
+locale exchangeemailtag sk    locale/sk/
 locale exchangeemailtag sv    locale/sv/
+locale exchangeemailtag tr    locale/tr/

From a6d7f80d4aef483a63c6f1319bfc6379102a22fd Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 19:26:50 +0100
Subject: [PATCH 205/222] Changelog: update informations for release
 4.0.0-beta5

---
 CHANGELOG.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42a84eaa..cd6e6146 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,34 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [4.0.0-beta5] - 2017-**-**
+## [4.0.0-beta5] - 2018-01-28
 ### Added
+- Code beautifiers are available for JavaScript, XML, XUL and RDF files
+- Translations are now managed with the Transifex tools.
+  You can participate with our [Transifex project](https://www.transifex.com/exchangecalendar/exchangecalendar/)
+- New locales: cs-CZ, pl, sk
+- Thunderbird Global Search preferences to explain that emailtag need them and won't work if disabled.
 
 ### Changed
-- Use Makefile instead of custom build shell
+- Use Makefile instead of custom build shell (#98)
 - Update install.rdf, README with new community
 - Builds now will disable automatic update checker to avoid issue with new forks
+- XML requests sent to Exchange servers now set "utf-8" for Content-Type HTTP header.
+- Logs now redirects to ExchangeCalendar Github community (#92)
+- Code tree has been structured to distinguish parts of the module (#80)
+  Current parts are now: addressbook, calendar, common and emailtag
+  Namespaces were updated too to reflect the new code structure.
 
 ### Fixed
+- Compatibilty with Lightning 5.4.2 and the new option to edit events and tasks from tabs (#60)
+- Some events were hidden from month view due to TimeZone errors (#67)
+- Hide password in logs if requested (#100)
+- Hide password shown in dialog boxes (#103)
+
+### Removed
+- `email` root directory contained only empty codes.
+- debug preferences were always enabled, they are now removed (#133)
+  It was disabling cache and forced the Thunderbird Global Search Indexer to be enabled.
 
 ## [4.0.0-beta4] - 2017-07-03
 ### Added

From 785f1db99eae7f50fddfc17c64e8e5501ec109f2 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 28 Jan 2018 23:34:49 +0100
Subject: [PATCH 206/222] Makefile: release target does not update translations
 any more

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e6b37627..c16c0a2c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,9 @@ defaults/preferences/update.js:
 	cp defaults/preferences/update_$(update).txt $@
 
 # Target to publish a new release:
-release: l10n-auto-commit build
+release: build
 	git tag "v$(version)"
-	@echo 'Translations updated, build done, tag added.'
+	@echo 'Build done, tag added.'
 	@echo 'Now, if the release is well done, please run one "git push" to publish code and one "git push v$(version)" to publish the new tag.'
 
 # Targets to update translations

From 34e5849993087c26b8b0b7f5ffe47f6fd9b7852e Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 30 Jan 2018 07:43:29 +0100
Subject: [PATCH 207/222] bump version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 922d4daa..35626288 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.0-beta5
+4.0.0-beta6

From 03f485d7165e6b474911f5bd6fc8f1ed3fda24d3 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 30 Jan 2018 07:44:22 +0100
Subject: [PATCH 208/222] Makefile: release target text updated

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c16c0a2c..46e33e67 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ defaults/preferences/update.js:
 # Target to publish a new release:
 release: build
 	git tag "v$(version)"
-	@echo 'Build done, tag added.'
-	@echo 'Now, if the release is well done, please run one "git push" to publish code and one "git push v$(version)" to publish the new tag.'
+	@echo 'Build done, tag localy added.'
+	@echo 'If the release is well done, please run "git push origin v$(version)" to publish the new tag.'
 
 # Targets to update translations
 # Requires an already configured Transifex client: https://docs.transifex.com/client/introduction

From 66461c4311f64a85d1405de076b8a6d1bbb28d5d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 3 Feb 2018 18:06:34 +0100
Subject: [PATCH 209/222] Strings from calExchangeCalendar.properties are
 located in the exchangecommon namespace

With code tree reorganization, default namespace is now exchangecommon.

The file calExchangeCalendar.properties is used inside common parts like
exchange settings and out of office settings.

It's also used in calendar part to give user some information about
current calendar synchronization jobs.

I've decided to just modify JavaScript code to use the new namespace
instead of moving the properties file, because:
  - It only required to modify 48 lines of code
  - If I've chosen to move the file to the exchangecalendar namespace
    I would done a dependency from the common part to the calendar part.
  - To split the file in two parts, it would require too lot of work to
    synchronize the split between all translated files.

Closes #152
---
 calendar/content/messenger_task_delegation.js | 12 +++----
 .../exchangeCalendar/mivExchangeCalendar.js   | 32 +++++++++----------
 common/content/exchangeSettingsOverlay.js     | 24 +++++++-------
 common/content/manageEWSAccounts.js           |  8 ++---
 common/content/oofSettings.js                 | 12 +++----
 5 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/calendar/content/messenger_task_delegation.js b/calendar/content/messenger_task_delegation.js
index a6c35771..80f6cbd1 100644
--- a/calendar/content/messenger_task_delegation.js
+++ b/calendar/content/messenger_task_delegation.js
@@ -114,22 +114,22 @@ exchTaskDelegation.prototype = {
                 var lastChange = task.getProperty("exchWebService-PidLidTaskHistory");
                 switch (lastChange) {
                 case "4":
-                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.duedate.changed", [], "exchangecalendar");
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.duedate.changed", [], "exchangecommon");
                     break;
                 case "3":
-                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.some.property.changed", [], "exchangecalendar");
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.some.property.changed", [], "exchangecommon");
                     break;
                 case "1":
-                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.accepted", [task.getProperty("exchWebService-Owner")], "exchangecalendar");
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.accepted", [task.getProperty("exchWebService-Owner")], "exchangecommon");
                     break;
                 case "2":
-                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.rejected", [task.getProperty("exchWebService-Owner")], "exchangecalendar");
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.rejected", [task.getProperty("exchWebService-Owner")], "exchangecommon");
                     break;
                 case "5":
-                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.assigned", [task.getProperty("exchWebService-Owner")], "exchangecalendar");
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.assigned", [task.getProperty("exchWebService-Owner")], "exchangecommon");
                     break;
                 case "0":
-                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.no.changes", [], "exchangecalendar");
+                    lastChange = this.globalFunctions.getString("calExchangeCalendar", "exchWebService.PidLidTaskHistory.no.changes", [], "exchangecommon");
                     break;
                 }
 
diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index 855cabde..c0fcc3bd 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -495,7 +495,7 @@ calExchangeCalendar.prototype = {
 
     get displayName() {
         if (this.debug) this.logInfo("get displayName()");
-        return calGetString("calExchangeCalendar", "displayName", null, "exchangecalendar");
+        return calGetString("calExchangeCalendar", "displayName", null, "exchangecommon");
     },
 
     //  void createCalendar(in AUTF8String aName, in nsIURI aURL,
@@ -3748,17 +3748,17 @@ calExchangeCalendar.prototype = {
         this.saveCredentials(erSyncFolderItemsRequest.argument);
 
         if ((creations.meetingrequests.length > 0) || (updates.meetingrequests.length > 0) || (deletions.meetingrequests.length > 0)) {
-            this.addActivity(calGetString("calExchangeCalendar", "syncInboxRequests", [creations.meetingrequests.length, updates.meetingrequests.length, deletions.meetingrequests.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "syncInboxRequests", [creations.meetingrequests.length, updates.meetingrequests.length, deletions.meetingrequests.length, this.name], "exchangecommon"), "", erSyncInboxRequest.argument.actionStart, Date.now());
             this.refresh();
         }
 
         if ((creations.meetingCancellations.length > 0) || (updates.meetingCancellations.length > 0) || (deletions.meetingCancellations.length > 0)) {
-            this.addActivity(calGetString("calExchangeCalendar", "syncInboxCancelations", [creations.meetingCancellations.length, updates.meetingCancellations.length, deletions.meetingCancellations.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "syncInboxCancelations", [creations.meetingCancellations.length, updates.meetingCancellations.length, deletions.meetingCancellations.length, this.name], "exchangecommon"), "", erSyncInboxRequest.argument.actionStart, Date.now());
             this.refresh();
         }
 
         if ((creations.meetingResponses.length > 0) || (updates.meetingResponses.length > 0) || (deletions.meetingResponses.length > 0)) {
-            this.addActivity(calGetString("calExchangeCalendar", "syncInboxResponses", [creations.meetingResponses.length, updates.meetingResponses.length, deletions.meetingResponses.length, this.name], "exchangecalendar"), "", erSyncInboxRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "syncInboxResponses", [creations.meetingResponses.length, updates.meetingResponses.length, deletions.meetingResponses.length, this.name], "exchangecommon"), "", erSyncInboxRequest.argument.actionStart, Date.now());
             this.refresh();
         }
 
@@ -3920,7 +3920,7 @@ calExchangeCalendar.prototype = {
                         var bodyText = null;
                         if (this.sendAutoRespondMeetingRequestMessage) {
                             bodyText = this.autoRespondMeetingRequestMessage;
-                            this.addActivity(calGetString("calExchangeCalendar", "sendAutoRespondMeetingRequestMessage", [index.title, this.name], "exchangecalendar"), "", Date.now(), Date.now());
+                            this.addActivity(calGetString("calExchangeCalendar", "sendAutoRespondMeetingRequestMessage", [index.title, this.name], "exchangecommon"), "", Date.now(), Date.now());
 
                         }
 
@@ -4032,7 +4032,7 @@ calExchangeCalendar.prototype = {
                                 // Remove calendar item and cancellation message
                                 // because user specified so in the EWS settings.
                                 // We remove it from the real calendar and in the inbox.
-                                this.addActivity(calGetString("calExchangeCalendar", "autoRemoveConfirmedInvitationOnCancellation", [inCalendar.title, this.name], "exchangecalendar"), "", Date.now(), Date.now());
+                                this.addActivity(calGetString("calExchangeCalendar", "autoRemoveConfirmedInvitationOnCancellation", [inCalendar.title, this.name], "exchangecommon"), "", Date.now(), Date.now());
                                 inCalendar.setProperty("X-IsCancelled", true);
                                 this.deleteItem(inCalendar);
                                 this.removeMeetingItem(index);
@@ -4409,7 +4409,7 @@ calExchangeCalendar.prototype = {
             + Ci.calICalendar.ITEM_FILTER_TYPE_EVENT, 0, oldBeginDate, oldEndDate, null);
 
         // Make an event for thistory.
-        this.addActivity(calGetString("calExchangeCalendar", "resetEventMessage", [this.name], "exchangecalendar"), "", this.resetStart, Date.now());
+        this.addActivity(calGetString("calExchangeCalendar", "resetEventMessage", [this.name], "exchangecommon"), "", this.resetStart, Date.now());
         if (this.debug) this.logInfo(" performReset 2");
     },
 
@@ -5439,11 +5439,11 @@ calExchangeCalendar.prototype = {
 
         // Make an event for thistory.
         if (isEvent(erCreateItemRequest.argument.item)) {
-            this.addActivity(calGetString("calExchangeCalendar", "addCalendarEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erCreateItemRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "addCalendarEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecommon"), "", erCreateItemRequest.argument.actionStart, Date.now());
         }
         else {
             //this.notifyTheObservers("onAddItem", [newItem]);
-            this.addActivity(calGetString("calExchangeCalendar", "addTaskEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erCreateItemRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "addTaskEventMessage", [erCreateItemRequest.argument.item.title, this.name], "exchangecommon"), "", erCreateItemRequest.argument.actionStart, Date.now());
         }
 
 
@@ -5745,7 +5745,7 @@ calExchangeCalendar.prototype = {
             //this.meetingrequestAnswered[erSendMeetingResponsRequest.argument.item.uid] = false;
         }
 
-        this.addActivity(calGetString("calExchangeCalendar", "ewsMeetingResponsEventMessage", [erSendMeetingResponsRequest.argument.item.title, erSendMeetingResponsRequest.argument.response, this.name], "exchangecalendar"), erSendMeetingResponsRequest.argument.bodyText, erSendMeetingResponsRequest.argument.actionStart, Date.now());
+        this.addActivity(calGetString("calExchangeCalendar", "ewsMeetingResponsEventMessage", [erSendMeetingResponsRequest.argument.item.title, erSendMeetingResponsRequest.argument.response, this.name], "exchangecommon"), erSendMeetingResponsRequest.argument.bodyText, erSendMeetingResponsRequest.argument.actionStart, Date.now());
         this.refresh();
     },
 
@@ -5872,7 +5872,7 @@ calExchangeCalendar.prototype = {
             }
         }
         else {
-            this.addActivity(calGetString("calExchangeCalendar", "ewsErrorEventMessage", [this.name, aMsg, aCode], "exchangecalendar"), aMsg, erGetOccurrenceIndexRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "ewsErrorEventMessage", [this.name, aMsg, aCode], "exchangecommon"), aMsg, erGetOccurrenceIndexRequest.argument.actionStart, Date.now());
 
             var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                 .getService(Components.interfaces.nsIPromptService);
@@ -6008,10 +6008,10 @@ calExchangeCalendar.prototype = {
 
         // Make an event for thistory.
         if (isEvent(erUpdateItemRequest.argument.newItem)) {
-            this.addActivity(calGetString("calExchangeCalendar", "updateCalendarEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "updateCalendarEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecommon"), "", erUpdateItemRequest.argument.actionStart, Date.now());
         }
         else {
-            this.addActivity(calGetString("calExchangeCalendar", "updateTaskEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecalendar"), "", erUpdateItemRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "updateTaskEventMessage", [erUpdateItemRequest.argument.newItem.title, this.name], "exchangecommon"), "", erUpdateItemRequest.argument.actionStart, Date.now());
         }
 
         if (!this.doAttachmentUpdates(erUpdateItemRequest.argument.attachmentsUpdates, erUpdateItemRequest.argument.item, erUpdateItemRequest.argument.sendto, erUpdateItemRequest.listener)) {
@@ -6113,10 +6113,10 @@ calExchangeCalendar.prototype = {
 
 
         if (isEvent(erDeleteItemRequest.argument.item)) {
-            this.addActivity(calGetString("calExchangeCalendar", "deleteCalendarEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erDeleteItemRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "deleteCalendarEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecommon"), "", erDeleteItemRequest.argument.actionStart, Date.now());
         }
         else {
-            this.addActivity(calGetString("calExchangeCalendar", "deleteTaskEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecalendar"), "", erDeleteItemRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "deleteTaskEventMessage", [erDeleteItemRequest.argument.item.title, this.name], "exchangecommon"), "", erDeleteItemRequest.argument.actionStart, Date.now());
         }
 
         //delete erDeleteItemRequest.argument.item;
@@ -8272,7 +8272,7 @@ else { dump("Occurrence does not exist in cache anymore.\n");}
         if (this.debug) this.logInfo("syncFolderItemsOK: Folderbase: " + erSyncFolderItemsRequest.folderBase + ", Creation:" + creations.length + ", Updates:" + updates.length + ", Deletions:" + deletions.length + ", syncState:" + syncState);
 
         if ((creations.length > 0) || (updates.length > 0) || (deletions.length > 0)) {
-            this.addActivity(calGetString("calExchangeCalendar", "syncFolderEventMessage", [creations.length, updates.length, deletions.length, this.name], "exchangecalendar"), "", erSyncFolderItemsRequest.argument.actionStart, Date.now());
+            this.addActivity(calGetString("calExchangeCalendar", "syncFolderEventMessage", [creations.length, updates.length, deletions.length, this.name], "exchangecommon"), "", erSyncFolderItemsRequest.argument.actionStart, Date.now());
         }
 
         if (syncState) {
diff --git a/common/content/exchangeSettingsOverlay.js b/common/content/exchangeSettingsOverlay.js
index 571cddd0..16308e37 100644
--- a/common/content/exchangeSettingsOverlay.js
+++ b/common/content/exchangeSettingsOverlay.js
@@ -416,10 +416,10 @@ exchSettingsOverlay.prototype = {
         case -30:
             break;
         case -6:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecommon"));
             break;
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecommon"));
         }
         this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
         this.exchWebServicesCheckRequired();
@@ -437,7 +437,7 @@ exchSettingsOverlay.prototype = {
             this._document.getElementById("exchWebServices-SharedFolderID-label").value = aExchangeRequest.displayName;
         }
         else {
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecommon"));
         }
 
         this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
@@ -453,10 +453,10 @@ exchSettingsOverlay.prototype = {
         case -30:
             break;
         case -6:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecommon"));
             break;
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecommon"));
         }
         this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
         this.exchWebServicesCheckRequired();
@@ -485,7 +485,7 @@ exchSettingsOverlay.prototype = {
         case -30:
             break;
         case -6:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecommon"));
             break;
         case -7:
         case -208: // folderNotFound. 
@@ -494,7 +494,7 @@ exchSettingsOverlay.prototype = {
         case -212:
             aMsg = aMsg + "(" + this.exchWebServicesgMailbox + ")";
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecommon"));
         }
         this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
         this.exchWebServicesCheckRequired();
@@ -543,7 +543,7 @@ exchSettingsOverlay.prototype = {
         this.globalFunctions.LOG("checkUserAvailabilityError");
         this.gexchWebServicesDetailsChecked = false;
 
-        alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecalendar"));
+        alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerAndMailboxCheck", [aMsg, aCode], "exchangecommon"));
 
         this._document.getElementById("exchWebService_serverandmailboxcheckbutton").disabled = false;
         this.exchWebServicesCheckRequired();
@@ -602,10 +602,10 @@ exchSettingsOverlay.prototype = {
         case -30:
             break;
         case -6:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [this.exchWebServicesgServer], "exchangecommon"));
             break;
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecommon"));
         }
         this._document.getElementById("exchWebService_servercheckbutton").disabled = false;
 
@@ -749,10 +749,10 @@ exchSettingsOverlay.prototype = {
         case -16:
         case -17:
         case -18:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [this.exchWebServicesgMailbox], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [this.exchWebServicesgMailbox], "exchangecommon"));
             break;
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecommon"));
         }
 
         this._document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
diff --git a/common/content/manageEWSAccounts.js b/common/content/manageEWSAccounts.js
index fcce77f4..c2cf1a5b 100644
--- a/common/content/manageEWSAccounts.js
+++ b/common/content/manageEWSAccounts.js
@@ -363,10 +363,10 @@ exchWebService.manageEWSAccounts = {
         case -16:
         case -17:
         case -18:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [document.getElementById("exchWebService_mailbox").value], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscoveryURLInvalid", [document.getElementById("exchWebService_mailbox").value], "exchangecommon"));
             break;
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorAutodiscovery", [aMsg, aCode], "exchangecommon"));
         }
 
         document.getElementById("exchWebService_autodiscovercheckbutton").disabled = false;
@@ -411,10 +411,10 @@ exchWebService.manageEWSAccounts = {
         case -30:
             break;
         case -6:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [document.getElementById("exchWebService_server").value], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheckURLInvalid", [document.getElementById("exchWebService_server").value], "exchangecommon"));
             break;
         default:
-            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecalendar"));
+            alert(this.globalFunctions.getString("calExchangeCalendar", "ecErrorServerCheck", [aMsg, aCode], "exchangecommon"));
         }
         document.getElementById("exchWebService_servercheckbutton").disabled = false;
 
diff --git a/common/content/oofSettings.js b/common/content/oofSettings.js
index b665f21a..11f65128 100644
--- a/common/content/oofSettings.js
+++ b/common/content/oofSettings.js
@@ -90,7 +90,7 @@ exchOOFSettings.prototype = {
     },
 
     getOofSettings: function _getOofSettings() {
-        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadingOofSettings", [], "exchangecalendar");
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadingOofSettings", [], "exchangecommon");
 
         var self = this;
         var tmpObject = new erGetUserOofSettingsRequest({
@@ -112,7 +112,7 @@ exchOOFSettings.prototype = {
         this.globalFunctions.LOG("intern:" + this.intOofSettings.internalReply);
         this.globalFunctions.LOG("extern:" + this.intOofSettings.externalReply);
 
-        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadedOofSettings", [], "exchangecalendar");
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecLoadedOofSettings", [], "exchangecommon");
 
         this._document.getElementById("exchWebService_oofSettings_dialog").buttons = "accept,cancel";
 
@@ -154,7 +154,7 @@ exchOOFSettings.prototype = {
     },
 
     getOofSettingsError: function _getOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg) {
-        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorLoadingOofSettings", [aMsg, aCode], "exchangecalendar");
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorLoadingOofSettings", [aMsg, aCode], "exchangecommon");
     },
 
     doScheduledChanged: function _doScheduledChanged() {
@@ -166,7 +166,7 @@ exchOOFSettings.prototype = {
     },
 
     setOofSettings: function _setOofSettings() {
-        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavingOofSettings", [], "exchangecalendar");
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavingOofSettings", [], "exchangecommon");
 
         var oofState = "Disabled";
         if (this._document.getElementById("exchWebService-oof-status").value == "Enabled") {
@@ -227,14 +227,14 @@ exchOOFSettings.prototype = {
     },
 
     setOofSettingsOK: function _setOofSettingsOK(aGetUserOofSettingsRequest) {
-        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavedOofSettings", [], "exchangecalendar");
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecSavedOofSettings", [], "exchangecommon");
         this.infoPopup(this._document.title, "Settings saved.");
         this.getOofSettings();
 
     },
 
     setOofSettingsError: function _setOofSettingsError(aGetUserOofSettingsRequest, aCode, aMsg) {
-        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorSavingOofSettings", [aMsg, aCode], "exchangecalendar");
+        this._document.getElementById("exchWebService-load-error-message").value = this.globalFunctions.getString("calExchangeCalendar", "ecErrorSavingOofSettings", [aMsg, aCode], "exchangecommon");
         alert("Error saving settings. Msg:" + aMsg + ", Code:" + aCode);
 
         this.getOofSettings();

From ceda6646ec1c34aef3892415d2a99ea8eb04beb8 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sat, 3 Feb 2018 21:42:44 +0100
Subject: [PATCH 210/222] fix priority-display.js to get correctly preferences
 from Thunderbird branches

---
 common/content/priority-display.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/content/priority-display.js b/common/content/priority-display.js
index bfc6be32..23f06b8d 100644
--- a/common/content/priority-display.js
+++ b/common/content/priority-display.js
@@ -31,13 +31,13 @@ function tag(hdr) {
 function gCP(pref) {
     var prefService = Cc["@mozilla.org/preferences-service;1"]
         .getService(Ci.nsIPrefService);
-    return prefService.getCharPref("extensions.extras." + pref);
+    return prefService.getBranch("extensions.extras.").getCharPref(pref);
 }
 
 function gBP(pref) {
     var prefService = Cc["@mozilla.org/preferences-service;1"]
         .getService(Ci.nsIPrefService);
-    return prefService.getBoolPref("extensions.extras." + pref);
+    return prefService.getBranch("extensions.extras.").getBoolPref(pref);
 }
 
 function toggleMessageTagPostEwsUpdate(key, addKey, hdr) {

From 5856de3cc92079a084a1e90e7b789c1aaf11cf98 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Feb 2018 13:46:43 +0100
Subject: [PATCH 211/222] Use standardized String.prototype.trim() from
 EcmaScript 5 instead of home made trim() functions

---
 .../exchangeapi/exchangeAbFunctions.js        |  3 +--
 common/exchangeapi/ecFunctions.js             |  1 -
 .../mivExchangeAuthPrompt2.js                 |  6 ++---
 common/interface/global/mivFunctions.idl      |  2 --
 common/interface/global/mivFunctions.js       | 11 --------
 common/interface/xml2json/xml2json.js         | 27 +++++--------------
 common/interface/xml2jxon/mivIxml2jxon.js     | 27 +++++--------------
 7 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/addressbook/exchangeapi/exchangeAbFunctions.js b/addressbook/exchangeapi/exchangeAbFunctions.js
index fb06fd05..ec21b701 100644
--- a/addressbook/exchangeapi/exchangeAbFunctions.js
+++ b/addressbook/exchangeapi/exchangeAbFunctions.js
@@ -144,8 +144,7 @@ exchWebService.commonAbFunctions = {
             return false;
         }
 
-        // Trim leadin and trailing spaces
-        var cleanQuery = exchWebService.commonFunctions.trim(aQuery);
+        var cleanQuery = aQuery.trim();
 
         // Check for round brackets.
         if ((cleanQuery.substr(0, 1) != "(") || (cleanQuery.substr(cleanQuery.length - 1, 1) != ")")) {
diff --git a/common/exchangeapi/ecFunctions.js b/common/exchangeapi/ecFunctions.js
index 7e39a281..c767262f 100644
--- a/common/exchangeapi/ecFunctions.js
+++ b/common/exchangeapi/ecFunctions.js
@@ -138,7 +138,6 @@ exchWebService.commonFunctions.ERROR = mivFunctions.ERROR;
 exchWebService.commonFunctions.STACK = mivFunctions.STACK;
 exchWebService.commonFunctions.STACKshort = mivFunctions.STACKshort;
 exchWebService.commonFunctions.ASSERT = mivFunctions.ASSERT;
-exchWebService.commonFunctions.trim = mivFunctions.trim;
 exchWebService.commonFunctions.copyPreferences = mivFunctions.copyPreferences;
 exchWebService.commonFunctions.xmlToJxon = mivFunctions.xmlToJxon;
 exchWebService.commonFunctions.splitOnCharacter = mivFunctions.splitOnCharacter;
diff --git a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index b537d410..bbbe5572 100644
--- a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -311,7 +311,7 @@ mivExchangeAuthPrompt2.prototype = {
                 this.logInfo("asyncPromptAuthNotifyCallback: Trying to detect username.");
                 username = decodeURIComponent(aChannel.URI.username);
                 if (username) {
-                    username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
+                    username = username.trim();
                 }
 
                 if (username === "") {
@@ -550,7 +550,7 @@ mivExchangeAuthPrompt2.prototype = {
         else {
             username = decodeURIComponent(aChannel.URI.username);
             if (username) {
-                username = this.globalFunctions.trim(decodeURIComponent(aChannel.URI.username));
+                username = username.trim();
             }
 
             if (username == "") {
@@ -614,7 +614,7 @@ mivExchangeAuthPrompt2.prototype = {
      *				result == false when password not found.
      */
     passwordManagerGet: function _passwordManagerGet(aUsername, aURL, aRealm) {
-        if ((!aUsername) || (this.globalFunctions.trim(aUsername) == "")) {
+        if ((!aUsername) || aUsername.trim() == "")) {
             this.logInfo("passwordManagerGet: username is undefined or empty.")
             return {
                 result: false
diff --git a/common/interface/global/mivFunctions.idl b/common/interface/global/mivFunctions.idl
index 122d667e..17b1e935 100644
--- a/common/interface/global/mivFunctions.idl
+++ b/common/interface/global/mivFunctions.idl
@@ -72,8 +72,6 @@ interface mivFunctions : nsISupports
 
   void ASSERT(in jsval aCondition, [optional] in AUTF8String aMessage, [optional] in boolean aCritical);
 
-  AUTF8String trim(in AUTF8String str);
-
   uint64_t copyPreferences(in jsval aFromPrefs, in jsval aToPrefs);
 
   jsval xmlToJxon([optional] in AUTF8String aXMLString) ;
diff --git a/common/interface/global/mivFunctions.js b/common/interface/global/mivFunctions.js
index bf905378..b4cfc040 100644
--- a/common/interface/global/mivFunctions.js
+++ b/common/interface/global/mivFunctions.js
@@ -617,17 +617,6 @@ mivFunctions.prototype = {
         };
     },
 
-    trim: function _trim(str) {
-        str = str.replace(/^\s+/, '');
-        for (var i = str.length - 1; i >= 0; i--) {
-            if (/\S/.test(str.charAt(i))) {
-                str = str.substring(0, i + 1);
-                break;
-            }
-        }
-        return str;
-    },
-
     copyPreferences: function _copyPreferences(aFromPrefs, aToPrefs) {
         var children = aFromPrefs.getChildList("");
         var count = 0;
diff --git a/common/interface/xml2json/xml2json.js b/common/interface/xml2json/xml2json.js
index f513fa92..3a642785 100644
--- a/common/interface/xml2json/xml2json.js
+++ b/common/interface/xml2json/xml2json.js
@@ -225,19 +225,6 @@ function convertSpecialCharatersToXML(aXMLString) {
     return result;
 }
 
-function trim(aValue) {
-    var strLength = aValue.length;
-    var leftPos = 0;
-    while ((leftPos < strLength) && (aValue.charAt(leftPos) == " ")) {
-        leftPos++;
-    }
-    var rightPos = strLength - 1;
-    while ((rightPos >= 0) && (aValue.charAt(rightPos) == " ")) {
-        rightPos--;
-    }
-    return aValue.substr(leftPos, rightPos - leftPos + 1);
-}
-
 function hasXMLHeader(aStr, aSP) {
     if (!aStr) return 0;
 
@@ -310,7 +297,7 @@ function convertComparisonPart(a, aJSONObject) {
 
 function ifFunction(aCondition, aJSONObject) {
     var level = 0;
-    var tmpCondition = trim(aCondition);
+    var tmpCondition = aCondition.trim();
     var compareList = [];
     while (tmpCondition != "") {
         var startPos = 0;
@@ -380,8 +367,8 @@ function ifFunction(aCondition, aJSONObject) {
                     break;
                 }
                 compareList.push({
-                    left: trim(splitPart2),
-                    right: trim(splitPart.substr(splitPart2.length + comparison.length)),
+                    left: splitPart2.trim(),
+                    right: splitPart.substr(splitPart2.length + comparison.length).trim(),
                     operator: operator,
                     comparison: comparison,
                     subCondition: subCondition
@@ -389,7 +376,7 @@ function ifFunction(aCondition, aJSONObject) {
             }
             else {
                 compareList.push({
-                    left: trim(splitPart),
+                    left: splitPart.trim(),
                     right: "",
                     operator: operator,
                     comparison: comparison,
@@ -554,7 +541,7 @@ function realXPath(aParent, aPath) {
             throw "XPath error: Did not find closing square bracket. tagName:" + aParent.tagName + ", tmpPath:" + tmpPath;
         }
         tmpPath = tmpPath.substr(index.length + 2);
-        index = trim(index);
+        index = index.trim();
         if (index != "") {
             if (ifFunction(index, aParent)) {
                 result.push(aParent);
@@ -715,8 +702,8 @@ function realSetAttributeStr(aParent, aString) {
     if (sp == -1) {
         throw -13; // Equal sign not found.
     }
-    var an = trim(aString.substr(0, sp));
-    var av = trim(aString.substr(sp + 1));
+    var an = aString.substr(0, sp).trim();
+    var av = aString.substr(sp + 1).trim();
     var tc = av[0];
     if ((tc == "'") || (tc == '"')) {
         let vl = av.length;
diff --git a/common/interface/xml2jxon/mivIxml2jxon.js b/common/interface/xml2jxon/mivIxml2jxon.js
index c06a8ee9..41f4f552 100644
--- a/common/interface/xml2jxon/mivIxml2jxon.js
+++ b/common/interface/xml2jxon/mivIxml2jxon.js
@@ -227,19 +227,6 @@ function convertSpecialCharatersToXML(aStr) {
     return result;
 }
 
-function trim(aValue) {
-    var strLength = aValue.length;
-    var leftPos = 0;
-    while ((leftPos < strLength) && (aValue[leftPos] == " ")) {
-        leftPos++;
-    }
-    var rightPos = strLength - 1;
-    while ((rightPos >= 0) && (aValue[rightPos] == " ")) {
-        rightPos--;
-    }
-    return aValue.substr(leftPos, rightPos - leftPos + 1);
-}
-
 var nameSpaceMgr = Cc["@1st-setup.nl/conversion/namespaces;1"]
     .getService(Ci.mivNameSpaces);
 
@@ -294,8 +281,8 @@ mivIxml2jxon.prototype = {
         if (sp == -1) {
             throw Ci.mivIxml2jxon.ERR_WRONG_ATTRIBUTE_SEPARATOR;
         }
-        var an = trim(a.substr(0, sp));
-        var av = trim(a.substr(sp + 1));
+        var an = a.substr(0, sp).trim();
+        var av = a.substr(sp + 1).trim();
         var tc = av[0];
         if ((tc == "'") || (tc == '"')) {
             let vl = av.length;
@@ -652,7 +639,7 @@ mivIxml2jxon.prototype = {
                 throw "XPath error: Did not find closing square bracket. tagName:" + this.tagName + ", tmpPath:" + tmpPath;
             }
             tmpPath = tmpPath.substr(index.length + 2);
-            index = trim(index);
+            index = index.trim();
             if (index != "") {
                 if (ifFunction(index, this)) {
                     result.push(this);
@@ -998,7 +985,7 @@ function convertComparisonPart(a, aXMLObject) {
 
 function ifFunction(aCondition, aXMLObject) {
     var level = 0;
-    var tmpCondition = trim(aCondition);
+    var tmpCondition = aCondition.trim();
     var compareList = [];
     while (tmpCondition != "") {
         var startPos = 0;
@@ -1068,8 +1055,8 @@ function ifFunction(aCondition, aXMLObject) {
                     break;
                 }
                 compareList.push({
-                    left: trim(splitPart2),
-                    right: trim(splitPart.substr(splitPart2.length + comparison.length)),
+                    left: splitPart2.trim(),
+                    right: splitPart.substr(splitPart2.length + comparison.length).trim(),
                     operator: operator,
                     comparison: comparison,
                     subCondition: subCondition
@@ -1077,7 +1064,7 @@ function ifFunction(aCondition, aXMLObject) {
             }
             else {
                 compareList.push({
-                    left: trim(splitPart),
+                    left: splitPart.trim(),
                     right: "",
                     operator: operator,
                     comparison: comparison,

From 43039ab3026bc983782eafb129ca3a0606b7e9ca Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Feb 2018 13:47:15 +0100
Subject: [PATCH 212/222] remove unused backup file from git sources

---
 .../interface/xml2jxon/mivIxml2jxon.js.backup | 1422 -----------------
 1 file changed, 1422 deletions(-)
 delete mode 100644 common/interface/xml2jxon/mivIxml2jxon.js.backup

diff --git a/common/interface/xml2jxon/mivIxml2jxon.js.backup b/common/interface/xml2jxon/mivIxml2jxon.js.backup
deleted file mode 100644
index 4a6c78b3..00000000
--- a/common/interface/xml2jxon/mivIxml2jxon.js.backup
+++ /dev/null
@@ -1,1422 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: GPL 3.0
- *
- * The contents of this file are subject to the General Public License
- * 3.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.gnu.org/licenses/gpl.html
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Author: Michel Verbraak (info@1st-setup.nl)
- * Website: http://www.1st-setup.nl/wordpress/?page_id=133
- * email: exchangecalendar@extensions.1st-setup.nl
- *
- * This XML interface can be used to convert from xml-string to JXON object
- * and back.
- *
- * ***** BEGIN LICENSE BLOCK *****/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-var components = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-function typeString(o) {
-	if (typeof o != 'object')
-		return typeof o;
-
-	if (o === null)
-		return "null";
-  //object, array, function, date, regexp, string, number, boolean, error
-	var internalClass = Object.prototype.toString.call(o)
-                                               .match(/\[object\s(\w+)\]/)[1];
-	return internalClass.toLowerCase();
-}
-
-function isArray(obj) {
-	return (typeString(obj) == "array");
-}
-
-function isInList(inArray, inStr)
-{
-	return (inArray[inStr] !== undefined);
-}
-
-const specialChars1 = {	" ": true, 
-			"\n" : true, 
-			"\r" : true, 
-			"\t" : true };
-
-function xmlErrorObject(aName, aMessage, aCode) {
-	this.name = aName;
-	this.message = aMessage;
-	this.code = aCode;
-}
-
-function findCharacter(aString, aStartPos, aChar)
-{
-	if (!aString) return -1;
-
-	var pos = aStartPos;
-	var strLength = aString.length;
-	while ((pos < strLength) && (aString[pos] != aChar)) {
-		pos++;
-	}
-
-	if (pos < strLength) {
-		return pos;
-	}
-
-	return -1;
-}
-
-function findString(aString, aStartPos, aNeedle)
-{
-	if (!aString) return -1;
-
-	var pos = aStartPos;
-	var needleLength = aNeedle.length;
-	var strLength = aString.length - needleLength + 1;
-	while ((pos < strLength) && (aString.substr(pos, needleLength) != aNeedle)) {
-		pos++;
-	}
-
-	if (pos < strLength) {
-		return pos;
-	}
-
-	return -1;
-}
-
-function splitOnCharacter(aString, aStartPos, aSplitCharacter)
-{
-	if (!aString) {
-		return null;
-	}
-
-	var tmpPos = aStartPos;
-	var result = "";
-	var notClosed = true;
-	var notQuoteOpen = true;
-	var quotesUsed = "";
-	var strLen = aString.length;
-	var splitCharIsArray = isArray(aSplitCharacter);
-	while ((tmpPos < strLen) && (notClosed)) {
-		if ((aString[tmpPos] == "'") || (aString[tmpPos] == '"')) {
-			// We found quotes. Do they belong to our string.
-			if (notQuoteOpen) {
-				quotesUsed = aString[tmpPos];
-				notQuoteOpen = false;
-			}
-			else {
-				if (aString[tmpPos] == quotesUsed) {
-					quotesUsed = "";
-					notQuoteOpen = true;
-				}
-			}
-		}
-
-		var hitSplitCharacter = false;
-		if (notQuoteOpen) {
-			if (splitCharIsArray) {
-				for (var index in aSplitCharacter) {
-					if (aString.substr(tmpPos,aSplitCharacter[index].length) == aSplitCharacter[index]) {
-						hitSplitCharacter = true;
-						break;
-					}
-				}
-			}
-			else {
-				if (aString.substr(tmpPos,aSplitCharacter.length) == aSplitCharacter) {
-					hitSplitCharacter = true;
-				}
-			}
-		}
-
-		if (hitSplitCharacter) {
-			notClosed = false;
-		}
-		else {
-			result += aString[tmpPos];
-		}
-		tmpPos++;
-	}
-
-	if (!notClosed) {
-		return result;
-	}
-	else {
-		return null;
-	}
-}
-
-var replaceFromXML = function _replaceFromXML(str, r1)
-{
-	var result = str;
-	if (r1[0] == "#") {
-		if (r1[1] == "x") {
-			// hexadecimal
-			result = String.fromCharCode(parseInt(r1.substr(2),16))
-		}
-		else {
-			// Decimal
-			result = String.fromCharCode(parseInt(r1.substr(1),10))
-		}
-	}
-	else {
-		switch (r1) {
-		case "amp": result = "&"; break;
-		case "quot": result = '"'; break;
-		case "apos": result = "'"; break;
-		case "lt": result = "<"; break;
-		case "gt": result = ">"; break;
-		}
-	}
-	return result;
-}
-
-function convertSpecialCharatersFromXML(aString)
-{
-	if (!aString) return aString;
-
-	var result = aString;
-	// Convert special characters
-	result = result.replace(/&(quot|apos|lt|gt|amp|#x[0123456789ancdefABCDEF][0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?[0123456789ancdefABCDEF]?|#[0123456789][0123456789]?[0123456789]?[0123456789]?);/g, replaceFromXML); 
-
-	return result;
-}
-
-var replaceToXML = function _replaceToXML(str, r1)
-{
-	var result = str;
-	switch (r1) {
-	case "&": result = "&amp;"; break;
-	case '"': result = "&quot;"; break;
-	case "'": result = "&apos;"; break;
-	case "<": result = "&lt;"; break;
-	case ">": result = "&gt;"; break;
-	}
-
-	return result;
-}
-
-function convertSpecialCharatersToXML(aString)
-{
-	if (!aString) return aString;
-
-	var result = aString.toString();
-	// Convert special characters
-	result = result.replace(/(&|\x22|\x27|<|>)/g, replaceToXML);  
-
-	return result;
-}
-
-function trim(aValue)
-{
-	var strLength = aValue.length;
-	var leftPos = 0;
-	while ((leftPos < strLength) && (aValue[leftPos] == " ")) {
-		leftPos++;
-	}
-	var rightPos = strLength-1;
-	while ((rightPos >= 0) && (aValue[rightPos] == " ")) {
-		rightPos--;
-	}
-	return aValue.substr(leftPos, rightPos - leftPos + 1);
-}
-
-var globalFunctions = Cc["@1st-setup.nl/global/functions;1"]
-			.getService(Ci.mivFunctions);
-
-var nameSpaceMgr = Cc["@1st-setup.nl/conversion/namespaces;1"]
-			.getService(Ci.mivNameSpaces);
-
-var tagNameMgr = Cc["@1st-setup.nl/conversion/tagnames;1"]
-			.getService(Ci.mivTagNames);
-
-function mivIxml2jxon(aXMLString, aStartPos, aParent) {
-
-
-if (aParent) {
-	dump("    mivIxml2jxon INIT: aParent:"+aParent+"("+globalFunctions.STACKshort()+")\n");
-}
-else {
-	if (aXMLString) {
-		dump("mivIxml2jxon INIT: aParent:null, aXMLString:"+aXMLString.substr(aStartPos)+"\n");
-	}
-	else {
-		dump("mivIxml2jxon INIT: aParent:null, aXMLString:null\n");
-	}
-}
-
-	this.content = {};
-	this.itemCount = 0;
-	this.messageLength = 0;
-	this._closed = false;
-	this.nameSpaces = {};
-	this.tags = {};
-	this.attr = {};
-
-	this._siblings = new Array();
-
-	this.uuid = Cc["@mozilla.org/uuid-generator;1"]
-				.getService(Ci.nsIUUIDGenerator).generateUUID().toString().replace(/[{}]/g, '');
-
-	if (aXMLString) {
-		this.processXMLString(aXMLString, aStartPos, aParent);
-	}
-}
-
-var xml2jxonGUID = "d7165a60-7d64-42b2-ac48-6ccfc0962abb";
-
-const tagSeparator = ":";
-
-mivIxml2jxon.prototype = {
-
-	// methods from nsISupport
-
-	/* void QueryInterface(
-	  in nsIIDRef uuid,
-	  [iid_is(uuid),retval] out nsQIResult result
-	);	 */
-	QueryInterface: XPCOMUtils.generateQI([Ci.mivIxml2jxon,
-			Ci.nsIClassInfo,
-			Ci.nsISupports]),
-
-	// methods from nsIClassInfo
-
-	// nsISupports getHelperForLanguage(in PRUint32 language);
-	getHelperForLanguage: function _getHelperForLanguage(language) {
-		return null;
-	},
-
-	// void getInterfaces(out PRUint32 count, [array, size_is(count), retval] out nsIIDPtr array);
-	getInterfaces: function _getInterfaces(count) 
-	{
-		var ifaces = [Ci.mivIxml2jxon,
-			Ci.nsIClassInfo,
-			Ci.nsISupports];
-		count.value = ifaces.length;
-		return ifaces;
-	},
-
-	// Attributes from nsIClassInfo
-
-	classDescription: "XML to JXON and back conversion functionality.",
-	classID: components.ID("{"+xml2jxonGUID+"}"),
-	contractID: "@1st-setup.nl/conversion/xml2jxon;1",
-	flags: Ci.nsIClassInfo.THREADSAFE,
-	implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-
-	// External methods
-
-	// External attributes
-
-	get closed()
-	{
-		return this._closed;
-	},
-
-	set closed(aValue)
-	{
-		this._closed = aValue;
-	},
-
-	// Internal methods.
-
-	xmlError: function _xmlError(aErrorID)
-	{
-		switch (aErrorID) {
-			case Ci.mivIxml2jxon.ERR_MISSING_SPECIAL_TAG: 
-				return new xmlErrorObject("ERR_MISSING_SPECIAL_TAG","A special tag like '?' is missing",aErrorID);
-			case Ci.mivIxml2jxon.ERR_INVALID_TAG: 
-				return new xmlErrorObject("ERR_INVALID_SPECIAL_TAG", "Tag is invalid", aErrorID);
-			case Ci.mivIxml2jxon.ERR_INVALID_SPECIAL_TAG: 
-				return new xmlErrorObject("ERR_INVALID_SPECIAL_TAG", "Special Tag is invalid", aErrorID);
-			case Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG: 
-				return new xmlErrorObject("ERR_WRONG_CLOSING_TAG", "Found wrong closing tag. Expected another.", aErrorID);
-			case Ci.mivIxml2jxon.ERR_WRONG_ATTRIBUTE_SEPARATOR: 
-				return new xmlErrorObject("ERR_WRONG_ATTRIBUTE_SEPARATOR", "Found wrong attribute separator. Expected '=' character.", aErrorID);
-			case Ci.mivIxml2jxon.ERR_ATTRIBUTE_VALUE_QUOTES: 
-				return new xmlErrorObject("ERR_ATTRIBUTE_VALUE_QUOTES", "Found error in attribute value quotes.", aErrorID);
-		}
-	},
-
-	addToContent: function _addToContent(aValue)
-	{
-dump("addToContent: aValue:"+aValue+"("+globalFunctions.STACKshort()+")\n");
-		if ((this.itemCount > 0) && (trim(aValue) == "")) {
-			return;
-		}
-		this.content[this.itemCount] = aValue;
-		this.itemCount++;
-	},
-
-	explodeAttribute: function _explodeAttribute(aValue)
-	{
-		// Remove any of the special characters
-		aValue = aValue.replace(/\n/g, "");
-		aValue = aValue.replace(/\r/g, "");
-		aValue = aValue.replace(/\t/g, "");
-
-
-		var splitPos = aValue.indexOf("=");
-		if (splitPos == -1) {
-			throw this.xmlError(Ci.mivIxml2jxon.ERR_WRONG_ATTRIBUTE_SEPARATOR);
-		}
- 
-		// trim left and right.
-		var attributeName = trim(aValue.substr(0, splitPos));
-		var attributeValue = trim(aValue.substr(splitPos+1));
-
-		var tmpChar = attributeValue[0];
-		if ((tmpChar == "'") || (tmpChar == '"')) {
-			var valueLength = attributeValue.length;
-			if (tmpChar == attributeValue.substr(valueLength-1,1)) {
-				// Remove quote around attribute value.
-				attributeValue = attributeValue.substr(1, valueLength-2);
-			}
-			else {
-				throw this.xmlError(Ci.mivIxml2jxon.ERR_ATTRIBUTE_VALUE_QUOTES);
-			}
-		}
-
-		if (attributeName.toLowerCase().indexOf("xmlns") == 0) {
-			var xmlnsPos = attributeName.indexOf(":");
-			if (xmlnsPos > -1) {
-				this.addNameSpace(attributeName.substr(xmlnsPos+1), attributeValue);
-			}
-			else {
-				this.addNameSpace("" , attributeValue);
-			}
-		}
-		else {
-			this.attr[attributeName] = attributeValue;
-		}
-	},
-
-	getNameSpace: function _getNameSpace(aAlias)
-	{
-		// Check if we have this nameSpace alias our selfs.
-		if (aAlias === undefined) {
-			return null;
-		}
-
-		if (aAlias == "") {
-			aAlias = "_default_";
-		}
-
-		return nameSpaceMgr.getNameSpace(this.nameSpaces[aAlias]);
-	},
-
-	addNameSpace: function _addNameSpace(aAlias, aValue)
-	{
-		var index = aAlias;
-		if ((aAlias == "") || (aAlias === undefined)) {
-			index = "_default_";
-		}
-
-		this.nameSpaces[index] = nameSpaceMgr.addNameSpace(aAlias, aValue);
-
-		// Add new namespace to children.
-		for each(var child in this.tags) {
-			child.addNameSpace(index, aValue);
-		}
-	},
-
-	setAttribute: function _setAttribute(aAttribute, aValue)
-	{
-		this.attr[aAttribute] = convertSpecialCharatersToXML(aValue);
-	},
-
-	getAttribute: function _getAttribute(aAttribute, aDefaultValue)
-	{
-		if (this.attr[aAttribute]) {
-			return convertSpecialCharatersFromXML(this.attr[aAttribute]);
-		}
-		else {
-			return aDefaultValue;
-		}
-	},
-
-	getAttributeByTag: function _getAttributeByTag(aTagName, aAttribute, aDefaultValue)
-	{
-		var tmpObject = this.getTag(aTagName);
-		if (tmpObject) {
-			return tmpObject.getAttribute(aAttribute, aDefaultValue);
-		}
-		else {
-			return aDefaultValue;
-		}
-	},
-
-	get tagName()
-	{
-		if (this._tagNameIndex === undefined) return "";
-		return tagNameMgr.getTagName(this._tagNameIndex);
-	},
-
-	set tagName(aValue)
-	{
-		this._tagNameIndex = tagNameMgr.addTagName(aValue);
-	},
-
-	getTag: function _getTag(aTagName)
-	{
-		if (this.tags[aTagName]) {
-			return this.tags[aTagName];
-		}
-
-		var inputTagName = aTagName;
-		var separaTorPos = inputTagName.indexOf(tagSeparator);
-		if (separaTorPos > -1) {
-			inputTagName = inputTagName.substr(separaTorPos);
-		}
-
-		var realIndex;
-		var realATagName;
-		for (let index in this.tags) {
-			let childTag = this.tags[index];
-			if ((childTag instanceof Ci.mivIxml2jxon) || (childTag instanceof mivIxml2jxon)) {
-				// this[index] is an xml2jxon object.
-				realIndex = childTag.realTagName(index);
-				realATagName = childTag.realTagName(aTagName);
-				if (realIndex == realATagName) {
-					return childTag;
-				}
-			}
-			else {
-				// this[index] is an array of xml2jxon objects. We pick the first
-				for (let arrayIndex in childTag) {
-					realIndex = childTag[arrayIndex].realTagName(index);
-					realATagName = childTag[arrayIndex].realTagName(aTagName);
-					if (realIndex == realATagName) {
-						return childTag;
-					}
-				}
-
-			}
-
-		}
-
-		return null;
-	},
-
-	getTags: function _getTags(aTagName)
-	{
-		var tmpObject = this.getTag(aTagName);
-		if (!tmpObject) {
-			return [];
-		}
-
-		if (isArray(tmpObject)) {
-			return tmpObject;
-		}
-
-		var result = new Array;
-		result.push(tmpObject);
-		return result;
-	},
-
-	getTagValue: function _getTagValue(aTagName, aDefaultValue)
-	{
-		var tmpObject = this.getTag(aTagName);
-		if (tmpObject) {
-			return tmpObject.value;
-		}
-		else {
-			return aDefaultValue;
-		}
-	},
-
-	getTagValueByXPath: function _getTagValueByXPath(aXPath, aDefaultValue)
-	{
-		var results = this.XPath(aXPath);
-
-		var result = aDefaultValue;
-		if (results.length > 0) {
-			result = results[0].value;
-		}
-		
-		results = null;
-		return result;
-	},
-
-	addParentNameSpaces: function _addParentNameSpaces(aParent)
-	{
-		if (!this.nameSpaces) {
-			this.nameSpaces = {};
-		}
-
-		for (let index in aParent.nameSpaces) {
-			if (!this.nameSpaces[index]) {
-				this.nameSpaces[index] = aParent.nameSpaces[index];
-			}
-		}
-	},
-
-	addChildTagObject: function _addChildTagObject(aObject)
-	{
-	dump("         addChildTagObject: aObject:"+aObject+"("+globalFunctions.STACKshort()+")\n");
-		if (!aObject) {
-			return;
-		}
-
-		if (aObject.uuid != this.uuid) {
-			aObject.addParentNameSpaces(this);
-		}
-
-		var aNSTagName = aObject.nameSpace+tagSeparator+aObject.tagName;
-		if (!this.tags[aNSTagName]) {
-			this.tags[aNSTagName] = aObject;
-		}
-		else {
-			if (!isArray(this.tags[aNSTagName])) {
-				let firstObject = this.tags[aNSTagName];
-				this.tags[aNSTagName] = new Array();
-				this.tags[aNSTagName].push(firstObject);
-			}
-			this.tags[aNSTagName].push(aObject);
-		}
-	},
-
-	addChildTag: function _addChildTag(aTagName, aNameSpace, aValue)
-	{
-		if (aNameSpace) {
-			var nameSpace = aNameSpace;
-		}
-		else {
-			if (this.nameSpace) {
-				var nameSpace = this.nameSpace;
-			}
-			else {
-				var nameSpace = "_default_";
-			}
-		}
-
-		if ((aValue) && (aValue != "")) {
-			var result = new mivIxml2jxon("<"+nameSpace+tagSeparator+aTagName+">"+convertSpecialCharatersToXML(aValue)+"</"+nameSpace+tagSeparator+aTagName+">", 0, null);
-		}
-		else {
-			var result = new mivIxml2jxon("<"+nameSpace+tagSeparator+aTagName+"/>", 0, null);
-		}
-
-		this.addChildTagObject(result);
-		return result;
-	},
-
-	addSibblingTag: function _addSibblingTag(aTagName, aNameSpace, aValue)
-	{
-		if (aNameSpace) {
-			var nameSpace = aNameSpace;
-		}
-		else {
-			var nameSpace = "_default_";
-		}
-
-		var result = new mivIxml2jxon("<"+nameSpace+tagSeparator+aTagName+"/>", 0, null);
-		result.addToContent(aValue);
-		this._siblings.push(result);
-		//this.addToContent(result);
-		return result;
-	},
-
-	contentStr: function _contentStr()
-	{
-		if (this.content[0]) {
-			return this.content[0];
-		}
-		else {
-			return "";
-		}
-	},
-
-	get value()
-	{
-		var result = convertSpecialCharatersFromXML(this.contentStr().toString());
-
-
-		return result;
-	},
-
-	attributesToString: function _attributesToString()
-	{
-		var result = "";
-		for (let index in this.attr) {
-				result += " "+index + '="'+this.attr[index]+'"';
-		}
-		return result;
-	},
-
-	nameSpacesToString: function _nameSpacesToString()
-	{
-		var result = "";
-		for (let index in this.nameSpaces) {
-			if (index == "_default_") {   
-				result += ' xmlns="'+nameSpaceMgr.getNameSpace(this.nameSpaces[index])+'"';
-			}
-			else {
-				result += " xmlns:"+index+'="'+nameSpaceMgr.getNameSpace(this.nameSpaces[index])+'"';
-			}
-		}
-
-		return result;
-	},
-
-	clone: function _clone()
-	{
-		return new mivIxml2jxon(this.toString(), 0, null);
-	},
-
-	toString: function _toString(parentNameSpace)
-	{
-		var nameSpaces = this.nameSpacesToString();
-		var result = "";
-		var contentCount = 0;
-		for (let index in this.tags) {
-			contentCount++;
-			if (isArray(this.tags[index])) {
-				for each(let tag in this.tags[index]) {
-					result += tag.toString(nameSpaces);
-				}
-			}
-			else {
-				result += this.tags[index].toString(nameSpaces);
-			}
-			
-		}
-
-
-		for (let index in this.content) {
-			contentCount++;
-			if ((typeof this.content[index] === "string") || (this.content[index] instanceof String)) {
-				result += this.content[index];
-			}
-		}
-
-		if ((parentNameSpace) && (nameSpaces == parentNameSpace)) {
-			nameSpaces = "";
-		}
-
-		var attributes = this.attributesToString();
-
-		var nameSpace = this.nameSpace;
-		if (nameSpace == "_default_") {
-			nameSpace = "";
-		}
-		else {
-			nameSpace += tagSeparator;
-		}
-
-		if (contentCount == 0) {
-			result = "<"+nameSpace+this.tagName+attributes+nameSpaces+"/>";
-		}
-		else {
-			result = "<"+nameSpace+this.tagName+attributes+nameSpaces+">" + result + "</"+nameSpace+this.tagName+">";
-		}
-
-		for each(let sibling in this._siblings) {
-			result = result + sibling.toString();
-		}
-
-		return result;
-	},
-
-	convertComparisonPart: function _convertComparisonPart(aPart)
-	{
-		var result = new Array();
-		var tmpChar = aPart[0];
-		if ((tmpChar == "/") || (tmpChar == ".") || (tmpChar == "@")) {
-			// Left side is a XPath query.
-			result = this.XPath(aPart);
-		}
-		else {
-			// Left side is a number or string.
-			var result = new Array();
-			if ( (tmpChar == "'") || (tmpChar == '"')) {
-				result.push(new String(aPart.substr(1,aPart.length-2)));
-			}
-			else {
-				if (isNaN(aPart)) {
-					result = this.XPath(aPart);
-				}
-				else {
-					result.push(Number(aPart));
-				}
-			}
-		}
-		return result;
-	},
-
-	if: function _if(aCondition)
-	{
-		var level = 0;
-
-		var tmpCondition = trim(aCondition);
-
-		var compareList = new Array();
-		while (tmpCondition != "") {
-			var startPos = 0;
-			var weHaveSubCondition = false;
-
-			if (tmpCondition[0] == "(") {
-				var subCondition = splitOnCharacter(tmpCondition.substr(1), 0, ")");
-				if (subCondition) {
-					startPos = subCondition.length;
-					weHaveSubCondition = true;
-				}
-				else {
-					throw "XPath error: Did not find closing round bracket '"+this.tagName+"' for condition:"+aCondition;
-				}
-			}
-
-			var splitPart = splitOnCharacter(tmpCondition.toLowerCase(), startPos, [" and ", " or "]);
-
-			var operator = null;
-			var comparison = null;
-			if (splitPart) {
-				splitPart = tmpCondition.substr(0, splitPart.length);
-				tmpCondition = tmpCondition.substr(splitPart.length + 1);
-
-				// Findout which operator was specified.
-			
-				if (tmpCondition[0] == "a") {
-					var operator = "and";
-					tmpCondition = tmpCondition.substr(4);
-				}
-				else {
-					var operator = "or";
-					tmpCondition = tmpCondition.substr(3);
-				}
-			}
-			else {
-				splitPart = tmpCondition;
-				tmpCondition = "";
-			}
-
-			// Findout which comparison is requested.
-			if (weHaveSubCondition) {
-				compareList.push( { left: subCondition, right: "", operator: operator, comparison: comparison, subCondition: subCondition} );
-			}
-			else {
-				var splitPart2 = splitOnCharacter(splitPart, 0, ["!=", "<=", ">=", "<", "=", ">"]);
-				if (splitPart2) {
-					// Get comparison type
-					var smallerThen = false;
-					var equalTo = false;
-					var biggerThen = false;
-					var splitPos2 = splitPart2.length;
-					switch (splitPart[splitPos2]) {
-						case "!" : 
-							comparison = "!=";
-							break;
-						case "<" : 
-							comparison = "<";
-							if (splitPart[splitPos2+1] == "=") comparison = "<="; 
-							break;
-						case "=" : 
-							comparison = "="; 
-							break;
-						case ">" : 
-							comparison = ">";
-							if (splitPart[splitPos2+1] == "=") comparison = ">="; 
-							break;
-					}
-					compareList.push( { left: trim(splitPart2), right: trim(splitPart.substr(splitPart2.length+comparison.length)), operator: operator, comparison: comparison, subCondition: subCondition} );
-				}
-				else {
-					compareList.push( { left: trim(splitPart), right: "", operator: operator, comparison: comparison, subCondition: subCondition} );
-				}
-			}
-		}
-
-		var totalResult = true;
-		var lastOperator = null;
-		for (let index in compareList) {
-			
-			var tmpResult = false;
-
-			if (compareList[index].subCondition) {
-				tmpResult = this.if(compareList[index].left);
-			}
-			else {
-				let tmpLeft = this.convertComparisonPart(compareList[index].left);
-				let tmpRight = this.convertComparisonPart(compareList[index].right);
-
-				if (tmpLeft.length > 0) {
-					if (compareList[index].comparison) {
-						// Filter out ony the valid ones.
-						if (tmpRight.length > 0) {
-							var x = 0;
-							tmpResult = false;
-							while ((x < tmpLeft.length) && (!tmpResult)) {
-
-								if ((typeof tmpLeft[x] === "string") || (tmpLeft[x] instanceof String) || (typeof tmpLeft[x] === "number")) {
-									var evalConditionLeft = tmpLeft[x].toString();
-								}
-								else {
-									var evalConditionLeft = tmpLeft[x].value.toString();
-								}
-
-								var y = 0;
-								while ((y < tmpRight.length) && (!tmpResult)) {
-
-									if ((typeof tmpRight[y] === "string") || (tmpRight[y] instanceof String) || (typeof tmpRight[y] === "number")) {
-										var evalConditionRight = tmpRight[y].toString();
-									}
-									else {
-										var evalConditionRight = tmpRight[y].value.toString();
-									}
-
-									switch (compareList[index].comparison) {
-									case "!=":
-										tmpResult = (evalConditionLeft != evalConditionRight);
-										break;
-									case "<=":
-										tmpResult = (evalConditionLeft <= evalConditionRight);
-										break;
-									case ">=":
-										tmpResult = (evalConditionLeft >= evalConditionRight);
-										break;
-									case "<":
-										tmpResult = (evalConditionLeft < evalConditionRight);
-										break;
-									case "=":
-										tmpResult = (evalConditionLeft==evalConditionRight);
-										break;
-									case ">":
-										tmpResult = (evalConditionLeft > evalConditionRight);
-										break;
-									}
-
-									y++;
-								}
-								x++;
-							}
-						}
-					}
-					else {
-						// Return all results.
-						tmpResult = true;
-					}
-				}
-				else {
-					tmpResult = false;
-				}
-
-				tmpLeft = null;
-				tmpRight = null;
-			}
-
-			switch (lastOperator) {
-			case "and":
-				totalResult = (totalResult && tmpResult);
-				break;
-			case "or":
-				totalResult = (totalResult || tmpResult);
-				break;
-			case null:
-				totalResult = tmpResult;
-				break;
-			}
-
-			if (compareList[index].operator) {
-				if ((compareList[index].operator == "and") && (!totalResult)) { // We are done false is the endresult.
-					return false;
-				}
-				if ((compareList[index].operator == "or") && (totalResult)) {// We are done true is the endresult.
-					return true;
-				}
-			}
-
-			lastOperator = compareList[index].operator;
-		}
-
-		return totalResult;
-	},
-
-	realTagName: function _realTagName(aCurrentTagName)
-	{
-		var result = aCurrentTagName;
-		var tmpAlias = "_default_";
-		var tmpTagName = "";
-		var aliasPos = aCurrentTagName.indexOf(tagSeparator);
-		if (aliasPos > -1) {
-			tmpAlias = aCurrentTagName.substr(0,aliasPos);
-			tmpTagName = aCurrentTagName.substr(aliasPos+1);
-		}
-		else {
-			tmpTagName = aCurrentTagName;
-		}
-
-		var newNameSpace = this.getNameSpace(tmpAlias);
-		if (newNameSpace) {
-			result = newNameSpace + tagSeparator + tmpTagName;
-		}
-
-		return result;
-	},
-
-	XPath: function XPath(aPath)
-	{
-		var tmpPath = aPath;
-		var result = new Array();
-
-		if (tmpPath[0] == "/") {
-			tmpPath = tmpPath.substr(1);
-		}
-
-		switch (tmpPath[0]) {
-		case "/" : // Find all elements by specified element name
-			var allTag = splitOnCharacter(tmpPath.substr(1), 0, ["/", "["]);
-			if (!allTag) {
-				allTag = tmpPath.substr(1);
-			}
-
-			for (let index in this.tags) {
-				result.push(this.tags[index]);
-			}
-			tmpPath = "/"+tmpPath;
-			break;
-
-		case "@" : // Find attribute within this element
-			if (this.attr[tmpPath.substr(1)]) {
-				result.push(this.attr[tmpPath.substr(1)]);
-			}
-			tmpPath = "";
-			break;
-
-		case "*" : // Wildcard. Will parse all children.
-			tmpPath = tmpPath.substr(1);
-			for (let index in this.tags) {
-
-//				if (this.tags[index]) && (index.indexOf(tagSeparator) > -1)) {
-					let tmpTagName = "";
-					var tmpIsArray = isArray(this.tags[index]);
-					if (tmpIsArray) {
-						tmpTagName = this.tags[index][0].tagName;
-					}
-					else {
-						tmpTagName = this.tags[index].tagName;
-					}
-
-					if (tmpTagName != this.tagName) {
-						if (tmpIsArray) {
-							for (let index2 in this.tags[index]) {
-								result.push(this.tags[index][index2]);
-							}
-						}
-						else {
-							result.push(this.tags[index]);
-						}
-					}
-					
-//				}
-
-			}
-			break;
-
-		case "[" : // Compare/match function
-
-			var index = splitOnCharacter(tmpPath.substr(1), 0, "]");
-			if (!index) {
-				throw "XPath error: Did not find closing square bracket. tagName:"+this.tagName+", tmpPath:"+tmpPath;
-			}
-
-			tmpPath = tmpPath.substr(index.length+2);
-
-			index = trim(index); 
-
-			if (index != "") {
-
-				if (this.if(index)) {
-					result.push(this);
-				}
-				else {
-					return result;
-				}
-
-			}
-			else {
-				throw "XPath compare error:No Value between square brackets:"+this.tagName+"["+index+"]";
-			}
-			break;
-
-		default:
-			var bracketPos = tmpPath.indexOf("[");
-			var forwardSlashPos = tmpPath.indexOf("/");
-			var splitPos = tmpPath.length;
-			if ((bracketPos < splitPos) && (bracketPos > -1)) {
-				splitPos = bracketPos;
-			}
-			if ((forwardSlashPos < splitPos) && (forwardSlashPos > -1)) {
-				splitPos = forwardSlashPos;
-			}
-
-			var tmpPath2 = tmpPath.substr(0, splitPos);
-			tmpPath = tmpPath.substr(splitPos);
-
-			if (tmpPath2 != "") {
-
-				var equalTags = this.getTags(tmpPath2);
-				for (let index in equalTags) {
-					result.push(equalTags[index]);
-				}
-			}
-
-		} // End of switch
-
-		if ((result.length > 0) && (tmpPath != "")) {
-			var finalResult = new Array();
-			for (let index in result) {
-
-				if ((typeof result[index] === "string") || (result[index] instanceof String)) {
-					finalResult.push(result[index]);
-				}
-				else {
-					if (isArray(result[index])) {
-						for (let index2 in result[index]) {
-							let tmpResult = result[index][index2].XPath(tmpPath);
-							if (tmpResult) {
-								for (let index3 in tmpResult) {
-									finalResult.push(tmpResult[index3]);
-									tmpResult[index3] = null;
-								}
-							}
-							tmpResult = null;
-						}
-					}
-					else {
-						let tmpResult = result[index].XPath(tmpPath);
-						if (tmpResult) {
-							for (let index2 in tmpResult) {
-								finalResult.push(tmpResult[index2]);
-								tmpResult[index2] = null;
-							}
-						}
-						tmpResult = null;
-					}
-				}
-			}
-			result = finalResult;
-		}
-		else {
-			if ((tmpPath != "") && (tmpPath.substr(0,2) != "//")) {
-				var finalResult = new Array();
-				let tmpResult = this.XPath(tmpPath);
-				if (tmpResult) {
-					for (let index2 in tmpResult) {
-						finalResult.push(tmpResult[index2]);
-						tmpResult[index2] = null;
-					}
-				}
-				tmpResult = null;
-				result = finalResult;
-			}
-		}
-
-		if ((tmpPath != "") && (tmpPath.substr(0,2) == "//") && (this.tags[allTag]) && (this.tagName == this.tags[allTag].tagName)) {
-			tmpPath = tmpPath.substr(1); // We remove one of double forward slash so it becomes a normal xpath and filtering will take place.
-			if ((tmpPath != "") && (tmpPath.substr(0,2) != "//")) {
-				var finalResult = new Array();
-				let tmpResult = this.XPath(tmpPath);
-				if (tmpResult) {
-					for (let index2 in tmpResult) {
-						finalResult.push(tmpResult[index2]);
-						tmpResult[index2] = null;
-					}
-				}
-				tmpResult = null;
-				result = finalResult;
-			}
-
-		}
-
-		return result;
-	},
-
-	get lastPos()
-	{
-		return this._lastPos;
-	},
-
-	set lastPos(aValue)
-	{
-		this._lastPos = aValue;
-	},
-
-	processXMLString: function _processXMLString(aString, aStartPos, aParent)
-	{
-dump(" processXMLString 1: aStartPos:"+aStartPos+", aString.substr:"+aString.substr(aStartPos)+"\n");
-		//Search for Tag opening character "<"
-		if (!aString) return;
-try{
-		var pos = findCharacter(aString, aStartPos, "<");
-		var strLength = aString.length;
-dump(" processXMLString 2: pos:"+pos+"\n");
-		if (pos > -1) {
-			// Found opening character for Tag.
-			this.startPos = pos;
-			let skipped = pos - aStartPos;
-dump(" processXMLString 3: skipped:"+skipped+"\n");
-			if ((skipped > 0) && (aParent)) {
-dump(" going to add to content 1: aStartPos:"+aStartPos+", skipped:"+skipped+"\n");
-dump(" going to add to content 2:"+aString.substr(aStartPos, skipped)+"\n");
-				aParent.addToContent(aString.substr(aStartPos, skipped));
-dump(" going to add to content 3.\n");
-			}
-dump(" processXMLString 4.\n");
-
-			pos++;
-			// check if next character is special character "?"
-			var tmpChar = aString[pos];
-			if ( (pos < strLength) && (tmpChar == "?")) {
-				// found special character "?"
-				// Next four characters should be "xml " or else error.
-				pos++;
-				if (aString.substr(pos, 4) == "xml ") {
-					// We have a header.
-					var tmpPos = findString(aString, pos, "?>");
-					if (tmpPos == -1) {
-						throw this.xmlError(Ci.mivIxml2jxon.ERR_INVALID_SPECIAL_TAG);
-					}
-					else {
-						// found complete special tag.
-						//this.isXMLHeader = true;
-						//this.XMLHeader = aString.substr(this.startPos, tmpPos-this.startPos+1);
-//						this.addToContent(new mivIxml2jxon(aString, tmpPos+2, this));
-						this.processXMLString(aString, tmpPos+2, null);
-						//this.messageLength = tmpPos - this.startPos + 3;
-						this.closed = true; 
-						return;						
-					}
-				}
-				else {
-					// Error no valid header.
-					throw this.xmlError(Ci.mivIxml2jxon.ERR_MISSING_SPECIAL_TAG);
-				}
-			}
-			else {
-				if ( (pos < strLength) && (tmpChar == "/")) {
-					// found special character "/" at start of tag
-					// this should be a closing tag.
-					pos++;
-					var tmpStartPos = pos;
-					if (pos < strLength) {
-						// We still have characters left.
-						var tmpPos = findCharacter(aString, pos, ">");
-						if (tmpPos > -1) {
-							// We found a closing character.
-							// Disassemble the tag. And see if it is the same tag as our parent. If so return else Error.
-							var closingTag = aString.substr(tmpStartPos, tmpPos-tmpStartPos);
-							var xmlnsPos = closingTag.indexOf(tagSeparator);
-							if (xmlnsPos > -1) {
-								var nameSpace = closingTag.substr(0, xmlnsPos);
-								closingTag = closingTag.substr(xmlnsPos+1);
-							}
-							else {
-								var nameSpace = "_default_";
-							}
-
-							if ((aParent) && (closingTag == aParent.tagName) && (nameSpace == aParent.nameSpace)) {
-								this.lastPos = tmpPos;
-								this.closed = true;
-								return;
-							}
-							else {
-								throw this.xmlError(Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG);
-							}
-						}
-						else {
-							throw this.xmlError(Ci.mivIxml2jxon.ERR_INVALID_TAG);
-						}
-					}
-					else {
-						// No more characters left in aString.
-						throw this.xmlError(Ci.mivIxml2jxon.ERR_INVALID_TAG);
-					}
-				}
-				else {
-					// did not find special character or aString is not long enough.
-					if (pos < strLength) {
-						// We still have characters left.
-						var tmpPos = findCharacter(aString, pos, ">");
-						if (tmpPos > -1) {
-							// We found a closing character.
-							// Disassemble the tag. And process the content.
-						
-							// get tag name.
-							var tmpStart = this.startPos + 1;
-
-							let tmpTagName = "";
-							tmpChar = aString[tmpStart];
-							while ((tmpStart < strLength) && (tmpChar != ">") && 
-								(tmpChar != "/") && (!(isInList(specialChars1,tmpChar)))) {
-								tmpTagName = tmpTagName + tmpChar;
-								tmpStart++;
-								tmpChar = aString[tmpStart];
-							}
-
-							var xmlnsPos = tmpTagName.indexOf(tagSeparator);
-							if (xmlnsPos > -1) {
-								this.nameSpace = tmpTagName.substr(0, xmlnsPos);
-								tmpTagName = tmpTagName.substr(xmlnsPos+1);
-							}
-							else {
-								this.nameSpace = "_default_";
-							}
-
-							this.tagName = tmpTagName;
-
-							if (aParent) {
-								aParent.addChildTagObject(this);
-							}
-
-							if ((tmpStart < strLength) && (tmpChar == "/")) {
-								this.messageLength = tmpStart - this.startPos + 2;
-								this.lastPos = tmpStart+1;
-								return;
-							}
-							else {
-								if ((tmpStart < strLength) && (isInList(specialChars1,tmpChar))) {
-									// get attributes &
-									// get namespaces
-									var attribute = "";
-									tmpStart++;
-									tmpChar = aString[tmpStart];
-									var quoteOpen = false;
-									var seenAttributeSeparator = false;
-									var quoteChar = "";
-									while ((tmpStart < strLength) && 
-										(((tmpChar != ">") && (tmpChar != "/")) || (quoteOpen)) ) {
-
-										attribute = attribute + tmpChar;
-
-										if ((!seenAttributeSeparator) && (tmpChar == "=") && (!quoteOpen)) {
-											seenAttributeSeparator = true;
-										}
-										else {
-											if (seenAttributeSeparator) {
-												if ((tmpChar == '"') || (tmpChar == "'")) {
-													if ((!quoteOpen) || ((quoteOpen) && (quoteChar == tmpChar))) {
-														quoteOpen = !quoteOpen;
-														if (quoteOpen) {
-															quoteChar = tmpChar;
-														}
-													}
-												}
-											}
-										}
-
-										tmpStart++;
-										tmpChar = aString[tmpStart];
-
-										if ((seenAttributeSeparator) && (tmpStart < strLength) && (isInList(specialChars1,tmpChar)) && (!quoteOpen)) {
-											this.explodeAttribute(attribute);
-											attribute = "";
-											seenAttributeSeparator = false;
-											tmpStart++;
-											tmpChar = aString[tmpStart];
-										}
-									}
-
-									if ((seenAttributeSeparator) && (!quoteOpen) && (tmpStart < strLength) && (attribute.length > 0)) {
-										this.explodeAttribute(attribute);
-										seenAttributeSeparator = false;
-										attribute = "";
-									}
-
-									if ((tmpStart < strLength) && (tmpChar == "/")) {
-										// Found opening tag with attributes which is also closed.
-										this.messageLength = tmpStart - this.startPos + 2;
-										this.lastPos = tmpStart+1;
-										return;
-									}
-									else {
-										if (!((tmpStart < strLength) && (tmpChar == ">"))) {
-											throw this.xmlError(Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG);
-										}
-									}
-
-								}
-								else {
-									if (!((tmpStart < strLength) && (tmpChar == ">"))) {
-										throw this.xmlError(Ci.mivIxml2jxon.ERR_WRONG_CLOSING_TAG);
-									}
-								}
-						
-							}
-
-
-							var tmpChild = null;
-							while (((!tmpChild) || (!tmpChild.closed)) && (tmpPos)) {
-dump(" }} tmpPos:"+tmpPos+", aString.substr:"+aString.substr(tmpPos+1)+"\n");
-								//tmpChild = new mivIxml2jxon(aString, tmpPos+1, this);
-								tmpChild = Cc["@1st-setup.nl/conversion/xml2jxon;1"]
-										.createInstance(Ci.mivIxml2jxon);
-								tmpChild.processXMLString(aString,tmpPos+1, this);
-dump("  +=+ tmpChild.closed:"+tmpChild.closed+"\n");
-								//if (tmpChild.
-								//this.addChildTagObject(tmpChild);
-
-								this.messageLength = tmpChild.lastPos - this.startPos + 1;
-								tmpPos = tmpChild.lastPos;
-							}
-							tmpChild = null;
-							this.lastPos = tmpPos;
-
-							
-						}
-						else {
-							throw this.xmlError(Ci.mivIxml2jxon.ERR_INVALID_TAG);
-						}
-					}
-					else {
-						// No more characters left in aString.
-						throw this.xmlError(Ci.mivIxml2jxon.ERR_INVALID_TAG);
-					}
-				}
-			}
-		}
-		else {
-			// Did not find opening character for Tag.
-			// We stop here.
-dump("nothing left.\n");
-			if (aParent) {
-				aParent.addToContent(new String(aString));
-				aParent.messageLength = aParent.messageLength+aString.length; 
-			}
-			this.lastPos = aString.length - 1;
-			this.closed = true;
-		}
-}
-catch(err){ dump(" !! err:"+err+"\n");}
-	},
-}
-
-function NSGetFactory(cid) {
-
-	try {
-		if (!NSGetFactory.xml2json) {
-			// Load main script from lightning that we need.
-			NSGetFactory.xml2json = XPCOMUtils.generateNSGetFactory([mivIxml2jxon]);
-			
-	}
-
-	} catch(e) {
-		Components.utils.reportError(e);
-		dump(e);
-		throw e;
-	}
-
-	return NSGetFactory.xml2json(cid);
-} 
-

From 89cff8fd95ef97e70e665b02a9a1f2b25b0253ad Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Feb 2018 13:51:57 +0100
Subject: [PATCH 213/222] Rebuild mivFunctions.xpt as the mivFunctions.idl has
 been modified

---
 common/interface/global/mivFunctions.xpt | Bin 1103 -> 1086 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/common/interface/global/mivFunctions.xpt b/common/interface/global/mivFunctions.xpt
index 983a46833847d07936c6e7fabfc79d9c15688588..1e17272c747b937e8ba8d2b524637af1f1196329 100644
GIT binary patch
delta 186
zcmX@lv5#YdIHTP}2`5IOjnO%blg}`&WK`K)#$?D?&)gu@AeF%0z{bG9z*xi7vOPfx
z!fs<~fU_qcvFEZhY;Rz1kXo@FqHZ0C&)mS1zzpH<f$+D(_{W(Wwzq7DslLMqR1LQ4
V4aiJ3SqSGFkONi1!~$nG004N4Gj0F?

delta 203
zcmdnTah_v>IHUhW2`5JJjnO%bEG0#mxs#7Eu3}W(T*zd|SkKh3eZ}?$HU<U;#zN)>
zsRpS8b_lPLsbzbD6olOkR0U&CMPe^vY1rPt-XH}tVKa!&+`yB-4AFNG!ru<#pJ8s;
d-U7GpA!EaKO^CveAVb+8?B56{F>%7#4FIMVISv2-


From 261d3d221d66461979c425d3155d1fa918340025 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Sun, 4 Feb 2018 15:42:50 +0100
Subject: [PATCH 214/222] mivExchangeAuhtPrompt2: unify the way to find realm
 for Basic HTTP Authentication

Before these modifications, there was an error in the
'asyncPromptAuthNotifyCallback' implementation using a not defined
`index` variable.

The unified method to getRealm try to be a little bit more compliant
with the RFC defining Basic HTTP Authentication.
---
 .../mivExchangeAuthPrompt2.js                 | 87 +++++++++++--------
 1 file changed, 50 insertions(+), 37 deletions(-)

diff --git a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index b537d410..2bbd1aa6 100644
--- a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -103,7 +103,12 @@ mivExchangeAuthPrompt2.prototype = {
 
         this.showPassword = this.globalFunctions.safeGetBoolPref(null, "extensions.1st-setup.authentication.showpassword", false, true);
 
-        //		var realm = aRealm;
+        /*
+         * This realm variable is never used in authentication, it's just used by exchangecalendar to save
+         * credentials in its cache and/or in the Thundebird password manager.
+         * So, this value is fixed to a specific string to avoid having non-valid string in these two systems.
+         */
+        // var realm = aRealm;
         var realm = "Exchange Web Service";
 
         if (!realm) {
@@ -324,25 +329,10 @@ mivExchangeAuthPrompt2.prototype = {
                 this.logInfo("asyncPromptAuthNotifyCallback: username=" + username);
 
                 if (!error) {
-                    // Trying to get realm from response header.
-                    // This is used when basic authentication is available.
-                    var realm = "exchange.server";
-                    try {
-                        var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
-                        acceptedAuthentications = acceptedAuthentications.split("\n");
-
-                        for (let acceptAuth of acceptedAuthentications) {
-                            this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate:" + acceptAuth);
-                            if (acceptAuth.indexOf("realm=") > -1) {
-                                realm = acceptAuth.substr(index.indexOf("realm=") + 6);
-                                realm = realm.replace(/"/g, "");
-                                this.logInfo("asyncPromptAuthNotifyCallback: Found a realm going to use it. realm=" + realm);
-                                canUseBasicAuth = true;
-                            }
-                        }
-                    }
-                    catch (err) {
-                        this.logInfo("asyncPromptAuthNotifyCallback: WWW-Authenticate HTTP response header not found !");
+                    // Read response headers, to get the realm argument required for the HTTP Basic authentication method.
+                    var realm = this.getRealm('Basic', aChannel);
+                    if (realm) {
+                        canUseBasicAuth = true;
                     }
 
                     // try to get password.
@@ -561,23 +551,8 @@ mivExchangeAuthPrompt2.prototype = {
             }
             this.logInfo("promptAuth: username=" + username);
 
-            // Trying to get realm from response header. This is used when basic authentication is available.
-            var realm = "exchange.server";
-            try {
-                var acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
-                acceptedAuthentications = acceptedAuthentications.split("\n");
-                for (let authenticateHeader of acceptedAuthentications) {
-                    this.logInfo("promptAuth: WWW-Authenticate:" + authenticateHeader);
-                    if (authenticateHeader.indexOf("realm=") > -1) {
-                        realm = index.substr(authenticateHeader.indexOf("realm=") + 6);
-                        this.logInfo("promptAuth: Found a realm going to use it. realm=" + realm);
-                    }
-                }
-            }
-            catch (err) {
-                this.logInfo("promptAuth: NO WWW-Authenticate in response header!?");
-            }
-
+            // Read response headers, to get the realm argument required for the HTTP Basic authentication method.
+            let realm = this.getRealm('Basic', aChannel);
             password = this.getPassword(aChannel, username, URL, realm);
             if ((!password) || (password == null)) {
                 this.logInfo("promptAuth: No password.");
@@ -778,6 +753,44 @@ mivExchangeAuthPrompt2.prototype = {
         };
     },
 
+    /* Helper function to retrieve realm from WWW-Authenticate HTTP headers
+     * realm is a string defining the location where the credentials are valid
+     * It's defined by [RFC2617](https://tools.ietf.org/html/rfc2617)
+     * */
+    getRealm: function _getRealm(aChallengeType, aChannel) {
+        let acceptedAuthentications = null;
+        let realm = null;
+
+        try {
+            acceptedAuthentications = aChannel.getResponseHeader("WWW-Authenticate");
+        }
+        catch (err) {
+            this.logInfo("getRealm: Error while looking for WWW-Authenticate HTTP response header: " + err);
+        }
+
+        if (acceptedAuthentications) {
+            // Mozilla's nsHttpHeaderArray.h uses char '\n' to join multiple WWW-Authenticate HTTP response header
+            acceptedAuthentications = acceptedAuthentications.split('\n');
+            for (let authenticateHeader of acceptedAuthentications) {
+                this.logInfo("getRealm: reading header: WWW-Authenticate:" + authenticateHeader);
+
+                // Look only realm in header with the required challenge
+                if (authenticateHeader.search(aChallengeType + ' ') == 0) {
+                    // Look for first realm= position using regular expression, as realm instruction is case insensitive
+                    let realmPosition = authenticateHeader.search('realm=', 'i');
+                    if (realmPosition > -1) {
+                        let firstQuotePosition = authenticateHeader.indexOf('"', realmPosition);
+                        let secondQuotePosition = authenticateHeader.indexOf('"', firstQuotePosition);
+                        realm = authenticateHeader.substring(firstQuotePosition + 1, secondQuotePosition);
+                        this.logInfo("getRealm: Found a realm going to use it. realm=" + realm);
+                    }
+                }
+            }
+        }
+
+        return realm;
+    },
+
     logInfo: function _logInfo(aMsg, aDebugLevel) {
         var prefB = Cc["@mozilla.org/preferences-service;1"]
             .getService(Ci.nsIPrefBranch);

From 4b345edac35f340cb3444bcdbaad90b7e5e1ac95 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 5 Feb 2018 22:10:09 +0100
Subject: [PATCH 215/222] mivExchangeAuthPrompt2: fix syntax typo

---
 common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
index bbbe5572..240f1949 100644
--- a/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
+++ b/common/interface/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js
@@ -614,7 +614,7 @@ mivExchangeAuthPrompt2.prototype = {
      *				result == false when password not found.
      */
     passwordManagerGet: function _passwordManagerGet(aUsername, aURL, aRealm) {
-        if ((!aUsername) || aUsername.trim() == "")) {
+        if ((!aUsername) || aUsername.trim() == "") {
             this.logInfo("passwordManagerGet: username is undefined or empty.")
             return {
                 result: false

From f40c1d15cca0931ef885dfb689d6d82cc1a1e1bb Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 5 Feb 2018 23:53:24 +0100
Subject: [PATCH 216/222] mivFunctions.js: LOG now uses ISO format to write
 current time in logs (in UTC timezone)

---
 common/interface/global/mivFunctions.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/interface/global/mivFunctions.js b/common/interface/global/mivFunctions.js
index b4cfc040..f15ddea2 100644
--- a/common/interface/global/mivFunctions.js
+++ b/common/interface/global/mivFunctions.js
@@ -407,9 +407,6 @@ mivFunctions.prototype = {
     },
 
     LOG: function _LOG(aArg) {
-        //var prefB = Cc["@mozilla.org/preferences-service;1"].
-        //            getService(Ci.nsIPrefBranch);
-        //var shouldLog = this.safeGetBoolPref(prefB, "extensions.1st-setup.debug.log", false, true);
 
         if (!this.shouldLog()) {
             return;
@@ -433,7 +430,7 @@ mivFunctions.prototype = {
         }
         else {
             var dt = new Date();
-            string = "1st-setup:" + dt.getFullYear() + "-" + dt.getMonth() + "-" + dt.getDay() + " " + dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds() + "." + dt.getMilliseconds() + ":" + aArg;
+            string = "ExchangeCalendar [" + dt.toISOString() + "]: " + aArg;
         }
 
         // xxx todo consider using function debug()

From 5c5a65a2d7be3cf941875690d83847bb1bb4bcfb Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Date: Tue, 27 Feb 2018 14:06:38 +0100
Subject: [PATCH 217/222] Fix link to lightning extension

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92d9c46e..bc4daae3 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Exchange Calendar is an add-on for [Thunderbird](https://mozilla.org/thunderbird)
 and [Seamonkey](https://www.seamonkey-project.org/).
 
-It extends the [Lightning](https://mozilla.org/calendar) add-on to provide
+It extends the [Lightning](https://addons.mozilla.org/de/thunderbird/addon/lightning/) add-on to provide
 [Microsoft Exchange](http://microsoft.com/exchange) support.
 
 Exchange Calendar extension can:

From 9b39a13364a507758090d33b26eb79dd4ce5e786 Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Date: Sun, 4 Mar 2018 20:07:56 +0100
Subject: [PATCH 218/222] Fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc4daae3..99859848 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Exchange Calendar is an add-on for [Thunderbird](https://mozilla.org/thunderbird)
 and [Seamonkey](https://www.seamonkey-project.org/).
 
-It extends the [Lightning](https://addons.mozilla.org/de/thunderbird/addon/lightning/) add-on to provide
+It extends the [Lightning](https://addons.mozilla.org/thunderbird/addon/lightning/) add-on to provide
 [Microsoft Exchange](http://microsoft.com/exchange) support.
 
 Exchange Calendar extension can:

From 2096b84c2223a8f7c324d6d77698355d12ac126f Mon Sep 17 00:00:00 2001
From: sergio-mena <sergiomena@gmail.com>
Date: Tue, 13 Mar 2018 21:26:13 +0100
Subject: [PATCH 219/222] Fixed usage of addDuration (which returns void)

---
 calendar/interface/exchangeCalendar/mivExchangeCalendar.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
index c0fcc3bd..5e87b5b9 100644
--- a/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
+++ b/calendar/interface/exchangeCalendar/mivExchangeCalendar.js
@@ -2597,7 +2597,8 @@ calExchangeCalendar.prototype = {
             let offset = cal.createDuration();
             offset.weeks = -5;
 
-            aRangeStart = cal.now().addDuration(offset);
+            aRangeStart = cal.now()
+            aRangeStart.addDuration(offset);
 
             // If cache already contains a bigger range, use it
             if (this.startDate
@@ -2614,7 +2615,8 @@ calExchangeCalendar.prototype = {
             let offset = cal.createDuration();
             offset.weeks = 5;
 
-            aRangeEnd = cal.now().addDuration(offset);
+            aRangeEnd = cal.now()
+            aRangeEnd.addDuration(offset);
 
             // If cache already contains a bigger range, use it
             if ((this.endDate) && (this.endDate.compare(aRangeEnd) > 0)) {

From d4ff7d89f12675c47b26a12bc01c697cbcd129f4 Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sun, 30 Sep 2018 11:49:08 +0200
Subject: [PATCH 220/222] Pull latest translations from Transifex

Resolves #191.
---
 common/locale/cs_CZ/preferences.dtd | 6 +++---
 common/locale/tr/preferences.dtd    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/locale/cs_CZ/preferences.dtd b/common/locale/cs_CZ/preferences.dtd
index 6b693016..93502f8d 100644
--- a/common/locale/cs_CZ/preferences.dtd
+++ b/common/locale/cs_CZ/preferences.dtd
@@ -43,9 +43,9 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Mezi jednotlivými požadavky na exchange server počkat alespoň:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP user agent:">
 
-<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
-<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
-<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Rejstřík globálního vyhledávání v Thunderbird">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Zapnout rejstřík globálního vyhledávání v Thunderbird">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "Pokud zapnete tuto funkci Thunderbird, exchangecalendar bude schopné zapnout vzdálené štítkování e-mailů a zvací sloupec ve stromovém pohledu na e-maily.">
 
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Předvolby Ntlm-v1:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Zapnout">
diff --git a/common/locale/tr/preferences.dtd b/common/locale/tr/preferences.dtd
index 9798c25d..ac797d83 100644
--- a/common/locale/tr/preferences.dtd
+++ b/common/locale/tr/preferences.dtd
@@ -43,9 +43,9 @@
 <!ENTITY exchangeWebService.preference.loadbalancer.prefs.sleepBetweenJobs.label "Exchange sunucuna gönderilen istekler arasındaki en kısa bekleme süresi:">
 <!ENTITY exchangeWebService.preference.userAgent.label "HTTP kullanıcı aracısı:">
 
-<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Global Search Index">
-<!ENTITY exchangeWebService.preference.globalsearch.label "Enable the Thunderbird Global Search Index">
-<!ENTITY exchangeWebService.preference.globalsearch.explain "If you enable this Thunderbird feature, exchangecalendar would be able to enable the email remote tagging and the invitation column in the mail tree view.">
+<!ENTITY exchangeWebService.preference.globalsearch.caption "Thunderbird Küresel Arama Dizini">
+<!ENTITY exchangeWebService.preference.globalsearch.label "Thunderbird Küresel Arama Dizinini Etkinleştir">
+<!ENTITY exchangeWebService.preference.globalsearch.explain "Eğer bu Thunderbird özelliğini etkinleştirirseniz, exchangecalendar, uzaktan eposta etiketlemeyi ve posta ağacı görüntüsünde davet sütununu göstermeyi açabilme yeteneklerini kazanacaktır.">
 
 <!ENTITY exchangeWebService.preference.ntlmv1.label "Ntlm-v1 Tercihleri:">
 <!ENTITY exchangeWebService.preference.ntlmv1.true.label "Etkinleştir">

From b1b5c20e8e4674c1f1906dcaf5fb11bcd07ffa5a Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sun, 30 Sep 2018 11:58:48 +0200
Subject: [PATCH 221/222] Release version 4.0.0

Resolves #193
---
 CHANGELOG.md | 5 +++++
 README.md    | 1 +
 VERSION      | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd6e6146..c90ebf2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.0.0] - 2018-09-30
+### Changed
+- Pull latest localization from Transifex
+- Update readme with Thunderbird version compatibility
+
 ## [4.0.0-beta5] - 2018-01-28
 ### Added
 - Code beautifiers are available for JavaScript, XML, XUL and RDF files
diff --git a/README.md b/README.md
index 99859848..1a26e388 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Exchange Calendar extension can:
   * Manage the Exchange « out of office » feature.
 
 This extension requires:
+  * A recent Thunderbird version up to 59.
   * Lightning extension corresponding to the Thunderbird release.
   * The Exchange server has to provide an Exchange Web Service.
 
diff --git a/VERSION b/VERSION
index 35626288..fcdb2e10 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.0-beta6
+4.0.0

From f8e60da39ece55db574761a5b972a75ca34b516a Mon Sep 17 00:00:00 2001
From: Markus Weiland <mw@graph-ix.net>
Date: Sun, 30 Sep 2018 12:08:43 +0200
Subject: [PATCH 222/222] Add Thunderbird maximum version restriction

---
 CHANGELOG.md         | 2 +-
 install.rdf.template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c90ebf2b..f1b65b67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 ## [4.0.0] - 2018-09-30
 ### Changed
 - Pull latest localization from Transifex
-- Update readme with Thunderbird version compatibility
+- Set maximum version restriction to Thunderbird 59
 
 ## [4.0.0-beta5] - 2018-01-28
 ### Added
diff --git a/install.rdf.template b/install.rdf.template
index 78ebc2fb..ee349008 100644
--- a/install.rdf.template
+++ b/install.rdf.template
@@ -9,7 +9,7 @@
                 <!-- Thunderbird -->
                 <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
                 <em:minVersion>52.0.0</em:minVersion>
-                <em:maxVersion>52.*.*</em:maxVersion>
+                <em:maxVersion>59.*.*</em:maxVersion>
             </Description>
         </em:targetApplication>
         <em:targetApplication>